summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-05-19 21:30:22 +0200
committerWolfgang Denk <wd@denx.de>2011-05-19 21:30:22 +0200
commitb0e51ebca2dc66e005e61084d08ad17ce611e890 (patch)
tree02181fcc7471a0f713a0f308983f1e9e1575324c /board
parent638a48ed6006b70f966908ddde38fdc27a63bdb9 (diff)
parentbe827c7ab033c972c87f9b1f36a0d574a14b2acb (diff)
downloadu-boot-imx-b0e51ebca2dc66e005e61084d08ad17ce611e890.zip
u-boot-imx-b0e51ebca2dc66e005e61084d08ad17ce611e890.tar.gz
u-boot-imx-b0e51ebca2dc66e005e61084d08ad17ce611e890.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
* 'master' of git://git.denx.de/u-boot-mpc85xx: powerpc/85xx: add support for env in MMC/SPI on corenet ds boards powerpc/85xx: Enable eSPI support on corenet ds boards
Diffstat (limited to 'board')
-rw-r--r--board/freescale/common/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index dbf1da8..c47d10d 100644
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -36,7 +36,9 @@ COBJS-$(CONFIG_FSL_NGPIXIS) += ngpixis.o
COBJS-$(CONFIG_PQ_MDS_PIB) += pq-mds-pib.o
COBJS-$(CONFIG_ID_EEPROM) += sys_eeprom.o
COBJS-$(CONFIG_FSL_SGMII_RISER) += sgmii_riser.o
+ifndef CONFIG_RAMBOOT_PBL
COBJS-$(CONFIG_ENV_IS_IN_MMC) += sdhc_boot.o
+endif
COBJS-$(CONFIG_MPC8541CDS) += cds_pci_ft.o
COBJS-$(CONFIG_MPC8548CDS) += cds_pci_ft.o