From patchwork Fri Dec 9 11:14:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Denk X-Patchwork-Id: 130344 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 96555B6F62 for ; Fri, 9 Dec 2011 22:15:42 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C3A2728171; Fri, 9 Dec 2011 12:15:21 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4q597GHj3JSK; Fri, 9 Dec 2011 12:15:21 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ECD8A2814D; Fri, 9 Dec 2011 12:14:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1EB1B2814C for ; Fri, 9 Dec 2011 12:14:41 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d13k0v2ozQau for ; Fri, 9 Dec 2011 12:14:40 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by theia.denx.de (Postfix) with ESMTP id 5A6002814A for ; Fri, 9 Dec 2011 12:14:36 +0100 (CET) Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 1FDAA1801129; Fri, 9 Dec 2011 12:14:35 +0100 (CET) X-Auth-Info: 4E296MRz1vVAcZSBAO3Z71NOL1ZOjwNmP1JTcYL9ANc= Received: from diddl.denx.de (host-80-81-18-216.customer.m-online.net [80.81.18.216]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 6D0541C00130; Fri, 9 Dec 2011 12:14:35 +0100 (CET) Received: from gemini.denx.de (unknown [10.0.0.2]) by diddl.denx.de (Postfix) with ESMTP id 439001A3768; Fri, 9 Dec 2011 12:14:35 +0100 (CET) Received: by gemini.denx.de (Postfix, from userid 500) id BE4591A32833; Fri, 9 Dec 2011 12:14:34 +0100 (CET) From: Wolfgang Denk To: u-boot@lists.denx.de Date: Fri, 9 Dec 2011 12:14:30 +0100 Message-Id: <1323429272-26801-12-git-send-email-wd@denx.de> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1323429272-26801-1-git-send-email-wd@denx.de> References: <1323429272-26801-1-git-send-email-wd@denx.de> Cc: Kshitij Gupta Subject: [U-Boot] [PATCH 11/13] ARM: convert "omap16xx" boards to boards.cfg X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 0f7b820..c2b52d0 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 e603b9a..8474ce7 100644 --- a/Makefile +++ b/Makefile @@ -646,26 +646,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 c1b0bad..b9cc705 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