rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD

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>

diff --git a/Kconfig b/Kconfig
index 15f1a75c61abbf0d7bad430250271532fff18dba..0e7ccc0b074cb0300d1e12018b2606d208e0851d 100644 (file)
--- 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 586464620c79c53d3e729830296ee2b7bc7d5442..8bdcf3409dc348c8c28af2dde7512e69ba6db721 100644 (file)
--- 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 2b44ffb4936baf79a61e1ea974e4abe234cd93d8..9b3ca9772c2398e52dac70466a391f4487f082f6 100644 (file)
--- 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 1325134bd418bf3c3245e0d4a98f2c7d35c973d9..66fcfc56467a01de2fe6796ce16eb270e10fe12d 100644 (file)
--- 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 2f68092f825c34d62c1786119cdca68a81a56962..ae44cb665e0b33723ac7433d233324b161565dc8 100644 (file)
--- 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 b73952044de7ab07f89d6554be59ad88925be1c3..7e9c206ed6b87dafb2288beb12bdf601915a60ee 100644 (file)
--- 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 a95db5e5c3c7e3f8ad917cf77dd7fbae2b34e80c..39bd200c830ce8188837894712fc8ae117038b55 100644 (file)
--- 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 7f4cad86aa79795a1d275b97927a6e2d27359ba9..e20c01743636e44dd3355afae00c1d4ec4b50acb 100644 (file)
--- 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 4b3c7295987ff37c6138fe52f6424c16211b463c..b21db3c9df60413b2d61c18c0dedd3b4a93fdf6a 100644 (file)
--- 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 fdbde4930f9e181f733f7ef9909434ba373c3d3f..420d75ea30f90817aec99663735ffb81a35257a0 100644 (file)
--- 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 41ed344e73eb935609fd00d8d86c8c9130916346..fe3c6c47620dd929acc429efe3a6917ffbf4b572 100644 (file)
--- 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 e3904237800331772a035fe7eb1b6a83b82d7b6d..f98e462d42dcf4be185b309517326d4a5b5babe2 100644 (file)
--- 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 1bef1c5bb3663ba3cf29143b5a0dff8f36da967d..52af8f41cee9f49dae1661967bf8a9603d05185d 100644 (file)
--- 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 8457806282275e7389d09a6b3a9c8100081210bb..e44ec51ce989794d3637f7a52fce75a4cbba6287 100644 (file)
--- 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 079b6652f1322f97006d893d7d005d4cc8d1c050..fcc597d249507f71b00263411bd30b58cb04be14 100644 (file)
--- 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 566aa0dbf4f7f19a83cd1e37fec55be2e2fce943..26bb8b7e19433e5e74c539de28c2ac9c553f531d 100644 (file)
--- 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 3f7a6614324b2705a983117b8836e99e36843bb2..89ed5eb13ccd87789492820eebb3de4fa13d8363 100644 (file)
--- 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 97b1615c8a951744851043a270e95dfddf6314da..9384244ebb2bedc88f76038a4ce5748e1cfc84be 100644 (file)
--- 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 2bdd78041dc69af3cf53bb120b916f5068278c60..8d862696ca666f3c478156de1fbc5330fdf65b9b 100644 (file)
--- 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 9da976f399e9bd0a751c5eeafb1ab5e0062853c1..fea69d32e9ff042250b89566aedbe559e57ce9ab 100644 (file)
--- 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 8121867008e6ba3e94ed9e5c2896fd3ee1315649..4281aa93bc4b6ae4fdbac10488c19ff0ba4d9df6 100644 (file)
--- 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 94c708e602d7575e5a3d9bbd4a0d70d6d11e285a..6144eb5fad4592c6ca56bc3bfe4bbc7ed2f543ae 100644 (file)
--- 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 d185100f66515bfb1fba1e40fc47f6afd3f75c88..9bbbfd9442eb4db29d39354da361633e150ae828 100644 (file)
--- 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 a8374d9fc238b0c29077d6082ab46bd8a8efb093..887893ef33e5cb2d2ea18cdd6ca1ad5397e9ed65 100644 (file)
--- 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 7ad69e1639e1c0452a273a76975aad6e5d141b38..81c9f697bbbf112c405bfeedb2bd3400cc254eb1 100644 (file)
--- 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 b70bab618eae23e778cebb6d2587c2875c7fb234..169d8952036231c9ac5ac28ad9c1a4a32c49200f 100644 (file)
--- 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 a4b301db7dba6188c6fbc2557b73acf7f8c43371..8d90cdab0f2252ff76d3e41d6f97333a75205668 100644 (file)
--- 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 119607ac91af3718f9bb908d159398c1055b26e7..82006010ed0db41d640e94b16fb791014464568e 100644 (file)
--- 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 2ce23464b92d95e29468dcf2f9f5fc9794d56cda..e2e0e8af71b68f61a45f3ef93ac4def5ffe8e4e5 100644 (file)
--- 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 336fb34d5badb04e4f5c7b13d2c8fba4796d2baf..4de845da2c9fd88fcf714f50fb41aa3f24c46a0b 100644 (file)
--- 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 eb7effe98f76a3a3969f0926d8e3408ad16844c8..918fd26b05113c951b7758b281affd4e2b1416f3 100644 (file)
--- 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 b7565e5214344d3bbb8f40402aeefce738a326e7..1389d309009676007eb4be8a800336f996a12bc6 100644 (file)
--- 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 3f95f38dabf1d9630b6886c689f02266a175626a..c744d2c58efc524fc65cfef1002f1e04e6164348 100644 (file)
--- 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 1d710395aed70d4d85da052f9225e74571ffe54c..8602729fcb4ebf7510fb03a42695629e45500978 100644 (file)
--- 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 abf8011e4f243deefdff4d0d74a4590101ed9282..ba9301de4d53e0108ddcd0c32e047f2c3bd761b7 100644 (file)
--- 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 052049af1c05bd6310deb1dd9957a061de1f4722..6ba1ef423e1988fe33377d1761ebf8d991e658d2 100644 (file)
--- 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 6a1073c30b2852826648e3dbd2641f37dc43cec3..7a864bddf314810b00ede9cac99ae807f0cdb986 100644 (file)
--- 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 f575bf24e7975d534a6c848ec1ed98666bb7dee7..2551f284afe1f5f0cc01aca865f81dad00ec6ebe 100644 (file)
--- 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 42f37869184fb5aa38c12f85f1669f8ad0b61ff6..c0bf3be373e59772085cd05e3b50e1f648007032 100644 (file)
--- 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 47189da080db3a1d1bf90f3229684d50786ecb5b..ab97d66e89668724e4ae19f766bac1ae69ec383c 100644 (file)
--- 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 8957a87639d082324d902f5399ac0e315cc54d65..e254ac0393a02c3042be0306c83cfeb98c1ccfac 100644 (file)
--- 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 723ef7bb46fdf58e5978522ed1ea8047ec91e55d..d350429cada5db2f8f5444dee07f5150dc60c0d9 100644 (file)
--- 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 9ac16555d6cde1169cbabb4829236f0af88ba66f..6bbb345f6effba1e7e88170c4bf8074b9bab976a 100644 (file)
--- 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 6019ac089e862f94a23bd9c60e5aa46d2010d05f..9ced9c0fa8767b7d81e85b0ec15aa9ab4966e3fd 100644 (file)
--- 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 77fe35a42bd762468f0ee47473f4fea4c5e58ee3..d4b2031249f4a6418b83a479a4fb21a48a8bc630 100644 (file)
--- 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 4d6716fdb80b850ee731e6c87a1b01688017fa9a..f7855c92d38cbc490f67f50fa490a79ad6c4556e 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -309,7 +309,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 b0b8d349a8d61b6a053fd3519256c4738efdedd0..6d56360a202e09c2fa6ec9f50b337a97fe4eeaa9 100644 (file)
--- 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 c725625146d2602a37e3b7cbdc0e247ecd643202..38fe4143f5abfefbef34a3bec1e0e11261e33a1f 100644 (file)
--- 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 cc9646d40aa5b9116debfddebf35e4fd5dced0c6..cbfb54c5a223d29d66e27c9de0b15cdf79af2e0f 100644 (file)
--- 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 3b10cdfc58ba2645db89a27061ea203ab95c8de8..5a9bd549e37feca9add2b537f6ea9c2feab9507a 100644 (file)
--- 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 1f9144f0288004f0f82ddb3f5508a9b98996bea4..879c3fd4a7485e1797b1f0d87bb0bdf6c9f45f0a 100644 (file)
--- 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