From patchwork Wed Mar 9 13:16:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Schwierzeck X-Patchwork-Id: 86109 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 CE887B6FB9 for ; Thu, 10 Mar 2011 00:18:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9BFB02808F; Wed, 9 Mar 2011 14:17:51 +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 y+7gwAROKBOi; Wed, 9 Mar 2011 14:17:51 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5E171280B4; Wed, 9 Mar 2011 14:17:31 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B594228087 for ; Wed, 9 Mar 2011 14:17: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 sVRNCih8yvJm for ; Wed, 9 Mar 2011 14:17:27 +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-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id DCF0828081 for ; Wed, 9 Mar 2011 14:17:18 +0100 (CET) Received: by mail-bw0-f44.google.com with SMTP id 13so603743bwz.3 for ; Wed, 09 Mar 2011 05:17:18 -0800 (PST) Received: by 10.204.74.203 with SMTP id v11mr5493215bkj.3.1299676638255; Wed, 09 Mar 2011 05:17:18 -0800 (PST) Received: from localhost.localdomain (dslb-088-073-208-151.pools.arcor-ip.net [88.73.208.151]) by mx.google.com with ESMTPS id x6sm1289031bkv.12.2011.03.09.05.17.16 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Mar 2011 05:17:17 -0800 (PST) From: daniel.schwierzeck@googlemail.com To: u-boot@lists.denx.de Date: Wed, 9 Mar 2011 14:16:57 +0100 Message-Id: <1299676619-7963-5-git-send-email-daniel.schwierzeck@googlemail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1299676619-7963-1-git-send-email-daniel.schwierzeck@googlemail.com> References: <1299676619-7963-1-git-send-email-daniel.schwierzeck@googlemail.com> Cc: sr@denx.de, Daniel Schwierzeck Subject: [U-Boot] [RFC PATCH 4/6] Mips: Purple: Move all Purple specific code to separate subdirectory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 Purple is a SoC and its specific code should reside in an own SoC subdirectory. Signed-off-by: Daniel Schwierzeck Shinya Kuribayashi --- arch/mips/cpu/mips32/Makefile | 1 - arch/mips/cpu/mips32/purple/Makefile | 45 ++++++++++++++++++++++++ arch/mips/cpu/mips32/{ => purple}/asc_serial.c | 0 arch/mips/cpu/mips32/{ => purple}/asc_serial.h | 0 arch/mips/cpu/mips32/purple/config.mk | 22 +++++++++++ boards.cfg | 2 +- 6 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 arch/mips/cpu/mips32/purple/Makefile rename arch/mips/cpu/mips32/{ => purple}/asc_serial.c (100%) rename arch/mips/cpu/mips32/{ => purple}/asc_serial.h (100%) create mode 100644 arch/mips/cpu/mips32/purple/config.mk -- 1.7.4.1 diff --git a/arch/mips/cpu/mips32/Makefile b/arch/mips/cpu/mips32/Makefile index 4339ef0..88e3023 100644 --- a/arch/mips/cpu/mips32/Makefile +++ b/arch/mips/cpu/mips32/Makefile @@ -29,7 +29,6 @@ START = start.o SOBJS-y = cache.o COBJS-y = cpu.o interrupts.o -COBJS-$(CONFIG_PURPLE) += asc_serial.o COBJS-$(CONFIG_SOC_AU1X00) += au1x00_eth.o au1x00_serial.o au1x00_usb_ohci.o SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) diff --git a/arch/mips/cpu/mips32/purple/Makefile b/arch/mips/cpu/mips32/purple/Makefile new file mode 100644 index 0000000..e8c81e8 --- /dev/null +++ b/arch/mips/cpu/mips32/purple/Makefile @@ -0,0 +1,45 @@ +# +# (C) Copyright 2011 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(SOC).o + +COBJS = asc_serial.o + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +all: $(obj).depend $(LIB) + +$(LIB): $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/arch/mips/cpu/mips32/asc_serial.c b/arch/mips/cpu/mips32/purple/asc_serial.c similarity index 100% rename from arch/mips/cpu/mips32/asc_serial.c rename to arch/mips/cpu/mips32/purple/asc_serial.c diff --git a/arch/mips/cpu/mips32/asc_serial.h b/arch/mips/cpu/mips32/purple/asc_serial.h similarity index 100% rename from arch/mips/cpu/mips32/asc_serial.h rename to arch/mips/cpu/mips32/purple/asc_serial.h diff --git a/arch/mips/cpu/mips32/purple/config.mk b/arch/mips/cpu/mips32/purple/config.mk new file mode 100644 index 0000000..3516213 --- /dev/null +++ b/arch/mips/cpu/mips32/purple/config.mk @@ -0,0 +1,22 @@ +# +# (C) Copyright 2011 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# diff --git a/boards.cfg b/boards.cfg index 4da68ac..0eb5b90 100644 --- a/boards.cfg +++ b/boards.cfg @@ -228,7 +228,7 @@ incaip_100MHz mips mips32 incaip - incaip_133MHz mips mips32 incaip - incaip incaip:CPU_CLOCK_RATE=133000000 incaip_150MHz mips mips32 incaip - incaip incaip:CPU_CLOCK_RATE=150000000 pb1000 mips mips32 pb1x00 - - pb1x00:PB1000 -purple mips mips32 +purple mips mips32 - - purple qemu_mips mips mips32 qemu-mips - - qemu-mips tb0229 mips mips32 vct_premium mips mips32 vct micronas - vct:VCT_PREMIUM