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/qil-a926x | |
| 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/qil-a926x')
| -rw-r--r-- | arch/arm/boards/qil-a926x/init.c | 8 |
1 files changed, 8 insertions, 0 deletions
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; } |