[U-Boot] [PATCH 2/3] versatile: use boards.confg

[Alessandro Rubini]

From: Alessandro Rubini <rubini at gnudd.com>

Signed-off-by: Alessandro Rubini <rubini at gnudd.com>
---
 Makefile                                   |    9 ------
 board/armltd/versatile/split_by_variant.sh |   42 ----------------------------
 boards.cfg                                 |    5 ++-
 3 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100755 board/armltd/versatile/split_by_variant.sh

diff --git a/Makefile b/Makefile
index 93c33c7..bbd2e9c 100644
--- a/Makefile
+++ b/Makefile
@@ -998,15 +998,6 @@ edb9315a_config: unconfig
 	@$(MKCONFIG) -n $@ -t $(@:_config=) edb93xx arm arm920t edb93xx - ep93xx
 
 #########################################################################
-# ARM supplied Versatile development boards
-#########################################################################
-
-versatile_config	\
-versatileab_config	\
-versatilepb_config :	unconfig
-	@board/armltd/versatile/split_by_variant.sh $@
-
-#########################################################################
 ## XScale Systems
 #########################################################################
 
diff --git a/board/armltd/versatile/split_by_variant.sh b/board/armltd/versatile/split_by_variant.sh
deleted file mode 100755
index 475e5a3..0000000
--- a/board/armltd/versatile/split_by_variant.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-# ---------------------------------------------------------
-#  Set the core module defines according to Core Module
-# ---------------------------------------------------------
-# ---------------------------------------------------------
-# Set up the Versatile type define
-# ---------------------------------------------------------
-
-mkdir -p ${obj}include
-variant=PB926EJ-S
-if [ "$1" = "" ]
-then
-	echo "$0:: No parameters - using versatilepb_config"
-	echo "#define CONFIG_ARCH_VERSATILE_PB" > ${obj}include/config.h
-	variant=PB926EJ-S
-else
-	case "$1" in
-	versatilepb_config	|	\
-	versatile_config)
-	echo "#define CONFIG_ARCH_VERSATILE_PB" > ${obj}include/config.h
-	;;
-
-	versatileab_config)
-	echo "#define CONFIG_ARCH_VERSATILE_AB" > ${obj}include/config.h
-	variant=AB926EJ-S
-	;;
-
-
-	*)
-	echo "$0:: Unrecognised config - using versatilepb_config"
-	echo "#define CONFIG_ARCH_VERSATILE_PB" > ${obj}include/config.h
-	variant=PB926EJ-S
-	;;
-
-	esac
-
-fi
-# ---------------------------------------------------------
-# Complete the configuration
-# ---------------------------------------------------------
-$MKCONFIG -a versatile arm arm926ejs versatile armltd versatile
-echo "Variant:: $variant"
diff --git a/boards.cfg b/boards.cfg
index 80488b8..39a023e 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -115,7 +115,10 @@ nhk8815                      arm         arm926ejs   nhk8815             st
 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
+dkb                          arm         arm926ejs   -                   Marvell        pantheon
+versatile                    arm         arm926ejs   -                   armltd         versatile
+versatileab                  arm         arm926ejs   versatile           armltd         versatile     versatile:ARCH_VERSATILE_AB
+versatilepb                  arm         arm926ejs   versatile           armltd         versatile     versatile:
 ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
 efikamx                      arm         armv7       efikamx             -              mx5
 mx51evk                      arm         armv7       mx51evk             freescale      mx5
-- 
1.5.6.5