diff options
| author | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:56:34 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:57:51 -0400 |
| commit | 72e20f5704987c27e549c85706b125fd4bac02c7 (patch) | |
| tree | c5a252708f5a4f6e04cd9390c5bd29b8bd48fda4 /Makefile | |
| parent | 405bb978ee2321b6cf5381a012c812bdc7679e40 (diff) | |
| parent | 251484cfb845d5d54c652a1801270ede1521ca6d (diff) | |
Merge branch 'u-boot-1.1.5-at91' into u-boot-1.3.0-at91
Conflicts:
include/configs/at91sam9261ek.h
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 72 |
1 files changed, 64 insertions, 8 deletions
@@ -2379,21 +2379,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 + @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 |