Merge branch 'for-next/boardinfo'

Conflicts:
	arch/mips/boards/qemu-malta/init.c
	commands/bootm.c
	drivers/of/base.c

Documentation/board.dox

@@ -82,7 +82,6 @@ TBD
  - modify arch/\<architecture\>/Kconfig
   - add your board (MACH_*) to the list
   - add your default text base address for this architecture (ARCH_TEXT_BASE)
-  - add BOARDINFO with valueable info for your board
  - modify arch/\<architecture\>/Makefile:
   - add board-$(MACH_*) = \<your board_dir\>
 

arch/arm/boards/a9m2410/a9m2410.c

@@ -135,6 +135,9 @@ device_initcall(a9m2410_devices_init);
 
 static int a9m2410_console_init(void)
 {
+	barebox_set_model("Digi A9M2410");
+	barebox_set_hostname("a9m2410");
+
 	s3c24xx_add_uart1();
 	return 0;
 }

arch/arm/boards/a9m2440/a9m2440.c

@@ -154,6 +154,9 @@ device_initcall(a9m2440_devices_init);
 
 static int a9m2440_console_init(void)
 {
+	barebox_set_model("Digi A9M2440");
+	barebox_set_hostname("a9m2440");
+
 	s3c24xx_add_uart1();
 	return 0;
 }

arch/arm/boards/animeo_ip/init.c

@@ -246,6 +246,10 @@ static int animeo_ip_console_init(void)
 	 */
 #define ATMEL_US_BRGR	0x0020
 	at91_sys_write(AT91_DBGU + ATMEL_US_BRGR, 0);
+
+	barebox_set_model("Somfy Animeo IP");
+	barebox_set_hostname("animeoip");
+
 	at91_register_uart(3, 0);
 	return 0;
 }

arch/arm/boards/archosg9/board.c

@@ -26,7 +26,11 @@
 #include <readkey.h>
 #include "archos_features.h"
 
