Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 06:24:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename symbol: CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD

Browse source 
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>
This commit is contained in:
Trevor Woerner 2020-05-06 08:02:40 -04:00 • committed by Tom Rini
parent b48f72a86b
commit bb0fb4c0f4
51 changed files with 66 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Kconfig
View file

@ -268,7 +268,7 @@ config BUILD_TARGET
default "u-boot-elf.srec" if RCAR_GEN3 default "u-boot-elf.srec" if RCAR_GEN3
default "u-boot.itb" if SPL_LOAD_FIT && (ARCH_ROCKCHIP || \ default "u-boot.itb" if SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
ARCH_SUNXI || RISCV || ARCH_ZYNQMP) 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.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
default "u-boot-with-spl.imx" if ARCH_MX6 && SPL default "u-boot-with-spl.imx" if ARCH_MX6 && SPL
help help

2
arch/arm/Kconfig
View file

@ -553,7 +553,7 @@ config ARCH_DAVINCI
help help
Support for TI's DaVinci platform. Support for TI's DaVinci platform.
config KIRKWOOD config ARCH_KIRKWOOD
bool "Marvell Kirkwood" bool "Marvell Kirkwood"
select ARCH_MISC_INIT select ARCH_MISC_INIT
select BOARD_EARLY_INIT_F select BOARD_EARLY_INIT_F

3
arch/arm/Makefile
View file

@ -60,8 +60,7 @@ machine-$(CONFIG_ARCH_EXYNOS) += exynos
machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_HIGHBANK) += highbank
machine-$(CONFIG_ARCH_K3) += k3 machine-$(CONFIG_ARCH_K3) += k3
machine-$(CONFIG_ARCH_KEYSTONE) += keystone machine-$(CONFIG_ARCH_KEYSTONE) += keystone
# TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD machine-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
machine-$(CONFIG_KIRKWOOD) += kirkwood
machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx
machine-$(CONFIG_ARCH_MEDIATEK) += mediatek machine-$(CONFIG_ARCH_MEDIATEK) += mediatek
machine-$(CONFIG_ARCH_MESON) += meson machine-$(CONFIG_ARCH_MESON) += meson

2
arch/arm/dts/Makefile
View file

@ -34,7 +34,7 @@ dtb-$(CONFIG_ARCH_DAVINCI) += \
da850-lcdk.dtb \ da850-lcdk.dtb \
da850-lego-ev3.dtb da850-lego-ev3.dtb
dtb-$(CONFIG_KIRKWOOD) += \ dtb-$(CONFIG_ARCH_KIRKWOOD) += \
kirkwood-atl-sbx81lifkw.dtb \ kirkwood-atl-sbx81lifkw.dtb \
kirkwood-atl-sbx81lifxcat.dtb \ kirkwood-atl-sbx81lifxcat.dtb \
kirkwood-blackarmor-nas220.dtb \ kirkwood-blackarmor-nas220.dtb \

2
arch/arm/mach-kirkwood/Kconfig
View file

@ -1,4 +1,4 @@
if KIRKWOOD if ARCH_KIRKWOOD
choice choice
prompt "Marvell Kirkwood board select" prompt "Marvell Kirkwood board select"

6
arch/arm/mach-mvebu/Makefile
View file

@ -10,14 +10,14 @@ obj-y += arm64-common.o
else # CONFIG_ARM64 else # CONFIG_ARM64
ifdef CONFIG_KIRKWOOD ifdef CONFIG_ARCH_KIRKWOOD
obj-y = dram.o obj-y = dram.o
obj-y += gpio.o obj-y += gpio.o
obj-y += mbus.o obj-y += mbus.o
obj-y += timer.o obj-y += timer.o
else # CONFIG_KIRKWOOD else # CONFIG_ARCH_KIRKWOOD
obj-y = cpu.o obj-y = cpu.o
obj-y += dram.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_38X) += serdes/a38x/
obj-$(CONFIG_ARMADA_XP) += serdes/axp/ obj-$(CONFIG_ARMADA_XP) += serdes/axp/
endif # CONFIG_KIRKWOOD endif # CONFIG_ARCH_KIRKWOOD
endif # CONFIG_ARM64 endif # CONFIG_ARM64

