diff options
author | Wolfgang Denk <wd@denx.de> | 2010-01-12 23:30:40 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-01-12 23:30:40 +0100 |
commit | 02c631e6eec5439daea46f8cbdb1572b0df3c843 (patch) | |
tree | bdc82731cdc493dfe35c13f39f985199c8bd5ba3 /Makefile | |
parent | 8b0ab304943b07d13a29db6d3d2ca3edad32cdcb (diff) | |
parent | a3f5da1bee9a8c343a411080d7d468bdc78794a4 (diff) | |
download | u-boot-imx-02c631e6eec5439daea46f8cbdb1572b0df3c843.zip u-boot-imx-02c631e6eec5439daea46f8cbdb1572b0df3c843.tar.gz u-boot-imx-02c631e6eec5439daea46f8cbdb1572b0df3c843.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -2261,8 +2261,12 @@ MPC8313ERDB_NAND_66_config: unconfig echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk ; \ fi ; +MPC8315ERDB_NAND_config \ MPC8315ERDB_config: unconfig - @$(MKCONFIG) -a MPC8315ERDB ppc mpc83xx mpc8315erdb freescale + @if [ "$(findstring _NAND_,$@)" ] ; then \ + ln -sf mpc8313erdb nand_spl/board/freescale/mpc8315erdb ; \ + fi ; + @$(MKCONFIG) -t $(@:_config=) MPC8315ERDB ppc mpc83xx mpc8315erdb freescale MPC8323ERDB_config: unconfig @$(MKCONFIG) -a MPC8323ERDB ppc mpc83xx mpc8323erdb freescale @@ -2396,8 +2400,9 @@ SIMPC8313_SP_config: unconfig TQM834x_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x tqc +caddy2_config \ vme8349_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc83xx vme8349 esd + @$(MKCONFIG) -t $(@:_config=) vme8349 ppc mpc83xx vme8349 esd ######################################################################### ## MPC85xx Systems |