* [U-Boot] [PATCH 1/6] ARM: socfpga: do not add board directory to header search path
2015-04-21 2:09 [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Masahiro Yamada
@ 2015-04-21 2:09 ` Masahiro Yamada
2015-04-21 2:09 ` [U-Boot] [PATCH 2/6] ARM: socfpga: remove redundant config.mk Masahiro Yamada
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2015-04-21 2:09 UTC (permalink / raw)
To: u-boot
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 <yamada.masahiro@socionext.com>
---
arch/arm/cpu/armv7/socfpga/config.mk | 3 ---
board/altera/socfpga/iocsr_config.c | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm/cpu/armv7/socfpga/config.mk b/arch/arm/cpu/armv7/socfpga/config.mk
index 2a99c72..3d18491 100644
--- a/arch/arm/cpu/armv7/socfpga/config.mk
+++ b/arch/arm/cpu/armv7/socfpga/config.mk
@@ -6,6 +6,3 @@
ifndef CONFIG_SPL_BUILD
ALL-y += u-boot.img
endif
-
-# Added for handoff support
-PLATFORM_RELFLAGS += -Iboard/$(VENDOR)/$(BOARD)
diff --git a/board/altera/socfpga/iocsr_config.c b/board/altera/socfpga/iocsr_config.c
index c79aa6d..3b202b5 100644
--- a/board/altera/socfpga/iocsr_config.c
+++ b/board/altera/socfpga/iocsr_config.c
@@ -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[((
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 2/6] ARM: socfpga: remove redundant config.mk
2015-04-21 2:09 [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Masahiro Yamada
2015-04-21 2:09 ` [U-Boot] [PATCH 1/6] ARM: socfpga: do not add board directory to header search path Masahiro Yamada
@ 2015-04-21 2:09 ` Masahiro Yamada
2015-04-21 2:09 ` [U-Boot] [PATCH 3/6] ARM: socfpga: move board select into mach-socfpga/Kconfig Masahiro Yamada
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2015-04-21 2:09 UTC (permalink / raw)
To: u-boot
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 <yamada.masahiro@socionext.com>
---
arch/arm/cpu/armv7/socfpga/config.mk | 8 --------
1 file changed, 8 deletions(-)
delete mode 100644 arch/arm/cpu/armv7/socfpga/config.mk
diff --git a/arch/arm/cpu/armv7/socfpga/config.mk b/arch/arm/cpu/armv7/socfpga/config.mk
deleted file mode 100644
index 3d18491..0000000
--- a/arch/arm/cpu/armv7/socfpga/config.mk
+++ /dev/null
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 3/6] ARM: socfpga: move board select into mach-socfpga/Kconfig
2015-04-21 2:09 [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Masahiro Yamada
2015-04-21 2:09 ` [U-Boot] [PATCH 1/6] ARM: socfpga: do not add board directory to header search path Masahiro Yamada
2015-04-21 2:09 ` [U-Boot] [PATCH 2/6] ARM: socfpga: remove redundant config.mk Masahiro Yamada
@ 2015-04-21 2:09 ` Masahiro Yamada
2015-04-21 2:09 ` [U-Boot] [PATCH 4/6] ARM: socfpga: move SoC sources to mach-socfpga Masahiro Yamada
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2015-04-21 2:09 UTC (permalink / raw)
To: u-boot
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 <yamada.masahiro@socionext.com>
---
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3702bb0..ac7a11b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
new file mode 100644
index 0000000..204efca
--- /dev/null
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -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
diff --git a/board/altera/socfpga/Kconfig b/board/altera/socfpga/Kconfig
deleted file mode 100644
index cbed8d6..0000000
--- a/board/altera/socfpga/Kconfig
+++ /dev/null
@@ -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
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index 52032e5..d658a50 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -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"
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index 6c982ab..a67b0c1 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -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"
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index c81ab0f..1aa3ee5 100644
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -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"
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 4/6] ARM: socfpga: move SoC sources to mach-socfpga
2015-04-21 2:09 [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Masahiro Yamada
` (2 preceding siblings ...)
2015-04-21 2:09 ` [U-Boot] [PATCH 3/6] ARM: socfpga: move board select into mach-socfpga/Kconfig Masahiro Yamada
@ 2015-04-21 2:09 ` Masahiro Yamada
2015-04-21 2:09 ` [U-Boot] [PATCH 5/6] ARM: socfpga: move SoC headers to mach-socfpga/include/mach Masahiro Yamada
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2015-04-21 2:09 UTC (permalink / raw)
To: u-boot
Our recent trend is to collect SoC files into arch/arm/mach-(SOC).
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
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%)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index bd4749c..cd71d46 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -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
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index 21fc03b..3e50263 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -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/
diff --git a/arch/arm/cpu/armv7/socfpga/Makefile b/arch/arm/mach-socfpga/Makefile
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/Makefile
rename to arch/arm/mach-socfpga/Makefile
diff --git a/arch/arm/cpu/armv7/socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/clock_manager.c
rename to arch/arm/mach-socfpga/clock_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/fpga_manager.c b/arch/arm/mach-socfpga/fpga_manager.c
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/fpga_manager.c
rename to arch/arm/mach-socfpga/fpga_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/freeze_controller.c
rename to arch/arm/mach-socfpga/freeze_controller.c
diff --git a/arch/arm/cpu/armv7/socfpga/lowlevel_init.S b/arch/arm/mach-socfpga/lowlevel_init.S
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/lowlevel_init.S
rename to arch/arm/mach-socfpga/lowlevel_init.S
diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/misc.c
rename to arch/arm/mach-socfpga/misc.c
diff --git a/arch/arm/cpu/armv7/socfpga/reset_manager.c b/arch/arm/mach-socfpga/reset_manager.c
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/reset_manager.c
rename to arch/arm/mach-socfpga/reset_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/scan_manager.c
rename to arch/arm/mach-socfpga/scan_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/spl.c b/arch/arm/mach-socfpga/spl.c
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/spl.c
rename to arch/arm/mach-socfpga/spl.c
diff --git a/arch/arm/cpu/armv7/socfpga/system_manager.c b/arch/arm/mach-socfpga/system_manager.c
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/system_manager.c
rename to arch/arm/mach-socfpga/system_manager.c
diff --git a/arch/arm/cpu/armv7/socfpga/timer.c b/arch/arm/mach-socfpga/timer.c
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/timer.c
rename to arch/arm/mach-socfpga/timer.c
diff --git a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds b/arch/arm/mach-socfpga/u-boot-spl.lds
similarity index 100%
rename from arch/arm/cpu/armv7/socfpga/u-boot-spl.lds
rename to arch/arm/mach-socfpga/u-boot-spl.lds
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 1ecd56f..4872370 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 5/6] ARM: socfpga: move SoC headers to mach-socfpga/include/mach
2015-04-21 2:09 [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Masahiro Yamada
` (3 preceding siblings ...)
2015-04-21 2:09 ` [U-Boot] [PATCH 4/6] ARM: socfpga: move SoC sources to mach-socfpga Masahiro Yamada
@ 2015-04-21 2:09 ` Masahiro Yamada
2015-04-21 2:09 ` [U-Boot] [PATCH 6/6] ARM: socfpga: abolish CONFIG_SOCFPGA Masahiro Yamada
2015-04-21 10:56 ` [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Marek Vasut
6 siblings, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2015-04-21 2:09 UTC (permalink / raw)
To: u-boot
Move headers to mach-socfpga as well.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
.../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%)
diff --git a/arch/arm/include/asm/arch-socfpga/clock_manager.h b/arch/arm/mach-socfpga/include/mach/clock_manager.h
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
diff --git a/arch/arm/include/asm/arch-socfpga/dwmmc.h b/arch/arm/mach-socfpga/include/mach/dwmmc.h
similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/dwmmc.h
rename to arch/arm/mach-socfpga/include/mach/dwmmc.h
diff --git a/arch/arm/include/asm/arch-socfpga/fpga_manager.h b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
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
diff --git a/arch/arm/include/asm/arch-socfpga/freeze_controller.h b/arch/arm/mach-socfpga/include/mach/freeze_controller.h
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
diff --git a/arch/arm/include/asm/arch-socfpga/gpio.h b/arch/arm/mach-socfpga/include/mach/gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/gpio.h
rename to arch/arm/mach-socfpga/include/mach/gpio.h
diff --git a/arch/arm/include/asm/arch-socfpga/nic301.h b/arch/arm/mach-socfpga/include/mach/nic301.h
similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/nic301.h
rename to arch/arm/mach-socfpga/include/mach/nic301.h
diff --git a/arch/arm/include/asm/arch-socfpga/reset_manager.h b/arch/arm/mach-socfpga/include/mach/reset_manager.h
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
diff --git a/arch/arm/include/asm/arch-socfpga/scan_manager.h b/arch/arm/mach-socfpga/include/mach/scan_manager.h
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
diff --git a/arch/arm/include/asm/arch-socfpga/scu.h b/arch/arm/mach-socfpga/include/mach/scu.h
similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/scu.h
rename to arch/arm/mach-socfpga/include/mach/scu.h
diff --git a/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h b/arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h
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
diff --git a/arch/arm/include/asm/arch-socfpga/system_manager.h b/arch/arm/mach-socfpga/include/mach/system_manager.h
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
diff --git a/arch/arm/include/asm/arch-socfpga/timer.h b/arch/arm/mach-socfpga/include/mach/timer.h
similarity index 100%
rename from arch/arm/include/asm/arch-socfpga/timer.h
rename to arch/arm/mach-socfpga/include/mach/timer.h
--
1.9.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 6/6] ARM: socfpga: abolish CONFIG_SOCFPGA
2015-04-21 2:09 [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Masahiro Yamada
` (4 preceding siblings ...)
2015-04-21 2:09 ` [U-Boot] [PATCH 5/6] ARM: socfpga: move SoC headers to mach-socfpga/include/mach Masahiro Yamada
@ 2015-04-21 2:09 ` Masahiro Yamada
2015-04-21 10:56 ` [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Marek Vasut
6 siblings, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2015-04-21 2:09 UTC (permalink / raw)
To: u-boot
CONFIG_SOCFPGA is only referenced by arch/arm/dts/Makefile.
Replace it with CONFIG_ARCH_SOCFPGA.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/arm/dts/Makefile | 2 +-
include/configs/socfpga_common.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 09708d9..8c421b1 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -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
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 4872370..0e6232f 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -13,8 +13,6 @@
#define CONFIG_SYS_THUMB_BUILD
-#define CONFIG_SOCFPGA
-
/*
* High level configuration
*/
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga
2015-04-21 2:09 [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Masahiro Yamada
` (5 preceding siblings ...)
2015-04-21 2:09 ` [U-Boot] [PATCH 6/6] ARM: socfpga: abolish CONFIG_SOCFPGA Masahiro Yamada
@ 2015-04-21 10:56 ` Marek Vasut
2015-04-21 11:40 ` Masahiro Yamada
6 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2015-04-21 10:56 UTC (permalink / raw)
To: u-boot
On Tuesday, April 21, 2015 at 04:09:52 AM, Masahiro Yamada wrote:
> 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
^ permalink raw reply [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga
2015-04-21 10:56 ` [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga Marek Vasut
@ 2015-04-21 11:40 ` Masahiro Yamada
2015-04-21 13:32 ` Marek Vasut
0 siblings, 1 reply; 10+ messages in thread
From: Masahiro Yamada @ 2015-04-21 11:40 UTC (permalink / raw)
To: u-boot
Hi Marek,
2015-04-21 19:56 GMT+09:00 Marek Vasut <marex@denx.de>:
> On Tuesday, April 21, 2015 at 04:09:52 AM, Masahiro Yamada wrote:
>> 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 :(
>
Sure. I have posted v2.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 0/6] ARM: socfpga: refactoring, move files to arch/arm/mach-socfpga
2015-04-21 11:40 ` Masahiro Yamada
@ 2015-04-21 13:32 ` Marek Vasut
0 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2015-04-21 13:32 UTC (permalink / raw)
To: u-boot
On Tuesday, April 21, 2015 at 01:40:32 PM, Masahiro Yamada wrote:
> Hi Marek,
Hi!
> 2015-04-21 19:56 GMT+09:00 Marek Vasut <marex@denx.de>:
> > On Tuesday, April 21, 2015 at 04:09:52 AM, Masahiro Yamada wrote:
> >> 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 :(
>
> Sure. I have posted v2.
?????! ;-)
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 10+ messages in thread