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/friendlyarm-mini2440 | |
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/friendlyarm-mini2440')
-rw-r--r-- | arch/arm/boards/friendlyarm-mini2440/env/config | 1 | ||||
-rw-r--r-- | arch/arm/boards/friendlyarm-mini2440/mini2440.c | 3 |
2 files changed, 3 insertions, 1 deletions
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; } |