summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-08-15 09:02:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-08-16 08:40:55 +0200
commit068bed22a6154aec1fe689603b8a8eaa27c0f350 (patch)
tree5cebcbbbcd486ee49552253d27d079b7f6703fd4 /arch/x86
parent774580c2bde4c8b126eed0a80d00cb22cbfb3193 (diff)
downloadbarebox-068bed22a6154aec1fe689603b8a8eaa27c0f350.tar.gz
Set model and hostname at boardlevel
With multiboard support the compiletime generated BOARDINFO string gets more and more meaningless. This removes it from Kconfig and replaces it with a variable that can be set at boardlevel. Also many boards have a standard setting for the hostname in the environment. This patch also moves the standard to C code by calling barebox_set_hostname(). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig3
-rw-r--r--arch/x86/boards/x86_generic/generic_pc.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6589ae7..d8d7f0e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -5,9 +5,6 @@ config ARCH_TEXT_BASE
hex
default 0x00007c00 if MACH_X86_GENERIC
-config BOARDINFO
- default "Generic x86 bootloader" if MACH_X86_GENERIC
-
config BOARD_LINKER_SCRIPT
bool
default n
diff --git a/arch/x86/boards/x86_generic/generic_pc.c b/arch/x86/boards/x86_generic/generic_pc.c
index 9d37069..172c531 100644
--- a/arch/x86/boards/x86_generic/generic_pc.c
+++ b/arch/x86/boards/x86_generic/generic_pc.c
@@ -75,6 +75,9 @@ static struct NS16550_plat serial_plat = {
static int pc_console_init(void)
{
+ barebox_set_model("X86 generic barebox");
+ barebox_set_hostname("x86");
+
/* Register the serial port */
add_ns16550_device(DEVICE_ID_DYNAMIC, 0x3f8, 8, 0, &serial_plat);