From patchwork Mon Aug 10 23:10:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 505824 X-Patchwork-Delegate: marek.vasut@gmail.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 D241B14031D for ; Tue, 11 Aug 2015 09:11:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5B64B4BA1E; Tue, 11 Aug 2015 01:11:20 +0200 (CEST) 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 uajobTGsjMin; Tue, 11 Aug 2015 01:11:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 50A434B9F4; Tue, 11 Aug 2015 01:11:13 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AA57C4B9E6 for ; Tue, 11 Aug 2015 01:11:02 +0200 (CEST) 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 L4fiMlyVjDdq for ; Tue, 11 Aug 2015 01:11:02 +0200 (CEST) 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 ESMTPS id 43C384B9C4 for ; Tue, 11 Aug 2015 01:10:58 +0200 (CEST) Received: from mail.nefkom.net (unknown [192.168.8.184]) by mail-out.m-online.net (Postfix) with ESMTP id 3mqtM63ZQWz3hjDD; Tue, 11 Aug 2015 01:10:58 +0200 (CEST) X-Auth-Info: b87VEYus6TAjpfMFHH4XbgtetRJSIOIrA2y8jL0ka/w= Received: from chi.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3mqtM61jHczvdWt; Tue, 11 Aug 2015 01:10:58 +0200 (CEST) From: Marek Vasut To: u-boot@lists.denx.de Date: Tue, 11 Aug 2015 01:10:41 +0200 Message-Id: <1439248246-9701-4-git-send-email-marex@denx.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439248246-9701-1-git-send-email-marex@denx.de> References: <1439248246-9701-1-git-send-email-marex@denx.de> Cc: Marek Vasut Subject: [U-Boot] [PATCH 3/8] arm: socfpga: Split Altera socfpga into AV and CV SoCDK 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" The board/altera/socfpga directory is not a generic SoCFPGA machine anymore, but instead it represents the Altera SoCDK board. To make matters more complicated, it represents both CycloneV and ArriaV variant. On the other hand, nowadays, the content of this board directory is mostly comprised of QTS-generated header files, while all the generic code is in arch/arm/mach-socfpga already. Thus, this patch splits the board/altera/socfpga into a separate board directory for ArriaV SoCDK and CycloneV SoCDK, so that each can be populated with the correct QTS-generated header files for that particular board. Signed-off-by: Marek Vasut --- arch/arm/mach-socfpga/Kconfig | 4 ++-- board/altera/{socfpga => arria5-socdk}/MAINTAINERS | 0 board/altera/{socfpga => arria5-socdk}/Makefile | 0 board/altera/{socfpga => arria5-socdk}/qts/iocsr_config.c | 0 board/altera/{socfpga => arria5-socdk}/qts/iocsr_config.h | 0 board/altera/{socfpga => arria5-socdk}/qts/pinmux_config.c | 0 board/altera/{socfpga => arria5-socdk}/qts/pinmux_config.h | 0 board/altera/{socfpga => arria5-socdk}/qts/pll_config.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sdram_config.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto_ac_init.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto_inst_init.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sequencer_defines.h | 0 board/altera/{socfpga => arria5-socdk}/socfpga.c | 0 board/altera/{socfpga => cyclone5-socdk}/MAINTAINERS | 0 board/altera/{socfpga => cyclone5-socdk}/Makefile | 0 board/altera/{socfpga => cyclone5-socdk}/qts/iocsr_config.c | 0 board/altera/{socfpga => cyclone5-socdk}/qts/iocsr_config.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/pinmux_config.c | 0 board/altera/{socfpga => cyclone5-socdk}/qts/pinmux_config.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/pll_config.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/sdram_config.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto_ac_init.h | 0 .../altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto_inst_init.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_defines.h | 0 board/altera/{socfpga => cyclone5-socdk}/socfpga.c | 0 27 files changed, 2 insertions(+), 2 deletions(-) copy board/altera/{socfpga => arria5-socdk}/MAINTAINERS (100%) copy board/altera/{socfpga => arria5-socdk}/Makefile (100%) copy board/altera/{socfpga => arria5-socdk}/qts/iocsr_config.c (100%) copy board/altera/{socfpga => arria5-socdk}/qts/iocsr_config.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/pinmux_config.c (100%) copy board/altera/{socfpga => arria5-socdk}/qts/pinmux_config.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/pll_config.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sdram_config.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto_ac_init.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto_inst_init.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sequencer_defines.h (100%) copy board/altera/{socfpga => arria5-socdk}/socfpga.c (100%) rename board/altera/{socfpga => cyclone5-socdk}/MAINTAINERS (100%) rename board/altera/{socfpga => cyclone5-socdk}/Makefile (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/iocsr_config.c (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/iocsr_config.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/pinmux_config.c (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/pinmux_config.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/pll_config.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sdram_config.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto_ac_init.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto_inst_init.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_defines.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/socfpga.c (100%) diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 1a441ff..690e362 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -21,8 +21,8 @@ config TARGET_SOCFPGA_CYCLONE5_SOCDK endchoice config SYS_BOARD - default "socfpga" if TARGET_SOCFPGA_ARRIA5_SOCDK - default "socfpga" if TARGET_SOCFPGA_CYCLONE5_SOCDK + default "arria5-socdk" if TARGET_SOCFPGA_ARRIA5_SOCDK + default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK config SYS_VENDOR default "altera" if TARGET_SOCFPGA_ARRIA5_SOCDK diff --git a/board/altera/socfpga/MAINTAINERS b/board/altera/arria5-socdk/MAINTAINERS similarity index 100% copy from board/altera/socfpga/MAINTAINERS copy to board/altera/arria5-socdk/MAINTAINERS diff --git a/board/altera/socfpga/Makefile b/board/altera/arria5-socdk/Makefile similarity index 100% copy from board/altera/socfpga/Makefile copy to board/altera/arria5-socdk/Makefile diff --git a/board/altera/socfpga/qts/iocsr_config.c b/board/altera/arria5-socdk/qts/iocsr_config.c similarity index 100% copy from board/altera/socfpga/qts/iocsr_config.c copy to board/altera/arria5-socdk/qts/iocsr_config.c diff --git a/board/altera/socfpga/qts/iocsr_config.h b/board/altera/arria5-socdk/qts/iocsr_config.h similarity index 100% copy from board/altera/socfpga/qts/iocsr_config.h copy to board/altera/arria5-socdk/qts/iocsr_config.h diff --git a/board/altera/socfpga/qts/pinmux_config.c b/board/altera/arria5-socdk/qts/pinmux_config.c similarity index 100% copy from board/altera/socfpga/qts/pinmux_config.c copy to board/altera/arria5-socdk/qts/pinmux_config.c diff --git a/board/altera/socfpga/qts/pinmux_config.h b/board/altera/arria5-socdk/qts/pinmux_config.h similarity index 100% copy from board/altera/socfpga/qts/pinmux_config.h copy to board/altera/arria5-socdk/qts/pinmux_config.h diff --git a/board/altera/socfpga/qts/pll_config.h b/board/altera/arria5-socdk/qts/pll_config.h similarity index 100% copy from board/altera/socfpga/qts/pll_config.h copy to board/altera/arria5-socdk/qts/pll_config.h diff --git a/board/altera/socfpga/qts/sdram_config.h b/board/altera/arria5-socdk/qts/sdram_config.h similarity index 100% copy from board/altera/socfpga/qts/sdram_config.h copy to board/altera/arria5-socdk/qts/sdram_config.h diff --git a/board/altera/socfpga/qts/sequencer_auto.h b/board/altera/arria5-socdk/qts/sequencer_auto.h similarity index 100% copy from board/altera/socfpga/qts/sequencer_auto.h copy to board/altera/arria5-socdk/qts/sequencer_auto.h diff --git a/board/altera/socfpga/qts/sequencer_auto_ac_init.h b/board/altera/arria5-socdk/qts/sequencer_auto_ac_init.h similarity index 100% copy from board/altera/socfpga/qts/sequencer_auto_ac_init.h copy to board/altera/arria5-socdk/qts/sequencer_auto_ac_init.h diff --git a/board/altera/socfpga/qts/sequencer_auto_inst_init.h b/board/altera/arria5-socdk/qts/sequencer_auto_inst_init.h similarity index 100% copy from board/altera/socfpga/qts/sequencer_auto_inst_init.h copy to board/altera/arria5-socdk/qts/sequencer_auto_inst_init.h diff --git a/board/altera/socfpga/qts/sequencer_defines.h b/board/altera/arria5-socdk/qts/sequencer_defines.h similarity index 100% copy from board/altera/socfpga/qts/sequencer_defines.h copy to board/altera/arria5-socdk/qts/sequencer_defines.h diff --git a/board/altera/socfpga/socfpga.c b/board/altera/arria5-socdk/socfpga.c similarity index 100% copy from board/altera/socfpga/socfpga.c copy to board/altera/arria5-socdk/socfpga.c diff --git a/board/altera/socfpga/MAINTAINERS b/board/altera/cyclone5-socdk/MAINTAINERS similarity index 100% rename from board/altera/socfpga/MAINTAINERS rename to board/altera/cyclone5-socdk/MAINTAINERS diff --git a/board/altera/socfpga/Makefile b/board/altera/cyclone5-socdk/Makefile similarity index 100% rename from board/altera/socfpga/Makefile rename to board/altera/cyclone5-socdk/Makefile diff --git a/board/altera/socfpga/qts/iocsr_config.c b/board/altera/cyclone5-socdk/qts/iocsr_config.c similarity index 100% rename from board/altera/socfpga/qts/iocsr_config.c rename to board/altera/cyclone5-socdk/qts/iocsr_config.c diff --git a/board/altera/socfpga/qts/iocsr_config.h b/board/altera/cyclone5-socdk/qts/iocsr_config.h similarity index 100% rename from board/altera/socfpga/qts/iocsr_config.h rename to board/altera/cyclone5-socdk/qts/iocsr_config.h diff --git a/board/altera/socfpga/qts/pinmux_config.c b/board/altera/cyclone5-socdk/qts/pinmux_config.c similarity index 100% rename from board/altera/socfpga/qts/pinmux_config.c rename to board/altera/cyclone5-socdk/qts/pinmux_config.c diff --git a/board/altera/socfpga/qts/pinmux_config.h b/board/altera/cyclone5-socdk/qts/pinmux_config.h similarity index 100% rename from board/altera/socfpga/qts/pinmux_config.h rename to board/altera/cyclone5-socdk/qts/pinmux_config.h diff --git a/board/altera/socfpga/qts/pll_config.h b/board/altera/cyclone5-socdk/qts/pll_config.h similarity index 100% rename from board/altera/socfpga/qts/pll_config.h rename to board/altera/cyclone5-socdk/qts/pll_config.h diff --git a/board/altera/socfpga/qts/sdram_config.h b/board/altera/cyclone5-socdk/qts/sdram_config.h similarity index 100% rename from board/altera/socfpga/qts/sdram_config.h rename to board/altera/cyclone5-socdk/qts/sdram_config.h diff --git a/board/altera/socfpga/qts/sequencer_auto.h b/board/altera/cyclone5-socdk/qts/sequencer_auto.h similarity index 100% rename from board/altera/socfpga/qts/sequencer_auto.h rename to board/altera/cyclone5-socdk/qts/sequencer_auto.h diff --git a/board/altera/socfpga/qts/sequencer_auto_ac_init.h b/board/altera/cyclone5-socdk/qts/sequencer_auto_ac_init.h similarity index 100% rename from board/altera/socfpga/qts/sequencer_auto_ac_init.h rename to board/altera/cyclone5-socdk/qts/sequencer_auto_ac_init.h diff --git a/board/altera/socfpga/qts/sequencer_auto_inst_init.h b/board/altera/cyclone5-socdk/qts/sequencer_auto_inst_init.h similarity index 100% rename from board/altera/socfpga/qts/sequencer_auto_inst_init.h rename to board/altera/cyclone5-socdk/qts/sequencer_auto_inst_init.h diff --git a/board/altera/socfpga/qts/sequencer_defines.h b/board/altera/cyclone5-socdk/qts/sequencer_defines.h similarity index 100% rename from board/altera/socfpga/qts/sequencer_defines.h rename to board/altera/cyclone5-socdk/qts/sequencer_defines.h diff --git a/board/altera/socfpga/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c similarity index 100% rename from board/altera/socfpga/socfpga.c rename to board/altera/cyclone5-socdk/socfpga.c