12 files changed, 12 insertions, 32 deletions
diff --git a/arch/mips/boards/dlink-dir-320/Kconfig b/arch/mips/boards/dlink-dir-320/Kconfig
deleted file mode 100644
index 0393d04530..0000000000
--- a/arch/mips/boards/dlink-dir-320/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-if BOARD_DLINK_DIR320
-
-config BOARDINFO
-	default "D-Link DIR-320"
-
-endif
diff --git a/arch/mips/boards/dlink-dir-320/serial.c b/arch/mips/boards/dlink-dir-320/serial.c
index 099af2057d..bddb6838c9 100644
--- a/arch/mips/boards/dlink-dir-320/serial.c
+++ b/arch/mips/boards/dlink-dir-320/serial.c
@@ -31,6 +31,9 @@ static struct NS16550_plat serial_plat = {
 
 static int dir320_console_init(void)
 {
+	barebox_set_model("D-Link DIR-320");
+	barebox_set_hostname("dir320");
+
 	/* Register the serial port */
 	add_ns16550_device(DEVICE_ID_DYNAMIC, DEBUG_LL_UART_ADDR, 8,
 			IORESOURCE_MEM_8BIT, &serial_plat);
diff --git a/arch/mips/boards/netgear-wg102/Kconfig b/arch/mips/boards/netgear-wg102/Kconfig
deleted file mode 100644
index ceca6de820..0000000000
--- a/arch/mips/boards/netgear-wg102/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-if BOARD_NETGEAR_WG102
-
-config BOARDINFO
-	default "Netgear WG102"
-
-endif
diff --git a/arch/mips/boards/netgear-wg102/ram.c b/arch/mips/boards/netgear-wg102/ram.c
index 00a008a1ee..e26dc7cbd3 100644
--- a/arch/mips/boards/netgear-wg102/ram.c
+++ b/arch/mips/boards/netgear-wg102/ram.c
@@ -5,6 +5,9 @@
 
 static int mem_init(void)
 {
+	barebox_set_model("Netgear wg102");
+	barebox_set_hostname("wg102");
+
 	mips_add_ram0(SZ_16M);
 	return 0;
 }
diff --git a/arch/mips/boards/qemu-malta/Kconfig b/arch/mips/boards/qemu-malta/Kconfig
deleted file mode 100644
index 6d86c148c7..0000000000
--- a/arch/mips/boards/qemu-malta/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-if BOARD_QEMU_MALTA
-
-config BOARDINFO
-	default "qemu malta"
-
-endif
diff --git a/arch/mips/boards/qemu-malta/init.c b/arch/mips/boards/qemu-malta/init.c
index f77fcad821..ddc90dc758 100644
--- a/arch/mips/boards/qemu-malta/init.c
+++ b/arch/mips/boards/qemu-malta/init.c
@@ -43,6 +43,9 @@ static struct NS16550_plat serial_plat = {
 
 static int malta_console_init(void)
 {
+	barebox_set_model("qemu malta");
+	barebox_set_hostname("malta");
+
 	/* Register the serial port */
 	add_ns16550_device(DEVICE_ID_DYNAMIC, MALTA_PIIX4_UART0, 8,
 			IORESOURCE_MEM_8BIT, &serial_plat);
diff --git a/arch/mips/boards/rzx50/Kconfig b/arch/mips/boards/rzx50/Kconfig
deleted file mode 100644
index 38401aa69a..0000000000
--- a/arch/mips/boards/rzx50/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-if BOARD_RZX50
-
-config BOARDINFO
-	default "Ritmix RZX-50"
-
-endif
diff --git a/arch/mips/boards/rzx50/serial.c b/arch/mips/boards/rzx50/serial.c
index 129806d5a1..0038c1db40 100644
--- a/arch/mips/boards/rzx50/serial.c
+++ b/arch/mips/boards/rzx50/serial.c
@@ -22,6 +22,9 @@
 
 static int rzx50_console_init(void)
 {
+	barebox_set_model("Ritmix RZX-50");
+	barebox_set_hostname("rzx50");
+
 	/* Register the serial port */
 	jz_add_uart(DEVICE_ID_DYNAMIC, UART1_BASE, 12000000);
 
diff --git a/arch/mips/mach-ar231x/Kconfig b/arch/mips/mach-ar231x/Kconfig
index 3f338ea115..5f9e24377f 100644
--- a/arch/mips/mach-ar231x/Kconfig
+++ b/arch/mips/mach-ar231x/Kconfig
@@ -14,6 +14,4 @@ config BOARD_NETGEAR_WG102
 
 endchoice
 
-source arch/mips/boards/netgear-wg102/Kconfig
-
 endif
diff --git a/arch/mips/mach-bcm47xx/Kconfig b/arch/mips/mach-bcm47xx/Kconfig
index d0df0fd6b8..f7522b79d6 100644
--- a/arch/mips/mach-bcm47xx/Kconfig
+++ b/arch/mips/mach-bcm47xx/Kconfig
@@ -12,6 +12,4 @@ config BOARD_DLINK_DIR320
 
 endchoice
 
-source arch/mips/boards/dlink-dir-320/Kconfig
-
 endif
diff --git a/arch/mips/mach-malta/Kconfig b/arch/mips/mach-malta/Kconfig
index 67763f8d22..1bf2b0e68a 100644
--- a/arch/mips/mach-malta/Kconfig
+++ b/arch/mips/mach-malta/Kconfig
@@ -15,6 +15,4 @@ config BOARD_QEMU_MALTA
 
 endchoice
 
-source arch/mips/boards/qemu-malta/Kconfig
-
 endif
diff --git a/arch/mips/mach-xburst/Kconfig b/arch/mips/mach-xburst/Kconfig
index e6413d5637..706d59249b 100644
--- a/arch/mips/mach-xburst/Kconfig
+++ b/arch/mips/mach-xburst/Kconfig
@@ -35,6 +35,4 @@ endchoice
 endif # CPU_JZ4755
 endif # DEBUG_LL
 
-source arch/mips/boards/rzx50/Kconfig
-
 endif