-static int archosg9_console_init(void){
+static int archosg9_console_init(void)
+{
+	barebox_set_model("Archos G9");
+	barebox_set_hostname("g9");
+
 	if (IS_ENABLED(CONFIG_DRIVER_SERIAL_OMAP4_USBBOOT) &&
 			omap4_usbboot_ready()) {
 		add_generic_device("serial_omap4_usbboot", DEVICE_ID_DYNAMIC

arch/arm/boards/at91rm9200ek/init.c

@@ -184,6 +184,9 @@ device_initcall(at91rm9200ek_devices_init);
 
 static int at91rm9200ek_console_init(void)
 {
+	barebox_set_model("Atmel at91rm9200-ek");
+	barebox_set_hostname("at91rm9200-ek");
+
 	at91_register_uart(0, 0);
 	return 0;
 }

arch/arm/boards/at91sam9260ek/init.c

@@ -266,6 +266,14 @@ device_initcall(at91sam9260ek_devices_init);
 
 static int at91sam9260ek_console_init(void)
 {
+	if (machine_is_at91sam9g20ek()) {
+		barebox_set_model("Atmel at91sam9g20-ek");
+		barebox_set_hostname("at91sam9g20-ek");
+	} else {
+		barebox_set_model("Atmel at91sam9260-ek");
+		barebox_set_hostname("at91sam9260-ek");
+	}
+
 	at91_register_uart(0, 0);
 	return 0;
 }

arch/arm/boards/at91sam9261ek/init.c

@@ -402,6 +402,14 @@ device_initcall(at91sam9261ek_devices_init);
 
 static int at91sam9261ek_console_init(void)
 {
+	if (machine_is_at91sam9g10ek()) {
+		barebox_set_model("Atmel at91sam9g10-ek");
+		barebox_set_hostname("at91sam9g10-ek");
+	} else {
+		barebox_set_model("Atmel at91sam9261-ek");
+		barebox_set_hostname("at91sam9261-ek");
+	}
+
 	at91_register_uart(0, 0);
 	return 0;
 }

arch/arm/boards/at91sam9263ek/init.c

@@ -280,6 +280,9 @@ device_initcall(at91sam9263ek_devices_init);
 
 static int at91sam9263ek_console_init(void)
 {
+	barebox_set_model("Atmel at91sam9263-ek");
+	barebox_set_hostname("at91sam9263-ek");
+
 	at91_register_uart(0, 0);
 	return 0;
 }

arch/arm/boards/at91sam9m10g45ek/init.c

@@ -326,6 +326,9 @@ device_initcall(at91sam9m10g45ek_devices_init);
 
 static int at91sam9m10g45ek_console_init(void)
 {
+	barebox_set_model("Atmel at91sam9m10g45-ek");
+	barebox_set_hostname("at91sam9m10g45-ek");
+
 	at91_register_uart(0, 0);
 	return 0;
 }

arch/arm/boards/at91sam9m10ihd/env/config

@@ -3,8 +3,6 @@
 # change network settings in /env/network/eth0
 # change mtd partition settings and automountpoints in /env/init/*
 
-#global.hostname=
-
 # set to false if you do not want to have colors
 global.allow_color=true
 

arch/arm/boards/at91sam9m10ihd/init.c

@@ -283,6 +283,9 @@ device_initcall(at91sam9m10ihd_devices_init);
 
 static int at91sam9m10ihd_console_init(void)
 {
+	barebox_set_model("Atmel at91sam9m10ihd");
+	barebox_set_hostname("at91sam9m10ihd");
+
 	at91_register_uart(0, 0);
 	return 0;
 }

arch/arm/boards/at91sam9n12ek/init.c

@@ -334,6 +334,9 @@ device_initcall(at91sam9n12ek_devices_init);
 
 static int at91sam9n12ek_console_init(void)
 {
+	barebox_set_model("Atmel at91sam9n12-ek");
+	barebox_set_hostname("at91sam9n12-ek");
+
 	at91_register_uart(0, 0);
 	return 0;
 }

arch/arm/boards/at91sam9x5ek/init.c

@@ -327,6 +327,9 @@ device_initcall(at91sam9x5ek_devices_init);
 
 static int at91sam9x5ek_console_init(void)
 {
+	barebox_set_model("Atmel at91sam9x5-ek");
+	barebox_set_hostname("at91sam9x5-ek");
+
 	at91_register_uart(0, 0);
 	at91_register_uart(1, 0);
 	return 0;

arch/arm/boards/avnet-zedboard/board.c

@@ -44,6 +44,9 @@ device_initcall(zedboard_device_init);
 
 static int zedboard_console_init(void)
 {
+	barebox_set_model("Avnet ZedBoard");
+	barebox_set_hostname("zedboard");
+
 	zynq_add_uart1();
 
 	return 0;

arch/arm/boards/avnet-zedboard/env/init/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=ZedBoard
 global.linux.bootargs.base="console=ttyPS1,115200"

arch/arm/boards/beagle/board.c

@@ -73,6 +73,9 @@
  */
 static int beagle_console_init(void)
 {
+	barebox_set_model("Texas Instruments beagle");
+	barebox_set_hostname("beagle");
+
 	omap3_add_uart3();
 
 	return 0;

arch/arm/boards/beagle/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=beagle
 global.linux.bootargs.base="console=ttyO2,115200"

arch/arm/boards/beaglebone/board.c

@@ -59,6 +59,9 @@
  */
 static int beaglebone_console_init(void)
 {
+	barebox_set_model("Texas Instruments beaglebone");
+	barebox_set_hostname("beaglebone");
+
 	am33xx_add_uart0();
 
 	return 0;

arch/arm/boards/beaglebone/env/config

@@ -3,8 +3,6 @@
 # change network settings in /env/network/eth0
 # change mtd partition settings and automountpoints in /env/init/*
 
-global.hostname=beaglebone
-
 # set to false if you do not want to have colors
 global.allow_color=true
 

arch/arm/boards/ccxmx51/ccxmx51.c

@@ -474,6 +474,9 @@ static int ccxmx51_console_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(ccxmx51_pads, ARRAY_SIZE(ccxmx51_pads));
 
+	barebox_set_model("Digi ConnectCore i.MX51");
+	barebox_set_hostname("ccmx51");
+
 	imx51_add_uart0();
 
 	return 0;

arch/arm/boards/ccxmx51/env/config-board

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-global.hostname=ccmx51
-
 # Timeout in seconds before the default boot entry is started
 global.autoboot_timeout=2
 

arch/arm/boards/chumby_falconwing/env/config

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-global.hostname=falconwing
-
 # use 'dhcp' to do dhcp in barebox and in kernel
 # use 'none' if you want to skip kernel ip autoconfiguration
 ip=none

arch/arm/boards/chumby_falconwing/falconwing.c

@@ -312,6 +312,9 @@ device_initcall(falconwing_devices_init);
 
 static int falconwing_console_init(void)
 {
+	barebox_set_model("Chumby Falconwing");
+	barebox_set_hostname("falconwing");
+
 	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, 8192,
 			   IORESOURCE_MEM, NULL);
 

arch/arm/boards/clep7212/clep7212.c

@@ -51,6 +51,9 @@ device_initcall(clps711x_devices_init);
 
 static int clps711x_console_init(void)
 {
+	barebox_set_model("Cirrus Logic CLEP7212");
+	barebox_set_hostname("clep7212");
+
 	clps711x_add_uart(0);
 
 	return 0;

arch/arm/boards/clep7212/env/config-board

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-global.hostname=clps711x
-
 # Timeout in seconds before the default boot entry is started
 global.autoboot_timeout=2
 

arch/arm/boards/crystalfontz-cfa10036/cfa10036.c

@@ -147,6 +147,9 @@ device_initcall(cfa10036_devices_init);
 
 static int cfa10036_console_init(void)
 {
+	barebox_set_model("crystalfontz-cfa10036");
+	barebox_set_hostname("cfa10036");
+
 	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, SZ_8K,
 			   IORESOURCE_MEM, NULL);
 

arch/arm/boards/crystalfontz-cfa10036/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=cfa10036
 global.linux.bootargs.base="console=ttyAMA0,115200"

arch/arm/boards/crystalfontz-cfa10036/hwdetect.c

@@ -104,8 +104,8 @@ void cfa10036_detect_hw(void)
 		return;
 	}
 
-	globalvar_add_simple("board.variant");
-	setenv("global.board.variant", board_name);
+	globalvar_add_simple("board.variant", board_name);
+
 	pr_info("Booting on a CFA10036 with %s\n", board_name);
 }
 

arch/arm/boards/dmo-mx6-realq7/board.c

@@ -115,6 +115,8 @@ static int realq7_console_init(void)
 	if (!of_machine_is_compatible("dmo,imx6q-realq7"))
 		return 0;
 
+	barebox_set_hostname("eDM-QMX6");
+
 	imx6_init_lowlevel();
 
 	switch (bootsource_get()) {

arch/arm/boards/dmo-mx6-realq7/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=realq7
 global.linux.bootargs.base="console=ttymxc1,115200"

arch/arm/boards/dss11/init.c

@@ -155,6 +155,9 @@ device_initcall(dss11_devices_init);
 
 static int dss11_console_init(void)
 {
+	barebox_set_model("Aizo dSS11");
+	barebox_set_hostname("dss11");
+
 	at91_register_uart(0, 0);
 	return 0;
 }

arch/arm/boards/edb93xx/edb93xx.c

@@ -83,6 +83,7 @@ device_initcall(ep93xx_devices_init);
 static int edb93xx_console_init(void)
 {
 	struct syscon_regs *syscon = (struct syscon_regs *)SYSCON_BASE;
+	char *shortname, *board;
 
 	/*
 	 * set UARTBAUD bit to drive UARTs with 14.7456MHz instead of
@@ -98,6 +99,30 @@ static int edb93xx_console_init(void)
 	writel(0xAA, &syscon->sysswlock);
 	writel(value, &syscon->devicecfg);
 
+	if (IS_ENABLED(CONFIG_MACH_EDB9301))
+		shortname = "EDB9301";
+	else if (IS_ENABLED(CONFIG_MACH_EDB9302))
+		shortname = "EDB9302";
+	else if (IS_ENABLED(CONFIG_MACH_EDB9302))
+		shortname = "EDB9302A";
+	else if (IS_ENABLED(CONFIG_MACH_EDB9307))
+		shortname = "EDB9307";
+	else if (IS_ENABLED(CONFIG_MACH_EDB9307A))
+		shortname = "EDB9307A";
+	else if (IS_ENABLED(CONFIG_MACH_EDB9312))
+		shortname = "EDB9312";
+	else if (IS_ENABLED(CONFIG_MACH_EDB9315))
+		shortname = "EDB9315";
+	else if (IS_ENABLED(CONFIG_MACH_EDB9315A))
+		shortname = "EDB9315A";
+	else
+		shortname = "unknown";
+
+	board = asprintf("Cirrus Logic %s", shortname);
+	barebox_set_model(board);
+	free(board);
+	barebox_set_hostname(shortname);
+
 	add_generic_device("pl010_serial", DEVICE_ID_DYNAMIC, NULL, UART1_BASE, 4096,
 			   IORESOURCE_MEM, NULL);
 

arch/arm/boards/efika-mx-smartbook/board.c

@@ -185,6 +185,8 @@ static int efikamx_usb_init(void)
 	if (!of_machine_is_compatible("genesi,imx51-sb"))
 		return 0;
 
+	barebox_set_hostname("efikasb");
+
 	gpio_direction_output(GPIO_BLUETOOTH, 0);
 	gpio_direction_output(GPIO_WIFI_ENABLE, 1);
 	gpio_direction_output(GPIO_WIFI_RESET, 0);

arch/arm/boards/efika-mx-smartbook/env/config-board

@@ -3,7 +3,6 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=efikasb
 global.linux.bootargs.base="console=ttymxc0,115200"
 
 [ -f /env/config ] && /env/config

arch/arm/boards/eukrea_cpuimx25/env/config

@@ -5,8 +5,6 @@ otg_mode="device"
 # video : can be CMO-QVGA, URT-WVGA, DVI-VGA or DVI-SVGA
 video="CMO-QVGA"
 
-global.hostname=eukrea-cpuimx25
-
 # use 'dhcp' to do dhcp in barebox and in kernel
 # use 'none' if you want to skip kernel ip autoconfiguration
 ip=none

arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c

@@ -230,6 +230,9 @@ device_initcall(eukrea_cpuimx25_devices_init);
 
 static int eukrea_cpuimx25_console_init(void)
 {
+	barebox_set_model("Eukrea CPUIMX25");
+	barebox_set_hostname("eukrea-cpuimx25");
+
 	imx25_add_uart0();
 	return 0;
 }

arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c

@@ -210,6 +210,9 @@ static int eukrea_cpuimx27_console_init(void)
 {
 	uint32_t val;
 
+	barebox_set_model("Eukrea CPUIMX27");
+	barebox_set_hostname("eukrea-cpuimx27");
+
 #ifdef CONFIG_DRIVER_SERIAL_IMX
 	imx27_add_uart0();
 #endif

arch/arm/boards/eukrea_cpuimx35/env/config

@@ -5,8 +5,6 @@ otg_mode="device"
 # video : can be CMO-QVGA, URT-WVGA, DVI-VGA or DVI-SVGA
 video="CMO-QVGA"
 
-global.hostname=eukrea-cpuimx35
-
 # use 'dhcp' to do dhcp in barebox and in kernel
 # use 'none' if you want to skip kernel ip autoconfiguration
 ip=none

arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c

@@ -227,6 +227,9 @@ device_initcall(eukrea_cpuimx35_devices_init);
 
 static int eukrea_cpuimx35_console_init(void)
 {
+	barebox_set_model("Eukrea CPUIMX35");
+	barebox_set_hostname("eukrea-cpuimx35");
+
 	imx35_add_uart0();
 	return 0;
 }

arch/arm/boards/eukrea_cpuimx51/env/config

@@ -8,8 +8,6 @@ video="CMO-QVGA"
 # screen type : can be 'tft' or 'dvi'
 screen_type="tft"
 
-global.hostname=eukrea-cpuimx51
-
 # use 'dhcp' to do dhcp in barebox and in kernel
 # use 'none' if you want to skip kernel ip autoconfiguration
 ip=none

arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c

@@ -132,6 +132,9 @@ static int eukrea_cpuimx51_console_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx51_pads, ARRAY_SIZE(eukrea_cpuimx51_pads));
 
+	barebox_set_model("Eukrea CPUIMX51");
+	barebox_set_hostname("eukrea-cpuimx51");
+
 	imx51_init_lowlevel(800);
 
 	imx51_add_uart0();

arch/arm/boards/freescale-mx23-evk/mx23-evk.c

@@ -131,6 +131,9 @@ device_initcall(mx23_evk_devices_init);
 
 static int mx23_evk_console_init(void)
 {
+	barebox_set_model("Freescale i.MX23 EVK");
+	barebox_set_hostname("mx23evk");
+
 	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, 8192,
 			   IORESOURCE_MEM, NULL);
 	

arch/arm/boards/freescale-mx25-3-stack/3stack.c

@@ -268,6 +268,9 @@ static int imx25_console_init(void)
 
 	writel(0x03010101, 0x53f80024);
 
+	barebox_set_model("Freescale i.MX25 3DS");
+	barebox_set_hostname("mx25-3stack");
+
 	imx25_add_uart0();
 	return 0;
 }

arch/arm/boards/freescale-mx28-evk/env/config

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-global.hostname=mx28-evk
 #user=
 
 # use 'dhcp' to do dhcp in barebox and in kernel

arch/arm/boards/freescale-mx28-evk/mx28-evk.c

@@ -286,6 +286,9 @@ device_initcall(mx28_evk_devices_init);
 
 static int mx28_evk_console_init(void)
 {
+	barebox_set_model("Freescale i.MX28 EVK");
+	barebox_set_hostname("mx28evk");
+
 	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, 0x2000,
 			   IORESOURCE_MEM, NULL);
 

arch/arm/boards/freescale-mx35-3-stack/3stack.c

@@ -260,6 +260,9 @@ static int f3s_console_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(f3s_pads, ARRAY_SIZE(f3s_pads));
 
+	barebox_set_model("Freescale i.MX35 3DS");
+	barebox_set_hostname("mx35-3stack");
+
 	imx35_add_uart0();
 	return 0;
 }

arch/arm/boards/freescale-mx35-3-stack/env/config

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-global.hostname=mx35-3stack
 eth0.serverip=
 user=
 

arch/arm/boards/freescale-mx53-smd/board.c

@@ -151,6 +151,9 @@ static int smd_console_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(smd_pads, ARRAY_SIZE(smd_pads));
 
+	barebox_set_model("Freescale i.MX53 SMD");
+	barebox_set_hostname("imx53-smd");
+
 	imx53_init_lowlevel(1000);
 
 	imx53_add_uart0();

arch/arm/boards/freescale-mx53-smd/env/config

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-global.hostname=loco
 eth0.serverip=
 user=
 

arch/arm/boards/freescale-mx6-arm2/board.c

@@ -150,6 +150,9 @@ static int arm2_console_init(void)
 
 	imx6_init_lowlevel();
 
+	barebox_set_model("Freescale i.MX6 Armadillo2");
+	barebox_set_hostname("armadillo2");
+
 	imx6_add_uart3();
 
 	return 0;

arch/arm/boards/freescale-mx6-sabrelite/board.c

@@ -144,6 +144,8 @@ static int sabrelite_core_init(void)
 {
 	imx6_init_lowlevel();
 
+	barebox_set_hostname("sabrelite");
+
 	return 0;
 }
 core_initcall(sabrelite_core_init);

arch/arm/boards/freescale-mx6-sabrelite/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=SabreLite
 global.linux.bootargs.base="console=ttymxc1,115200"

arch/arm/boards/freescale-mx6-sabresd/board.c

@@ -109,6 +109,8 @@ static int sabresd_core_init(void)
 {
 	imx6_init_lowlevel();
 
+	barebox_set_hostname("sabresd");
+
 	return 0;
 }
 core_initcall(sabresd_core_init);

arch/arm/boards/freescale-mx6-sabresd/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=SabreSD
 global.linux.bootargs.base="console=ttymxc0,115200"

arch/arm/boards/friendlyarm-mini2440/env/config

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-global.hostname=mini2440
 eth0.serverip=
 user=
 

arch/arm/boards/friendlyarm-mini2440/mini2440.c

@@ -332,6 +332,9 @@ static int mini2440_console_init(void)
 	s3c_gpio_mode(GPH2_TXD0);
 	s3c_gpio_mode(GPH3_RXD0);
 
+	barebox_set_model("Friendlyarm mini2440");
+	barebox_set_hostname("mini2440");
+
 	s3c24xx_add_uart1();
 	return 0;
 }

arch/arm/boards/friendlyarm-mini6410/mini6410.c

@@ -298,6 +298,9 @@ static int mini6410_console_init(void)
 	s3c_gpio_mode(GPA2_NCTS0 | ENABLE_PU);
 	s3c_gpio_mode(GPA3_NRTS0);
 
+	barebox_set_model("Friendlyarm mini6410");
+	barebox_set_hostname("mini6410");
+
 	s3c64xx_add_uart1();
 
 	return 0;

arch/arm/boards/friendlyarm-tiny210/tiny210.c

@@ -87,6 +87,9 @@ static int tiny210_console_init(void)
 	s3c_gpio_mode(GPA02_NCTS0 | ENABLE_PU);
 	s3c_gpio_mode(GPA03_NRTS0);
 
+	barebox_set_model("Friendlyarm tiny210");
+	barebox_set_hostname("tiny210");
+
 	add_generic_device("s3c_serial", DEVICE_ID_DYNAMIC, NULL,
 			   S3C_UART1_BASE, S3C_UART1_SIZE,
 			   IORESOURCE_MEM, NULL);

arch/arm/boards/friendlyarm-tiny6410/development-board.c

@@ -93,6 +93,9 @@ static int tiny6410evk_console_init(void)
 	s3c_gpio_mode(GPA0_RXD0 | ENABLE_PU);
 	s3c_gpio_mode(GPA1_TXD0);
 
+	barebox_set_model("Friendlyarm tiny6410");
+	barebox_set_hostname("tiny6410");
+
 	s3c64xx_add_uart1();
 
 	return 0;

arch/arm/boards/gk802/board.c

@@ -77,6 +77,8 @@ static int gk802_console_init(void)
 	if (!of_machine_is_compatible("zealz,imx6q-gk802"))
 		return 0;
 
+	barebox_set_hostname("gk802");
+
 	imx6_init_lowlevel();
 
 	return 0;

arch/arm/boards/gk802/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=gk802
 global.linux.bootargs.base="console=ttymxc3,115200"

arch/arm/boards/guf-cupid/board.c

@@ -227,6 +227,9 @@ static int cupid_console_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(cupid_pads, ARRAY_SIZE(cupid_pads));
 
+	barebox_set_model("Garz & Fricke CUPID");
+	barebox_set_hostname("cupid");
+
 	imx35_add_uart0();
 
 	return 0;
@@ -355,4 +358,3 @@ BAREBOX_CMD_START(cpufreq)
 	.usage          = "adjust CPU frequency",
 	BAREBOX_CMD_HELP(cmd_cpufreq_help)
 BAREBOX_CMD_END
-

arch/arm/boards/guf-cupid/env/config

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-global.hostname=cupid
 eth0.serverip=
 user=
 

arch/arm/boards/guf-neso/board.c

@@ -289,6 +289,9 @@ device_initcall(neso_devices_init);
 
 static int neso_console_init(void)
 {
+	barebox_set_model("Garz & Fricke NESO");
+	barebox_set_hostname("neso");
+
 	imx27_add_uart0();
 
 	return 0;

arch/arm/boards/guf-neso/env/config

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-global.hostname=guf-neso
 eth0.serverip=
 user=
 

arch/arm/boards/guf-vincell/board.c

@@ -314,6 +314,9 @@ static int vincell_console_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(vincell_pads, ARRAY_SIZE(vincell_pads));
 
+	barebox_set_model("Garz & Fricke VINCELL");
+	barebox_set_hostname("vincell");
+
 	imx53_add_uart1();
 
 	return 0;

arch/arm/boards/highbank/env/config-board

@@ -3,7 +3,6 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=highbank
 global.allow_color=true
 global.autoboot_timeout=3
 global.bootm.oftree="/dev/dtb"

arch/arm/boards/highbank/init.c

@@ -134,6 +134,9 @@ device_initcall(highbank_devices_init);
 
 static int highbank_console_init(void)
 {
+	barebox_set_model("Calxeda Highbank");
+	barebox_set_hostname("highbank");
+
 	highbank_register_uart();
 
 	return 0;

arch/arm/boards/imx21ads/imx21ads.c

@@ -185,6 +185,9 @@ late_initcall(mx21ads_enable_display);
 
 static int mx21ads_console_init(void)
 {
+	barebox_set_model("Freescale i.MX21 ADS");
+	barebox_set_hostname("mx21ads");
+
 	imx21_add_uart0();
 	return 0;
 }

arch/arm/boards/imx233-olinuxino/env/config

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-hostname=imx23-olinuxino
-
 # use 'dhcp' to do dhcp in barebox and in kernel
 # use 'none' if you want to skip kernel ip autoconfiguration
 ip=none

arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c

@@ -142,6 +142,9 @@ device_initcall(imx23_olinuxino_devices_init);
 
 static int imx23_olinuxino_console_init(void)
 {
+	barebox_set_model("Olimex.ltd imx233-olinuxino");
+	barebox_set_hostname("imx233-olinuxino");
+
 	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, 8192,
 			   IORESOURCE_MEM, NULL);
 

arch/arm/boards/imx27ads/imx27ads.c

@@ -114,6 +114,9 @@ device_initcall(mx27ads_devices_init);
 
 static int mx27ads_console_init(void)
 {
+	barebox_set_model("Freescale i.MX27 ADS");
+	barebox_set_hostname("mx27ads");
+
 	imx27_add_uart0();
 	return 0;
 }

arch/arm/boards/karo-tx25/board.c

@@ -149,6 +149,9 @@ static int tx25_console_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(tx25_pads, ARRAY_SIZE(tx25_pads));
 
+	barebox_set_model("Ka-Ro TX25");
+	barebox_set_hostname("tx25");
+
 	imx25_add_uart0();
 	return 0;
 }

arch/arm/boards/karo-tx28/env/config

@@ -1,7 +1,6 @@
 #
 #
 
-global.hostname=tx28
 baseboard=tx28stk5
 
 # use 'dhcp' to do dhcp in barebox and in kernel

arch/arm/boards/karo-tx28/tx28-stk5.c

@@ -399,6 +399,9 @@ void base_board_init(void)
 
 static int tx28kit_console_init(void)
 {
+	barebox_set_model("Ka-Ro TX28");
+	barebox_set_hostname("tx28");
+
 	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, 0x2000,
 			   IORESOURCE_MEM, NULL);
 

arch/arm/boards/karo-tx51/tx51.c

@@ -271,6 +271,10 @@ static int tx51_console_init(void)
 {
 	imx51_init_lowlevel(800);
 	mxc_iomux_v3_setup_multiple_pads(tx51_pads, ARRAY_SIZE(tx51_pads));
+
+	barebox_set_model("Ka-Ro TX51");
+	barebox_set_hostname("tx51");
+
 	imx51_add_uart0();
 
 	return 0;

arch/arm/boards/karo-tx53/board.c

@@ -264,6 +264,9 @@ static int tx53_console_init(void)
 	if (!IS_ENABLED(CONFIG_TX53_REV_XX30))
 		imx53_init_lowlevel(1000);
 
+	barebox_set_model("Ka-Ro TX53");
+	barebox_set_hostname("tx53");
+
 	imx53_add_uart0();
 	return 0;
 }

arch/arm/boards/karo-tx53/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=tx53
 global.linux.bootargs.base="console=ttymxc0,115200"

arch/arm/boards/mioa701/board.c

@@ -275,6 +275,9 @@ static int mioa701_coredevice_init(void)
 	asm volatile("mcr p14, 0, %0, c6, c0, 0 @ set CCLK"
 	  : : "r" (cclk) : "cc");
 
+	barebox_set_model("Scoter Mitac Mio A701");
+	barebox_set_hostname("mioa701");
+
 	return 0;
 }
 coredevice_initcall(mioa701_coredevice_init);

arch/arm/boards/mmccpu/init.c

@@ -73,6 +73,9 @@ device_initcall(mmccpu_devices_init);
 
 static int mmccpu_console_init(void)
 {
+	barebox_set_model("Bucyrus MMC-CPU");
+	barebox_set_hostname("mmccpu");
+
 	at91_register_uart(0, 0);
 	return 0;
 }

arch/arm/boards/netx/netx.c

@@ -73,6 +73,9 @@ static int netx_console_init(void)
 	*(volatile unsigned long *)(0x00100808) = 2;
 	*(volatile unsigned long *)(0x0010080c) = 2;
 
+	barebox_set_model("Hilscher Netx nxdb500");
+	barebox_set_hostname("nxdb500");
+
 	add_generic_device("netx_serial", DEVICE_ID_DYNAMIC, NULL, NETX_PA_UART0, 0x40,
 			   IORESOURCE_MEM, NULL);
 	return 0;

arch/arm/boards/nhk8815/setup.c

@@ -113,7 +113,11 @@ device_initcall(nhk8815_devices_init);
 
 static int nhk8815_console_init(void)
 {
+	barebox_set_model("Nomadik nhk8815");
+	barebox_set_hostname("nhk8815");
+
 	st8815_register_uart(1);
+
 	return 0;
 }
 

arch/arm/boards/omap343xdsp/board.c

@@ -53,9 +53,6 @@
 #include <mach/gpmc.h>
 #include <errno.h>
 
-/*-----------------------CONSOLE  Devices -----------------------------------*/
-
-#ifdef CONFIG_DRIVER_SERIAL_NS16550
 /**
  * @brief UART serial port initialization - remember to enable COM clocks in arch
  *
@@ -63,13 +60,15 @@
  */
 static int sdp3430_console_init(void)
 {
+	barebox_set_model("Texas Instruments SDP343x");
+	barebox_set_hostname("sdp343x");
+
 	omap3_add_uart3();
 
 	return 0;
 }
 
 console_initcall(sdp3430_console_init);
-#endif				/* CONFIG_DRIVER_SERIAL_NS16550 */
 
 static int sdp3430_mem_init(void)
 {

arch/arm/boards/omap3evm/board.c

@@ -53,8 +53,6 @@
 #include <generated/mach-types.h>
 #include <mach/omap3-devices.h>
 
-#ifdef CONFIG_DRIVER_SERIAL_NS16550
-
 /**
  * @brief Initialize the serial port to be used as console.
  *
@@ -62,6 +60,9 @@
  */
 static int omap3evm_init_console(void)
 {
+	barebox_set_model("Texas Instruments omap3evm");
+	barebox_set_hostname("omap3evm");
+
 	if (IS_ENABLED(CONFIG_OMAP_UART1))
 		omap3_add_uart1();
 	if (IS_ENABLED(CONFIG_OMAP_UART3))
@@ -70,7 +71,6 @@ static int omap3evm_init_console(void)
 	return 0;
 }
 console_initcall(omap3evm_init_console);
-#endif /* CONFIG_DRIVER_SERIAL_NS16550 */
 
 static int omap3evm_mem_init(void)
 {

arch/arm/boards/panda/board.c

@@ -33,6 +33,9 @@ static int board_revision;
 
 static int panda_console_init(void)
 {
+	barebox_set_model("Texas Instruments panda");
+	barebox_set_hostname("panda");
+
 	omap44xx_add_uart3();
 
 	return 0;

arch/arm/boards/panda/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=panda
 global.linux.bootargs.base="console=ttyO2,115200"

arch/arm/boards/pcm027/board.c

@@ -178,6 +178,9 @@ static int pcm027_console_init(void)
 	/* enable clock */
 	CKEN |= CKEN_FFUART;
 
+	barebox_set_model("Phytec phyCORE-PXA270");
+	barebox_set_hostname("pcm027");
+
 	pxa_add_uart((void *)0x40100000, 0);
 
 	return 0;

arch/arm/boards/pcm027/env/config

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-global.hostname=pcm027
 eth0.serverip=
 user=
 

arch/arm/boards/pcm037/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=pcm037
 global.linux.bootargs.base="console=ttymxc0,115200"

arch/arm/boards/pcm037/pcm037.c

@@ -248,6 +248,9 @@ static int imx31_console_init(void)
 {
 	imx_iomux_setup_multiple_pins(pcm037_iomux, ARRAY_SIZE(pcm037_iomux));
 
+	barebox_set_model("Phytec phyCORE-i.MX31");
+	barebox_set_hostname("phycore-imx31");
+
 	imx31_add_uart0();
 	return 0;
 }

arch/arm/boards/pcm038/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=pcm038
 global.linux.bootargs.base="console=ttymxc0,115200"

arch/arm/boards/pcm038/pcm038.c

@@ -367,6 +367,9 @@ device_initcall(pcm038_devices_init);
 
 static int pcm038_console_init(void)
 {
+	barebox_set_model("Phytec phyCORE-i.MX27");
+	barebox_set_hostname("phycore-imx27");
+
 	imx27_add_uart0();
 
 	return 0;

arch/arm/boards/pcm043/env/config-board

@@ -3,5 +3,4 @@
 # board defaults, do not change in running system. Change /env/config
 # instead
 
-global.hostname=pcm043
 global.linux.bootargs.base="console=ttymxc0,115200"

arch/arm/boards/pcm043/pcm043.c

@@ -209,6 +209,9 @@ static int imx35_console_init(void)
 {
 	mxc_iomux_v3_setup_multiple_pads(pcm043_pads, ARRAY_SIZE(pcm043_pads));
 
+	barebox_set_model("Phytec phyCORE-i.MX35");
+	barebox_set_hostname("phycore-imx35");
+
 	imx35_add_uart0();
 
 	return 0;

arch/arm/boards/pcm049/board.c

@@ -42,6 +42,9 @@
 
 static int pcm049_console_init(void)
 {
+	barebox_set_model("Phytec phyCORE-OMAP4460");
+	barebox_set_hostname("phycore-omap4460");
+
 	omap44xx_add_uart3();
 
 	return 0;

arch/arm/boards/pcm049/env/config

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-global.hostname=pcm049
 eth0.serverip=
 user=
 

arch/arm/boards/pcm051/board.c

@@ -50,6 +50,9 @@
  */
 static int pcm051_console_init(void)
 {
+	barebox_set_model("Phytec phyCORE-AM335x");
+	barebox_set_hostname("phycore-am335x");
+
 	am33xx_enable_uart0_pin_mux();
 	/* Register the serial port */
 	am33xx_add_uart0();

arch/arm/boards/pcm051/env/config

@@ -3,8 +3,6 @@
 # change network settings in /env/network/eth0
 # change mtd partition settings and automountpoints in /env/init/*
 
-global.hostname=pcm051
-
 # set to false if you do not want to have colors
 global.allow_color=true
 

arch/arm/boards/phycard-a-l1/env/config

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-global.hostname=pcaal1
 #user=
 
 # Enter MAC address here if not retrieved automatically