From patchwork Sun Jan 25 06:11:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 432477 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 5D2B21401D0 for ; Sun, 25 Jan 2015 19:50:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 180384B796; Sun, 25 Jan 2015 09:49:53 +0100 (CET) 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 jIE7UWKa4nRi; Sun, 25 Jan 2015 09:49:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3B67B4B79B; Sun, 25 Jan 2015 09:49:27 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7D2A74B700 for ; Sun, 25 Jan 2015 07:12:37 +0100 (CET) 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 vv5RQsDPfFOk for ; Sun, 25 Jan 2015 07:12:37 +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-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by theia.denx.de (Postfix) with ESMTPS id 308524B6FC for ; Sun, 25 Jan 2015 07:12:37 +0100 (CET) Received: by mail-pa0-f43.google.com with SMTP id eu11so5537088pac.2 for ; Sat, 24 Jan 2015 22:12:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tBObux3yQu2d4i+hUUPCayl6bWKOyDB8MaGC7gjJLxM=; b=VWHVlz6Ow1SY7iTpXdJezhQva3AV1xt28Mc2JB2bSkm5BT8p2ijr+BYN9I3dNeJ8cZ xr8EaKX+gNdFHjAqree5YJFO/MUl0p1l1+WMxzAfFQZJkE3TUfk0IPJYvxXpWEjyHqUl 43MmHFyCWPRiIaq/MNSlR7AHT63tNgznNoYy1aiomSsgG8YXq7ttIa3MbWFtD5Kajhz9 tIl8gUyu3Amf/Ch8DPmSk2LLDFjtBiNGzXeq9Ye08AHix3NA4A7IPvowz1pCH1ny5n+R +mTqOP7IrLsgcKSlnmOGjYMbmCb+S8p7bQtUXA0P7ERf+yG/hS4FJbBH9JjRCH/l2npi WWmw== X-Received: by 10.70.101.136 with SMTP id fg8mr24643266pdb.65.1422166355677; Sat, 24 Jan 2015 22:12:35 -0800 (PST) Received: from oscar.sesame (112.136.111.86.er.eaccess.ne.jp. [112.136.111.86]) by mx.google.com with ESMTPSA id sm4sm6438237pab.22.2015.01.24.22.12.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 24 Jan 2015 22:12:34 -0800 (PST) From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sun, 25 Jan 2015 15:11:09 +0900 Message-Id: <1422166283-20822-8-git-send-email-yamada.m@jp.panasonic.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422166283-20822-1-git-send-email-yamada.m@jp.panasonic.com> References: <1422166283-20822-1-git-send-email-yamada.m@jp.panasonic.com> X-Mailman-Approved-At: Sun, 25 Jan 2015 09:49:18 +0100 Cc: Luka Perkov , "angelo@sysam.it" , Tom Rini , Stefan Roese , York Sun Subject: [U-Boot] [RFC PATCH 07/21] ARM: kirkwood: move SOC sources to mach-kirkwood X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 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 Move arch/arm/cpu/arm926ejs/kirkwood/* -> arch/arm/mach-kirkwood/* Note: Perhaps, can we merge arch/arm/mach-kirkwood and arch/arm/mvebu-common into arch/arm/mach-mvebu, like Linux? Signed-off-by: Masahiro Yamada Cc: Prafulla Wadaskar Cc: Luka Perkov Cc: Stefan Roese Acked-by: Stefan Roese --- MAINTAINERS | 2 +- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 2 ++ arch/arm/cpu/arm926ejs/Makefile | 1 - arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Kconfig | 0 arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Makefile | 0 arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cache.c | 0 arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cpu.c | 0 arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/mpp.c | 0 9 files changed, 4 insertions(+), 3 deletions(-) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Kconfig (100%) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Makefile (100%) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cache.c (100%) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cpu.c (100%) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/mpp.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 697cc1b..84d5b05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -99,7 +99,7 @@ M: Prafulla Wadaskar M: Luka Perkov S: Maintained T: git git://git.denx.de/u-boot-marvell.git -F: arch/arm/cpu/arm926ejs/kirkwood/ +F: arch/arm/mach-kirkwood/ F: arch/arm/include/asm/arch-kirkwood/ ARM MARVELL PXA diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8cd7c14..961ab4d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -694,7 +694,7 @@ source "arch/arm/cpu/armv7/highbank/Kconfig" source "arch/arm/cpu/armv7/keystone/Kconfig" -source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig" +source "arch/arm/mach-kirkwood/Kconfig" source "arch/arm/cpu/arm926ejs/nomadik/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index b6e9323..7a244af 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -6,6 +6,8 @@ # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_DAVINCI) += davinci +# TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD +machine-$(CONFIG_KIRKWOOD) += kirkwood # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 27b4353..0b43a90 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -15,7 +15,6 @@ endif endif obj-$(CONFIG_ARMADA100) += armada100/ -obj-$(CONFIG_KIRKWOOD) += kirkwood/ obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/ obj-$(CONFIG_MB86R0x) += mb86r0x/ obj-$(CONFIG_MX25) += mx25/ diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/Kconfig rename to arch/arm/mach-kirkwood/Kconfig diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/Makefile rename to arch/arm/mach-kirkwood/Makefile diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cache.c b/arch/arm/mach-kirkwood/cache.c similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/cache.c rename to arch/arm/mach-kirkwood/cache.c diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/cpu.c rename to arch/arm/mach-kirkwood/cpu.c diff --git a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/mpp.c rename to arch/arm/mach-kirkwood/mpp.c