rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
Subsystems (9)
PATCH 5/5 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.
--- 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(-)
Kconfig +1 -1
@@ -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
arch/arm/Kconfig +1 -1
@@ -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
arch/arm/Makefile +1 -2
@@ -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
arch/arm/dts/Makefile +1 -1
@@ -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 \
arch/arm/mach-kirkwood/Kconfig +1 -1
@@ -1,4 +1,4 @@ -if KIRKWOOD +if ARCH_KIRKWOOD choice prompt "Marvell Kirkwood board select"
arch/arm/mach-mvebu/Makefile +3 -3
@@ -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
arch/arm/mach-mvebu/mbus.c +3 -3
@@ -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 )
board/keymile/Kconfig +6 -6
@@ -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.
configs/SBx81LIFKW_defconfig +1 -1
@@ -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
configs/SBx81LIFXCAT_defconfig +1 -1
@@ -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
configs/d2net_v2_defconfig +1 -1
@@ -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
configs/db-88f6281-bp-nand_defconfig +1 -1
@@ -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
configs/db-88f6281-bp-spi_defconfig +1 -1
@@ -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
configs/dns325_defconfig +1 -1
@@ -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
configs/dockstar_defconfig +1 -1
@@ -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
configs/dreamplug_defconfig +1 -1
@@ -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
configs/ds109_defconfig +1 -1
@@ -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
configs/goflexhome_defconfig +1 -1
@@ -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
configs/guruplug_defconfig +1 -1
@@ -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
configs/ib62x0_defconfig +1 -1
@@ -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
configs/iconnect_defconfig +1 -1
@@ -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
configs/inetspace_v2_defconfig +1 -1
@@ -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
configs/km_kirkwood_128m16_defconfig +1 -1
@@ -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
configs/km_kirkwood_defconfig +1 -1
@@ -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
configs/km_kirkwood_pci_defconfig +1 -1
@@ -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
configs/kmcoge5un_defconfig +1 -1
@@ -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
configs/kmnusa_defconfig +1 -1
@@ -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
configs/kmsuse2_defconfig +1 -1
@@ -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
configs/lschlv2_defconfig +1 -1
@@ -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
configs/lsxhl_defconfig +1 -1
@@ -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
configs/nas220_defconfig +1 -1
@@ -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
configs/net2big_v2_defconfig +1 -1
@@ -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
configs/netspace_lite_v2_defconfig +1 -1
@@ -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
configs/netspace_max_v2_defconfig +1 -1
@@ -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
configs/netspace_mini_v2_defconfig +1 -1
@@ -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
configs/netspace_v2_defconfig +1 -1
@@ -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
configs/nsa310s_defconfig +1 -1
@@ -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
configs/openrd_base_defconfig +1 -1
@@ -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
configs/openrd_client_defconfig +1 -1
@@ -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
configs/openrd_ultimate_defconfig +1 -1
@@ -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
configs/pogo_e02_defconfig +1 -1
@@ -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
configs/sheevaplug_defconfig +1 -1
@@ -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
drivers/ata/mvsata_ide.c +1 -1
@@ -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>
drivers/ata/sata_mv.c +1 -1
@@ -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
drivers/i2c/mvtwsi.c +2 -2
@@ -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);
drivers/net/Kconfig +1 -1
@@ -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
drivers/net/mvgbe.c +1 -1
@@ -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>
drivers/spi/kirkwood_spi.c +5 -5
@@ -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);
drivers/usb/host/Kconfig +1 -1
@@ -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.
drivers/usb/host/ehci-marvell.c +1 -1
@@ -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>
tools/Makefile +2 -2
@@ -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
Signature · 1 line
2.25.0.114.g5b0ca878e0
PATCH 5/5 rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
Quoted 5 lines · Trevor Woerner,
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 <[email protected]>
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:
---
Quoted 871 lines
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(-)Kconfig +1
-1@@ -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 helparch/arm/Kconfig +1
-1@@ -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_Farch/arm/Makefile +1
-2@@ -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) += mesonarch/arm/dts/Makefile +1
-1@@ -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 \arch/arm/mach-kirkwood/Kconfig +1
-1@@ -1,4 +1,4 @@ -if KIRKWOOD +if ARCH_KIRKWOOD choice prompt "Marvell Kirkwood board select"arch/arm/mach-mvebu/Makefile +3
-3@@ -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_ARM64arch/arm/mach-mvebu/mbus.c +1
-1@@ -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){
arch/arm/mach-mvebu/mbus.c +2
-2@@ -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)board/keymile/Kconfig +6
-6@@ -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 isconnected to.
configs/SBx81LIFKW_defconfig +1
-1@@ -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=0x2000configs/SBx81LIFXCAT_defconfig +1
-1@@ -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=0x2000configs/d2net_v2_defconfig +1
-1@@ -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=0x1000configs/db-88f6281-bp-nand_defconfig +1
-1@@ -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=0x1000configs/db-88f6281-bp-spi_defconfig +1
-1@@ -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=0x1000configs/dns325_defconfig +1
-1@@ -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=0x20000configs/dockstar_defconfig +1
-1@@ -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=0x20000configs/dreamplug_defconfig +1
-1@@ -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=0x1000configs/ds109_defconfig +1
-1@@ -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=0x10000configs/goflexhome_defconfig +1
-1@@ -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=0x20000configs/guruplug_defconfig +1
-1@@ -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=0x20000configs/ib62x0_defconfig +1
-1@@ -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=0x20000configs/iconnect_defconfig +1
-1@@ -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=0x20000configs/inetspace_v2_defconfig +1
-1@@ -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=0x1000configs/km_kirkwood_128m16_defconfig +1
-1@@ -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=0x2000configs/km_kirkwood_defconfig +1
-1@@ -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=0x2000configs/km_kirkwood_pci_defconfig +1
-1@@ -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=yconfigs/kmcoge5un_defconfig +1
-1@@ -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=3configs/kmnusa_defconfig +1
-1@@ -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=yconfigs/kmsuse2_defconfig +1
-1@@ -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=yconfigs/lschlv2_defconfig +1
-1@@ -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=0x10000configs/lsxhl_defconfig +1
-1@@ -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=0x10000configs/nas220_defconfig +1
-1@@ -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=0x10000configs/net2big_v2_defconfig +1
-1@@ -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=0x1000configs/netspace_lite_v2_defconfig +1
-1@@ -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=0x1000configs/netspace_max_v2_defconfig +1
-1@@ -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=0x1000configs/netspace_mini_v2_defconfig +1
-1@@ -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=0x1000configs/netspace_v2_defconfig +1
-1@@ -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=0x1000configs/nsa310s_defconfig +1
-1@@ -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=0x20000configs/openrd_base_defconfig +1
-1@@ -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=0x20000configs/openrd_client_defconfig +1
-1@@ -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=0x20000configs/openrd_ultimate_defconfig +1
-1@@ -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=0x20000configs/pogo_e02_defconfig +1
-1@@ -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=0x20000configs/sheevaplug_defconfig +1
-1@@ -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=0x20000drivers/ata/mvsata_ide.c +1
-1@@ -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> drivers/ata/sata_mv.c +1
-1@@ -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_BASEdrivers/i2c/mvtwsi.c +2
-2@@ -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);drivers/net/Kconfig +1
-1@@ -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 thedrivers/net/mvgbe.c +1
-1@@ -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> drivers/spi/kirkwood_spi.c +3
-3@@ -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 */drivers/spi/kirkwood_spi.c +1
-1@@ -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
drivers/spi/kirkwood_spi.c +1
-1@@ -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_KIRKWOODkirkwood_mpp_conf (cs_spi_mpp_back ,NULL );#endif free(slave);drivers/usb/host/Kconfig +1
-1@@ -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.drivers/usb/host/ehci-marvell.c +1
-1@@ -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> tools/Makefile +2
-3@@ -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
PATCH 5/5 rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
Hi Chris,
Thank you for your "reviewed-by" :-)
Quoted 10 lines · Chris Packham
Quoted 5 lines · Trevor Woerner,
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 <[email protected]>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.
Sorry, I couldn't decide whether or not to include a cover letter since the changes included in the set meander around doing various cleanups that are only loosely related. The strongest thing they have in common is that their order relies on each other. In the end I didn't include one.
I'll include a cover letter next time; I like reading them on other sets of patches.
Best regards,
Trevor