9
0
Fork 0

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>
This commit is contained in:
Sascha Hauer 2013-06-23 15:49:51 +02:00
parent 41f53d8d17
commit 7d7a982541
4 changed files with 7 additions and 6 deletions

View File

@ -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

View File

@ -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;
}

View File

@ -16,7 +16,7 @@ image-$(CONFIG_MACH_PCM038) += barebox-phytec-phycore-imx27.img
# ----------------------- i.MX51 based boards ---------------------------
pblx-$(CONFIG_MACH_FREESCALE_MX51_PDK) += start_imx51_babbage
CFG_start_imx51_babbage.pblx.imximg = $(board)/freescale-mx51-pdk/flash-header.imxcfg
CFG_start_imx51_babbage.pblx.imximg = $(board)/freescale-mx51-pdk/flash-header-imx51-babbage.imxcfg
imximage-$(CONFIG_MACH_FREESCALE_MX51_PDK) += start_imx51_babbage.pblx.imximg
FILE_barebox-freescale-imx51-babbage.img = start_imx51_babbage.pblx.imximg
image-$(CONFIG_MACH_FREESCALE_MX51_PDK) += barebox-freescale-imx51-babbage.img