diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-04 10:06:14 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-04-04 10:06:14 +0200 |
commit | 4997646b200006118f0f390d7c5b5eaec9618fed (patch) | |
tree | 8515a81eae7d2c972be3314e6ccaee0d3d31d08b /arch/arm/boards/freescale-mx53-qsb | |
parent | 712b555f6cd07cfe3a1c26dc804134d006bf929d (diff) | |
parent | 279fb4346b1ffd3ce1d1dc4854cce681e46e5ad3 (diff) | |
download | barebox-4997646b200006118f0f390d7c5b5eaec9618fed.tar.gz barebox-4997646b200006118f0f390d7c5b5eaec9618fed.tar.xz |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/boards/freescale-mx53-qsb')
-rw-r--r-- | arch/arm/boards/freescale-mx53-qsb/board.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/freescale-mx53-qsb/env/config-board | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boards/freescale-mx53-qsb/board.c b/arch/arm/boards/freescale-mx53-qsb/board.c index 11b4a42033..38d1ee6f7c 100644 --- a/arch/arm/boards/freescale-mx53-qsb/board.c +++ b/arch/arm/boards/freescale-mx53-qsb/board.c @@ -99,6 +99,7 @@ static int loco_late_init(void) rev = readl(MX53_IIM_BASE_ADDR + 0x878); set_board_rev(rev); printf("MCIMX53-START-R board 1.0 rev %c\n", (rev == 1) ? 'A' : 'B' ); + barebox_set_hostname("loco-r"); armlinux_set_revision(loco_system_rev); /* Set VDDGP to 1.25V for 1GHz on SW1 */ mc13xxx_reg_read(mc34708, MC13892_REG_SW_0, &val); @@ -146,6 +147,7 @@ static int loco_late_init(void) } else { /* so we have a DA9053 based board */ printf("MCIMX53-START board 1.0\n"); + barebox_set_hostname("loco"); armlinux_set_revision(loco_system_rev); } diff --git a/arch/arm/boards/freescale-mx53-qsb/env/config-board b/arch/arm/boards/freescale-mx53-qsb/env/config-board index a6cf69ddbc..e8e8378f53 100644 --- a/arch/arm/boards/freescale-mx53-qsb/env/config-board +++ b/arch/arm/boards/freescale-mx53-qsb/env/config-board @@ -3,5 +3,4 @@ # board defaults, do not change in running system. Change /env/config # instead -global.hostname=loco global.linux.bootargs.base="console=ttymxc0,115200" |