From c81f9cdd2201a6fb770a82879e471b96370e18e1 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Fri, 9 Dec 2011 12:14:30 +0100 Subject: [PATCH] ARM: convert "omap16xx" boards to boards.cfg Signed-off-by: Wolfgang Denk Cc: Kshitij Gupta Acked-by: Tom Rini --- MAKEALL | 2 -- Makefile | 20 -------------------- boards.cfg | 8 ++++++++ 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/MAKEALL b/MAKEALL index 0f7b82002c..c2b52d036c 100755 --- 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 773073fc1f..cfd44b1ef4 100644 --- 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 2e7f5b8be4..62039d11c7 100644 --- 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 -- 2.25.1