From patchwork Wed Mar 18 07:54:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roese X-Patchwork-Id: 451251 X-Patchwork-Delegate: prafulla@marvell.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 7E8FC14009B for ; Wed, 18 Mar 2015 18:55:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CA29AA7445; Wed, 18 Mar 2015 08:55:21 +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 Gg2Psfi8or-n; Wed, 18 Mar 2015 08:55:21 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E49024B699; Wed, 18 Mar 2015 08:54:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AF24F4A03C for ; Wed, 18 Mar 2015 08:54:25 +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 2mciqCzQCTrf for ; Wed, 18 Mar 2015 08:54:25 +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 mo4-p04-ob.smtp.rzone.de (mo4-p04-ob.smtp.rzone.de [81.169.146.223]) by theia.denx.de (Postfix) with ESMTPS id 552504A04E for ; Wed, 18 Mar 2015 08:54:19 +0100 (CET) X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :IW0NeWC7b/q2i6W/qstXb1SBUuFnrGohfvxEndrDXKjzPMsB3oimjD61I4fPQhgcxWV3 Received: from stefan-work.domain_not_set.invalid (b9168f1c.cgn.dg-w.de [185.22.143.28]) by post.strato.de (RZmta 37.4 SBL|AUTH) with ESMTPA id u023d1r2I7sC081; Wed, 18 Mar 2015 08:54:12 +0100 (CET) From: Stefan Roese To: u-boot@lists.denx.de Date: Wed, 18 Mar 2015 08:54:03 +0100 Message-Id: <1426665251-23868-3-git-send-email-sr@denx.de> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1426665251-23868-1-git-send-email-sr@denx.de> References: <1426665251-23868-1-git-send-email-sr@denx.de> Cc: Luka Perkov , Tawfik Bayouk Subject: [U-Boot] [PATCH 02/10] arm: armada-xp: Move SoC headers to mach-mvebu/include/mach X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move arch/arm/include/asm/arch-armada-xp/* -> arch/arm/mach-mvebu/include/mach/* Additionally the SYS_SOC is renamed from "armada-xp" to "mvebu". With this change all these files can better be shared with other, newer Mavell MVEBU SoC's. Like the upcoming Armada 38x support. Signed-off-by: Stefan Roese Cc: Masahiro Yamada --- arch/arm/Makefile | 2 +- .../{include/asm/arch-armada-xp => mach-mvebu/include/mach}/config.h | 0 arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/cpu.h | 0 arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/soc.h | 0 board/Marvell/db-mv784mp-gp/Kconfig | 2 +- board/maxbcm/Kconfig | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/config.h (100%) rename arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/cpu.h (100%) rename arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/soc.h (100%) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a756338..03b4970 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -47,7 +47,7 @@ libs-y += arch/arm/imx-common/ endif endif -ifneq (,$(filter $(SOC), armada-xp kirkwood)) +ifneq (,$(filter $(SOC), mvebu kirkwood)) libs-y += arch/arm/mvebu-common/ endif diff --git a/arch/arm/include/asm/arch-armada-xp/config.h b/arch/arm/mach-mvebu/include/mach/config.h similarity index 100% rename from arch/arm/include/asm/arch-armada-xp/config.h rename to arch/arm/mach-mvebu/include/mach/config.h diff --git a/arch/arm/include/asm/arch-armada-xp/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h similarity index 100% rename from arch/arm/include/asm/arch-armada-xp/cpu.h rename to arch/arm/mach-mvebu/include/mach/cpu.h diff --git a/arch/arm/include/asm/arch-armada-xp/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h similarity index 100% rename from arch/arm/include/asm/arch-armada-xp/soc.h rename to arch/arm/mach-mvebu/include/mach/soc.h diff --git a/board/Marvell/db-mv784mp-gp/Kconfig b/board/Marvell/db-mv784mp-gp/Kconfig index 98aa10a..d0b426e 100644 --- a/board/Marvell/db-mv784mp-gp/Kconfig +++ b/board/Marvell/db-mv784mp-gp/Kconfig @@ -7,7 +7,7 @@ config SYS_VENDOR default "Marvell" config SYS_SOC - default "armada-xp" + default "mvebu" config SYS_CONFIG_NAME default "db-mv784mp-gp" diff --git a/board/maxbcm/Kconfig b/board/maxbcm/Kconfig index d833ca0..e86aa16 100644 --- a/board/maxbcm/Kconfig +++ b/board/maxbcm/Kconfig @@ -4,7 +4,7 @@ config SYS_BOARD default "maxbcm" config SYS_SOC - default "armada-xp" + default "mvebu" config SYS_CONFIG_NAME default "maxbcm"