ARM: convert "omap16xx" boards to boards.cfg

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kshitij Gupta <kshitij@ti.com>
Acked-by: Tom Rini <trini@ti.com>

diff --git a/MAKEALL b/MAKEALL
index 0f7b82002cefbd0d2ac4214c024322b79553dc03..c2b52d036cae599c337dad7120215b5fb5aea5c0 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -308,8 +308,6 @@ LIST_SA="$(boards_by_cpu sa1100)"
 LIST_ARM9="$(boards_by_cpu arm920t)    \
        $(boards_by_cpu arm926ejs)      \
        $(boards_by_cpu arm925t)        \
-       omap1610h2              \
-       omap1610inn             \
        omap730p2               \
 "
 

diff --git a/Makefile b/Makefile
index 773073fc1f7f8edc8f4675bfc1524529040a3854..cfd44b1ef4dba5282eec01beaf081d3dff096507 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -654,26 +654,6 @@ ucname     = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
 # ARM
 #========================================================================
 
-xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
-
-omap1610inn_config \
-omap1610inn_cs0boot_config \
-omap1610inn_cs3boot_config \
-omap1610inn_cs_autoboot_config \
-omap1610h2_config \
-omap1610h2_cs0boot_config \
-omap1610h2_cs3boot_config \
-omap1610h2_cs_autoboot_config: unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _cs0boot_, $@)" ] ; then \
-               echo "#define CONFIG_CS0_BOOT" >> .$(obj)include/config.h ; \
-       elif [ "$(findstring _cs_autoboot_, $@)" ] ; then \
-               echo "#define CONFIG_CS_AUTOBOOT" >> $(obj)include/config.h ; \
-       else \
-               echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
-       fi;
-       @$(MKCONFIG) -n $@ -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn ti omap
-
 omap730p2_config \
 omap730p2_cs0boot_config \
 omap730p2_cs3boot_config :     unconfig

diff --git a/boards.cfg b/boards.cfg
index 2e7f5b8be4c7c2348602b119aca710d3475824dc..62039d11c77e1a4c308b3d4d56f482f06a88929b 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -162,6 +162,14 @@ magnesium                    arm         arm926ejs   imx27lite           logicpd
 m28evk                       arm         arm926ejs   -                   denx           mx28
 nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
 nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
+omap1610h2                  arm         arm926ejs   omap1610inn         ti             omap        omap1610inn:CS3_BOOT
+omap1610h2_cs0boot          arm         arm926ejs   omap1610inn         ti             omap        omap1610inn:CS0_BOOT
+omap1610h2_cs3boot          arm         arm926ejs   omap1610inn         ti             omap        omap1610inn:CS3_BOOT
+omap1610h2_cs_autoboot      arm         arm926ejs   omap1610inn         ti             omap        omap1610inn:CS_AUTOBOOT
+omap1610inn                 arm         arm926ejs   omap1610inn         ti             omap        omap1610inn:CS3_BOOT
+omap1610inn_cs0boot         arm         arm926ejs   omap1610inn         ti             omap        omap1610inn:CS0_BOOT
+omap1610inn_cs3boot         arm         arm926ejs   omap1610inn         ti             omap        omap1610inn:CS3_BOOT
+omap1610inn_cs_autoboot             arm         arm926ejs   omap1610inn         ti             omap        omap1610inn:CS_AUTOBOOT
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb                         arm         arm926ejs   -                   Marvell        pantheon