From patchwork Fri Dec 16 15:37:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 131854 X-Patchwork-Delegate: trini@ti.com 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 CDE071007D7 for ; Sat, 17 Dec 2011 02:39:50 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 601D328550; Fri, 16 Dec 2011 16:39:28 +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 FNZgLD6FkM8a; Fri, 16 Dec 2011 16:39:28 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BB0BC28516; Fri, 16 Dec 2011 16:38:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 43B38284C9 for ; Fri, 16 Dec 2011 16:38:43 +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 PYyEM6wCK41y for ; Fri, 16 Dec 2011 16:38:41 +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 smtpi3.ngi.it (smtpi3.ngi.it [88.149.128.33]) by theia.denx.de (Postfix) with ESMTP id CFE9528488 for ; Fri, 16 Dec 2011 16:38:10 +0100 (CET) Received: from paperina.lan (unknown [88.149.182.160]) by smtpi3.ngi.it (Postfix) with ESMTP id 967EF318DC7; Fri, 16 Dec 2011 16:38:09 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by paperina.lan (Postfix) with ESMTP id DC5F1140A0BF; Fri, 16 Dec 2011 16:38:07 +0100 (CET) Received: from paperina.lan ([127.0.0.1]) by localhost (paperina.lan [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pYrMkdU54cLh; Fri, 16 Dec 2011 16:38:00 +0100 (CET) Received: from papero.lan (papero.lan [192.168.2.247]) by paperina.lan (Postfix) with ESMTP id 777B1140A12E; Fri, 16 Dec 2011 16:37:17 +0100 (CET) From: Stefano Babic To: u-boot@lists.denx.de Date: Fri, 16 Dec 2011 16:37:10 +0100 Message-Id: <1324049833-18143-11-git-send-email-sbabic@denx.de> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1324049833-18143-1-git-send-email-sbabic@denx.de> References: <1313073896-12952-1-git-send-email-simonschwarzcor@gmail.com> <1324049833-18143-1-git-send-email-sbabic@denx.de> Subject: [U-Boot] [PATCH V11 10/13] OMAP3: move SPL files to be used by other architectures. 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 The SPL used on OMAPx can be reused by other SOCs from different architectures. Move common files into common/ directory. Signed-off-by: Stefano Babic CC: Tom Rini CC: Wolfgang Denk CC: Simon Schwarz --- arch/arm/cpu/armv7/omap-common/Makefile | 10 ---------- common/Makefile | 4 ++++ {arch/arm/cpu/armv7/omap-common => common}/spl.c | 0 .../arm/cpu/armv7/omap-common => common}/spl_mmc.c | 0 .../cpu/armv7/omap-common => common}/spl_nand.c | 0 5 files changed, 4 insertions(+), 10 deletions(-) rename {arch/arm/cpu/armv7/omap-common => common}/spl.c (100%) rename {arch/arm/cpu/armv7/omap-common => common}/spl_mmc.c (100%) rename {arch/arm/cpu/armv7/omap-common => common}/spl_nand.c (100%) diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/common/spl.c similarity index 100% rename from arch/arm/cpu/armv7/omap-common/spl.c rename to common/spl.c diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/common/spl_mmc.c similarity index 100% rename from arch/arm/cpu/armv7/omap-common/spl_mmc.c rename to common/spl_mmc.c diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/common/spl_nand.c similarity index 100% rename from arch/arm/cpu/armv7/omap-common/spl_nand.c rename to common/spl_nand.c diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile index a684611..e65e992 100644 --- a/arch/arm/cpu/armv7/omap-common/Makefile +++ b/arch/arm/cpu/armv7/omap-common/Makefile @@ -40,16 +40,6 @@ COBJS += emif-common.o SOBJS += lowlevel_init.o endif -ifdef CONFIG_SPL_BUILD -COBJS += spl.o -ifdef CONFIG_SPL_NAND_SUPPORT -COBJS += spl_nand.o -endif -ifdef CONFIG_SPL_MMC_SUPPORT -COBJS += spl_mmc.o -endif -endif - ifndef CONFIG_SPL_BUILD ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) COBJS += mem-common.o diff --git a/common/Makefile b/common/Makefile index 91f3f2e..41b67ca 100644 --- a/common/Makefile +++ b/common/Makefile @@ -186,6 +186,10 @@ COBJS-$(CONFIG_MENU) += menu.o COBJS-$(CONFIG_MODEM_SUPPORT) += modem.o COBJS-$(CONFIG_UPDATE_TFTP) += update.o COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o +else +COBJS-y += spl.o +COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o +COBJS-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o endif COBJS-y += console.o