summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Rigby <jrigby@freescale.com>2007-08-16 17:40:03 -0600
committerJohn Rigby <jrigby@freescale.com>2007-08-16 17:40:03 -0600
commit81735b2568cf634d601c0d4a1bbc3a3882bc8eda (patch)
tree521d22623e48f6923b4cda08a36cc26a9cc9abde /Makefile
parentd35b508a55508535b6e8445b718585d27df733d3 (diff)
parentd61ea14885631e58a25feaa81ee82eb464c62d6a (diff)
downloadblackbird-obmc-uboot-81735b2568cf634d601c0d4a1bbc3a3882bc8eda.tar.gz
blackbird-obmc-uboot-81735b2568cf634d601c0d4a1bbc3a3882bc8eda.zip
Merge branch 'denx-coldfire' into coldfire-aug2007
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 14 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 65efd3f5e0..2bb11b6f88 100644
--- a/Makefile
+++ b/Makefile
@@ -209,12 +209,14 @@ LIBS += drivers/libdrivers.a
LIBS += drivers/bios_emulator/libatibiosemu.a
LIBS += drivers/nand/libnand.a
LIBS += drivers/nand_legacy/libnand_legacy.a
+LIBS += drivers/net/libnet.a
ifeq ($(CPU),mpc83xx)
LIBS += drivers/qe/qe.a
endif
ifeq ($(CPU),mpc85xx)
LIBS += drivers/qe/qe.a
endif
+LIBS += drivers/serial/libserial.a
LIBS += drivers/sk98lin/libsk98lin.a
LIBS += post/libpost.a post/drivers/libpostdrivers.a
LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \
@@ -1672,6 +1674,18 @@ TASREG_config : unconfig
r5200_config : unconfig
@$(MKCONFIG) $(@:_config=) m68k mcf52x2 r5200
+M5329AFEE_config \
+M5329BFEE_config : unconfig
+ @case "$@" in \
+ M5329AFEE_config) NAND=0;; \
+ M5329BFEE_config) NAND=16;; \
+ esac; \
+ >include/config.h ; \
+ if [ "$${NAND}" != "0" ] ; then \
+ echo "#define NANDFLASH_SIZE $${NAND}" >> include/config.h ; \
+ fi
+ @$(MKCONFIG) -a M5329EVB m68k mcf532x m5329evb freescale
+
#########################################################################
## MPC83xx Systems
#########################################################################
OpenPOWER on IntegriCloud