Commit 19ba9cf7 authored by Conor Dooley's avatar Conor Dooley
Browse files

RISC-V: kbuild: convert all use of SOC_FOO to ARCH_FOO 



Convert all non user visible use of SOC_FOO symbols to their ARCH_FOO
variants. The canaan DTs are an outlier in that they're gated at the
directory and the file level. Drop the directory level gating while we
are swapping the symbol names over.

Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
parent fc432119

arch/riscv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ endif 
endif



ifneq ($(CONFIG_XIP_KERNEL),y)

ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy)

ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)

KBUILD_IMAGE := $(boot)/loader.bin

else

ifeq ($(CONFIG_EFI_ZBOOT),)

arch/riscv/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

subdir-y += sifive

subdir-y += starfive

subdir-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) += canaan

subdir-y += canaan

subdir-y += microchip

subdir-y += renesas

arch/riscv/boot/dts/canaan/Makefile

+7 −7
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_SOC_CANAAN) += canaan_kd233.dtb

dtb-$(CONFIG_SOC_CANAAN) += k210_generic.dtb

dtb-$(CONFIG_SOC_CANAAN) += sipeed_maix_bit.dtb

dtb-$(CONFIG_SOC_CANAAN) += sipeed_maix_dock.dtb

dtb-$(CONFIG_SOC_CANAAN) += sipeed_maix_go.dtb

dtb-$(CONFIG_SOC_CANAAN) += sipeed_maixduino.dtb

dtb-$(CONFIG_ARCH_CANAAN) += canaan_kd233.dtb

dtb-$(CONFIG_ARCH_CANAAN) += k210_generic.dtb

dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maix_bit.dtb

dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maix_dock.dtb

dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maix_go.dtb

dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maixduino.dtb



obj-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) += $(addsuffix .dtb.o, $(CONFIG_SOC_CANAAN_K210_DTB_SOURCE))
 
obj-$(CONFIG_ARCH_CANAAN_K210_DTB_BUILTIN) += $(addsuffix .dtb.o, $(CONFIG_ARCH_CANAAN_K210_DTB_SOURCE))

arch/riscv/boot/dts/microchip/Makefile

+4 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-icicle-kit.dtb

dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-m100pfsevp.dtb

dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-polarberry.dtb

dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-sev-kit.dtb

dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-icicle-kit.dtb

dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-m100pfsevp.dtb

dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-polarberry.dtb

dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-sev-kit.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

arch/riscv/boot/dts/sifive/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_SOC_SIFIVE) += hifive-unleashed-a00.dtb \

dtb-$(CONFIG_ARCH_SIFIVE) += hifive-unleashed-a00.dtb \

			     hifive-unmatched-a00.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))