Patchwork [U-Boot,4/4] at91sam9261/g10: move config from Makefile to boards.cfg

login
register
mail settings
Submitter Alessandro Rubini
Date April 18, 2011, 9:21 a.m.
Message ID <b6527dd554695efe30d8a22085dfc22d315afe39.1303118067.git.rubini@gnudd.com>
Download mbox | patch
Permalink /patch/91706/
State Superseded
Delegated to: Reinhard Meyer
Headers show

Comments

Alessandro Rubini - April 18, 2011, 9:21 a.m.
This moves config targets, but defines DATAFLASH_CS0 for "dataflash_cs0"
configs and DATAFLASH_CS3 for "dataflash_cs3" configs, whereas the
Makefile targets had it swapped.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
 Makefile   |   22 ----------------------
 boards.cfg |    8 ++++++++
 2 files changed, 8 insertions(+), 22 deletions(-)

Patch

diff --git a/Makefile b/Makefile
index 584105c..93c33c7 100644
--- a/Makefile
+++ b/Makefile
@@ -803,28 +803,6 @@  at91sam9xeek_config	:	unconfig
 	fi;
 	@$(MKCONFIG) -n $@ -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
 
-at91sam9261ek_nandflash_config \
-at91sam9261ek_dataflash_cs0_config \
-at91sam9261ek_dataflash_cs3_config \
-at91sam9261ek_config \
-at91sam9g10ek_nandflash_config \
-at91sam9g10ek_dataflash_cs0_config \
-at91sam9g10ek_dataflash_cs3_config \
-at91sam9g10ek_config	:	unconfig
-	@mkdir -p $(obj)include
-	@if [ "$(findstring 9g10,$@)" ] ; then \
-		echo "#define CONFIG_AT91SAM9G10EK 1"	>>$(obj)include/config.h ; \
-	else \
-		echo "#define CONFIG_AT91SAM9261EK 1"	>>$(obj)include/config.h ; \
-	fi;
-	@if [ "$(findstring _nandflash,$@)" ] ; then \
-		echo "#define CONFIG_SYS_USE_NANDFLASH 1"	>>$(obj)include/config.h ; \
-	elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
-		echo "#define CONFIG_SYS_USE_DATAFLASH_CS3 1"	>>$(obj)include/config.h ; \
-	else \
-		echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1"	>>$(obj)include/config.h ; \
-	fi;
-	@$(MKCONFIG) -n $@ -a at91sam9261ek arm arm926ejs at91sam9261ek atmel at91
 
 at91sam9263ek_norflash_config \
 at91sam9263ek_norflash_boot_config \
diff --git a/boards.cfg b/boards.cfg
index 9194610..80488b8 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -73,6 +73,14 @@  omap1510inn                  arm         arm925t     -                   ti
 aspenite                     arm         arm926ejs   -                   Marvell        armada100
 afeb9260                     arm         arm926ejs   -                   -              at91
 at91cap9adk                  arm         arm926ejs   -                   atmel          at91
+at91sam9261ek                arm         arm926ejs   -                   atmel          at91        at91sam9261ek:AT91SAM9261EK,SYS_USE_DATAFLASH_CS0
+at91sam9261ek_dataflash_cs0  arm         arm926ejs   -                   atmel          at91        at91sam9261ek:AT91SAM9261EK,SYS_USE_DATAFLASH_CS0
+at91sam9261ek_dataflash_cs3  arm         arm926ejs   -                   atmel          at91        at91sam9261ek:AT91SAM9261EK,SYS_USE_DATAFLASH_CS3
+at91sam9261ek_nandflash      arm         arm926ejs   -                   atmel          at91        at91sam9261ek:AT91SAM9261EK,SYS_USE_NANDFLASH
+at91sam92g10ek               arm         arm926ejs   -                   atmel          at91        at91sam9261ek:AT91SAM9G10EK,SYS_USE_DATAFLASH_CS0
+at91sam92g10ek_dataflash_cs0 arm         arm926ejs   -                   atmel          at91        at91sam9261ek:AT91SAM9G10EK,SYS_USE_DATAFLASH_CS0
+at91sam92g10ek_dataflash_cs3 arm         arm926ejs   -                   atmel          at91        at91sam9261ek:AT91SAM9G10EK,SYS_USE_DATAFLASH_CS3
+at91sam92g10ek_nandflash     arm         arm926ejs   -                   atmel          at91        at91sam9261ek:AT91SAM9G10EK,SYS_USE_NANDFLASH
 top9000eval_xe               arm         arm926ejs   top9000             emk            at91        top9000:EVAL9000
 top9000su_xe                 arm         arm926ejs   top9000             emk            at91        top9000:SU9000
 meesc                        arm         arm926ejs   -                   esd            at91