diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-03-26 22:27:45 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-26 22:27:45 +0100 |
| commit | aaa0e0812ffdf861993129f41936eb175a2eaa5f (patch) | |
| tree | 2f729e92c83925a5acb9f204e381878928c2c57f /Makefile | |
| parent | 99a4ffe202d8bc1d3c4faff9b8258b686ef656ca (diff) | |
| parent | df486b1fa3f750b153eac7daa0b3bf1f594e5098 (diff) | |
| download | u-boot-imx-aaa0e0812ffdf861993129f41936eb175a2eaa5f.zip u-boot-imx-aaa0e0812ffdf861993129f41936eb175a2eaa5f.tar.gz u-boot-imx-aaa0e0812ffdf861993129f41936eb175a2eaa5f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-at91
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -2653,8 +2653,18 @@ at91cap9adk_config : unconfig at91sam9260ek_nandflash_config \ at91sam9260ek_dataflash_cs0_config \ at91sam9260ek_dataflash_cs1_config \ -at91sam9260ek_config : unconfig - @mkdir -p $(obj)include +at91sam9260ek_config \ +at91sam9g20ek_nandflash_config \ +at91sam9g20ek_dataflash_cs0_config \ +at91sam9g20ek_dataflash_cs1_config \ +at91sam9g20ek_config : unconfig + @mkdir -p $(obj)include + @if [ "$(findstring 9g20,$@)" ] ; then \ + echo "#define CONFIG_AT91SAM9G20EK 1" >>$(obj)include/config.h ; \ + $(XECHO) "... 9G20 Variant" ; \ + else \ + echo "#define CONFIG_AT91SAM9260EK 1" >>$(obj)include/config.h ; \ + fi; @if [ "$(findstring _nandflash,$@)" ] ; then \ echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ $(XECHO) "... with environment variable in NAND FLASH" ; \ @@ -2682,7 +2692,7 @@ at91sam9xeek_config : unconfig echo "#define CONFIG_SYS_USE_DATAFLASH_CS1 1" >>$(obj)include/config.h ; \ $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \ fi; - @$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91sam9 + @$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91 at91sam9261ek_nandflash_config \ at91sam9261ek_dataflash_cs0_config \ |