diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2015-01-05 14:24:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-06 14:51:38 +0100 |
| commit | 556a39131f61efe78e0df14982d014e813dc159c (patch) | |
| tree | 4ad212459a43d99d1d25280e4154c21fbe4446aa /arch/arm/boards/versatile | |
| parent | 783125caef136d7371ec30cceee5cdbb82cc5a75 (diff) | |
| download | barebox-556a39131f61efe78e0df14982d014e813dc159c.tar.gz barebox-556a39131f61efe78e0df14982d014e813dc159c.tar.xz | |
versatilepb: allow to compile it an arm1176
useful to use it for testing on qemu
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/versatile')
| -rw-r--r-- | arch/arm/boards/versatile/env/nv/hostname | 1 | ||||
| -rw-r--r-- | arch/arm/boards/versatile/versatilepb.c | 15 |
2 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/boards/versatile/env/nv/hostname b/arch/arm/boards/versatile/env/nv/hostname deleted file mode 100644 index 7cdb629f27..0000000000 --- a/arch/arm/boards/versatile/env/nv/hostname +++ /dev/null @@ -1 +0,0 @@ -versatilepb diff --git a/arch/arm/boards/versatile/versatilepb.c b/arch/arm/boards/versatile/versatilepb.c index 7e2103ede6..9ed114682b 100644 --- a/arch/arm/boards/versatile/versatilepb.c +++ b/arch/arm/boards/versatile/versatilepb.c @@ -22,6 +22,7 @@ #include <common.h> #include <init.h> #include <asm/armlinux.h> +#include <asm/system_info.h> #include <generated/mach-types.h> #include <mach/init.h> #include <mach/platform.h> @@ -32,7 +33,19 @@ static int vpb_console_init(void) { - barebox_set_hostname("versatilepb"); + char *hostname = "versatilepb-unknown"; + char *model = "ARM Versatile PB"; + + if (cpu_is_arm926()) { + hostname = "versatilepb-arm926"; + model = "ARM Versatile PB (arm926)"; + } else if (cpu_is_arm1176()) { + hostname = "versatilepb-arm1176"; + model = "ARM Versatile PB (arm1176)"; + } + + barebox_set_hostname(hostname); + barebox_set_model(model); versatile_register_uart(0); return 0; |