6
arch/arm/mach-mvebu/mbus.c
View file

@ -411,7 +411,7 @@ int mvebu_mbus_del_window(phys_addr_t base, size_t size)
return 0; return 0;
} }
#ifndef CONFIG_KIRKWOOD #ifndef CONFIG_ARCH_KIRKWOOD
static void mvebu_mbus_get_lowest_base(struct mvebu_mbus_state *mbus, static void mvebu_mbus_get_lowest_base(struct mvebu_mbus_state *mbus,
phys_addr_t *base) phys_addr_t *base)
{ {
@ -479,7 +479,7 @@ int mbus_dt_setup_win(struct mvebu_mbus_state *mbus,
return -ENOMEM; return -ENOMEM;
} }
#ifndef CONFIG_KIRKWOOD #ifndef CONFIG_ARCH_KIRKWOOD
/* /*
* Re-configure the mbus bridge registers each time this function * Re-configure the mbus bridge registers each time this function
* is called. Since it may get called from the board code in * 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 ret;
int i; int i;
#if defined(CONFIG_KIRKWOOD) #if defined(CONFIG_ARCH_KIRKWOOD)
mbus_state.soc = &kirkwood_mbus_data; mbus_state.soc = &kirkwood_mbus_data;
#endif #endif
#if defined(CONFIG_ARCH_MVEBU) #if defined(CONFIG_ARCH_MVEBU)

12
board/keymile/Kconfig
View file

@ -28,7 +28,7 @@ config KM_PHRAM
config KM_RESERVED_PRAM config KM_RESERVED_PRAM
hex "Reserved RAM" hex "Reserved RAM"
default 0x801000 if KIRKWOOD default 0x801000 if ARCH_KIRKWOOD
default 0x0 if MPC83xx default 0x0 if MPC83xx
default 0x1000 if MPC85xx default 0x1000 if MPC85xx
depends on !ARCH_SOCFPGA depends on !ARCH_SOCFPGA
@ -37,7 +37,7 @@ config KM_RESERVED_PRAM
config KM_CRAMFS_ADDR config KM_CRAMFS_ADDR
hex "CRAMFS Address" hex "CRAMFS Address"
default 0x2400000 if KIRKWOOD default 0x2400000 if ARCH_KIRKWOOD
default 0xC00000 if MPC83xx default 0xC00000 if MPC83xx
default 0x2000000 if MPC85xx default 0x2000000 if MPC85xx
depends on !ARCH_SOCFPGA depends on !ARCH_SOCFPGA
@ -46,7 +46,7 @@ config KM_CRAMFS_ADDR
config KM_KERNEL_ADDR config KM_KERNEL_ADDR
hex "Kernel Load Address" hex "Kernel Load Address"
default 0x2000000 if KIRKWOOD default 0x2000000 if ARCH_KIRKWOOD
default 0x400000 if MPC83xx default 0x400000 if MPC83xx
default 0x1000000 if MPC85xx || ARCH_SOCFPGA default 0x1000000 if MPC85xx || ARCH_SOCFPGA
help help
@ -54,7 +54,7 @@ config KM_KERNEL_ADDR
config KM_FDT_ADDR config KM_FDT_ADDR
hex "FDT Load Address" hex "FDT Load Address"
default 0x23E0000 if KIRKWOOD || ARCH_SOCFPGA default 0x23E0000 if ARCH_KIRKWOOD || ARCH_SOCFPGA
default 0xB80000 if MPC83xx default 0xB80000 if MPC83xx
default 0x1F80000 if MPC85xx default 0x1F80000 if MPC85xx
help help
@ -74,7 +74,7 @@ config KM_DEF_NETDEV
config KM_COMMON_ETH_INIT config KM_COMMON_ETH_INIT
bool "Common Ethernet Initialization" bool "Common Ethernet Initialization"
default y if KIRKWOOD || MPC83xx default y if ARCH_KIRKWOOD || MPC83xx
default n if MPC85xx || ARCH_SOCFPGA default n if MPC85xx || ARCH_SOCFPGA
help help
Use the Ethernet initialization implemented in common code, which Use the Ethernet initialization implemented in common code, which
@ -96,7 +96,7 @@ config KM_MVEXTSW_ADDR
config KM_IVM_BUS config KM_IVM_BUS
int "IVM I2C Bus" int "IVM I2C Bus"
default 0 if ARCH_SOCFPGA default 0 if ARCH_SOCFPGA
default 1 if KIRKWOOD || MPC85xx default 1 if ARCH_KIRKWOOD || MPC85xx
default 2 if MPC83xx default 2 if MPC83xx
help help
Identifier number of I2C bus, where the inventory EEPROM is connected to. Identifier number of I2C bus, where the inventory EEPROM is connected to.

2
configs/SBx81LIFKW_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x00600000 CONFIG_SYS_TEXT_BASE=0x00600000
CONFIG_TARGET_SBx81LIFKW=y CONFIG_TARGET_SBx81LIFKW=y
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

2
configs/SBx81LIFXCAT_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x00600000 CONFIG_SYS_TEXT_BASE=0x00600000
CONFIG_TARGET_SBx81LIFXCAT=y CONFIG_TARGET_SBx81LIFXCAT=y
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

2
configs/d2net_v2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NET2BIG_V2=y CONFIG_TARGET_NET2BIG_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/db-88f6281-bp-nand_defconfig
View file

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y CONFIG_SYS_THUMB_BUILD=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DB_88F6281_BP=y CONFIG_TARGET_DB_88F6281_BP=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/db-88f6281-bp-spi_defconfig
View file

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y CONFIG_SYS_THUMB_BUILD=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DB_88F6281_BP=y CONFIG_TARGET_DB_88F6281_BP=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/dns325_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DNS325=y CONFIG_TARGET_DNS325=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/dockstar_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DOCKSTAR=y CONFIG_TARGET_DOCKSTAR=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/dreamplug_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DREAMPLUG=y CONFIG_TARGET_DREAMPLUG=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/ds109_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DS109=y CONFIG_TARGET_DS109=y
CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SIZE=0x10000

2
configs/goflexhome_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_GOFLEXHOME=y CONFIG_TARGET_GOFLEXHOME=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/guruplug_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_GURUPLUG=y CONFIG_TARGET_GURUPLUG=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/ib62x0_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_IB62X0=y CONFIG_TARGET_IB62X0=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/iconnect_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_ICONNECT=y CONFIG_TARGET_ICONNECT=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/inetspace_v2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/km_kirkwood_128m16_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

2
configs/km_kirkwood_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

2
configs/km_kirkwood_pci_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_KM_FPGA_CONFIG=y CONFIG_KM_FPGA_CONFIG=y

2
configs/kmcoge5un_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3

2
configs/kmnusa_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_KM_FPGA_CONFIG=y CONFIG_KM_FPGA_CONFIG=y

2
configs/kmsuse2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_KM_FPGA_CONFIG=y CONFIG_KM_FPGA_CONFIG=y

2
configs/lschlv2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_LSXL=y CONFIG_TARGET_LSXL=y
CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SIZE=0x10000

2
configs/lsxhl_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_LSXL=y CONFIG_TARGET_LSXL=y
CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SIZE=0x10000

2
configs/nas220_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NAS220=y CONFIG_TARGET_NAS220=y
CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SIZE=0x10000

2
configs/net2big_v2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NET2BIG_V2=y CONFIG_TARGET_NET2BIG_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/netspace_lite_v2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/netspace_max_v2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/netspace_mini_v2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/netspace_v2_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NETSPACE_V2=y CONFIG_TARGET_NETSPACE_V2=y
CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SIZE=0x1000

2
configs/nsa310s_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NSA310S=y CONFIG_TARGET_NSA310S=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/openrd_base_defconfig
View file

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y CONFIG_SYS_THUMB_BUILD=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_OPENRD=y CONFIG_TARGET_OPENRD=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/openrd_client_defconfig
View file

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y CONFIG_SYS_THUMB_BUILD=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_OPENRD=y CONFIG_TARGET_OPENRD=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/openrd_ultimate_defconfig
View file

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y CONFIG_SYS_THUMB_BUILD=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_OPENRD=y CONFIG_TARGET_OPENRD=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/pogo_e02_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_POGO_E02=y CONFIG_TARGET_POGO_E02=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
configs/sheevaplug_defconfig
View file

@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_SYS_DCACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y
CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_CPU_INIT=y
CONFIG_SYS_THUMB_BUILD=y CONFIG_SYS_THUMB_BUILD=y
CONFIG_KIRKWOOD=y CONFIG_ARCH_KIRKWOOD=y
CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_SHEEVAPLUG=y CONFIG_TARGET_SHEEVAPLUG=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

2
drivers/ata/mvsata_ide.c
View file

@ -10,7 +10,7 @@
#if defined(CONFIG_ARCH_ORION5X) #if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h> #include <asm/arch/orion5x.h>
#elif defined(CONFIG_KIRKWOOD) #elif defined(CONFIG_ARCH_KIRKWOOD)
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#elif defined(CONFIG_ARCH_MVEBU) #elif defined(CONFIG_ARCH_MVEBU)
#include <linux/mbus.h> #include <linux/mbus.h>

2
drivers/ata/sata_mv.c
View file

@ -46,7 +46,7 @@
#include <linux/mbus.h> #include <linux/mbus.h>
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#if defined(CONFIG_KIRKWOOD) #if defined(CONFIG_ARCH_KIRKWOOD)
#define SATAHC_BASE KW_SATA_BASE #define SATAHC_BASE KW_SATA_BASE
#else #else
#define SATAHC_BASE MVEBU_AXP_SATA_BASE #define SATAHC_BASE MVEBU_AXP_SATA_BASE

4
drivers/i2c/mvtwsi.c
View file

@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_DM_I2C #ifndef CONFIG_DM_I2C
#if defined(CONFIG_ARCH_ORION5X) #if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h> #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> #include <asm/arch/soc.h>
#elif defined(CONFIG_ARCH_SUNXI) #elif defined(CONFIG_ARCH_SUNXI)
#include <asm/arch/i2c.h> #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); struct mvtwsi_registers *twsi = devfdt_get_addr_ptr(bus);
/* Disable the hidden slave in i2c0 of these platforms */ /* 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) && bus->req_seq == 0)
twsi_disable_i2c_slave(twsi); twsi_disable_i2c_slave(twsi);

2
drivers/net/Kconfig
View file

@ -309,7 +309,7 @@ config FSLDMAFEC
config MVGBE config MVGBE
bool "Marvell Orion5x/Kirkwood network interface support" bool "Marvell Orion5x/Kirkwood network interface support"
depends on KIRKWOOD || ARCH_ORION5X depends on ARCH_KIRKWOOD || ARCH_ORION5X
select PHYLIB if DM_ETH select PHYLIB if DM_ETH
help help
This driver supports the network interface units in the This driver supports the network interface units in the

2
drivers/net/mvgbe.c
View file

@ -24,7 +24,7 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#if defined(CONFIG_KIRKWOOD) #if defined(CONFIG_ARCH_KIRKWOOD)
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#elif defined(CONFIG_ARCH_ORION5X) #elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h> #include <asm/arch/orion5x.h>

10
drivers/spi/kirkwood_spi.c
View file

@ -13,7 +13,7 @@
#include <spi.h> #include <spi.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#ifdef CONFIG_KIRKWOOD #ifdef CONFIG_ARCH_KIRKWOOD
#include <asm/arch/mpp.h> #include <asm/arch/mpp.h>
#endif #endif
#include <asm/arch-mvebu/spi.h> #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 = static struct kwspi_registers *spireg =
(struct kwspi_registers *)MVEBU_SPI_BASE; (struct kwspi_registers *)MVEBU_SPI_BASE;
#ifdef CONFIG_KIRKWOOD #ifdef CONFIG_ARCH_KIRKWOOD
static u32 cs_spi_mpp_back[2]; static u32 cs_spi_mpp_back[2];
#endif #endif
@ -107,7 +107,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
{ {
struct spi_slave *slave; struct spi_slave *slave;
u32 data; u32 data;
#ifdef CONFIG_KIRKWOOD #ifdef CONFIG_ARCH_KIRKWOOD
static const u32 kwspi_mpp_config[2][2] = { static const u32 kwspi_mpp_config[2][2] = {
{ MPP0_SPI_SCn, 0 }, /* if cs == 0 */ { MPP0_SPI_SCn, 0 }, /* if cs == 0 */
{ MPP7_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_SMEMRDIRQ, &spireg->irq_cause);
writel(KWSPI_IRQMASK, &spireg->irq_mask); writel(KWSPI_IRQMASK, &spireg->irq_mask);
#ifdef CONFIG_KIRKWOOD #ifdef CONFIG_ARCH_KIRKWOOD
/* program mpp registers to select SPI_CSn */ /* program mpp registers to select SPI_CSn */
kirkwood_mpp_conf(kwspi_mpp_config[cs ? 1 : 0], cs_spi_mpp_back); kirkwood_mpp_conf(kwspi_mpp_config[cs ? 1 : 0], cs_spi_mpp_back);
#endif #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) void spi_free_slave(struct spi_slave *slave)
{ {
#ifdef CONFIG_KIRKWOOD #ifdef CONFIG_ARCH_KIRKWOOD
kirkwood_mpp_conf(cs_spi_mpp_back, NULL); kirkwood_mpp_conf(cs_spi_mpp_back, NULL);
#endif #endif
free(slave); free(slave);

2
drivers/usb/host/Kconfig
View file

@ -135,7 +135,7 @@ config USB_EHCI_ATMEL
config USB_EHCI_MARVELL config USB_EHCI_MARVELL
bool "Support for Marvell on-chip EHCI USB controller" 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 default y
---help--- ---help---
Enables support for the on-chip EHCI controller on MVEBU SoCs. Enables support for the on-chip EHCI controller on MVEBU SoCs.

2
drivers/usb/host/ehci-marvell.c
View file

@ -13,7 +13,7 @@
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#include <dm.h> #include <dm.h>
#if defined(CONFIG_KIRKWOOD) #if defined(CONFIG_ARCH_KIRKWOOD)
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#elif defined(CONFIG_ARCH_ORION5X) #elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h> #include <asm/arch/orion5x.h>

4
tools/Makefile
View file

@ -5,7 +5,7 @@
# Enable all the config-independent tools # Enable all the config-independent tools
ifneq ($(HOST_TOOLS_ALL),) ifneq ($(HOST_TOOLS_ALL),)
CONFIG_KIRKWOOD = y CONFIG_ARCH_KIRKWOOD = y
CONFIG_LCD_LOGO = y CONFIG_LCD_LOGO = y
CONFIG_CMD_LOADS = y CONFIG_CMD_LOADS = y
CONFIG_CMD_NET = y CONFIG_CMD_NET = y
@ -199,7 +199,7 @@ ubsha1-objs := os_support.o ubsha1.o lib/sha1.o
HOSTCFLAGS_ubsha1.o := -pedantic HOSTCFLAGS_ubsha1.o := -pedantic
hostprogs-$(CONFIG_KIRKWOOD) += kwboot hostprogs-$(CONFIG_ARCH_KIRKWOOD) += kwboot
hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot
hostprogs-y += proftool hostprogs-y += proftool
hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela