diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-02 13:47:31 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-04-05 11:54:37 +0200 |
| commit | b4497e075b68449fad356806765e8d0db89d4208 (patch) | |
| tree | 04529e115cd059867c2ae8d10349b111cf229b8c | |
| parent | de309f3b50ce10ac5838a6e96443acc42dee5eb6 (diff) | |
| download | barebox-b4497e075b68449fad356806765e8d0db89d4208.tar.gz | |
ARM: Rockchip: let boards depend on 32/64bit
So far we can enable support for 32bit and 64bit SoCs at the same time
which results in an unbuildable barebox. This is annoying, let the board
visibility depend on the selected code model.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/rockchip_v8_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 9 |
3 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index abe649de49..2c1783d8e9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -248,6 +248,8 @@ config ARCH_ROCKCHIP select OFTREE select HAVE_PBL_MULTI_IMAGES select HAS_DEBUG_LL + select CPU_SUPPORTS_32BIT_KERNEL + select CPU_SUPPORTS_64BIT_KERNEL config ARCH_STM32MP bool "STMicroelectronics STM32MP" diff --git a/arch/arm/configs/rockchip_v8_defconfig b/arch/arm/configs/rockchip_v8_defconfig index 0c3c498c03..f23c192870 100644 --- a/arch/arm/configs/rockchip_v8_defconfig +++ b/arch/arm/configs/rockchip_v8_defconfig @@ -4,6 +4,7 @@ CONFIG_MACH_RK3568_BPI_R2PRO=y CONFIG_MACH_PINE64_QUARTZ64=y CONFIG_MACH_RADXA_ROCK3=y CONFIG_BOARD_ARM_GENERIC_DT=y +CONFIG_64BIT=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_PSCI_CLIENT=y CONFIG_MMU=y diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 4ac75ab947..9b4913d5da 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -30,7 +30,6 @@ config ARCH_RK3288 config ARCH_ROCKCHIP_V8 bool select CPU_V8 - select CPU_SUPPORTS_64BIT_KERNEL select ARM_ATF select RELOCATABLE @@ -49,6 +48,8 @@ config ARCH_RK3568 comment "select Rockchip boards:" +if 32BIT + config MACH_RADXA_ROCK select ARCH_RK3188 select I2C @@ -62,6 +63,10 @@ config MACH_PHYTEC_SOM_RK3288 help Say Y here if you are using a RK3288 based Phytecs SOM +endif + +if 64BIT + config MACH_RK3568_EVB select ARCH_RK3568 bool "RK3568 EVB" @@ -86,6 +91,8 @@ config MACH_RADXA_ROCK3 help Say Y here if you are using a Radxa ROCK3 +endif + comment "select board features:" config ARCH_ROCKCHIP_ATF |