[PATCH 5/5] rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
Chris Packham
judge.packham at gmail.com
Mon Apr 6 09:54:53 CEST 2020
On Mon, 6 Apr 2020, 6:01 PM Trevor Woerner, <twoerner at gmail.com> wrote:
> Have this symbol follow the pattern of all other such symbols.
> This patch also removes a TODO from the code.
>
> Signed-off-by: Trevor Woerner <twoerner at gmail.com>
>
Not sure if there was a cover letter accompanying this series that I missed
but I can't really speak with any authority on the first two patches anyway.
I had a look at the last 3 and they look good to me. This one actually
touches boards I maintain so:
Reviewed-by: Chris Packham <judge.packham at gmail.com>
---
> 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 f698e0a94f..4a61b3d2fe 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -258,7 +258,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 d56f375c8b..c7717c2f12 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -524,7 +524,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 820ee9733a..9376770d09 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 379a4c26c2..63d1559ce9 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 d5b73b9f72..b13657fa2d 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 eea3e0abe3..8cd8b90992 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 e7a8b406dd..54493be208 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 ec63ffb4b7..6690971ec5 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 ebc3eb4872..9d038139df 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 0d7b895cc7..d22112f7e7 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 5bae7a8819..ad0a4a3250 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 1775273807..cce53d2837 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 3cef72cc86..3f01a58b28 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 e81a8b02fc..b77a60b239 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 716aca30b1..396fa0a2bc 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 2e760e5176..9831c56480 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 d334db0ae0..e4fe7b284d 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 cb00d483ce..d609a506b2 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 0317cb9555..3073a6a226 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 a87aaddb87..ae3973ff2d 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 e4e08a2e85..6e5dbfb203 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 3fd3e72219..2c8dd93dbe 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 5574e9f989..610ff601bf 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -121,7 +121,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 99be724b82..49a22e0e64 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
> @@ -204,7 +204,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.25.0.114.g5b0ca878e0
>
>
More information about the U-Boot
mailing list