diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:39:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:39:22 +0200 |
| commit | 1729b1798e1bfd4614a9cf7cf651cee8b6923283 (patch) | |
| tree | 0eab8d4a22e0bc795f15c3062500a420d801ef4c /arch/arm/boards | |
| parent | 8f9d4007c53cefc513619b83b5b81b146423b11b (diff) | |
| parent | 338b6e7edc054523e2cc0dec77ab3aa1716a385f (diff) | |
| download | barebox-1729b1798e1bfd4614a9cf7cf651cee8b6923283.tar.gz barebox-1729b1798e1bfd4614a9cf7cf651cee8b6923283.tar.xz | |
Merge branch 'for-next/boardinfo'
Conflicts:
arch/mips/boards/qemu-malta/init.c
commands/bootm.c
drivers/of/base.c
Diffstat (limited to 'arch/arm/boards')
124 files changed, 303 insertions, 85 deletions
diff --git a/arch/arm/boards/a9m2410/a9m2410.c b/arch/arm/boards/a9m2410/a9m2410.c index 537e1e9669..e371b4e81e 100644 --- a/arch/arm/boards/a9m2410/a9m2410.c +++ b/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; } diff --git a/arch/arm/boards/a9m2440/a9m2440.c b/arch/arm/boards/a9m2440/a9m2440.c index 36216aa36e..fc0a84ac65 100644 --- a/arch/arm/boards/a9m2440/a9m2440.c +++ b/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; } diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c index c240767bae..06d542e58d 100644 --- a/arch/arm/boards/animeo_ip/init.c +++ b/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; } diff --git a/arch/arm/boards/archosg9/board.c b/arch/arm/boards/archosg9/board.c index 0149ef2716..134b350a3d 100644 --- a/arch/arm/boards/archosg9/board.c +++ b/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 diff --git a/arch/arm/boards/at91rm9200ek/init.c b/arch/arm/boards/at91rm9200ek/init.c index 16f33e0c95..2c8bf0e932 100644 --- a/arch/arm/boards/at91rm9200ek/init.c +++ b/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; } diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c index d7a28ccfc4..688ed99c67 100644 --- a/arch/arm/boards/at91sam9260ek/init.c +++ b/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; } diff --git a/arch/arm/boards/at91sam9261ek/init.c b/arch/arm/boards/at91sam9261ek/init.c index 01a0215067..00fc745c07 100644 --- a/arch/arm/boards/at91sam9261ek/init.c +++ b/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; } diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c index c4269a3279..a889b5a4a3 100644 --- a/arch/arm/boards/at91sam9263ek/init.c +++ b/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; } diff --git a/arch/arm/boards/at91sam9m10g45ek/init.c b/arch/arm/boards/at91sam9m10g45ek/init.c index 539cbee0c3..0ffbec2951 100644 --- a/arch/arm/boards/at91sam9m10g45ek/init.c +++ b/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; } diff --git a/arch/arm/boards/at91sam9m10ihd/env/config b/arch/arm/boards/at91sam9m10ihd/env/config index bc2119ee96..db2713c19a 100644 --- a/arch/arm/boards/at91sam9m10ihd/env/config +++ b/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 diff --git a/arch/arm/boards/at91sam9m10ihd/init.c b/arch/arm/boards/at91sam9m10ihd/init.c index 7fa6afbdfe..b75c51de31 100644 --- a/arch/arm/boards/at91sam9m10ihd/init.c +++ b/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; } diff --git a/arch/arm/boards/at91sam9n12ek/init.c b/arch/arm/boards/at91sam9n12ek/init.c index 440d39d3dc..779e4f7ead 100644 --- a/arch/arm/boards/at91sam9n12ek/init.c +++ b/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; } diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c index c7948764c9..c677e4d401 100644 --- a/arch/arm/boards/at91sam9x5ek/init.c +++ b/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; diff --git a/arch/arm/boards/avnet-zedboard/board.c b/arch/arm/boards/avnet-zedboard/board.c index 7b95754692..ef9a8a878c 100644 --- a/arch/arm/boards/avnet-zedboard/board.c +++ b/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; diff --git a/arch/arm/boards/avnet-zedboard/env/init/config-board b/arch/arm/boards/avnet-zedboard/env/init/config-board index 99576533c7..f3032a478a 100644 --- a/arch/arm/boards/avnet-zedboard/env/init/config-board +++ b/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" diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c index 972c05efb7..1262df1b94 100644 --- a/arch/arm/boards/beagle/board.c +++ b/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; diff --git a/arch/arm/boards/beagle/env/config-board b/arch/arm/boards/beagle/env/config-board index cc0820a089..dcabf4c8a9 100644 --- a/arch/arm/boards/beagle/env/config-board +++ b/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" diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c index b3f39eaadc..52b3ec8f5c 100644 --- a/arch/arm/boards/beaglebone/board.c +++ b/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; diff --git a/arch/arm/boards/beaglebone/env/config b/arch/arm/boards/beaglebone/env/config index 4b7a63513a..fbfa7d5174 100644 --- a/arch/arm/boards/beaglebone/env/config +++ b/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 diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index 89d8f6c857..6b5acb2973 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/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; diff --git a/arch/arm/boards/ccxmx51/env/config-board b/arch/arm/boards/ccxmx51/env/config-board index 26acb4b927..1405344903 100644 --- a/arch/arm/boards/ccxmx51/env/config-board +++ b/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 diff --git a/arch/arm/boards/chumby_falconwing/env/config b/arch/arm/boards/chumby_falconwing/env/config index 3839b40584..e160027524 100644 --- a/arch/arm/boards/chumby_falconwing/env/config +++ b/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 diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index 3b97551cba..198a35be70 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/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); diff --git a/arch/arm/boards/clep7212/clep7212.c b/arch/arm/boards/clep7212/clep7212.c index ec9a9cbdc7..0ed059501e 100644 --- a/arch/arm/boards/clep7212/clep7212.c +++ b/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; diff --git a/arch/arm/boards/clep7212/env/config-board b/arch/arm/boards/clep7212/env/config-board index 3cf699aab8..f7a8f60e25 100644 --- a/arch/arm/boards/clep7212/env/config-board +++ b/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 diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index fc3bb9e606..c11bb2fbff 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/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); diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/config-board b/arch/arm/boards/crystalfontz-cfa10036/env/config-board index b99866ecfe..fff4caa2cf 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/env/config-board +++ b/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" diff --git a/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c b/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c index 21199d6433..e28dd49fad 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c +++ b/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); } diff --git a/arch/arm/boards/dmo-mx6-realq7/board.c b/arch/arm/boards/dmo-mx6-realq7/board.c index 628f5cbdd2..a456389503 100644 --- a/arch/arm/boards/dmo-mx6-realq7/board.c +++ b/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()) { diff --git a/arch/arm/boards/dmo-mx6-realq7/env/config-board b/arch/arm/boards/dmo-mx6-realq7/env/config-board index 3f05f9d5ba..4cabac63dd 100644 --- a/arch/arm/boards/dmo-mx6-realq7/env/config-board +++ b/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" diff --git a/arch/arm/boards/dss11/init.c b/arch/arm/boards/dss11/init.c index f769f4f681..8e992f446d 100644 --- a/arch/arm/boards/dss11/init.c +++ b/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; } diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c index adfcc16e2d..27ba90abfd 100644 --- a/arch/arm/boards/edb93xx/edb93xx.c +++ b/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); diff --git a/arch/arm/boards/efika-mx-smartbook/board.c b/arch/arm/boards/efika-mx-smartbook/board.c index 85ff466127..4469f975fb 100644 --- a/arch/arm/boards/efika-mx-smartbook/board.c +++ b/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); diff --git a/arch/arm/boards/efika-mx-smartbook/env/config-board b/arch/arm/boards/efika-mx-smartbook/env/config-board index 22993f9c29..bc8e9aadc5 100644 --- a/arch/arm/boards/efika-mx-smartbook/env/config-board +++ b/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 diff --git a/arch/arm/boards/eukrea_cpuimx25/env/config b/arch/arm/boards/eukrea_cpuimx25/env/config index 63a85b27eb..da19677574 100644 --- a/arch/arm/boards/eukrea_cpuimx25/env/config +++ b/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 diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c index 0de30e8c5d..9457bfbc93 100644 --- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c +++ b/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; } diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index 81ac6540f1..5603bfd9a2 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/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 diff --git a/arch/arm/boards/eukrea_cpuimx35/env/config b/arch/arm/boards/eukrea_cpuimx35/env/config index 50d33a46c3..05c4391d35 100644 --- a/arch/arm/boards/eukrea_cpuimx35/env/config +++ b/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 diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c index 8db2ab114a..a26f9adfb3 100644 --- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c +++ b/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; } diff --git a/arch/arm/boards/eukrea_cpuimx51/env/config b/arch/arm/boards/eukrea_cpuimx51/env/config index 17f8337f73..57abc1ee3d 100644 --- a/arch/arm/boards/eukrea_cpuimx51/env/config +++ b/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 diff --git a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c index ceabac64ab..892fbe72b2 100644 --- a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c +++ b/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(); diff --git a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c index 3b82760ff8..1714fddb6d 100644 --- a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c +++ b/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); diff --git a/arch/arm/boards/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3-stack/3stack.c index cba5cce0d9..cc4b1110ff 100644 --- a/arch/arm/boards/freescale-mx25-3-stack/3stack.c +++ b/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; } diff --git a/arch/arm/boards/freescale-mx28-evk/env/config b/arch/arm/boards/freescale-mx28-evk/env/config index 4e2c90d4b1..adbe7f4973 100644 --- a/arch/arm/boards/freescale-mx28-evk/env/config +++ b/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 diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c index 606ff46afe..92f0a75655 100644 --- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c +++ b/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); diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3-stack/3stack.c index c8358da7b2..f344099478 100644 --- a/arch/arm/boards/freescale-mx35-3-stack/3stack.c +++ b/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; } diff --git a/arch/arm/boards/freescale-mx35-3-stack/env/config b/arch/arm/boards/freescale-mx35-3-stack/env/config index 122c0fcaba..af2fb6b2bc 100644 --- a/arch/arm/boards/freescale-mx35-3-stack/env/config +++ b/arch/arm/boards/freescale-mx35-3-stack/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=mx35-3stack eth0.serverip= user= diff --git a/arch/arm/boards/freescale-mx53-smd/board.c b/arch/arm/boards/freescale-mx53-smd/board.c index 8c29e90d94..d36889b3c1 100644 --- a/arch/arm/boards/freescale-mx53-smd/board.c +++ b/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(); diff --git a/arch/arm/boards/freescale-mx53-smd/env/config b/arch/arm/boards/freescale-mx53-smd/env/config index d92beb9ee4..27d2663566 100644 --- a/arch/arm/boards/freescale-mx53-smd/env/config +++ b/arch/arm/boards/freescale-mx53-smd/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=loco eth0.serverip= user= diff --git a/arch/arm/boards/freescale-mx6-arm2/board.c b/arch/arm/boards/freescale-mx6-arm2/board.c index 7dbcecc329..073c347707 100644 --- a/arch/arm/boards/freescale-mx6-arm2/board.c +++ b/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; diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index 8bbeecdcea..eb6eb3c747 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/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); diff --git a/arch/arm/boards/freescale-mx6-sabrelite/env/config-board b/arch/arm/boards/freescale-mx6-sabrelite/env/config-board index e39e4b6141..4cabac63dd 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/env/config-board +++ b/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" diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c index 0b6bf69362..b02791939c 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/board.c +++ b/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); diff --git a/arch/arm/boards/freescale-mx6-sabresd/env/config-board b/arch/arm/boards/freescale-mx6-sabresd/env/config-board index cf936fb949..e8e8378f53 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/env/config-board +++ b/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" diff --git a/arch/arm/boards/friendlyarm-mini2440/env/config b/arch/arm/boards/friendlyarm-mini2440/env/config index 69d431a4ac..f060aae86e 100644 --- a/arch/arm/boards/friendlyarm-mini2440/env/config +++ b/arch/arm/boards/friendlyarm-mini2440/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=mini2440 eth0.serverip= user= diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c index cf96183100..5cf90bb8bb 100644 --- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c +++ b/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; } diff --git a/arch/arm/boards/friendlyarm-mini6410/mini6410.c b/arch/arm/boards/friendlyarm-mini6410/mini6410.c index ebe97f089a..194d665769 100644 --- a/arch/arm/boards/friendlyarm-mini6410/mini6410.c +++ b/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; diff --git a/arch/arm/boards/friendlyarm-tiny210/tiny210.c b/arch/arm/boards/friendlyarm-tiny210/tiny210.c index c78e9df4f3..6426bcff11 100644 --- a/arch/arm/boards/friendlyarm-tiny210/tiny210.c +++ b/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); diff --git a/arch/arm/boards/friendlyarm-tiny6410/development-board.c b/arch/arm/boards/friendlyarm-tiny6410/development-board.c index 2bcb7df35f..773a423ea0 100644 --- a/arch/arm/boards/friendlyarm-tiny6410/development-board.c +++ b/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; diff --git a/arch/arm/boards/gk802/board.c b/arch/arm/boards/gk802/board.c index 3c703a8463..fa5f320fdb 100644 --- a/arch/arm/boards/gk802/board.c +++ b/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; diff --git a/arch/arm/boards/gk802/env/config-board b/arch/arm/boards/gk802/env/config-board index 99540e9a63..e25a4193f1 100644 --- a/arch/arm/boards/gk802/env/config-board +++ b/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" diff --git a/arch/arm/boards/guf-cupid/board.c b/arch/arm/boards/guf-cupid/board.c index 32a3ed4dcf..057c1a7a92 100644 --- a/arch/arm/boards/guf-cupid/board.c +++ b/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 - diff --git a/arch/arm/boards/guf-cupid/env/config b/arch/arm/boards/guf-cupid/env/config index 17b11a1943..dc289b39f2 100644 --- a/arch/arm/boards/guf-cupid/env/config +++ b/arch/arm/boards/guf-cupid/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=cupid eth0.serverip= user= diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c index 055da540c4..631f07715d 100644 --- a/arch/arm/boards/guf-neso/board.c +++ b/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; diff --git a/arch/arm/boards/guf-neso/env/config b/arch/arm/boards/guf-neso/env/config index 1758c91454..bd44a555d9 100644 --- a/arch/arm/boards/guf-neso/env/config +++ b/arch/arm/boards/guf-neso/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=guf-neso eth0.serverip= user= diff --git a/arch/arm/boards/guf-vincell/board.c b/arch/arm/boards/guf-vincell/board.c index f53a8e86d5..e9808fc4f8 100644 --- a/arch/arm/boards/guf-vincell/board.c +++ b/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; diff --git a/arch/arm/boards/highbank/env/config-board b/arch/arm/boards/highbank/env/config-board index a64d9e3245..da8fcf640a 100644 --- a/arch/arm/boards/highbank/env/config-board +++ b/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" diff --git a/arch/arm/boards/highbank/init.c b/arch/arm/boards/highbank/init.c index 46ecc88e47..7b1be046a5 100644 --- a/arch/arm/boards/highbank/init.c +++ b/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; diff --git a/arch/arm/boards/imx21ads/imx21ads.c b/arch/arm/boards/imx21ads/imx21ads.c index 3d110f9a47..ef187f4984 100644 --- a/arch/arm/boards/imx21ads/imx21ads.c +++ b/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; } diff --git a/arch/arm/boards/imx233-olinuxino/env/config b/arch/arm/boards/imx233-olinuxino/env/config index 0e95373b19..c84014ff58 100644 --- a/arch/arm/boards/imx233-olinuxino/env/config +++ b/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 diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c index dc8a099e22..a5c54fe8ad 100644 --- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c +++ b/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); diff --git a/arch/arm/boards/imx27ads/imx27ads.c b/arch/arm/boards/imx27ads/imx27ads.c index 71749dc97a..93085c078c 100644 --- a/arch/arm/boards/imx27ads/imx27ads.c +++ b/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; } diff --git a/arch/arm/boards/karo-tx25/board.c b/arch/arm/boards/karo-tx25/board.c index d9669f112f..46a9cb612c 100644 --- a/arch/arm/boards/karo-tx25/board.c +++ b/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; } diff --git a/arch/arm/boards/karo-tx28/env/config b/arch/arm/boards/karo-tx28/env/config index 52593761a7..a6b10255a2 100644 --- a/arch/arm/boards/karo-tx28/env/config +++ b/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 diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index 8e8b62cbe3..2984d101eb 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/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); diff --git a/arch/arm/boards/karo-tx51/tx51.c b/arch/arm/boards/karo-tx51/tx51.c index 55643f2e92..22ab9bedce 100644 --- a/arch/arm/boards/karo-tx51/tx51.c +++ b/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; diff --git a/arch/arm/boards/karo-tx53/board.c b/arch/arm/boards/karo-tx53/board.c index ad867cb121..f3eccd2e7a 100644 --- a/arch/arm/boards/karo-tx53/board.c +++ b/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; } diff --git a/arch/arm/boards/karo-tx53/env/config-board b/arch/arm/boards/karo-tx53/env/config-board index 3ebfac6c9b..e8e8378f53 100644 --- a/arch/arm/boards/karo-tx53/env/config-board +++ b/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" diff --git a/arch/arm/boards/mioa701/board.c b/arch/arm/boards/mioa701/board.c index b5c05a6eea..c46b5da64a 100644 --- a/arch/arm/boards/mioa701/board.c +++ b/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); diff --git a/arch/arm/boards/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c index b695741436..a666b9d609 100644 --- a/arch/arm/boards/mmccpu/init.c +++ b/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; } diff --git a/arch/arm/boards/netx/netx.c b/arch/arm/boards/netx/netx.c index ce8086ca31..417186688f 100644 --- a/arch/arm/boards/netx/netx.c +++ b/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; diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c index b1e29d3a54..7cdc9965bb 100644 --- a/arch/arm/boards/nhk8815/setup.c +++ b/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; } diff --git a/arch/arm/boards/omap343xdsp/board.c b/arch/arm/boards/omap343xdsp/board.c index 654d8c0822..8329ace483 100644 --- a/arch/arm/boards/omap343xdsp/board.c +++ b/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) { diff --git a/arch/arm/boards/omap3evm/board.c b/arch/arm/boards/omap3evm/board.c index 7284f5f884..25a965ae84 100644 --- a/arch/arm/boards/omap3evm/board.c +++ b/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) { diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index 951fc5af53..55eb42471c 100644 --- a/arch/arm/boards/panda/board.c +++ b/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; diff --git a/arch/arm/boards/panda/env/config-board b/arch/arm/boards/panda/env/config-board index 27e7339658..dcabf4c8a9 100644 --- a/arch/arm/boards/panda/env/config-board +++ b/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" diff --git a/arch/arm/boards/pcm027/board.c b/arch/arm/boards/pcm027/board.c index 13b425bd02..b39a2970a9 100644 --- a/arch/arm/boards/pcm027/board.c +++ b/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; diff --git a/arch/arm/boards/pcm027/env/config b/arch/arm/boards/pcm027/env/config index ec2752a65d..d42780090b 100644 --- a/arch/arm/boards/pcm027/env/config +++ b/arch/arm/boards/pcm027/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=pcm027 eth0.serverip= user= diff --git a/arch/arm/boards/pcm037/env/config-board b/arch/arm/boards/pcm037/env/config-board index 03f9e97fca..e8e8378f53 100644 --- a/arch/arm/boards/pcm037/env/config-board +++ b/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" diff --git a/arch/arm/boards/pcm037/pcm037.c b/arch/arm/boards/pcm037/pcm037.c index ed3525c8f2..e67d322d1c 100644 --- a/arch/arm/boards/pcm037/pcm037.c +++ b/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; } diff --git a/arch/arm/boards/pcm038/env/config-board b/arch/arm/boards/pcm038/env/config-board index 93fd41bcf1..e8e8378f53 100644 --- a/arch/arm/boards/pcm038/env/config-board +++ b/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" diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index 1800dd0f80..99c3770777 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/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; diff --git a/arch/arm/boards/pcm043/env/config-board b/arch/arm/boards/pcm043/env/config-board index 545fdffe14..e8e8378f53 100644 --- a/arch/arm/boards/pcm043/env/config-board +++ b/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" diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c index e6987daa4c..070108e11e 100644 --- a/arch/arm/boards/pcm043/pcm043.c +++ b/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; diff --git a/arch/arm/boards/pcm049/board.c b/arch/arm/boards/pcm049/board.c index e7d947f5d2..65bd6b21c8 100644 --- a/arch/arm/boards/pcm049/board.c +++ b/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; diff --git a/arch/arm/boards/pcm049/env/config b/arch/arm/boards/pcm049/env/config index aa87228aac..1a252dd9c5 100644 --- a/arch/arm/boards/pcm049/env/config +++ b/arch/arm/boards/pcm049/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=pcm049 eth0.serverip= user= diff --git a/arch/arm/boards/pcm051/board.c b/arch/arm/boards/pcm051/board.c index 1993f34818..2a65b3c535 100644 --- a/arch/arm/boards/pcm051/board.c +++ b/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(); diff --git a/arch/arm/boards/pcm051/env/config b/arch/arm/boards/pcm051/env/config index dd35ff4cc0..a9fe44018d 100644 --- a/arch/arm/boards/pcm051/env/config +++ b/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 diff --git a/arch/arm/boards/phycard-a-l1/env/config b/arch/arm/boards/phycard-a-l1/env/config index 6de97ed5d5..a3f452b3d1 100644 --- a/arch/arm/boards/phycard-a-l1/env/config +++ b/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 diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.c b/arch/arm/boards/phycard-a-l1/pca-a-l1.c index 7cf6ae863c..26a0ce794f 100644 --- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c +++ b/arch/arm/boards/phycard-a-l1/pca-a-l1.c @@ -68,6 +68,9 @@ */ static int pcaal1_init_console(void) { + barebox_set_model("Phytec phyCARD-OMAP3"); + barebox_set_hostname("phycard-omap3"); + omap3_add_uart3(); return 0; diff --git a/arch/arm/boards/phycard-a-xl2/env/config b/arch/arm/boards/phycard-a-xl2/env/config index 349a51fb43..998f9fa0f2 100644 --- a/arch/arm/boards/phycard-a-xl2/env/config +++ b/arch/arm/boards/phycard-a-xl2/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=pcaaxl2 user= # use 'dhcp' to do dhcp in barebox and in kernel diff --git a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c b/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c index 7bb614021a..902edc2656 100644 --- a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c +++ b/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c @@ -41,6 +41,9 @@ static int pcaaxl2_console_init(void) { + barebox_set_model("Phytec phyCARD-OMAP4"); + barebox_set_hostname("phycard-omap4"); + omap44xx_add_uart3(); return 0; diff --git a/arch/arm/boards/phycard-i.MX27/env/config b/arch/arm/boards/phycard-i.MX27/env/config index 5f77440196..959631184c 100644 --- a/arch/arm/boards/phycard-i.MX27/env/config +++ b/arch/arm/boards/phycard-i.MX27/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=pca100 eth0.serverip= user= diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c index 1a64fc0f55..1b886cb2d8 100644 --- a/arch/arm/boards/phycard-i.MX27/pca100.c +++ b/arch/arm/boards/phycard-i.MX27/pca100.c @@ -303,6 +303,9 @@ device_initcall(pca100_devices_init); static int pca100_console_init(void) { + barebox_set_model("Phytec phyCARD-i.MX27"); + barebox_set_hostname("phycard-imx27"); + imx27_add_uart0(); return 0; } diff --git a/arch/arm/boards/pm9261/init.c b/arch/arm/boards/pm9261/init.c index d23e8343c0..8c039b77c6 100644 --- a/arch/arm/boards/pm9261/init.c +++ b/arch/arm/boards/pm9261/init.c @@ -158,6 +158,9 @@ device_initcall(pm9261_devices_init); static int pm9261_console_init(void) { + barebox_set_model("Ronetix PM9261"); + barebox_set_hostname("pm9261"); + at91_register_uart(0, 0); return 0; } diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c index 76fef7d264..3bc22f3af2 100644 --- a/arch/arm/boards/pm9263/init.c +++ b/arch/arm/boards/pm9263/init.c @@ -142,6 +142,9 @@ device_initcall(pm9263_devices_init); static int pm9263_console_init(void) { + barebox_set_model("Ronetix PM9263"); + barebox_set_hostname("pm9263"); + at91_register_uart(0, 0); return 0; } diff --git a/arch/arm/boards/pm9g45/init.c b/arch/arm/boards/pm9g45/init.c index 1a902ac913..75fd8a4be7 100644 --- a/arch/arm/boards/pm9g45/init.c +++ b/arch/arm/boards/pm9g45/init.c @@ -170,6 +170,9 @@ device_initcall(pm9g45_devices_init); static int pm9g45_console_init(void) { + barebox_set_model("Ronetix PM9G45"); + barebox_set_hostname("pm9g45"); + at91_register_uart(0, 0); return 0; } diff --git a/arch/arm/boards/qil-a926x/init.c b/arch/arm/boards/qil-a926x/init.c index 30aa64ae1e..4192923e37 100644 --- a/arch/arm/boards/qil-a926x/init.c +++ b/arch/arm/boards/qil-a926x/init.c @@ -242,6 +242,14 @@ console_initcall(qil_a9260_console_init); static int qil_a9260_main_clock(void) { + if (machine_is_qil_a9g20()) { + barebox_set_model("Calao QIL-a9G20"); + barebox_set_hostname("qil-a9g20"); + } else { + barebox_set_model("Calao QIL-A9260"); + barebox_set_hostname("qil-a9260"); + } + at91_set_main_clock(12000000); return 0; } diff --git a/arch/arm/boards/raspberry-pi/env/init/hostname b/arch/arm/boards/raspberry-pi/env/init/hostname deleted file mode 100644 index 7e8f294357..0000000000 --- a/arch/arm/boards/raspberry-pi/env/init/hostname +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "hostname" - exit -fi - -global.hostname=Raspberry-Pi diff --git a/arch/arm/boards/raspberry-pi/rpi.c b/arch/arm/boards/raspberry-pi/rpi.c index 3be95ae5c4..d4912ccdc7 100644 --- a/arch/arm/boards/raspberry-pi/rpi.c +++ b/arch/arm/boards/raspberry-pi/rpi.c @@ -29,6 +29,9 @@ mem_initcall(rpi_mem_init); static int rpi_console_init(void) { + barebox_set_model("RaspberryPi (BCM2835/ARM1176JZF-S)"); + barebox_set_hostname("rpi"); + bcm2835_register_uart(); return 0; } diff --git a/arch/arm/boards/sama5d3xek/init.c b/arch/arm/boards/sama5d3xek/init.c index fa57f18678..482c74a41b 100644 --- a/arch/arm/boards/sama5d3xek/init.c +++ b/arch/arm/boards/sama5d3xek/init.c @@ -428,6 +428,9 @@ device_initcall(at91sama5d3xek_devices_init); static int at91sama5d3xek_console_init(void) { + barebox_set_model("Atmel sama5d3x-ek"); + barebox_set_hostname("sama5d3x-ek"); + at91_register_uart(0, 0); at91_register_uart(2, 0); return 0; diff --git a/arch/arm/boards/scb9328/env/config b/arch/arm/boards/scb9328/env/config index ce6310b67d..c3cbce57d4 100644 --- a/arch/arm/boards/scb9328/env/config +++ b/arch/arm/boards/scb9328/env/config @@ -1,6 +1,5 @@ #!/bin/sh -global.hostname=scb9328 eth0.serverip= user= diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c index 541dddfa9d..64f9a16f6b 100644 --- a/arch/arm/boards/scb9328/scb9328.c +++ b/arch/arm/boards/scb9328/scb9328.c @@ -91,6 +91,9 @@ static int scb9328_console_init(void) imx_gpio_mode(PC11_PF_UART1_TXD); imx_gpio_mode(PC12_PF_UART1_RXD); + barebox_set_model("Synertronixx scb9328"); + barebox_set_hostname("scb9328"); + imx1_add_uart0(); return 0; diff --git a/arch/arm/boards/telit-evk-pro3/init.c b/arch/arm/boards/telit-evk-pro3/init.c index 38e3900690..005d207464 100644 --- a/arch/arm/boards/telit-evk-pro3/init.c +++ b/arch/arm/boards/telit-evk-pro3/init.c @@ -171,6 +171,9 @@ device_initcall(evk_devices_init); static int evk_console_init(void) { + barebox_set_model("Telit EVK-PRO3"); + barebox_set_hostname("evkpr03"); + at91_register_uart(0, 0); return 0; } diff --git a/arch/arm/boards/tny-a926x/init.c b/arch/arm/boards/tny-a926x/init.c index 6ad049daf6..e3dd784c5a 100644 --- a/arch/arm/boards/tny-a926x/init.c +++ b/arch/arm/boards/tny-a926x/init.c @@ -247,6 +247,17 @@ device_initcall(tny_a9260_devices_init); static int tny_a9260_console_init(void) { + if (machine_is_tny_a9g20()) { + barebox_set_model("Calao TNY-A9G20"); + barebox_set_hostname("tny-a9g20"); + } else if (machine_is_tny_a9263()) { + barebox_set_model("Calao TNY-A9263"); + barebox_set_hostname("tny-a9263"); + } else { + barebox_set_model("Calao TNY-A9260"); + barebox_set_hostname("tny-a9260"); + } + at91_register_uart(0, 0); if (IS_ENABLED(CONFIG_CALAO_MOB_TNY_MD2)) at91_register_uart(2, ATMEL_UART_CTS | ATMEL_UART_RTS); diff --git a/arch/arm/boards/toshiba-ac100/Kconfig b/arch/arm/boards/toshiba-ac100/Kconfig index abba2cc582..1cc13f01e3 100644 --- a/arch/arm/boards/toshiba-ac100/Kconfig +++ b/arch/arm/boards/toshiba-ac100/Kconfig @@ -4,6 +4,4 @@ config ARCH_TEXT_BASE hex default 0x01000000 -config BOARDINFO - default "Toshiba AC100 (Tegra2)" endif diff --git a/arch/arm/boards/tqma53/board.c b/arch/arm/boards/tqma53/board.c index 5173ca4552..ed337cea19 100644 --- a/arch/arm/boards/tqma53/board.c +++ b/arch/arm/boards/tqma53/board.c @@ -253,6 +253,10 @@ late_initcall(tqma53_part_init); static int tqma53_console_init(void) { mxc_iomux_v3_setup_multiple_pads(tqma53_pads, ARRAY_SIZE(tqma53_pads)); + + barebox_set_model("TQ tqma53"); + barebox_set_hostname("tqma53"); + imx53_add_uart1(); return 0; diff --git a/arch/arm/boards/tqma53/env/config-board b/arch/arm/boards/tqma53/env/config-board index 28d015ea77..4cabac63dd 100644 --- a/arch/arm/boards/tqma53/env/config-board +++ b/arch/arm/boards/tqma53/env/config-board @@ -3,5 +3,4 @@ # board defaults, do not change in running system. Change /env/config # instead -global.hostname=tqma53 global.linux.bootargs.base="console=ttymxc1,115200" diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c index edeee4ed3b..fd2603fc1c 100644 --- a/arch/arm/boards/usb-a926x/init.c +++ b/arch/arm/boards/usb-a926x/init.c @@ -424,6 +424,17 @@ static int usb_a9260_console_init(void) { struct device_d *dev; + if (machine_is_usb_a9260()) { + barebox_set_model("Calao USB-A9260"); + barebox_set_hostname("usb-a9260"); + } else if (machine_is_usb_a9g20()) { + barebox_set_model("Calao USB-A9G20"); + barebox_set_hostname("usb-a9g20"); + } else { + barebox_set_model("Calao USB-A9263"); + barebox_set_hostname("usb-a9263"); + } + at91_register_uart(0, 0); if (IS_ENABLED(CONFIG_CALAO_DAB_MMX)) { diff --git a/arch/arm/boards/versatile/Kconfig b/arch/arm/boards/versatile/Kconfig index 24289014cb..94cba3ba81 100644 --- a/arch/arm/boards/versatile/Kconfig +++ b/arch/arm/boards/versatile/Kconfig @@ -5,6 +5,4 @@ config ARCH_TEXT_BASE hex default 0x01000000 -config BOARDINFO - default "ARM Versatile/PB (ARM926EJ-S)" endif diff --git a/arch/arm/boards/versatile/versatilepb.c b/arch/arm/boards/versatile/versatilepb.c index 2eb7473b74..ebf36954e4 100644 --- a/arch/arm/boards/versatile/versatilepb.c +++ b/arch/arm/boards/versatile/versatilepb.c @@ -31,6 +31,9 @@ static int vpb_console_init(void) { + barebox_set_model("ARM Versatile/PB (ARM926EJ-S)"); + barebox_set_hostname("versatilepb"); + versatile_register_uart(0); return 0; } diff --git a/arch/arm/boards/vexpress/Kconfig b/arch/arm/boards/vexpress/Kconfig index 24289014cb..94cba3ba81 100644 --- a/arch/arm/boards/vexpress/Kconfig +++ b/arch/arm/boards/vexpress/Kconfig @@ -5,6 +5,4 @@ config ARCH_TEXT_BASE hex default 0x01000000 -config BOARDINFO - default "ARM Versatile/PB (ARM926EJ-S)" endif diff --git a/arch/arm/boards/vexpress/env/config b/arch/arm/boards/vexpress/env/config index 852f2428cf..6c0abda40c 100644 --- a/arch/arm/boards/vexpress/env/config +++ b/arch/arm/boards/vexpress/env/config @@ -3,8 +3,6 @@ # use 'dhcp' to do dhcp in barebox and in kernel # use 'none' if you want to skip kernel ip autoconfiguration ip=dhcp -# set in c -#global.hostname=vexpress global.dhcp.vendor_id=barebox-${global.hostname} # or set your networking parameters here diff --git a/arch/arm/boards/vexpress/init.c b/arch/arm/boards/vexpress/init.c index 2b2d085a54..48bc11efec 100644 --- a/arch/arm/boards/vexpress/init.c +++ b/arch/arm/boards/vexpress/init.c @@ -22,7 +22,6 @@ struct vexpress_init { void (*mem_init)(void); void (*console_init)(void); void (*devices_init)(void); - char *hostname; }; struct vexpress_init *v2m_init; @@ -87,7 +86,6 @@ struct vexpress_init vexpress_init_a9_legacy = { .mem_init = vexpress_a9_legacy_mem_init, .console_init = vexpress_a9_legacy_console_init, .devices_init = vexpress_a9_legacy_devices_init, - .hostname = "vexpress-a9-legacy", }; static int vexpress_mem_init(void) @@ -106,10 +104,6 @@ static int vexpress_devices_init(void) devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self"); devfs_add_partition("nor0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0"); - - globalvar_add_simple("hostname"); - setenv("global.hostname", v2m_init->hostname); - return 0; } device_initcall(vexpress_devices_init); @@ -124,20 +118,26 @@ console_initcall(vexpress_console_init); static int vexpress_core_init(void) { + char *hostname; + if (amba_is_arm_sp804(IOMEM(0x10011000))) { v2m_init = &vexpress_init_a9_legacy; + hostname = "vexpress-a9-legacy"; } else { v2m_init = &vexpress_init_ax; if (cpu_is_cortex_a5()) - v2m_init->hostname = "vexpress-a5"; + hostname = "vexpress-a5"; else if (cpu_is_cortex_a7()) - v2m_init->hostname = "vexpress-a7"; + hostname = "vexpress-a7"; else if (cpu_is_cortex_a9()) - v2m_init->hostname = "vexpress-a9"; + hostname = "vexpress-a9"; else if (cpu_is_cortex_a15()) - v2m_init->hostname = "vexpress-a15"; + hostname = "vexpress-a15"; } + barebox_set_model("ARM Vexpress"); + barebox_set_hostname(hostname); + v2m_init->core_init(); return 0; |