From: Stefan Roese Date: Fri, 1 Jun 2007 14:15:34 +0000 (+0200) Subject: Merge with /home/stefan/git/u-boot/bamboo-nand X-Git-Tag: v1.3.0-rc1~71^2~2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f3679aa13d9f483adb38245a87ecd5c84f57a5d3;p=oweals%2Fu-boot.git Merge with /home/stefan/git/u-boot/bamboo-nand --- f3679aa13d9f483adb38245a87ecd5c84f57a5d3 diff --cc Makefile index caa5a0e0ad,99f38afb6f..463757c43b --- a/Makefile +++ b/Makefile @@@ -1038,6 -1035,16 +1038,15 @@@ ASH405_config: unconfi bamboo_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx bamboo amcc + bamboo_nand_config: unconfig + @mkdir -p $(obj)include + @mkdir -p $(obj)nand_spl + @mkdir -p $(obj)board/amcc/bamboo + @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h - @echo "Compile NAND boot image for bamboo" - @$(MKCONFIG) -a bamboo ppc ppc4xx bamboo amcc ++ @$(MKCONFIG) -n $@ -a bamboo ppc ppc4xx bamboo amcc + @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/bamboo/config.tmp + @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk + bubinga_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx bubinga amcc diff --cc cpu/ppc4xx/ndfc.c index 08dfc32952,09aac38f48..f63fc79f6c --- a/cpu/ppc4xx/ndfc.c +++ b/cpu/ppc4xx/ndfc.c @@@ -38,8 -37,10 +38,10 @@@ #include #include + #include #include + #include -#include +#include static u8 hwctl = 0; diff --cc nand_spl/board/amcc/sequoia/Makefile index b42da8cf68,ce39032a91..ec1be5a768 --- a/nand_spl/board/amcc/sequoia/Makefile +++ b/nand_spl/board/amcc/sequoia/Makefile @@@ -1,5 -1,5 +1,5 @@@ # --# (C) Copyright 2006 ++# (C) Copyright 2006-2007 # Stefan Roese, DENX Software Engineering, sr@denx.de. # # See file CREDITS for list of people who contributed to this