[U-Boot] [PATCH 0/4] ARM: zynq: move sources to mach-zynq
Masahiro Yamada (4): ARM: zynq: pass "-mfpu=neon" only to lowlevel_init.S ARM: zynq: move SoC sources to mach-zynq ARM: zynq: move SoC headers to mach-zynq/include/mach ARM: zynq: rename CONFIG_ZYNQ to CONFIG_ARCH_ZYNQ
arch/arm/Kconfig | 4 ++-- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/cpu/armv7/zynq/config.mk | 7 ------- arch/arm/dts/Makefile | 2 +- arch/arm/{cpu/armv7/zynq => mach-zynq}/Kconfig | 2 +- arch/arm/{cpu/armv7/zynq => mach-zynq}/Makefile | 1 + arch/arm/{cpu/armv7/zynq => mach-zynq}/clk.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/cpu.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/ddrc.c | 0 arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/clk.h | 0 arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/gpio.h | 0 .../{include/asm/arch-zynq => mach-zynq/include/mach}/hardware.h | 0 .../{include/asm/arch-zynq => mach-zynq/include/mach}/sys_proto.h | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/lowlevel_init.S | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/slcr.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/spl.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/timer.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot-spl.lds | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot.lds | 0 configs/zynq_microzed_defconfig | 2 +- configs/zynq_zc70x_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- configs/zynq_zybo_defconfig | 2 +- include/configs/zynq-common.h | 4 ++-- 28 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 arch/arm/cpu/armv7/zynq/config.mk rename arch/arm/{cpu/armv7/zynq => mach-zynq}/Kconfig (98%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/Makefile (90%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/clk.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/cpu.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/ddrc.c (100%) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/clk.h (100%) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/hardware.h (100%) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/sys_proto.h (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/lowlevel_init.S (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/slcr.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/spl.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/timer.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot-spl.lds (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot.lds (100%)
The comment line in arch/arm/cpu/armv7/zynq/config.mk says that the option "-mfpu=neon" is necessary for compiling lowlevel_init.S. We do not have to give it to all the source files.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/cpu/armv7/zynq/Makefile | 1 + arch/arm/cpu/armv7/zynq/config.mk | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 arch/arm/cpu/armv7/zynq/config.mk
diff --git a/arch/arm/cpu/armv7/zynq/Makefile b/arch/arm/cpu/armv7/zynq/Makefile index 901f2ce..bf29b4d 100644 --- a/arch/arm/cpu/armv7/zynq/Makefile +++ b/arch/arm/cpu/armv7/zynq/Makefile @@ -14,4 +14,5 @@ obj-y += ddrc.o obj-y += slcr.o obj-y += clk.o obj-y += lowlevel_init.o +AFLAGS_lowlevel_init.o := -mfpu=neon obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/arch/arm/cpu/armv7/zynq/config.mk b/arch/arm/cpu/armv7/zynq/config.mk deleted file mode 100644 index 778a377..0000000 --- a/arch/arm/cpu/armv7/zynq/config.mk +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (C) 2013 - 2015 Xilinx, Inc. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0 -# -# Allow NEON instructions (needed for lowlevel_init.S with GNU toolchain) -PLATFORM_RELFLAGS += -mfpu=neon
Move arch/arm/cpu/armv7/zynq/* -> arch/arm/mach-zynq/*
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/{cpu/armv7/zynq => mach-zynq}/Kconfig | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/Makefile | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/clk.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/cpu.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/ddrc.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/lowlevel_init.S | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/slcr.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/spl.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/timer.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot-spl.lds | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot.lds | 0 include/configs/zynq-common.h | 4 ++-- 15 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/Kconfig (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/Makefile (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/clk.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/cpu.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/ddrc.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/lowlevel_init.S (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/slcr.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/spl.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/timer.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot-spl.lds (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot.lds (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b9ebee1..7af1e4b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -755,7 +755,7 @@ source "arch/arm/mach-uniphier/Kconfig"
source "arch/arm/mach-versatile/Kconfig"
-source "arch/arm/cpu/armv7/zynq/Kconfig" +source "arch/arm/mach-zynq/Kconfig"
source "arch/arm/cpu/armv7/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 08946de..45cb1d2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -17,6 +17,7 @@ machine-$(CONFIG_ORION5X) += orion5x machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_VERSATILE) += versatile +machine-$(CONFIG_ZYNQ) += zynq
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 1312a9d..204cbdd 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -57,4 +57,3 @@ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_U8500) += u8500/ obj-$(CONFIG_VF610) += vf610/ -obj-$(CONFIG_ZYNQ) += zynq/ diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/mach-zynq/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/zynq/Kconfig rename to arch/arm/mach-zynq/Kconfig diff --git a/arch/arm/cpu/armv7/zynq/Makefile b/arch/arm/mach-zynq/Makefile similarity index 100% rename from arch/arm/cpu/armv7/zynq/Makefile rename to arch/arm/mach-zynq/Makefile diff --git a/arch/arm/cpu/armv7/zynq/clk.c b/arch/arm/mach-zynq/clk.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/clk.c rename to arch/arm/mach-zynq/clk.c diff --git a/arch/arm/cpu/armv7/zynq/cpu.c b/arch/arm/mach-zynq/cpu.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/cpu.c rename to arch/arm/mach-zynq/cpu.c diff --git a/arch/arm/cpu/armv7/zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/ddrc.c rename to arch/arm/mach-zynq/ddrc.c diff --git a/arch/arm/cpu/armv7/zynq/lowlevel_init.S b/arch/arm/mach-zynq/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/armv7/zynq/lowlevel_init.S rename to arch/arm/mach-zynq/lowlevel_init.S diff --git a/arch/arm/cpu/armv7/zynq/slcr.c b/arch/arm/mach-zynq/slcr.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/slcr.c rename to arch/arm/mach-zynq/slcr.c diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/mach-zynq/spl.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/spl.c rename to arch/arm/mach-zynq/spl.c diff --git a/arch/arm/cpu/armv7/zynq/timer.c b/arch/arm/mach-zynq/timer.c similarity index 100% rename from arch/arm/cpu/armv7/zynq/timer.c rename to arch/arm/mach-zynq/timer.c diff --git a/arch/arm/cpu/armv7/zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds similarity index 100% rename from arch/arm/cpu/armv7/zynq/u-boot-spl.lds rename to arch/arm/mach-zynq/u-boot-spl.lds diff --git a/arch/arm/cpu/armv7/zynq/u-boot.lds b/arch/arm/mach-zynq/u-boot.lds similarity index 100% rename from arch/arm/cpu/armv7/zynq/u-boot.lds rename to arch/arm/mach-zynq/u-boot.lds diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 485babd..8396fd4 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -291,7 +291,7 @@ # define CONFIG_SYS_MMC_MAX_DEVICE 1 #endif
-#define CONFIG_SYS_LDSCRIPT "arch/arm/cpu/armv7/zynq/u-boot.lds" +#define CONFIG_SYS_LDSCRIPT "arch/arm/mach-zynq/u-boot.lds"
/* Commands */ #include <config_cmd_default.h> @@ -309,7 +309,7 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_BOARD_INIT
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/zynq/u-boot-spl.lds" +#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds"
/* MMC support */ #ifdef CONFIG_ZYNQ_SDHCI0
Move arch/arm/include/asm/arch-zynq/* -> arch/arm/mach-zynq/include/mach/*
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/clk.h | 0 arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/gpio.h | 0 arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/hardware.h | 0 arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/sys_proto.h | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/clk.h (100%) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/hardware.h (100%) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/sys_proto.h (100%)
diff --git a/arch/arm/include/asm/arch-zynq/clk.h b/arch/arm/mach-zynq/include/mach/clk.h similarity index 100% rename from arch/arm/include/asm/arch-zynq/clk.h rename to arch/arm/mach-zynq/include/mach/clk.h diff --git a/arch/arm/include/asm/arch-zynq/gpio.h b/arch/arm/mach-zynq/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-zynq/gpio.h rename to arch/arm/mach-zynq/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-zynq/hardware.h b/arch/arm/mach-zynq/include/mach/hardware.h similarity index 100% rename from arch/arm/include/asm/arch-zynq/hardware.h rename to arch/arm/mach-zynq/include/mach/hardware.h diff --git a/arch/arm/include/asm/arch-zynq/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h similarity index 100% rename from arch/arm/include/asm/arch-zynq/sys_proto.h rename to arch/arm/mach-zynq/include/mach/sys_proto.h
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 2 +- arch/arm/Makefile | 2 +- arch/arm/dts/Makefile | 2 +- arch/arm/mach-zynq/Kconfig | 2 +- configs/zynq_microzed_defconfig | 2 +- configs/zynq_zc70x_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- configs/zynq_zybo_defconfig | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7af1e4b..d98b18e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -609,7 +609,7 @@ config TARGET_VF610TWR bool "Support vf610twr" select CPU_V7
-config ZYNQ +config ARCH_ZYNQ bool "Xilinx Zynq Platform" select CPU_V7 select SUPPORT_SPL diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 45cb1d2..8b212a2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -17,7 +17,7 @@ machine-$(CONFIG_ORION5X) += orion5x machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_VERSATILE) += versatile -machine-$(CONFIG_ZYNQ) += zynq +machine-$(CONFIG_ARCH_ZYNQ) += zynq
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index cbe5b86..f59e23b 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -39,7 +39,7 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \ uniphier-ph1-pro4-ref.dtb \ uniphier-ph1-ld4-ref.dtb \ uniphier-ph1-sld8-ref.dtb -dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \ +dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \ zynq-zc706.dtb \ zynq-zed.dtb \ zynq-zybo.dtb \ diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 3a52535..d4fa87d 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -1,4 +1,4 @@ -if ZYNQ +if ARCH_ZYNQ
choice prompt "Xilinx Zynq board select" diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 39a7f6b..af531fa 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_ARM=y -CONFIG_ZYNQ=y +CONFIG_ARCH_ZYNQ=y CONFIG_TARGET_ZYNQ_MICROZED=y CONFIG_OF_CONTROL=y CONFIG_FIT=y diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig index a8ef97f..4496059 100644 --- a/configs/zynq_zc70x_defconfig +++ b/configs/zynq_zc70x_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_ARM=y -CONFIG_ZYNQ=y +CONFIG_ARCH_ZYNQ=y CONFIG_TARGET_ZYNQ_ZC70X=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702" diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index ecd245a..a2d294e 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" CONFIG_ARM=y -CONFIG_ZYNQ=y +CONFIG_ARCH_ZYNQ=y CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010" diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index 341a4d8..3e7b8ed 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" CONFIG_ARM=y -CONFIG_ZYNQ=y +CONFIG_ARCH_ZYNQ=y CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index ee08a9f..9563542 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" CONFIG_ARM=y -CONFIG_ZYNQ=y +CONFIG_ARCH_ZYNQ=y CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 2500d84..1decba4 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_ARM=y -CONFIG_ZYNQ=y +CONFIG_ARCH_ZYNQ=y CONFIG_TARGET_ZYNQ_ZED=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index c9d0121..6a47d5d 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_ARM=y -CONFIG_ZYNQ=y +CONFIG_ARCH_ZYNQ=y CONFIG_TARGET_ZYNQ_ZYBO=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
Hi Michal,
2015-03-16 16:43 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
Masahiro Yamada (4): ARM: zynq: pass "-mfpu=neon" only to lowlevel_init.S ARM: zynq: move SoC sources to mach-zynq ARM: zynq: move SoC headers to mach-zynq/include/mach ARM: zynq: rename CONFIG_ZYNQ to CONFIG_ARCH_ZYNQ
Is this series applicable?
Thanks!
Hi Masahiro,
On 04/21/2015 06:07 AM, Masahiro Yamada wrote:
Hi Michal,
2015-03-16 16:43 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
Masahiro Yamada (4): ARM: zynq: pass "-mfpu=neon" only to lowlevel_init.S ARM: zynq: move SoC sources to mach-zynq ARM: zynq: move SoC headers to mach-zynq/include/mach ARM: zynq: rename CONFIG_ZYNQ to CONFIG_ARCH_ZYNQ
Is this series applicable?
I completely missed this series - sorry for that. All patches are fine and I have applied them.
Thanks, Michal
participants (2)
-
Masahiro Yamada -
Michal Simek