ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga

PATCH Superseded Masahiro Yamada 2 participants 10 messages Apr 21, 2015

Subsystems (4)

Arm (32-bit) Arm sub-architectures Arm/actions semi architecture Arm/socfpga architecture

lore

Share & tools

lore

Masahiro Yamada

author

2015-04-21 02:09 UTC #0 lore raw

cover ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga

Masahiro Yamada (6):
ARM: socfpga: do not add board directory to header search path
ARM: socfpga: remove redundant config.mk
ARM: socfpga: move board select into mach-socfpga/Kconfig
ARM: socfpga: move SoC sources to mach-socfpga
ARM: socfpga: move SoC headers to mach-socfpga/include/mach
ARM: socfpga: abolish CONFIG_SOCFPGA

 arch/arm/Kconfig                                   | 15 +++--------
 arch/arm/Makefile                                  |  1 +
 arch/arm/cpu/armv7/Makefile                        |  1 -
 arch/arm/cpu/armv7/socfpga/config.mk               | 11 --------
 arch/arm/dts/Makefile                              |  2 +-
 arch/arm/mach-socfpga/Kconfig                      | 27 +++++++++++++++++++
 .../{cpu/armv7/socfpga => mach-socfpga}/Makefile   |  0
 .../armv7/socfpga => mach-socfpga}/clock_manager.c |  0
 .../armv7/socfpga => mach-socfpga}/fpga_manager.c  |  0
 .../socfpga => mach-socfpga}/freeze_controller.c   |  0
 .../include/mach}/clock_manager.h                  |  0
 .../include/mach}/dwmmc.h                          |  0
 .../include/mach}/fpga_manager.h                   |  0
 .../include/mach}/freeze_controller.h              |  0
 .../include/mach}/gpio.h                           |  0
 .../include/mach}/nic301.h                         |  0
 .../include/mach}/reset_manager.h                  |  0
 .../include/mach}/scan_manager.h                   |  0
 .../include/mach}/scu.h                            |  0
 .../include/mach}/socfpga_base_addrs.h             |  0
 .../include/mach}/system_manager.h                 |  0
 .../include/mach}/timer.h                          |  0
 .../armv7/socfpga => mach-socfpga}/lowlevel_init.S |  0
 .../arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c |  0
 .../armv7/socfpga => mach-socfpga}/reset_manager.c |  0
 .../armv7/socfpga => mach-socfpga}/scan_manager.c  |  0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c |  0
 .../socfpga => mach-socfpga}/system_manager.c      |  0
 .../{cpu/armv7/socfpga => mach-socfpga}/timer.c    |  0
 .../armv7/socfpga => mach-socfpga}/u-boot-spl.lds  |  0
 board/altera/socfpga/Kconfig                       | 31 ----------------------
 board/altera/socfpga/iocsr_config.c                |  2 +-
 configs/socfpga_arria5_defconfig                   |  1 +
 configs/socfpga_cyclone5_defconfig                 |  1 +
 configs/socfpga_socrates_defconfig                 |  1 +
 include/configs/socfpga_common.h                   |  4 +--
 36 files changed, 38 insertions(+), 59 deletions(-)
 delete mode 100644 arch/arm/cpu/armv7/socfpga/config.mk
 create mode 100644 arch/arm/mach-socfpga/Kconfig
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/Makefile (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/clock_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/fpga_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/freeze_controller.c (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/clock_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/dwmmc.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/fpga_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/freeze_controller.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/gpio.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/nic301.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/reset_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scan_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scu.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/socfpga_base_addrs.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/system_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/timer.h (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/lowlevel_init.S (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/reset_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/scan_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/system_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/timer.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/u-boot-spl.lds (100%)
 delete mode 100644 board/altera/socfpga/Kconfig

Signature · 1 line

1.9.1

Masahiro Yamada

author

2015-04-21 02:09 UTC #1 lore raw

PATCH 1/6 ARM: socfpga: do not add board directory to header search path

The compiler option "-Iboard/$(VENDOR)/$(BOARD)" just exists here for iocsr_config.c to be able to include iocsr_config.h.

Use "..." instead of <...> to include a header in the same directory.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/cpu/armv7/socfpga/config.mk | 3 ---
 board/altera/socfpga/iocsr_config.c  | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

arch/arm/cpu/armv7/socfpga/config.mk +0 -3

index 2a99c72..3d18491 100644
@@ -6,6 +6,3 @@
 ifndef CONFIG_SPL_BUILD
 ALL-y	+= u-boot.img
 endif
-
-# Added for handoff support
-PLATFORM_RELFLAGS += -Iboard/$(VENDOR)/$(BOARD)

board/altera/socfpga/iocsr_config.c +1 -1

index c79aa6d..3b202b5 100644
@@ -6,7 +6,7 @@
 
 /* This file is generated by Preloader Generator */
 
-#include <iocsr_config.h>
+#include "iocsr_config.h"
 
 #ifdef CONFIG_TARGET_SOCFPGA_CYCLONE5
 const unsigned long iocsr_scan_chain0_table[((

Signature · 1 line

1.9.1

Masahiro Yamada

author

2015-04-21 02:09 UTC #2 lore raw

PATCH 2/6 ARM: socfpga: remove redundant config.mk

In reply to Masahiro Yamada

Because all the SOCFPGA boards define CONFIG_SPL_FRAMEWORK (see include/configs/socfpga_common.h), u-boot.img is automatically added to the target image list by the top Makefile.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/cpu/armv7/socfpga/config.mk | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 arch/arm/cpu/armv7/socfpga/config.mk

arch/arm/cpu/armv7/socfpga/config.mk deleted +0 -8

deleted file mode 100644
index 3d18491..0000000
@@ -1,8 +0,0 @@
-#
-# Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-ifndef CONFIG_SPL_BUILD
-ALL-y	+= u-boot.img
-endif

Signature · 1 line

1.9.1

Masahiro Yamada

author

2015-04-21 02:09 UTC #3 lore raw

PATCH 3/6 ARM: socfpga: move board select into mach-socfpga/Kconfig

In reply to Masahiro Yamada

Switch to a more standard way of board select; put the SoC select into arch/arm/Kconfig and move the board select menu under arch/arm/mach-socfpga/Kconfig.

Also, consolidate SYS_BOARD, SYS_VENDOR, SYS_SOC, SYS_CONFIG_NAME.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/Kconfig                   | 15 ++++-----------
 arch/arm/mach-socfpga/Kconfig      | 27 +++++++++++++++++++++++++++
 board/altera/socfpga/Kconfig       | 31 -------------------------------
 configs/socfpga_arria5_defconfig   |  1 +
 configs/socfpga_cyclone5_defconfig |  1 +
 configs/socfpga_socrates_defconfig |  1 +
 6 files changed, 34 insertions(+), 42 deletions(-)
 create mode 100644 arch/arm/mach-socfpga/Kconfig
 delete mode 100644 board/altera/socfpga/Kconfig

arch/arm/Kconfig +4 ~~-11~~

index 3702bb0..ac7a11b 100644
@@ -634,16 +634,8 @@ config TARGET_CM_FX6
 	select DM_SERIAL
 	select DM_GPIO
 
-config TARGET_SOCFPGA_ARRIA5
-	bool "Support socfpga_arria5"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SPI_FLASH
-	select DM_SPI
-
-config TARGET_SOCFPGA_CYCLONE5
-	bool "Support socfpga_cyclone5"
+config ARCH_SOCFPGA
+	bool "Altera SOCFPGA family"
 	select CPU_V7
 	select SUPPORT_SPL
 	select DM

@@ -819,6 +811,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
 
+source "arch/arm/mach-socfpga/Kconfig"
+
 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-uniphier/Kconfig"

@@ -840,7 +834,6 @@ source "board/CarMediaLab/flea3/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/db-mv784mp-gp/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
-source "board/altera/socfpga/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/integrator/Kconfig"
 source "board/armltd/vexpress/Kconfig"

arch/arm/mach-socfpga/Kconfig new file +27 -0

new file mode 100644
index 0000000..204efca
@@ -0,0 +1,27 @@
+if ARCH_SOCFPGA
+
+choice
+	prompt "Altera SOCFPGA board select"
+
+config TARGET_SOCFPGA_ARRIA5
+	bool "Altera SOCFPGA Arria V"
+
+config TARGET_SOCFPGA_CYCLONE5
+	bool "Altera SOCFPGA Cyclone V"
+
+endchoice
+
+config SYS_BOARD
+	default "socfpga"
+
+config SYS_VENDOR
+	default "altera"
+
+config SYS_SOC
+	default "socfpga"
+
+config SYS_CONFIG_NAME
+	default "socfpga_arria5" if TARGET_SOCFPGA_ARRIA5
+	default "socfpga_cyclone5" if TARGET_SOCFPGA_CYCLONE5
+
+endif

board/altera/socfpga/Kconfig deleted +0 ~~-31~~

deleted file mode 100644
index cbed8d6..0000000
@@ -1,31 +0,0 @@
-if TARGET_SOCFPGA_CYCLONE5
-
-config SYS_BOARD
-	default "socfpga"
-
-config SYS_VENDOR
-	default "altera"
-
-config SYS_SOC
-	default "socfpga"
-
-config SYS_CONFIG_NAME
-	default "socfpga_cyclone5"
-
-endif
-
-if TARGET_SOCFPGA_ARRIA5
-
-config SYS_BOARD
-	default "socfpga"
-
-config SYS_VENDOR
-	default "altera"
-
-config SYS_SOC
-	default "socfpga"
-
-config SYS_CONFIG_NAME
-	default "socfpga_arria5"
-
-endif

configs/socfpga_arria5_defconfig +1 -0

index 52032e5..d658a50 100644
@@ -1,5 +1,6 @@
 CONFIG_SPL=y
 CONFIG_ARM=y
+CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_ARRIA5=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"

configs/socfpga_cyclone5_defconfig +1 -0

index 6c982ab..a67b0c1 100644
@@ -1,5 +1,6 @@
 CONFIG_SPL=y
 CONFIG_ARM=y
+CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"

configs/socfpga_socrates_defconfig +1 -0

index c81ab0f..1aa3ee5 100644
@@ -1,5 +1,6 @@
 CONFIG_SPL=y
 CONFIG_ARM=y
+CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"

Signature · 1 line

1.9.1

Masahiro Yamada

author

2015-04-21 02:09 UTC #4 lore raw

PATCH 4/6 ARM: socfpga: move SoC sources to mach-socfpga

In reply to Masahiro Yamada

Our recent trend is to collect SoC files into arch/arm/mach-(SOC).

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/Makefile                                                | 1 +
 arch/arm/cpu/armv7/Makefile                                      | 1 -
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/Makefile            | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/clock_manager.c     | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/fpga_manager.c      | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/freeze_controller.c | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/lowlevel_init.S     | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c              | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/reset_manager.c     | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/scan_manager.c      | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c               | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/system_manager.c    | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/timer.c             | 0
 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/u-boot-spl.lds      | 0
 include/configs/socfpga_common.h                                 | 2 +-
 15 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/Makefile (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/clock_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/fpga_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/freeze_controller.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/lowlevel_init.S (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/reset_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/scan_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/system_manager.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/timer.c (100%)
 rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/u-boot-spl.lds (100%)

arch/arm/Makefile +1 -0

index bd4749c..cd71d46 100644
@@ -52,6 +52,7 @@ machine-$(CONFIG_KIRKWOOD)		+= kirkwood
 machine-$(CONFIG_ARCH_NOMADIK)		+= nomadik
 # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
 machine-$(CONFIG_ORION5X)		+= orion5x
+machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
 machine-$(CONFIG_TEGRA)			+= tegra
 machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
 machine-$(CONFIG_ARCH_VERSATILE)	+= versatile

arch/arm/cpu/armv7/Makefile +0 -1

index 21fc03b..3e50263 100644
@@ -51,7 +51,6 @@ obj-$(CONFIG_OMAP44XX) += omap4/
 obj-$(CONFIG_OMAP54XX) += omap5/
 obj-$(CONFIG_RMOBILE) += rmobile/
 obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/
-obj-$(CONFIG_SOCFPGA) += socfpga/
 obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/
 obj-$(CONFIG_ARCH_SUNXI) += sunxi/
 obj-$(CONFIG_U8500) += u8500/

arch/arm/mach-socfpga/Makefile renamed from arch/arm/cpu/armv7/socfpga/Makefile +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/Makefile
rename to arch/arm/mach-socfpga/Makefile

arch/arm/mach-socfpga/clock_manager.c renamed from arch/arm/cpu/armv7/socfpga/clock_manager.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/clock_manager.c
rename to arch/arm/mach-socfpga/clock_manager.c

arch/arm/mach-socfpga/fpga_manager.c renamed from arch/arm/cpu/armv7/socfpga/fpga_manager.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/fpga_manager.c
rename to arch/arm/mach-socfpga/fpga_manager.c

arch/arm/mach-socfpga/freeze_controller.c renamed from arch/arm/cpu/armv7/socfpga/freeze_controller.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/freeze_controller.c
rename to arch/arm/mach-socfpga/freeze_controller.c

arch/arm/mach-socfpga/lowlevel_init.S renamed from arch/arm/cpu/armv7/socfpga/lowlevel_init.S +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/lowlevel_init.S
rename to arch/arm/mach-socfpga/lowlevel_init.S

arch/arm/mach-socfpga/misc.c renamed from arch/arm/cpu/armv7/socfpga/misc.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/misc.c
rename to arch/arm/mach-socfpga/misc.c

arch/arm/mach-socfpga/reset_manager.c renamed from arch/arm/cpu/armv7/socfpga/reset_manager.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/reset_manager.c
rename to arch/arm/mach-socfpga/reset_manager.c

arch/arm/mach-socfpga/scan_manager.c renamed from arch/arm/cpu/armv7/socfpga/scan_manager.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/scan_manager.c
rename to arch/arm/mach-socfpga/scan_manager.c

arch/arm/mach-socfpga/spl.c renamed from arch/arm/cpu/armv7/socfpga/spl.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/spl.c
rename to arch/arm/mach-socfpga/spl.c

arch/arm/mach-socfpga/system_manager.c renamed from arch/arm/cpu/armv7/socfpga/system_manager.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/system_manager.c
rename to arch/arm/mach-socfpga/system_manager.c

arch/arm/mach-socfpga/timer.c renamed from arch/arm/cpu/armv7/socfpga/timer.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/timer.c
rename to arch/arm/mach-socfpga/timer.c

arch/arm/mach-socfpga/u-boot-spl.lds renamed from arch/arm/cpu/armv7/socfpga/u-boot-spl.lds +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/u-boot-spl.lds
rename to arch/arm/mach-socfpga/u-boot-spl.lds

include/configs/socfpga_common.h +1 -1

index 1ecd56f..4872370 100644
@@ -297,7 +297,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_CRC32_VERIFY
 
 /* Linker script for SPL */
-#define CONFIG_SPL_LDSCRIPT	"arch/arm/cpu/armv7/socfpga/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT	"arch/arm/mach-socfpga/u-boot-spl.lds"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT

Signature · 1 line

1.9.1

Masahiro Yamada

author

2015-04-21 02:09 UTC #5 lore raw

PATCH 5/6 ARM: socfpga: move SoC headers to mach-socfpga/include/mach

In reply to Masahiro Yamada

Move headers to mach-socfpga as well.

Signed-off-by Masahiro Yamada <[email protected]>

---

 .../asm/arch-socfpga => mach-socfpga/include/mach}/clock_manager.h        | 0
 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/dwmmc.h  | 0
 .../asm/arch-socfpga => mach-socfpga/include/mach}/fpga_manager.h         | 0
 .../asm/arch-socfpga => mach-socfpga/include/mach}/freeze_controller.h    | 0
 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/gpio.h   | 0
 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/nic301.h | 0
 .../asm/arch-socfpga => mach-socfpga/include/mach}/reset_manager.h        | 0
 .../asm/arch-socfpga => mach-socfpga/include/mach}/scan_manager.h         | 0
 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scu.h    | 0
 .../asm/arch-socfpga => mach-socfpga/include/mach}/socfpga_base_addrs.h   | 0
 .../asm/arch-socfpga => mach-socfpga/include/mach}/system_manager.h       | 0
 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/timer.h  | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/clock_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/dwmmc.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/fpga_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/freeze_controller.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/gpio.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/nic301.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/reset_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scan_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scu.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/socfpga_base_addrs.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/system_manager.h (100%)
 rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/timer.h (100%)

arch/arm/mach-socfpga/include/mach/clock_manager.h renamed from arch/arm/include/asm/arch-socfpga/clock_manager.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/clock_manager.h
rename to arch/arm/mach-socfpga/include/mach/clock_manager.h

arch/arm/mach-socfpga/include/mach/dwmmc.h renamed from arch/arm/include/asm/arch-socfpga/dwmmc.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/dwmmc.h
rename to arch/arm/mach-socfpga/include/mach/dwmmc.h

arch/arm/mach-socfpga/include/mach/fpga_manager.h renamed from arch/arm/include/asm/arch-socfpga/fpga_manager.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/fpga_manager.h
rename to arch/arm/mach-socfpga/include/mach/fpga_manager.h

arch/arm/mach-socfpga/include/mach/freeze_controller.h renamed from arch/arm/include/asm/arch-socfpga/freeze_controller.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/freeze_controller.h
rename to arch/arm/mach-socfpga/include/mach/freeze_controller.h

arch/arm/mach-socfpga/include/mach/gpio.h renamed from arch/arm/include/asm/arch-socfpga/gpio.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/gpio.h
rename to arch/arm/mach-socfpga/include/mach/gpio.h

arch/arm/mach-socfpga/include/mach/nic301.h renamed from arch/arm/include/asm/arch-socfpga/nic301.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/nic301.h
rename to arch/arm/mach-socfpga/include/mach/nic301.h

arch/arm/mach-socfpga/include/mach/reset_manager.h renamed from arch/arm/include/asm/arch-socfpga/reset_manager.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/reset_manager.h
rename to arch/arm/mach-socfpga/include/mach/reset_manager.h

arch/arm/mach-socfpga/include/mach/scan_manager.h renamed from arch/arm/include/asm/arch-socfpga/scan_manager.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/scan_manager.h
rename to arch/arm/mach-socfpga/include/mach/scan_manager.h

arch/arm/mach-socfpga/include/mach/scu.h renamed from arch/arm/include/asm/arch-socfpga/scu.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/scu.h
rename to arch/arm/mach-socfpga/include/mach/scu.h

arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h renamed from arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
rename to arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h

arch/arm/mach-socfpga/include/mach/system_manager.h renamed from arch/arm/include/asm/arch-socfpga/system_manager.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/system_manager.h
rename to arch/arm/mach-socfpga/include/mach/system_manager.h

arch/arm/mach-socfpga/include/mach/timer.h renamed from arch/arm/include/asm/arch-socfpga/timer.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/timer.h
rename to arch/arm/mach-socfpga/include/mach/timer.h

Signature · 1 line

1.9.1

Masahiro Yamada

author

2015-04-21 02:09 UTC #6 lore raw

PATCH 6/6 ARM: socfpga: abolish CONFIG_SOCFPGA

In reply to Masahiro Yamada

CONFIG_SOCFPGA is only referenced by arch/arm/dts/Makefile. Replace it with CONFIG_ARCH_SOCFPGA.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/dts/Makefile            | 2 +-
 include/configs/socfpga_common.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

arch/arm/dts/Makefile +1 -1

index 09708d9..8c421b1 100644
@@ -49,7 +49,7 @@ dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
 	zynq-zc770-xm013.dtb
 dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb
 
-dtb-$(CONFIG_SOCFPGA) +=				\
+dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
 	socfpga_arria5_socdk.dtb			\
 	socfpga_cyclone5_socdk.dtb			\
 	socfpga_cyclone5_socrates.dtb

include/configs/socfpga_common.h +0 -2

index 4872370..0e6232f 100644
@@ -13,8 +13,6 @@
 
 #define CONFIG_SYS_THUMB_BUILD
 
-#define CONFIG_SOCFPGA
-
 /*
  * High level configuration
  */

Signature · 1 line

1.9.1

Marek Vasut

2015-04-21 10:56 UTC #7 lore raw

cover ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga

In reply to Masahiro Yamada

Quoted 7 lines · Masahiro Yamada

Masahiro Yamada (6):
ARM: socfpga: do not add board directory to header search path
ARM: socfpga: remove redundant config.mk
ARM: socfpga: move board select into mach-socfpga/Kconfig
ARM: socfpga: move SoC sources to mach-socfpga
ARM: socfpga: move SoC headers to mach-socfpga/include/mach
ARM: socfpga: abolish CONFIG_SOCFPGA

Hi!

Can you please rebase the set on top of u-boot-socfpga/master ? There are still some patches in there which collide with your set :(

Thank you!

Best regards,
Marek Vasut

Masahiro Yamada

author

2015-04-21 11:40 UTC #8 lore raw

cover ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga

Hi Marek,

2015-04-21 19:56 GMT+09:00 Marek Vasut <[email protected]>:

Quoted 9 lines · Masahiro Yamada

Quoted 7 lines
Masahiro Yamada (6):
ARM: socfpga: do not add board directory to header search path
ARM: socfpga: remove redundant config.mk
ARM: socfpga: move board select into mach-socfpga/Kconfig
ARM: socfpga: move SoC sources to mach-socfpga
ARM: socfpga: move SoC headers to mach-socfpga/include/mach
ARM: socfpga: abolish CONFIG_SOCFPGA

Quoted 5 lines

Hi!
Can you please rebase the set on top of u-boot-socfpga/master ? There are still some patches in there which collide with your set :(

Sure. I have posted v2.

Signature · 2 lines

Best Regards
Masahiro Yamada

Marek Vasut

2015-04-21 13:32 UTC #9 lore raw

cover ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga

Quoted 1 line · Masahiro Yamada

Hi Marek,

Hi!

Quoted 10 lines

2015-04-21 19:56 GMT+09:00 Marek Vasut <[email protected]>:
Quoted 9 lines · Masahiro Yamada
Quoted 7 lines
Masahiro Yamada (6):
ARM: socfpga: do not add board directory to header search path
ARM: socfpga: remove redundant config.mk
ARM: socfpga: move board select into mach-socfpga/Kconfig
ARM: socfpga: move SoC sources to mach-socfpga
ARM: socfpga: move SoC headers to mach-socfpga/include/mach
ARM: socfpga: abolish CONFIG_SOCFPGA

Quoted 6 lines

Quoted 4 lines
Hi!
Can you please rebase the set on top of u-boot-socfpga/master ? There are still some patches in there which collide with your set :(
Sure. I have posted v2.

?????! ;-)

Best regards,
Marek Vasut