summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJustin Waters <justin.waters@timesys.com>2008-06-16 13:31:33 -0400
committerJustin Waters <justin.waters@timesys.com>2008-06-16 13:31:33 -0400
commit251484cfb845d5d54c652a1801270ede1521ca6d (patch)
treed89611f0f7d9f1cd468c53d2cb122041db75b74a /Makefile
parentfc0717dc30824a3e0b9115c44787af7483e5aaa7 (diff)
Update to Atmel's 1.7 patch for 1.1.51.1.5-at91-200806161731
This patch came from Atmel. It fixes a number of NAND issues, as well as the 9263 rev B SPI bug. Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile71
1 files changed, 62 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index ce2050f0ca..6b934df7f2 100644
--- a/Makefile
+++ b/Makefile
@@ -2013,24 +2013,77 @@ zylonite_config :
#########################################################################
## ARM926EJS Systems
#########################################################################
-
+at91sam9260ek_nandflash_config \
+at91sam9260ek_dataflash_config \
at91sam9260ek_config : unconfig
- @./mkconfig $(@:_config=) arm arm926ejs at91sam9260ek NULL at91sam926x
-
+ @if [ "$(findstring _nandflash,$@)" ] ; then \
+ echo "#define CFG_ENV_IS_IN_NAND 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in NAND FLASH" ; \
+ else \
+ echo "#define CFG_ENV_IS_IN_DATAFLASH 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in SPI DATAFLASH CS1" ; \
+ fi;
+ @$(MKCONFIG) -a at91sam9260ek arm arm926ejs at91sam9260ek NULL at91sam926x
+
+at91sam9xeek_nandflash_config \
+at91sam9xeek_dataflash_config \
at91sam9xeek_config : unconfig
- @./mkconfig -n at91sam9xeek at91sam9260ek arm arm926ejs at91sam9260ek NULL at91sam926x
+ @if [ "$(findstring _nandflash,$@)" ] ; then \
+ echo "#define CFG_ENV_IS_IN_NAND 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in NAND FLASH" ; \
+ else \
+ echo "#define CFG_ENV_IS_IN_DATAFLASH 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in SPI DATAFLASH CS1" ; \
+ fi;
+ @$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek NULL at91sam926x
+at91sam9g20ek_nandflash_config \
+at91sam9g20ek_dataflash_config \
at91sam9g20ek_config : unconfig
- @./mkconfig $(@:_config=) arm arm926ejs at91sam9g20ek NULL at91sam926x
+ @if [ "$(findstring _nandflash,$@)" ] ; then \
+ echo "#define CFG_ENV_IS_IN_NAND 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in NAND FLASH" ; \
+ else \
+ echo "#define CFG_ENV_IS_IN_DATAFLASH 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in SPI DATAFLASH CS1" ; \
+ fi;
+ @$(MKCONFIG) -a at91sam9g20ek arm arm926ejs at91sam9g20ek NULL at91sam926x
+at91sam9261ek_nandflash_config \
+at91sam9261ek_dataflash_config \
at91sam9261ek_config : unconfig
- @./mkconfig $(@:_config=) arm arm926ejs at91sam9261ek NULL at91sam926x
+ @if [ "$(findstring _nandflash,$@)" ] ; then \
+ echo "#define CFG_ENV_IS_IN_NAND 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in NAND FLASH" ; \
+ else \
+ echo "#define CFG_ENV_IS_IN_DATAFLASH 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in SPI DATAFLASH CS0" ; \
+ fi;
+ @$(MKCONFIG) -a at91sam9261ek arm arm926ejs at91sam9261ek NULL at91sam926x
+at91sam9rlek_nandflash_config \
+at91sam9rlek_dataflash_config \
at91sam9rlek_config : unconfig
- @./mkconfig $(@:_config=) arm arm926ejs at91sam9rlek NULL at91sam926x
-
+ @if [ "$(findstring _nandflash,$@)" ] ; then \
+ echo "#define CFG_ENV_IS_IN_NAND 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in NAND FLASH" ; \
+ else \
+ echo "#define CFG_ENV_IS_IN_DATAFLASH 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in SPI DATAFLASH CS0" ; \
+ fi;
+ @$(MKCONFIG) -a at91sam9rlek arm arm926ejs at91sam9rlek NULL at91sam926x
+
+at91sam9263ek_nandflash_config \
+at91sam9263ek_dataflash_config \
at91sam9263ek_config : unconfig
- @./mkconfig $(@:_config=) arm arm926ejs at91sam9263ek NULL at91sam926x
+ @if [ "$(findstring _nandflash,$@)" ] ; then \
+ echo "#define CFG_ENV_IS_IN_NAND 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in NAND FLASH" ; \
+ else \
+ echo "#define CFG_ENV_IS_IN_DATAFLASH 1" >>$(obj)include/config.h ; \
+ echo "... with environment variable in SPI DATAFLASH CS0" ; \
+ fi;
+ @$(MKCONFIG) -a at91sam9263ek arm arm926ejs at91sam9263ek NULL at91sam926x
#########################################################################
## ARM1136 Systems