Patchwork [U-Boot,3/3] nhk8815: move config targets from Makefile to boards.cfg

login
register
mail settings
Submitter Alessandro Rubini
Date April 16, 2011, 5:50 p.m.
Message ID <26892931782ba32336c1dc383938c9ab4996e7a4.1302975984.git.rubini@gnudd.com>
Download mbox | patch
Permalink /patch/91491/
State Accepted
Commit aeb630d2063706187352543929058f0308f872d2
Delegated to: Albert ARIBAUD
Headers show

Comments

Alessandro Rubini - April 16, 2011, 5:50 p.m.
From: Alessandro Rubini <rubini@unipv.it>

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
---

BTW: please note that file is not sorted and has some white-space
error: "dkb" is aligned with tabs while all other use spaces and
there is a spurious tab after "Target" (both begin and end)


 Makefile   |    9 ---------
 boards.cfg |    2 ++
 2 files changed, 2 insertions(+), 9 deletions(-)
Albert ARIBAUD - April 23, 2011, 11:40 a.m.
Hi Alessandro,

Le 16/04/2011 19:50, Alessandro Rubini a écrit :
> From: Alessandro Rubini<rubini@unipv.it>
>
> Signed-off-by: Alessandro Rubini<rubini@unipv.it>
> Acked-by: Andrea Gallo<andrea.gallo@stericsson.com>
> ---
>
> BTW: please note that file is not sorted and has some white-space
> error: "dkb" is aligned with tabs while all other use spaces and
> there is a spurious tab after "Target" (both begin and end)

Applied to u-boot-arm/master, thanks.

Amicalement,

Patch

diff --git a/Makefile b/Makefile
index 713dba1..584105c 100644
--- a/Makefile
+++ b/Makefile
@@ -933,15 +933,6 @@  cp922_XA10_config	\
 cp1026_config: unconfig
 	@board/armltd/integrator/split_by_variant.sh cp $@
 
-nhk8815_config \
-nhk8815_onenand_config:	unconfig
-	@mkdir -p $(obj)include
-	@ > $(obj)include/config.h
-	@if [ "$(findstring _onenand, $@)" ] ; then \
-		echo "#define CONFIG_BOOT_ONENAND" >> $(obj)include/config.h; \
-	fi
-	@$(MKCONFIG) -n $@ -a nhk8815 arm arm926ejs nhk8815 st nomadik
-
 xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
 
 omap1610inn_config \
diff --git a/boards.cfg b/boards.cfg
index 554e06c..9194610 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -103,6 +103,8 @@  dockstar                     arm         arm926ejs   -                   Seagate
 jadecpu                      arm         arm926ejs   jadecpu             syteco         mb86r0x
 imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
 magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
+nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
+nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon