* [PATCH v4 0/8] A small set of arm cleanups
@ 2020-05-06 12:02 Trevor Woerner
2020-05-06 12:02 ` [PATCH v4 1/8] arm: lpc32xx: move SoC to mach-lpc32xx Trevor Woerner
` (7 more replies)
0 siblings, 8 replies; 17+ messages in thread
From: Trevor Woerner @ 2020-05-06 12:02 UTC (permalink / raw)
To: u-boot
This patch series presents a set of cleanups I stumbled across while looking
at some arm-related code.
A long time ago there was an effort to follow the Linux kernel's convention of
putting SoC-specific code in arch/$(ARCH)/mach-$(SOC) instead of the previous
location of arch/$(ARCH)/cpu/$(CPU)/$(SOC). For some reason this didn't occur
with code for NXP's LPC32xx SoC. Therefore the first patch performs this move.
While moving the code, I noticed that years of editing had caused a list in
arch/arm/Makefile to not be sorted alphanumerically anymore, despite the
comment's request to do so. Therefore the second patch re-orders the list to
put it back in alphanumerical order.
While sorting the above-mentioned list, I noticed that there were 4
symbol names that were not following the convention of other symbols:
CONFIG_KIRKWOOD, CONFIG_ORION5X, CONFIG_TEGRA, and CONFIG_STM32. These
symbols should have the pattern: CONFIG_ARCH_<machine>. Therefore more
patches were created to fix these symbol names.
While renaming the CONFIG_ARCH_ORION5X symbol I noticed that this SoC had
code both in arch/$(ARCH)/cpu/$(CPU)/$(SOC) and arch/$(ARCH)/mach-$(SOC),
so there's a patch to complete this move.
In the original series I only renamed 2 of the 4 symbols that were missing
the "ARCH_" string (CONFIG_ORION5X and CONFIG_KIRKWOOD), since those were
the only 2 with TODOs attached to them. As part of v2 I also converted
CONFIG_TEGRA and CONFIG_STM32
Also, I found a typo, so another patch, and I added a cover letter.
Changes in v4:
- Tweaked patch so it applies to master; some of the diff context lines have
changed.
Changes in v3:
- Add Simon Glass' r-b
Changes in v2:
- Update the commit message to fix the error identified by checkpatch.pl, namely
to fix the formatting used to reference a prior commit.
- Improve the wording of the commit message, mostly to specify that the sorting
was done assuming all symbols had "ARCH_" in the middle.
- Update patch to work on latest master; the location where the SPL linker
script is specified has changed.
- Update patch to work on latest master; the location where the SPL linker
script is specified has changed.
- Add Chris Packham's r-b
Trevor Woerner (8):
arm: lpc32xx: move SoC to mach-lpc32xx
arch/arm/Makefile: sort machine names
rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
arm: orion5x: finish moving SoC to mach-orion5x
rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32
drivers/reset/Kconfig: fix typo
Kconfig | 2 +-
Makefile | 4 ++--
arch/arm/Kconfig | 10 ++++----
arch/arm/Makefile | 24 +++++++++----------
arch/arm/cpu/arm720t/interrupts.c | 2 +-
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/cpu/armv7/Kconfig | 2 +-
arch/arm/dts/Makefile | 4 ++--
arch/arm/mach-kirkwood/Kconfig | 2 +-
.../lpc32xx => mach-lpc32xx}/Kconfig | 0
.../lpc32xx => mach-lpc32xx}/Makefile | 0
.../arm926ejs/lpc32xx => mach-lpc32xx}/clk.c | 0
.../arm926ejs/lpc32xx => mach-lpc32xx}/cpu.c | 0
.../lpc32xx => mach-lpc32xx}/devices.c | 0
.../arm926ejs/lpc32xx => mach-lpc32xx}/dram.c | 0
.../lpc32xx => mach-lpc32xx}/lowlevel_init.S | 0
.../lpc32xx => mach-lpc32xx}/timer.c | 0
arch/arm/mach-mvebu/Makefile | 6 ++---
arch/arm/mach-mvebu/mbus.c | 6 ++---
arch/arm/mach-orion5x/Kconfig | 2 +-
.../orion5x => mach-orion5x}/u-boot-spl.lds | 0
arch/arm/mach-stm32/Kconfig | 2 +-
arch/arm/mach-tegra/Kconfig | 2 +-
board/keymile/Kconfig | 12 +++++-----
common/spl/Kconfig | 4 ++--
config.mk | 2 +-
configs/SBx81LIFKW_defconfig | 2 +-
configs/SBx81LIFXCAT_defconfig | 2 +-
configs/apalis-tk1_defconfig | 2 +-
configs/apalis_t30_defconfig | 2 +-
configs/beaver_defconfig | 2 +-
configs/cardhu_defconfig | 2 +-
configs/cei-tk1-som_defconfig | 2 +-
configs/colibri_t20_defconfig | 2 +-
configs/colibri_t30_defconfig | 2 +-
configs/d2net_v2_defconfig | 2 +-
configs/dalmore_defconfig | 2 +-
configs/db-88f6281-bp-nand_defconfig | 2 +-
configs/db-88f6281-bp-spi_defconfig | 2 +-
configs/dns325_defconfig | 2 +-
configs/dockstar_defconfig | 2 +-
configs/dreamplug_defconfig | 2 +-
configs/ds109_defconfig | 2 +-
configs/e2220-1170_defconfig | 2 +-
configs/edminiv2_defconfig | 4 ++--
configs/goflexhome_defconfig | 2 +-
configs/guruplug_defconfig | 2 +-
configs/harmony_defconfig | 2 +-
configs/ib62x0_defconfig | 2 +-
configs/iconnect_defconfig | 2 +-
configs/inetspace_v2_defconfig | 2 +-
configs/jetson-tk1_defconfig | 2 +-
configs/km_kirkwood_128m16_defconfig | 2 +-
configs/km_kirkwood_defconfig | 2 +-
configs/km_kirkwood_pci_defconfig | 2 +-
configs/kmcoge5un_defconfig | 2 +-
configs/kmnusa_defconfig | 2 +-
configs/kmsuse2_defconfig | 2 +-
configs/lschlv2_defconfig | 2 +-
configs/lsxhl_defconfig | 2 +-
configs/medcom-wide_defconfig | 2 +-
configs/nas220_defconfig | 2 +-
configs/net2big_v2_defconfig | 2 +-
configs/netspace_lite_v2_defconfig | 2 +-
configs/netspace_max_v2_defconfig | 2 +-
configs/netspace_mini_v2_defconfig | 2 +-
configs/netspace_v2_defconfig | 2 +-
configs/nsa310s_defconfig | 2 +-
configs/nyan-big_defconfig | 2 +-
configs/openrd_base_defconfig | 2 +-
configs/openrd_client_defconfig | 2 +-
configs/openrd_ultimate_defconfig | 2 +-
configs/p2371-0000_defconfig | 2 +-
configs/p2371-2180_defconfig | 2 +-
configs/p2571_defconfig | 2 +-
configs/p2771-0000-000_defconfig | 2 +-
configs/p2771-0000-500_defconfig | 2 +-
configs/p3450-0000_defconfig | 2 +-
configs/paz00_defconfig | 2 +-
configs/plutux_defconfig | 2 +-
configs/pogo_e02_defconfig | 2 +-
configs/seaboard_defconfig | 2 +-
configs/sheevaplug_defconfig | 2 +-
configs/stm32f429-discovery_defconfig | 2 +-
configs/stm32f429-evaluation_defconfig | 2 +-
configs/stm32f469-discovery_defconfig | 2 +-
configs/stm32f746-disco_defconfig | 2 +-
configs/stm32f769-disco_defconfig | 2 +-
configs/stm32h743-disco_defconfig | 2 +-
configs/stm32h743-eval_defconfig | 2 +-
configs/tec-ng_defconfig | 2 +-
configs/tec_defconfig | 2 +-
configs/trimslice_defconfig | 2 +-
configs/venice2_defconfig | 2 +-
configs/ventana_defconfig | 2 +-
disk/Kconfig | 4 ++--
drivers/ata/mvsata_ide.c | 4 ++--
drivers/ata/sata_mv.c | 2 +-
drivers/gpio/Kconfig | 2 +-
drivers/i2c/Kconfig | 2 +-
drivers/i2c/mvtwsi.c | 6 ++---
drivers/mailbox/Kconfig | 2 +-
drivers/misc/Kconfig | 2 +-
drivers/mmc/Kconfig | 2 +-
drivers/net/Kconfig | 2 +-
drivers/net/mvgbe.c | 4 ++--
drivers/pci/Kconfig | 2 +-
drivers/reset/Kconfig | 4 ++--
drivers/spi/kirkwood_spi.c | 10 ++++----
drivers/usb/host/Kconfig | 4 ++--
drivers/usb/host/ehci-marvell.c | 4 ++--
drivers/video/Kconfig | 2 +-
include/serial.h | 2 +-
tools/Makefile | 4 ++--
114 files changed, 144 insertions(+), 147 deletions(-)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Kconfig (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Makefile (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/clk.c (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/cpu.c (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/devices.c (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/dram.c (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/lowlevel_init.S (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/timer.c (100%)
rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/u-boot-spl.lds (100%)
--
2.26.0.106.g9fadedd637
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 1/8] arm: lpc32xx: move SoC to mach-lpc32xx
2020-05-06 12:02 [PATCH v4 0/8] A small set of arm cleanups Trevor Woerner
@ 2020-05-06 12:02 ` Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 2/8] arch/arm/Makefile: sort machine names Trevor Woerner
` (6 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Trevor Woerner @ 2020-05-06 12:02 UTC (permalink / raw)
To: u-boot
Following the example of most other SoCs in arch/$(ARCH)/cpu/$(CPU)/$(SOC)
move the lpc32xx code from arch/arm/cpu/arm926ejs/lpc32xx to
arch/arm/mach-lpc32xx.
Following the checklist from
commit 01f14456306c ("ARM: prepare for moving SoC sources into mach-*"):
[1] move files from arch/arm/cpu/arm926ejs/lpc32xx to arch/arm/mach-lpx32xx
[2] add machine entry to arch/arm/Makefile
[3] remove "obj-y += ..." from arch/arm/cpu/arm926ejs/Makefile
[4] fix the Kconfig file path in arch/arm/Kconfig
[5] (no MAINTAINERS update)
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
Changes in v4: None
Changes in v3:
- Add Simon Glass' r-b
Changes in v2:
- Update the commit message to fix the error identified by checkpatch.pl, namely
to fix the formatting used to reference a prior commit.
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 1 +
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Kconfig | 0
arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Makefile | 0
arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/clk.c | 0
arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/cpu.c | 0
arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/devices.c | 0
arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/dram.c | 0
.../arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/lowlevel_init.S | 0
arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/timer.c | 0
11 files changed, 2 insertions(+), 2 deletions(-)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Kconfig (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/Makefile (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/clk.c (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/cpu.c (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/devices.c (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/dram.c (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/lowlevel_init.S (100%)
rename arch/arm/{cpu/arm926ejs/lpc32xx => mach-lpc32xx}/timer.c (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b494bcae95..70b7b89b47 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1766,7 +1766,7 @@ source "arch/arm/mach-keystone/Kconfig"
source "arch/arm/mach-kirkwood/Kconfig"
-source "arch/arm/cpu/arm926ejs/lpc32xx/Kconfig"
+source "arch/arm/mach-lpc32xx/Kconfig"
source "arch/arm/mach-mvebu/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e25bb0e594..33bb8923bf 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -62,6 +62,7 @@ machine-$(CONFIG_ARCH_K3) += k3
machine-$(CONFIG_ARCH_KEYSTONE) += keystone
# TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
machine-$(CONFIG_KIRKWOOD) += kirkwood
+machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx
machine-$(CONFIG_ARCH_MEDIATEK) += mediatek
machine-$(CONFIG_ARCH_MESON) += meson
machine-$(CONFIG_ARCH_MVEBU) += mvebu
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index b051025bb0..af63d5cc5e 100644
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -13,7 +13,6 @@ endif
endif
obj-$(CONFIG_ARMADA100) += armada100/
-obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
obj-$(CONFIG_MX25) += mx25/
obj-$(CONFIG_MX27) += mx27/
obj-$(if $(filter mxs,$(SOC)),y) += mxs/
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/Kconfig b/arch/arm/mach-lpc32xx/Kconfig
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/Kconfig
rename to arch/arm/mach-lpc32xx/Kconfig
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/Makefile b/arch/arm/mach-lpc32xx/Makefile
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/Makefile
rename to arch/arm/mach-lpc32xx/Makefile
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/clk.c b/arch/arm/mach-lpc32xx/clk.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/clk.c
rename to arch/arm/mach-lpc32xx/clk.c
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
rename to arch/arm/mach-lpc32xx/cpu.c
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/devices.c
rename to arch/arm/mach-lpc32xx/devices.c
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/dram.c b/arch/arm/mach-lpc32xx/dram.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/dram.c
rename to arch/arm/mach-lpc32xx/dram.c
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S b/arch/arm/mach-lpc32xx/lowlevel_init.S
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S
rename to arch/arm/mach-lpc32xx/lowlevel_init.S
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/lpc32xx/timer.c
rename to arch/arm/mach-lpc32xx/timer.c
--
2.26.0.106.g9fadedd637
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 2/8] arch/arm/Makefile: sort machine names
2020-05-06 12:02 [PATCH v4 0/8] A small set of arm cleanups Trevor Woerner
2020-05-06 12:02 ` [PATCH v4 1/8] arm: lpc32xx: move SoC to mach-lpc32xx Trevor Woerner
@ 2020-05-06 12:02 ` Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 3/8] rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X Trevor Woerner
` (5 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Trevor Woerner @ 2020-05-06 12:02 UTC (permalink / raw)
To: u-boot
The comment immediately above the block of machine directory names implored
users to keep the macro names sorted, but, alas, this is no longer the case.
Put the list of machine directory names back in alphanumerical order by
CONFIG_* macro name, as the comment asks. Sort all the symbols as though they
all followed the convention of having the string "ARCH_" in the middle of
their definitions.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Improve the wording of the commit message, mostly to specify that the sorting
was done assuming all symbols had "ARCH_" in the middle.
arch/arm/Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 33bb8923bf..5d32dec29c 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -66,25 +66,25 @@ machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx
machine-$(CONFIG_ARCH_MEDIATEK) += mediatek
machine-$(CONFIG_ARCH_MESON) += meson
machine-$(CONFIG_ARCH_MVEBU) += mvebu
-# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
+machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
machine-$(CONFIG_ORION5X) += orion5x
-machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
machine-$(CONFIG_ARCH_OWL) += owl
+machine-$(CONFIG_ARCH_RMOBILE) += rmobile
+machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
-machine-$(CONFIG_ARCH_SUNXI) += sunxi
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon
machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
-machine-$(CONFIG_ARCH_RMOBILE) += rmobile
-machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
machine-$(CONFIG_STM32) += stm32
machine-$(CONFIG_ARCH_STM32MP) += stm32mp
+machine-$(CONFIG_ARCH_SUNXI) += sunxi
+# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
machine-$(CONFIG_TEGRA) += tegra
machine-$(CONFIG_ARCH_U8500) += u8500
machine-$(CONFIG_ARCH_UNIPHIER) += uniphier
+machine-$(CONFIG_ARCH_VERSAL) += versal
machine-$(CONFIG_ARCH_ZYNQ) += zynq
machine-$(CONFIG_ARCH_ZYNQMP) += zynqmp
-machine-$(CONFIG_ARCH_VERSAL) += versal
machine-$(CONFIG_ARCH_ZYNQMP_R5) += zynqmp-r5
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
--
2.26.0.106.g9fadedd637
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 3/8] rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
2020-05-06 12:02 [PATCH v4 0/8] A small set of arm cleanups Trevor Woerner
2020-05-06 12:02 ` [PATCH v4 1/8] arm: lpc32xx: move SoC to mach-lpc32xx Trevor Woerner
2020-05-06 12:02 ` [PATCH v4 2/8] arch/arm/Makefile: sort machine names Trevor Woerner
@ 2020-05-06 12:02 ` Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 4/8] arm: orion5x: finish moving SoC to mach-orion5x Trevor Woerner
` (4 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Trevor Woerner @ 2020-05-06 12:02 UTC (permalink / raw)
To: u-boot
Have this symbol follow the pattern of all other such symbols.
This patch removes a TODO from the code.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Update patch to work on latest master; the location where the SPL linker
script is specified has changed.
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 3 +--
arch/arm/mach-orion5x/Kconfig | 2 +-
configs/edminiv2_defconfig | 2 +-
drivers/ata/mvsata_ide.c | 2 +-
drivers/i2c/mvtwsi.c | 2 +-
drivers/net/Kconfig | 2 +-
drivers/net/mvgbe.c | 2 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ehci-marvell.c | 2 +-
10 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 70b7b89b47..5546329a47 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -576,7 +576,7 @@ config TARGET_APF27
select CPU_ARM926EJS
select SUPPORT_SPL
-config ORION5X
+config ARCH_ORION5X
bool "Marvell Orion"
select CPU_ARM926EJS
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5d32dec29c..2b44ffb493 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -67,8 +67,7 @@ machine-$(CONFIG_ARCH_MEDIATEK) += mediatek
machine-$(CONFIG_ARCH_MESON) += meson
machine-$(CONFIG_ARCH_MVEBU) += mvebu
machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
-# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
-machine-$(CONFIG_ORION5X) += orion5x
+machine-$(CONFIG_ARCH_ORION5X) += orion5x
machine-$(CONFIG_ARCH_OWL) += owl
machine-$(CONFIG_ARCH_RMOBILE) += rmobile
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 7644b8dc85..5baa6fb935 100644
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -1,4 +1,4 @@
-if ORION5X
+if ARCH_ORION5X
choice
prompt "Marvell Orion board select"
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index b9a68a9263..d06f83db04 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -1,6 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_ORION5X=y
+CONFIG_ARCH_ORION5X=y
CONFIG_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds"
CONFIG_SYS_TEXT_BASE=0x00800000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
diff --git a/drivers/ata/mvsata_ide.c b/drivers/ata/mvsata_ide.c
index 38181235af..9ac16555d6 100644
--- a/drivers/ata/mvsata_ide.c
+++ b/drivers/ata/mvsata_ide.c
@@ -8,7 +8,7 @@
#include <common.h>
#include <asm/io.h>
-#if defined(CONFIG_ORION5X)
+#if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
#elif defined(CONFIG_KIRKWOOD)
#include <asm/arch/soc.h>
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 382cf4b304..77fe35a42b 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
*/
#ifndef CONFIG_DM_I2C
-#if defined(CONFIG_ORION5X)
+#if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
#elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU))
#include <asm/arch/soc.h>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a2587a29e1..8afaa7c06a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -303,7 +303,7 @@ config FSLDMAFEC
config MVGBE
bool "Marvell Orion5x/Kirkwood network interface support"
- depends on KIRKWOOD || ORION5X
+ depends on KIRKWOOD || ARCH_ORION5X
select PHYLIB if DM_ETH
help
This driver supports the network interface units in the
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 037e59ec6e..b0b8d349a8 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -26,7 +26,7 @@
#if defined(CONFIG_KIRKWOOD)
#include <asm/arch/soc.h>
-#elif defined(CONFIG_ORION5X)
+#elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
#endif
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 2f381dc958..cc9646d40a 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -135,7 +135,7 @@ config USB_EHCI_ATMEL
config USB_EHCI_MARVELL
bool "Support for Marvell on-chip EHCI USB controller"
- depends on ARCH_MVEBU || KIRKWOOD || ORION5X
+ depends on ARCH_MVEBU || KIRKWOOD || ARCH_ORION5X
default y
---help---
Enables support for the on-chip EHCI controller on MVEBU SoCs.
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 8efe6b63b9..3b10cdfc58 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -15,7 +15,7 @@
#if defined(CONFIG_KIRKWOOD)
#include <asm/arch/soc.h>
-#elif defined(CONFIG_ORION5X)
+#elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
#endif
--
2.26.0.106.g9fadedd637
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 4/8] arm: orion5x: finish moving SoC to mach-orion5x
2020-05-06 12:02 [PATCH v4 0/8] A small set of arm cleanups Trevor Woerner
` (2 preceding siblings ...)
2020-05-06 12:02 ` [PATCH v4 3/8] rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X Trevor Woerner
@ 2020-05-06 12:02 ` Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 5/8] rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD Trevor Woerner
` (3 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Trevor Woerner @ 2020-05-06 12:02 UTC (permalink / raw)
To: u-boot
The SPL linker script had been left in arch/$(ARCH)/cpu/$(CPU)/$(SOC);
therefore move it to the already-established arch/$(ARCH)/mach-$(SOC)
location.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Update patch to work on latest master; the location where the SPL linker
script is specified has changed.
arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/u-boot-spl.lds | 0
configs/edminiv2_defconfig | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/u-boot-spl.lds (100%)
diff --git a/arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds b/arch/arm/mach-orion5x/u-boot-spl.lds
similarity index 100%
rename from arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds
rename to arch/arm/mach-orion5x/u-boot-spl.lds
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index d06f83db04..9a9d9c58d7 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_CPU_INIT=y
CONFIG_ARCH_ORION5X=y
-CONFIG_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/mach-orion5x/u-boot-spl.lds"
CONFIG_SYS_TEXT_BASE=0x00800000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
--
2.26.0.106.g9fadedd637
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 5/8] rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
2020-05-06 12:02 [PATCH v4 0/8] A small set of arm cleanups Trevor Woerner
` (3 preceding siblings ...)
2020-05-06 12:02 ` [PATCH v4 4/8] arm: orion5x: finish moving SoC to mach-orion5x Trevor Woerner
@ 2020-05-06 12:02 ` Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 6/8] rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA Trevor Woerner
` (2 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Trevor Woerner @ 2020-05-06 12:02 UTC (permalink / raw)
To: u-boot
Have this symbol follow the pattern of all other such symbols.
This patch also removes a TODO from the code.
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
Changes in v4: None
Changes in v3: None
Changes in v2:
- Add Chris Packham's r-b
Kconfig | 2 +-
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 3 +--
arch/arm/dts/Makefile | 2 +-
arch/arm/mach-kirkwood/Kconfig | 2 +-
arch/arm/mach-mvebu/Makefile | 6 +++---
arch/arm/mach-mvebu/mbus.c | 6 +++---
board/keymile/Kconfig | 12 ++++++------
configs/SBx81LIFKW_defconfig | 2 +-
configs/SBx81LIFXCAT_defconfig | 2 +-
configs/d2net_v2_defconfig | 2 +-
configs/db-88f6281-bp-nand_defconfig | 2 +-
configs/db-88f6281-bp-spi_defconfig | 2 +-
configs/dns325_defconfig | 2 +-
configs/dockstar_defconfig | 2 +-
configs/dreamplug_defconfig | 2 +-
configs/ds109_defconfig | 2 +-
configs/goflexhome_defconfig | 2 +-
configs/guruplug_defconfig | 2 +-
configs/ib62x0_defconfig | 2 +-
configs/iconnect_defconfig | 2 +-
configs/inetspace_v2_defconfig | 2 +-
configs/km_kirkwood_128m16_defconfig | 2 +-
configs/km_kirkwood_defconfig | 2 +-
configs/km_kirkwood_pci_defconfig | 2 +-
configs/kmcoge5un_defconfig | 2 +-
configs/kmnusa_defconfig | 2 +-
configs/kmsuse2_defconfig | 2 +-
configs/lschlv2_defconfig | 2 +-
configs/lsxhl_defconfig | 2 +-
configs/nas220_defconfig | 2 +-
configs/net2big_v2_defconfig | 2 +-
configs/netspace_lite_v2_defconfig | 2 +-
configs/netspace_max_v2_defconfig | 2 +-
configs/netspace_mini_v2_defconfig | 2 +-
configs/netspace_v2_defconfig | 2 +-
configs/nsa310s_defconfig | 2 +-
configs/openrd_base_defconfig | 2 +-
configs/openrd_client_defconfig | 2 +-
configs/openrd_ultimate_defconfig | 2 +-
configs/pogo_e02_defconfig | 2 +-
configs/sheevaplug_defconfig | 2 +-
drivers/ata/mvsata_ide.c | 2 +-
drivers/ata/sata_mv.c | 2 +-
drivers/i2c/mvtwsi.c | 4 ++--
drivers/net/Kconfig | 2 +-
drivers/net/mvgbe.c | 2 +-
drivers/spi/kirkwood_spi.c | 10 +++++-----
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ehci-marvell.c | 2 +-
tools/Makefile | 4 ++--
51 files changed, 66 insertions(+), 67 deletions(-)
diff --git a/Kconfig b/Kconfig
index 15f1a75c61..0e7ccc0b07 100644
--- a/Kconfig
+++ b/Kconfig
@@ -268,7 +268,7 @@ config BUILD_TARGET
default "u-boot-elf.srec" if RCAR_GEN3
default "u-boot.itb" if SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
- default "u-boot.kwb" if KIRKWOOD
+ default "u-boot.kwb" if ARCH_KIRKWOOD
default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
default "u-boot-with-spl.imx" if ARCH_MX6 && SPL
help
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5546329a47..91185b9299 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -553,7 +553,7 @@ config ARCH_DAVINCI
help
Support for TI's DaVinci platform.
-config KIRKWOOD
+config ARCH_KIRKWOOD
bool "Marvell Kirkwood"
select ARCH_MISC_INIT
select BOARD_EARLY_INIT_F
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2b44ffb493..9b3ca9772c 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -60,8 +60,7 @@ machine-$(CONFIG_ARCH_EXYNOS) += exynos
machine-$(CONFIG_ARCH_HIGHBANK) += highbank
machine-$(CONFIG_ARCH_K3) += k3
machine-$(CONFIG_ARCH_KEYSTONE) += keystone
-# TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
-machine-$(CONFIG_KIRKWOOD) += kirkwood
+machine-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx
machine-$(CONFIG_ARCH_MEDIATEK) += mediatek
machine-$(CONFIG_ARCH_MESON) += meson
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 559d3ab6a7..9ce634e8b8 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -34,7 +34,7 @@ dtb-$(CONFIG_ARCH_DAVINCI) += \
da850-lcdk.dtb \
da850-lego-ev3.dtb
-dtb-$(CONFIG_KIRKWOOD) += \
+dtb-$(CONFIG_ARCH_KIRKWOOD) += \
kirkwood-atl-sbx81lifkw.dtb \
kirkwood-atl-sbx81lifxcat.dtb \
kirkwood-blackarmor-nas220.dtb \
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 2f68092f82..ae44cb665e 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -1,4 +1,4 @@
-if KIRKWOOD
+if ARCH_KIRKWOOD
choice
prompt "Marvell Kirkwood board select"
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index b73952044d..7e9c206ed6 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -10,14 +10,14 @@ obj-y += arm64-common.o
else # CONFIG_ARM64
-ifdef CONFIG_KIRKWOOD
+ifdef CONFIG_ARCH_KIRKWOOD
obj-y = dram.o
obj-y += gpio.o
obj-y += mbus.o
obj-y += timer.o
-else # CONFIG_KIRKWOOD
+else # CONFIG_ARCH_KIRKWOOD
obj-y = cpu.o
obj-y += dram.o
@@ -73,5 +73,5 @@ obj-$(CONFIG_SPL_BUILD) += lowlevel_spl.o
obj-$(CONFIG_ARMADA_38X) += serdes/a38x/
obj-$(CONFIG_ARMADA_XP) += serdes/axp/
-endif # CONFIG_KIRKWOOD
+endif # CONFIG_ARCH_KIRKWOOD
endif # CONFIG_ARM64
diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c
index a95db5e5c3..39bd200c83 100644
--- a/arch/arm/mach-mvebu/mbus.c
+++ b/arch/arm/mach-mvebu/mbus.c
@@ -411,7 +411,7 @@ int mvebu_mbus_del_window(phys_addr_t base, size_t size)
return 0;
}
-#ifndef CONFIG_KIRKWOOD
+#ifndef CONFIG_ARCH_KIRKWOOD
static void mvebu_mbus_get_lowest_base(struct mvebu_mbus_state *mbus,
phys_addr_t *base)
{
@@ -479,7 +479,7 @@ int mbus_dt_setup_win(struct mvebu_mbus_state *mbus,
return -ENOMEM;
}
-#ifndef CONFIG_KIRKWOOD
+#ifndef CONFIG_ARCH_KIRKWOOD
/*
* Re-configure the mbus bridge registers each time this function
* is called. Since it may get called from the board code in
@@ -497,7 +497,7 @@ int mvebu_mbus_probe(struct mbus_win windows[], int count)
int ret;
int i;
-#if defined(CONFIG_KIRKWOOD)
+#if defined(CONFIG_ARCH_KIRKWOOD)
mbus_state.soc = &kirkwood_mbus_data;
#endif
#if defined(CONFIG_ARCH_MVEBU)
diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig
index 7f4cad86aa..e20c017436 100644
--- a/board/keymile/Kconfig
+++ b/board/keymile/Kconfig
@@ -28,7 +28,7 @@ config KM_PHRAM
config KM_RESERVED_PRAM
hex "Reserved RAM"
- default 0x801000 if KIRKWOOD
+ default 0x801000 if ARCH_KIRKWOOD
default 0x0 if MPC83xx
default 0x1000 if MPC85xx
depends on !ARCH_SOCFPGA
@@ -37,7 +37,7 @@ config KM_RESERVED_PRAM
config KM_CRAMFS_ADDR
hex "CRAMFS Address"
- default 0x2400000 if KIRKWOOD
+ default 0x2400000 if ARCH_KIRKWOOD
default 0xC00000 if MPC83xx
default 0x2000000 if MPC85xx
depends on !ARCH_SOCFPGA
@@ -46,7 +46,7 @@ config KM_CRAMFS_ADDR
config KM_KERNEL_ADDR
hex "Kernel Load Address"
- default 0x2000000 if KIRKWOOD
+ default 0x2000000 if ARCH_KIRKWOOD
default 0x400000 if MPC83xx
default 0x1000000 if MPC85xx || ARCH_SOCFPGA
help
@@ -54,7 +54,7 @@ config KM_KERNEL_ADDR
config KM_FDT_ADDR
hex "FDT Load Address"
- default 0x23E0000 if KIRKWOOD || ARCH_SOCFPGA
+ default 0x23E0000 if ARCH_KIRKWOOD || ARCH_SOCFPGA
default 0xB80000 if MPC83xx
default 0x1F80000 if MPC85xx
help
@@ -74,7 +74,7 @@ config KM_DEF_NETDEV
config KM_COMMON_ETH_INIT
bool "Common Ethernet Initialization"
- default y if KIRKWOOD || MPC83xx
+ default y if ARCH_KIRKWOOD || MPC83xx
default n if MPC85xx || ARCH_SOCFPGA
help
Use the Ethernet initialization implemented in common code, which
@@ -96,7 +96,7 @@ config KM_MVEXTSW_ADDR
config KM_IVM_BUS
int "IVM I2C Bus"
default 0 if ARCH_SOCFPGA
- default 1 if KIRKWOOD || MPC85xx
+ default 1 if ARCH_KIRKWOOD || MPC85xx
default 2 if MPC83xx
help
Identifier number of I2C bus, where the inventory EEPROM is connected to.
diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig
index 4b3c729598..b21db3c9df 100644
--- a/configs/SBx81LIFKW_defconfig
+++ b/configs/SBx81LIFKW_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x00600000
CONFIG_TARGET_SBx81LIFKW=y
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig
index fdbde4930f..420d75ea30 100644
--- a/configs/SBx81LIFXCAT_defconfig
+++ b/configs/SBx81LIFXCAT_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x00600000
CONFIG_TARGET_SBx81LIFXCAT=y
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 41ed344e73..fe3c6c4762 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NET2BIG_V2=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/db-88f6281-bp-nand_defconfig b/configs/db-88f6281-bp-nand_defconfig
index e390423780..f98e462d42 100644
--- a/configs/db-88f6281-bp-nand_defconfig
+++ b/configs/db-88f6281-bp-nand_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DB_88F6281_BP=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/db-88f6281-bp-spi_defconfig b/configs/db-88f6281-bp-spi_defconfig
index 1bef1c5bb3..52af8f41ce 100644
--- a/configs/db-88f6281-bp-spi_defconfig
+++ b/configs/db-88f6281-bp-spi_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DB_88F6281_BP=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index 8457806282..e44ec51ce9 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DNS325=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 079b6652f1..fcc597d249 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DOCKSTAR=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 566aa0dbf4..26bb8b7e19 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DREAMPLUG=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index 3f7a661432..89ed5eb13c 100644
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DS109=y
CONFIG_ENV_SIZE=0x10000
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 97b1615c8a..9384244ebb 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_GOFLEXHOME=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index 2bdd78041d..8d862696ca 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_GURUPLUG=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 9da976f399..fea69d32e9 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_IB62X0=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 8121867008..4281aa93bc 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_ICONNECT=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 94c708e602..6144eb5fad 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index d185100f66..9bbbfd9442 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index a8374d9fc2..887893ef33 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 7ad69e1639..81c9f697bb 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_KM_FPGA_CONFIG=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index b70bab618e..169d895203 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index a4b301db7d..8d90cdab0f 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_KM_FPGA_CONFIG=y
diff --git a/configs/kmsuse2_defconfig b/configs/kmsuse2_defconfig
index 119607ac91..82006010ed 100644
--- a/configs/kmsuse2_defconfig
+++ b/configs/kmsuse2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_KM_FPGA_CONFIG=y
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 2ce23464b9..e2e0e8af71 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_LSXL=y
CONFIG_ENV_SIZE=0x10000
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index 336fb34d5b..4de845da2c 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_LSXL=y
CONFIG_ENV_SIZE=0x10000
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index eb7effe98f..918fd26b05 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NAS220=y
CONFIG_ENV_SIZE=0x10000
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index b7565e5214..1389d30900 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NET2BIG_V2=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 3f95f38dab..c744d2c58e 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 1d710395ae..8602729fcb 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index abf8011e4f..ba9301de4d 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 052049af1c..6ba1ef423e 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000
diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index 6a1073c30b..7a864bddf3 100644
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NSA310S=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index f575bf24e7..2551f284af 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_OPENRD=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 42f3786918..c0bf3be373 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_OPENRD=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index 47189da080..ab97d66e89 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_OPENRD=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 8957a87639..e254ac0393 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_POGO_E02=y
CONFIG_ENV_SIZE=0x20000
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 723ef7bb46..d350429cad 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_SHEEVAPLUG=y
CONFIG_ENV_SIZE=0x20000
diff --git a/drivers/ata/mvsata_ide.c b/drivers/ata/mvsata_ide.c
index 9ac16555d6..6bbb345f6e 100644
--- a/drivers/ata/mvsata_ide.c
+++ b/drivers/ata/mvsata_ide.c
@@ -10,7 +10,7 @@
#if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
-#elif defined(CONFIG_KIRKWOOD)
+#elif defined(CONFIG_ARCH_KIRKWOOD)
#include <asm/arch/soc.h>
#elif defined(CONFIG_ARCH_MVEBU)
#include <linux/mbus.h>
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 6019ac089e..9ced9c0fa8 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -46,7 +46,7 @@
#include <linux/mbus.h>
#include <asm/arch/soc.h>
-#if defined(CONFIG_KIRKWOOD)
+#if defined(CONFIG_ARCH_KIRKWOOD)
#define SATAHC_BASE KW_SATA_BASE
#else
#define SATAHC_BASE MVEBU_AXP_SATA_BASE
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 77fe35a42b..d4b2031249 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_DM_I2C
#if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
-#elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU))
+#elif (defined(CONFIG_ARCH_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU))
#include <asm/arch/soc.h>
#elif defined(CONFIG_ARCH_SUNXI)
#include <asm/arch/i2c.h>
@@ -821,7 +821,7 @@ static int mvtwsi_i2c_bind(struct udevice *bus)
struct mvtwsi_registers *twsi = devfdt_get_addr_ptr(bus);
/* Disable the hidden slave in i2c0 of these platforms */
- if ((IS_ENABLED(CONFIG_ARMADA_38X) || IS_ENABLED(CONFIG_KIRKWOOD))
+ if ((IS_ENABLED(CONFIG_ARMADA_38X) || IS_ENABLED(CONFIG_ARCH_KIRKWOOD))
&& bus->req_seq == 0)
twsi_disable_i2c_slave(twsi);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8afaa7c06a..2529c2e4cc 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -303,7 +303,7 @@ config FSLDMAFEC
config MVGBE
bool "Marvell Orion5x/Kirkwood network interface support"
- depends on KIRKWOOD || ARCH_ORION5X
+ depends on ARCH_KIRKWOOD || ARCH_ORION5X
select PHYLIB if DM_ETH
help
This driver supports the network interface units in the
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index b0b8d349a8..6d56360a20 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -24,7 +24,7 @@
#include <asm/byteorder.h>
#include <asm/arch/cpu.h>
-#if defined(CONFIG_KIRKWOOD)
+#if defined(CONFIG_ARCH_KIRKWOOD)
#include <asm/arch/soc.h>
#elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index c725625146..38fe4143f5 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -13,7 +13,7 @@
#include <spi.h>
#include <asm/io.h>
#include <asm/arch/soc.h>
-#ifdef CONFIG_KIRKWOOD
+#ifdef CONFIG_ARCH_KIRKWOOD
#include <asm/arch/mpp.h>
#endif
#include <asm/arch-mvebu/spi.h>
@@ -98,7 +98,7 @@ static int _spi_xfer(struct kwspi_registers *reg, unsigned int bitlen,
static struct kwspi_registers *spireg =
(struct kwspi_registers *)MVEBU_SPI_BASE;
-#ifdef CONFIG_KIRKWOOD
+#ifdef CONFIG_ARCH_KIRKWOOD
static u32 cs_spi_mpp_back[2];
#endif
@@ -107,7 +107,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
{
struct spi_slave *slave;
u32 data;
-#ifdef CONFIG_KIRKWOOD
+#ifdef CONFIG_ARCH_KIRKWOOD
static const u32 kwspi_mpp_config[2][2] = {
{ MPP0_SPI_SCn, 0 }, /* if cs == 0 */
{ MPP7_SPI_SCn, 0 } /* if cs != 0 */
@@ -135,7 +135,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
writel(KWSPI_SMEMRDIRQ, &spireg->irq_cause);
writel(KWSPI_IRQMASK, &spireg->irq_mask);
-#ifdef CONFIG_KIRKWOOD
+#ifdef CONFIG_ARCH_KIRKWOOD
/* program mpp registers to select SPI_CSn */
kirkwood_mpp_conf(kwspi_mpp_config[cs ? 1 : 0], cs_spi_mpp_back);
#endif
@@ -145,7 +145,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
void spi_free_slave(struct spi_slave *slave)
{
-#ifdef CONFIG_KIRKWOOD
+#ifdef CONFIG_ARCH_KIRKWOOD
kirkwood_mpp_conf(cs_spi_mpp_back, NULL);
#endif
free(slave);
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index cc9646d40a..cbfb54c5a2 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -135,7 +135,7 @@ config USB_EHCI_ATMEL
config USB_EHCI_MARVELL
bool "Support for Marvell on-chip EHCI USB controller"
- depends on ARCH_MVEBU || KIRKWOOD || ARCH_ORION5X
+ depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_ORION5X
default y
---help---
Enables support for the on-chip EHCI controller on MVEBU SoCs.
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 3b10cdfc58..5a9bd549e3 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -13,7 +13,7 @@
#include <asm/arch/cpu.h>
#include <dm.h>
-#if defined(CONFIG_KIRKWOOD)
+#if defined(CONFIG_ARCH_KIRKWOOD)
#include <asm/arch/soc.h>
#elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
diff --git a/tools/Makefile b/tools/Makefile
index 1f9144f028..879c3fd4a7 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -5,7 +5,7 @@
# Enable all the config-independent tools
ifneq ($(HOST_TOOLS_ALL),)
-CONFIG_KIRKWOOD = y
+CONFIG_ARCH_KIRKWOOD = y
CONFIG_LCD_LOGO = y
CONFIG_CMD_LOADS = y
CONFIG_CMD_NET = y
@@ -199,7 +199,7 @@ ubsha1-objs := os_support.o ubsha1.o lib/sha1.o
HOSTCFLAGS_ubsha1.o := -pedantic
-hostprogs-$(CONFIG_KIRKWOOD) += kwboot
+hostprogs-$(CONFIG_ARCH_KIRKWOOD) += kwboot
hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot
hostprogs-y += proftool
hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela
--
2.26.0.106.g9fadedd637
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 6/8] rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
2020-05-06 12:02 [PATCH v4 0/8] A small set of arm cleanups Trevor Woerner
` (4 preceding siblings ...)
2020-05-06 12:02 ` [PATCH v4 5/8] rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD Trevor Woerner
@ 2020-05-06 12:02 ` Trevor Woerner
2020-05-15 20:53 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 7/8] rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32 Trevor Woerner
2020-05-06 12:02 ` [PATCH v4 8/8] drivers/reset/Kconfig: fix typo Trevor Woerner
7 siblings, 1 reply; 17+ messages in thread
From: Trevor Woerner @ 2020-05-06 12:02 UTC (permalink / raw)
To: u-boot
Have this symbol follow the pattern of all other such symbols.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
Changes in v4:
- Tweaked patch so it applies to master; some of the diff context lines have
changed.
Changes in v3: None
Changes in v2: None
Makefile | 4 ++--
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 7 +++----
arch/arm/cpu/arm720t/interrupts.c | 2 +-
arch/arm/cpu/armv7/Kconfig | 2 +-
arch/arm/dts/Makefile | 2 +-
arch/arm/mach-tegra/Kconfig | 2 +-
common/spl/Kconfig | 4 ++--
config.mk | 2 +-
configs/apalis-tk1_defconfig | 2 +-
configs/apalis_t30_defconfig | 2 +-
configs/beaver_defconfig | 2 +-
configs/cardhu_defconfig | 2 +-
configs/cei-tk1-som_defconfig | 2 +-
configs/colibri_t20_defconfig | 2 +-
configs/colibri_t30_defconfig | 2 +-
configs/dalmore_defconfig | 2 +-
configs/e2220-1170_defconfig | 2 +-
configs/harmony_defconfig | 2 +-
configs/jetson-tk1_defconfig | 2 +-
configs/medcom-wide_defconfig | 2 +-
configs/nyan-big_defconfig | 2 +-
configs/p2371-0000_defconfig | 2 +-
configs/p2371-2180_defconfig | 2 +-
configs/p2571_defconfig | 2 +-
configs/p2771-0000-000_defconfig | 2 +-
configs/p2771-0000-500_defconfig | 2 +-
configs/p3450-0000_defconfig | 2 +-
configs/paz00_defconfig | 2 +-
configs/plutux_defconfig | 2 +-
configs/seaboard_defconfig | 2 +-
configs/tec-ng_defconfig | 2 +-
configs/tec_defconfig | 2 +-
configs/trimslice_defconfig | 2 +-
configs/venice2_defconfig | 2 +-
configs/ventana_defconfig | 2 +-
disk/Kconfig | 4 ++--
drivers/i2c/Kconfig | 2 +-
drivers/mailbox/Kconfig | 2 +-
drivers/mmc/Kconfig | 2 +-
drivers/pci/Kconfig | 2 +-
drivers/usb/host/Kconfig | 2 +-
drivers/video/Kconfig | 2 +-
include/serial.h | 2 +-
44 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/Makefile b/Makefile
index cc99873062..a38fb4a5ff 100644
--- a/Makefile
+++ b/Makefile
@@ -936,7 +936,7 @@ ALL-y += u-boot-sunxi-with-spl.bin
endif
# enable combined SPL/u-boot/dtb rules for tegra
-ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy)
+ifeq ($(CONFIG_ARCH_TEGRA)$(CONFIG_SPL),yy)
ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin
ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb-tegra.bin
endif
@@ -1632,7 +1632,7 @@ endif
u-boot-x86-with-spl.bin: spl/u-boot-spl.bin u-boot.bin FORCE
$(call if_changed,binman)
-ifneq ($(CONFIG_TEGRA),)
+ifneq ($(CONFIG_ARCH_TEGRA),)
ifneq ($(CONFIG_BINMAN),)
# Makes u-boot-dtb-tegra.bin u-boot-tegra.bin u-boot-nodtb-tegra.bin
%-dtb-tegra.bin %-tegra.bin %-nodtb-tegra.bin: \
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 91185b9299..574d1e246f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1142,7 +1142,7 @@ config ARCH_ZYNQMP
imply MP
imply DM_USB_GADGET
-config TEGRA
+config ARCH_TEGRA
bool "NVIDIA Tegra"
imply DISTRO_DEFAULTS
imply FAT_WRITE
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 9b3ca9772c..e91b37fb34 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0+
-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_ARCH_TEGRA),yy)
CONFIG_CPU_V7A=
CONFIG_CPU_ARM720T=y
endif
@@ -22,7 +22,7 @@ arch-$(CONFIG_ARM64) =-march=armv8-a
# On Tegra systems we must build SPL for the armv4 core on the device
# but otherwise we can use the value in CONFIG_SYS_ARM_ARCH
-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_ARCH_TEGRA),yy)
arch-y += -D__LINUX_ARM_ARCH__=4
else
arch-y += -D__LINUX_ARM_ARCH__=$(CONFIG_SYS_ARM_ARCH)
@@ -76,8 +76,7 @@ machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
machine-$(CONFIG_STM32) += stm32
machine-$(CONFIG_ARCH_STM32MP) += stm32mp
machine-$(CONFIG_ARCH_SUNXI) += sunxi
-# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
-machine-$(CONFIG_TEGRA) += tegra
+machine-$(CONFIG_ARCH_TEGRA) += tegra
machine-$(CONFIG_ARCH_U8500) += u8500
machine-$(CONFIG_ARCH_UNIPHIER) += uniphier
machine-$(CONFIG_ARCH_VERSAL) += versal
diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index 8437717a7b..f0fc58dead 100644
--- a/arch/arm/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
@@ -11,7 +11,7 @@
#include <common.h>
-#if defined(CONFIG_TEGRA)
+#if defined(CONFIG_ARCH_TEGRA)
static ulong timestamp;
static ulong lastdec;
diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
index 73d57a2aae..14569e560b 100644
--- a/arch/arm/cpu/armv7/Kconfig
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -19,7 +19,7 @@ config ARMV7_NONSEC
config ARMV7_BOOT_SEC_DEFAULT
bool "Boot in secure mode by default" if EXPERT
depends on ARMV7_NONSEC
- default y if TEGRA
+ default y if ARCH_TEGRA
---help---
Say Y here to boot in secure mode by default even if non-secure mode
is supported. This option is useful to boot kernels which do not
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 9ce634e8b8..b22c979422 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -162,7 +162,7 @@ dtb-$(CONFIG_ARCH_MESON) += \
meson-g12b-a311d-khadas-vim3.dtb \
meson-sm1-khadas-vim3l.dtb \
meson-sm1-sei610.dtb
-dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
+dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
tegra20-medcom-wide.dtb \
tegra20-paz00.dtb \
tegra20-plutux.dtb \
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index ff9f29f2d5..00facf492e 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -1,4 +1,4 @@
-if TEGRA
+if ARCH_TEGRA
config SPL_GPIO_SUPPORT
default y
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 9feadb5e43..e78576e054 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -970,7 +970,7 @@ config SPL_POWER_DOMAIN
config SPL_RAM_SUPPORT
bool "Support booting from RAM"
- default y if MICROBLAZE || ARCH_SOCFPGA || TEGRA || ARCH_ZYNQ
+ default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
help
Enable booting of an image in RAM. The image can be preloaded or
it can be loaded by SPL directly into RAM (e.g. using USB).
@@ -978,7 +978,7 @@ config SPL_RAM_SUPPORT
config SPL_RAM_DEVICE
bool "Support booting from preloaded image in RAM"
depends on SPL_RAM_SUPPORT
- default y if MICROBLAZE || ARCH_SOCFPGA || TEGRA || ARCH_ZYNQ
+ default y if MICROBLAZE || ARCH_SOCFPGA || ARCH_TEGRA || ARCH_ZYNQ
help
Enable booting of an image already loaded in RAM. The image has to
be already in memory when SPL takes over, e.g. loaded by the boot
diff --git a/config.mk b/config.mk
index 097d1f67d2..7bb1fd4ed1 100644
--- a/config.mk
+++ b/config.mk
@@ -23,7 +23,7 @@ VENDOR :=
ARCH := $(CONFIG_SYS_ARCH:"%"=%)
CPU := $(CONFIG_SYS_CPU:"%"=%)
ifdef CONFIG_SPL_BUILD
-ifdef CONFIG_TEGRA
+ifdef CONFIG_ARCH_TEGRA
CPU := arm720t
endif
endif
diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 150941fd1a..604a473fa9 100644
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index b2e3ff6614..a5db39129e 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index d70467012c..89f4dc1144 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 6145861060..bf2f5f5208 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index c30b37e8c7..366a90dd42 100644
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index cf3e4e0beb..a1d6ab206a 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x00110000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x10000
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 4937433af0..d44ed05784 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index cad56f131b..483a7cfeb5 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index d9f110ce1e..da418de4cd 100644
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80080000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index 197add3945..ec8f4dad22 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x00110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x1FFE0000
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 116950ea7b..74f4456d89 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index bfca54d857..95c9dfa807 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x00110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x1FFE0000
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 2b1bcb8695..8abb1a432a 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x81000100
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index 3c183df470..d8d28ed6ea 100644
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80080000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 3aa6f578d7..ec4c5909ac 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80080000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index 37685eaebc..95188a142a 100644
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80080000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
index e3d42a20e7..befa46a4cd 100644
--- a/configs/p2771-0000-000_defconfig
+++ b/configs/p2771-0000-000_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80080000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig
index 51715d0b23..71cde4e41d 100644
--- a/configs/p2771-0000-500_defconfig
+++ b/configs/p2771-0000-500_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80080000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig
index c12d58a44d..2bf8f97ca2 100644
--- a/configs/p3450-0000_defconfig
+++ b/configs/p3450-0000_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80080000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 8536c64fc0..4330d141a3 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x00110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 3c716d6e27..6b70a240f5 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x00110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x1FFE0000
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 9c285b96aa..ba19ceb5ac 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x00110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 2fc0470b34..d31db78818 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index fd7b1b6267..34df740bc5 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x00110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x1FFE0000
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index fb9be305b6..230a3b836d 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x00110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFE000
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 94211e5091..58fb867e9e 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x80110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index bb94e23ad5..9ff4f1c8ac 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_TEGRA=y
+CONFIG_ARCH_TEGRA=y
CONFIG_SYS_TEXT_BASE=0x00110000
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFE000
diff --git a/disk/Kconfig b/disk/Kconfig
index 747275c2ba..cee16a80bc 100644
--- a/disk/Kconfig
+++ b/disk/Kconfig
@@ -53,7 +53,7 @@ config ISO_PARTITION
bool "Enable ISO partition table"
depends on PARTITIONS
default y if DISTRO_DEFAULTS
- default y if MIPS || TEGRA
+ default y if MIPS || ARCH_TEGRA
config SPL_ISO_PARTITION
bool "Enable ISO partition table for SPL"
@@ -75,7 +75,7 @@ config EFI_PARTITION
bool "Enable EFI GPT partition table"
depends on PARTITIONS
default y if DISTRO_DEFAULTS
- default y if TEGRA
+ default y if ARCH_TEGRA
select LIB_UUID
help
Say Y here if you would like to use device under U-Boot which
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index e42b6516bf..f8b18de8f3 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -402,7 +402,7 @@ config SYS_I2C_STM32F7
config SYS_I2C_TEGRA
bool "NVIDIA Tegra internal I2C controller"
- depends on TEGRA
+ depends on ARCH_TEGRA
help
Support for NVIDIA I2C controller available in Tegra SoCs.
diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
index 85c2a829ae..dd4b0ac0c3 100644
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -19,7 +19,7 @@ config SANDBOX_MBOX
config TEGRA_HSP
bool "Enable Tegra HSP controller support"
- depends on DM_MAILBOX && TEGRA
+ depends on DM_MAILBOX && ARCH_TEGRA
help
This enables support for the NVIDIA Tegra HSP Hw module, which
implements doorbells, mailboxes, semaphores, and shared interrupts.
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 8f0df568b9..3c4f057373 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -616,7 +616,7 @@ config MMC_SDHCI_TANGIER
config MMC_SDHCI_TEGRA
bool "SDHCI platform support for the Tegra SD/MMC Controller"
- depends on TEGRA
+ depends on ARCH_TEGRA
select BOUNCE_BUFFER
default y
help
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 437cd9a055..6fc26884e2 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -111,7 +111,7 @@ config PCI_SANDBOX
config PCI_TEGRA
bool "Tegra PCI support"
- depends on TEGRA
+ depends on ARCH_TEGRA
depends on (TEGRA186 && POWER_DOMAIN) || (!TEGRA186)
help
Enable support for the PCIe controller found on some generations of
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index cbfb54c5a2..f0a9ed226c 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -203,7 +203,7 @@ config USB_EHCI_PCI
config USB_EHCI_TEGRA
bool "Support for NVIDIA Tegra on-chip EHCI USB controller"
- depends on TEGRA
+ depends on ARCH_TEGRA
---help---
Enable support for Tegra on-chip EHCI USB controller
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7c5012a67f..38123543a5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -128,7 +128,7 @@ config CONSOLE_TRUETYPE_SIZE
config SYS_WHITE_ON_BLACK
bool "Display console as white on a black background"
- default y if ARCH_AT91 || ARCH_EXYNOS || ARCH_ROCKCHIP || TEGRA || X86 || ARCH_SUNXI
+ default y if ARCH_AT91 || ARCH_EXYNOS || ARCH_ROCKCHIP || ARCH_TEGRA || X86 || ARCH_SUNXI
help
Normally the display is black on a white background, Enable this
option to invert this, i.e. white on a black background. This can be
diff --git a/include/serial.h b/include/serial.h
index 54b21a0470..c590637b1f 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -28,7 +28,7 @@ extern struct serial_device *default_serial_console(void);
#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
defined(CONFIG_MPC86xx) || \
- defined(CONFIG_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \
+ defined(CONFIG_ARCH_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \
defined(CONFIG_MICROBLAZE)
extern struct serial_device serial0_device;
extern struct serial_device serial1_device;
--
2.26.0.106.g9fadedd637
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 7/8] rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32
2020-05-06 12:02 [PATCH v4 0/8] A small set of arm cleanups Trevor Woerner
` (5 preceding siblings ...)
2020-05-06 12:02 ` [PATCH v4 6/8] rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA Trevor Woerner
@ 2020-05-06 12:02 ` Trevor Woerner
2020-05-15 20:53 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 8/8] drivers/reset/Kconfig: fix typo Trevor Woerner
7 siblings, 1 reply; 17+ messages in thread
From: Trevor Woerner @ 2020-05-06 12:02 UTC (permalink / raw)
To: u-boot
Have this symbol follow the pattern of all other such symbols.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 2 +-
arch/arm/mach-stm32/Kconfig | 2 +-
configs/stm32f429-discovery_defconfig | 2 +-
configs/stm32f429-evaluation_defconfig | 2 +-
configs/stm32f469-discovery_defconfig | 2 +-
configs/stm32f746-disco_defconfig | 2 +-
configs/stm32f769-disco_defconfig | 2 +-
configs/stm32h743-disco_defconfig | 2 +-
configs/stm32h743-eval_defconfig | 2 +-
drivers/gpio/Kconfig | 2 +-
drivers/misc/Kconfig | 2 +-
drivers/reset/Kconfig | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 574d1e246f..56972234b8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1596,7 +1596,7 @@ config ARCH_UNIPHIER
Support for UniPhier SoC family developed by Socionext Inc.
(formerly, System LSI Business Division of Panasonic Corporation)
-config STM32
+config ARCH_STM32
bool "Support STMicroelectronics STM32 MCU with cortex M"
select CPU_V7M
select DM
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e91b37fb34..94eb50bf72 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -73,7 +73,7 @@ machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon
machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
-machine-$(CONFIG_STM32) += stm32
+machine-$(CONFIG_ARCH_STM32) += stm32
machine-$(CONFIG_ARCH_STM32MP) += stm32mp
machine-$(CONFIG_ARCH_SUNXI) += sunxi
machine-$(CONFIG_ARCH_TEGRA) += tegra
diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
index cea5ee2ce5..b42b05669a 100644
--- a/arch/arm/mach-stm32/Kconfig
+++ b/arch/arm/mach-stm32/Kconfig
@@ -1,4 +1,4 @@
-if STM32
+if ARCH_STM32
config STM32F4
bool "stm32f4 family"
diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
index 52a577f97b..da43317ae5 100644
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
CONFIG_SYS_TEXT_BASE=0x08000000
CONFIG_SYS_MALLOC_F_LEN=0xF00
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/stm32f429-evaluation_defconfig b/configs/stm32f429-evaluation_defconfig
index 24f79b51bf..f67ce3e407 100644
--- a/configs/stm32f429-evaluation_defconfig
+++ b/configs/stm32f429-evaluation_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
CONFIG_SYS_TEXT_BASE=0x08000000
CONFIG_SYS_MALLOC_F_LEN=0xF00
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/stm32f469-discovery_defconfig b/configs/stm32f469-discovery_defconfig
index 0ab00514d5..082fb0cc19 100644
--- a/configs/stm32f469-discovery_defconfig
+++ b/configs/stm32f469-discovery_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
CONFIG_SYS_TEXT_BASE=0x08000000
CONFIG_SYS_MALLOC_F_LEN=0xF00
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig
index cdfa8bbbc4..be030bfb37 100644
--- a/configs/stm32f746-disco_defconfig
+++ b/configs/stm32f746-disco_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
CONFIG_SYS_TEXT_BASE=0x08008000
CONFIG_SYS_MALLOC_F_LEN=0xE00
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig
index c40730e14a..09fbcc968f 100644
--- a/configs/stm32f769-disco_defconfig
+++ b/configs/stm32f769-disco_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
CONFIG_SYS_TEXT_BASE=0x08008000
CONFIG_SYS_MALLOC_F_LEN=0xE00
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/stm32h743-disco_defconfig b/configs/stm32h743-disco_defconfig
index 6b7a1d6d68..21ea90a2c1 100644
--- a/configs/stm32h743-disco_defconfig
+++ b/configs/stm32h743-disco_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
CONFIG_SYS_TEXT_BASE=0x08000000
CONFIG_SYS_MALLOC_F_LEN=0xF00
CONFIG_ENV_SIZE=0x2000
diff --git a/configs/stm32h743-eval_defconfig b/configs/stm32h743-eval_defconfig
index 7564d97707..432fce0181 100644
--- a/configs/stm32h743-eval_defconfig
+++ b/configs/stm32h743-eval_defconfig
@@ -1,5 +1,5 @@
CONFIG_ARM=y
-CONFIG_STM32=y
+CONFIG_ARCH_STM32=y
CONFIG_SYS_TEXT_BASE=0x08000000
CONFIG_SYS_MALLOC_F_LEN=0xF00
CONFIG_ENV_SIZE=0x2000
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 2081520f42..d87f6cc105 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -318,7 +318,7 @@ config PIC32_GPIO
config STM32_GPIO
bool "ST STM32 GPIO driver"
- depends on DM_GPIO && (STM32 || ARCH_STM32MP)
+ depends on DM_GPIO && (ARCH_STM32 || ARCH_STM32MP)
default y
help
Device model driver support for STM32 GPIO controller. It should be
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 766402745d..81ed9eb209 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -310,7 +310,7 @@ config STM32MP_FUSE
config STM32_RCC
bool "Enable RCC driver for the STM32 SoC's family"
- depends on (STM32 || ARCH_STM32MP) && MISC
+ depends on (ARCH_STM32 || ARCH_STM32MP) && MISC
help
Enable the STM32 RCC driver. The RCC block (Reset and Clock Control
block) is responsible of the management of the clock and reset
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 75ccd65799..65101ab4e8 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -30,7 +30,7 @@ config STI_RESET
config STM32_RESET
bool "Enable the STM32 reset"
- depends on STM32 || ARCH_STM32MP
+ depends on ARCH_STM32 || ARCH_STM32MP
help
Support for reset controllers on STMicroelectronics STM32 family SoCs.
This resset driver is compatible with STM32 F4/F7 and H7 SoCs.
--
2.26.0.106.g9fadedd637
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 8/8] drivers/reset/Kconfig: fix typo
2020-05-06 12:02 [PATCH v4 0/8] A small set of arm cleanups Trevor Woerner
` (6 preceding siblings ...)
2020-05-06 12:02 ` [PATCH v4 7/8] rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32 Trevor Woerner
@ 2020-05-06 12:02 ` Trevor Woerner
2020-05-15 20:53 ` Tom Rini
7 siblings, 1 reply; 17+ messages in thread
From: Trevor Woerner @ 2020-05-06 12:02 UTC (permalink / raw)
To: u-boot
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/reset/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 65101ab4e8..88d3be1593 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -33,7 +33,7 @@ config STM32_RESET
depends on ARCH_STM32 || ARCH_STM32MP
help
Support for reset controllers on STMicroelectronics STM32 family SoCs.
- This resset driver is compatible with STM32 F4/F7 and H7 SoCs.
+ This reset driver is compatible with STM32 F4/F7 and H7 SoCs.
config TEGRA_CAR_RESET
bool "Enable Tegra CAR-based reset driver"
--
2.26.0.106.g9fadedd637
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v4 1/8] arm: lpc32xx: move SoC to mach-lpc32xx
2020-05-06 12:02 ` [PATCH v4 1/8] arm: lpc32xx: move SoC to mach-lpc32xx Trevor Woerner
@ 2020-05-15 20:52 ` Tom Rini
0 siblings, 0 replies; 17+ messages in thread
From: Tom Rini @ 2020-05-15 20:52 UTC (permalink / raw)
To: u-boot
On Wed, May 06, 2020 at 08:02:36AM -0400, Trevor Woerner wrote:
> Following the example of most other SoCs in arch/$(ARCH)/cpu/$(CPU)/$(SOC)
> move the lpc32xx code from arch/arm/cpu/arm926ejs/lpc32xx to
> arch/arm/mach-lpc32xx.
>
> Following the checklist from
> commit 01f14456306c ("ARM: prepare for moving SoC sources into mach-*"):
>
> [1] move files from arch/arm/cpu/arm926ejs/lpc32xx to arch/arm/mach-lpx32xx
> [2] add machine entry to arch/arm/Makefile
> [3] remove "obj-y += ..." from arch/arm/cpu/arm926ejs/Makefile
> [4] fix the Kconfig file path in arch/arm/Kconfig
> [5] (no MAINTAINERS update)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200515/87691d4c/attachment.sig>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 2/8] arch/arm/Makefile: sort machine names
2020-05-06 12:02 ` [PATCH v4 2/8] arch/arm/Makefile: sort machine names Trevor Woerner
@ 2020-05-15 20:52 ` Tom Rini
0 siblings, 0 replies; 17+ messages in thread
From: Tom Rini @ 2020-05-15 20:52 UTC (permalink / raw)
To: u-boot
On Wed, May 06, 2020 at 08:02:37AM -0400, Trevor Woerner wrote:
> The comment immediately above the block of machine directory names implored
> users to keep the macro names sorted, but, alas, this is no longer the case.
>
> Put the list of machine directory names back in alphanumerical order by
> CONFIG_* macro name, as the comment asks. Sort all the symbols as though they
> all followed the convention of having the string "ARCH_" in the middle of
> their definitions.
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200515/da5656ae/attachment.sig>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 3/8] rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
2020-05-06 12:02 ` [PATCH v4 3/8] rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X Trevor Woerner
@ 2020-05-15 20:52 ` Tom Rini
0 siblings, 0 replies; 17+ messages in thread
From: Tom Rini @ 2020-05-15 20:52 UTC (permalink / raw)
To: u-boot
On Wed, May 06, 2020 at 08:02:38AM -0400, Trevor Woerner wrote:
> Have this symbol follow the pattern of all other such symbols.
> This patch removes a TODO from the code.
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200515/4f68d02f/attachment.sig>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 4/8] arm: orion5x: finish moving SoC to mach-orion5x
2020-05-06 12:02 ` [PATCH v4 4/8] arm: orion5x: finish moving SoC to mach-orion5x Trevor Woerner
@ 2020-05-15 20:52 ` Tom Rini
0 siblings, 0 replies; 17+ messages in thread
From: Tom Rini @ 2020-05-15 20:52 UTC (permalink / raw)
To: u-boot
On Wed, May 06, 2020 at 08:02:39AM -0400, Trevor Woerner wrote:
> The SPL linker script had been left in arch/$(ARCH)/cpu/$(CPU)/$(SOC);
> therefore move it to the already-established arch/$(ARCH)/mach-$(SOC)
> location.
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200515/70168b25/attachment.sig>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 5/8] rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
2020-05-06 12:02 ` [PATCH v4 5/8] rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD Trevor Woerner
@ 2020-05-15 20:52 ` Tom Rini
0 siblings, 0 replies; 17+ messages in thread
From: Tom Rini @ 2020-05-15 20:52 UTC (permalink / raw)
To: u-boot
On Wed, May 06, 2020 at 08:02:40AM -0400, Trevor Woerner wrote:
> Have this symbol follow the pattern of all other such symbols.
> This patch also removes a TODO from the code.
>
> Reviewed-by: Chris Packham <judge.packham@gmail.com>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200515/b08e2d42/attachment.sig>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 6/8] rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
2020-05-06 12:02 ` [PATCH v4 6/8] rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA Trevor Woerner
@ 2020-05-15 20:53 ` Tom Rini
0 siblings, 0 replies; 17+ messages in thread
From: Tom Rini @ 2020-05-15 20:53 UTC (permalink / raw)
To: u-boot
On Wed, May 06, 2020 at 08:02:41AM -0400, Trevor Woerner wrote:
> Have this symbol follow the pattern of all other such symbols.
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200515/cb2df79c/attachment.sig>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 7/8] rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32
2020-05-06 12:02 ` [PATCH v4 7/8] rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32 Trevor Woerner
@ 2020-05-15 20:53 ` Tom Rini
0 siblings, 0 replies; 17+ messages in thread
From: Tom Rini @ 2020-05-15 20:53 UTC (permalink / raw)
To: u-boot
On Wed, May 06, 2020 at 08:02:42AM -0400, Trevor Woerner wrote:
> Have this symbol follow the pattern of all other such symbols.
>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200515/bd4100b4/attachment.sig>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4 8/8] drivers/reset/Kconfig: fix typo
2020-05-06 12:02 ` [PATCH v4 8/8] drivers/reset/Kconfig: fix typo Trevor Woerner
@ 2020-05-15 20:53 ` Tom Rini
0 siblings, 0 replies; 17+ messages in thread
From: Tom Rini @ 2020-05-15 20:53 UTC (permalink / raw)
To: u-boot
On Wed, May 06, 2020 at 08:02:43AM -0400, Trevor Woerner wrote:
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200515/22a93dfb/attachment.sig>
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2020-05-15 20:53 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-06 12:02 [PATCH v4 0/8] A small set of arm cleanups Trevor Woerner
2020-05-06 12:02 ` [PATCH v4 1/8] arm: lpc32xx: move SoC to mach-lpc32xx Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 2/8] arch/arm/Makefile: sort machine names Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 3/8] rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 4/8] arm: orion5x: finish moving SoC to mach-orion5x Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 5/8] rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD Trevor Woerner
2020-05-15 20:52 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 6/8] rename symbol: CONFIG_TEGRA -> CONFIG_ARCH_TEGRA Trevor Woerner
2020-05-15 20:53 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 7/8] rename symbol: CONFIG_STM32 -> CONFIG_ARCH_STM32 Trevor Woerner
2020-05-15 20:53 ` Tom Rini
2020-05-06 12:02 ` [PATCH v4 8/8] drivers/reset/Kconfig: fix typo Trevor Woerner
2020-05-15 20:53 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.