diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-23 15:49:51 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 08:24:08 +0200 |
| commit | 7d7a982541bf4c7be52c87cf60944e7c2ac6833e (patch) | |
| tree | 1e74b27583e696e4e615b2138e8d6cc68089ee3c /arch/arm/boards/freescale-mx51-pdk | |
| parent | 41f53d8d17863a28d82ad4558e0f53a8806c8950 (diff) | |
| download | barebox-7d7a982541bf4c7be52c87cf60944e7c2ac6833e.tar.gz barebox-7d7a982541bf4c7be52c87cf60944e7c2ac6833e.tar.xz | |
ARM: i.MX51 babbage: add board name to flash header file
This is necessary because the C name for the flash header matches
the filename. For multiple board support we have to make the name
unique to prevent linker errors.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/freescale-mx51-pdk')
| -rw-r--r-- | arch/arm/boards/freescale-mx51-pdk/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx51-pdk/board.c | 7 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx51-pdk/flash-header-imx51-babbage.imxcfg (renamed from arch/arm/boards/freescale-mx51-pdk/flash-header.imxcfg) | 0 |
3 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boards/freescale-mx51-pdk/Makefile b/arch/arm/boards/freescale-mx51-pdk/Makefile index f1baae24ff..0c06778a95 100644 --- a/arch/arm/boards/freescale-mx51-pdk/Makefile +++ b/arch/arm/boards/freescale-mx51-pdk/Makefile @@ -1,3 +1,3 @@ -obj-y += board.o flash-header.o -extra-y += flash-header.S flash-header.dcd +obj-y += board.o flash-header-imx51-babbage.o +extra-y += flash-header-imx51-babbage.S flash-header-imx51-babbage.dcd lwl-y += lowlevel.o diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c index fc7e17568b..3906e47977 100644 --- a/arch/arm/boards/freescale-mx51-pdk/board.c +++ b/arch/arm/boards/freescale-mx51-pdk/board.c @@ -157,7 +157,8 @@ static void babbage_power_init(void) mdelay(50); } -extern char flash_header_start[], flash_header_end[]; +extern char flash_header_imx51_babbage_start[]; +extern char flash_header_imx51_babbage_end[]; static int f3s_devices_init(void) { @@ -171,8 +172,8 @@ static int f3s_devices_init(void) armlinux_set_architecture(MACH_TYPE_MX51_BABBAGE); imx51_bbu_internal_mmc_register_handler("mmc", "/dev/mmc0", - BBU_HANDLER_FLAG_DEFAULT, (void *)flash_header_start, - flash_header_end - flash_header_start, 0); + BBU_HANDLER_FLAG_DEFAULT, (void *)flash_header_imx51_babbage_start, + flash_header_imx51_babbage_end - flash_header_imx51_babbage_start, 0); return 0; } diff --git a/arch/arm/boards/freescale-mx51-pdk/flash-header.imxcfg b/arch/arm/boards/freescale-mx51-pdk/flash-header-imx51-babbage.imxcfg index bac6816fee..bac6816fee 100644 --- a/arch/arm/boards/freescale-mx51-pdk/flash-header.imxcfg +++ b/arch/arm/boards/freescale-mx51-pdk/flash-header-imx51-babbage.imxcfg |