diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index be5c8d7a1a..8ccac93638 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -383,16 +383,15 @@ endif config ROCKCHIP_RK3568 bool "Support Rockchip RK3568" - select ARM64 + select ARM64 if !ARM64_BOOT_AARCH32 select ARM_SMCCC - select GICV3 - select SPL - select SUPPORT_TPL - select SUPPORT_SPL + select GICV3 if !ARM64_BOOT_AARCH32 + select SUPPORT_TPL if !ARM64_BOOT_AARCH32 + select SUPPORT_SPL if !ARM64_BOOT_AARCH32 select TPL_TINY_FRAMEWORK if TPL select DEBUG_UART_BOARD_INIT - imply TPL - imply SPL + imply TPL if !ARM64_BOOT_AARCH32 + imply SPL if !ARM64_BOOT_AARCH32 imply TPL_SERIAL_SUPPORT help The Rockchip RK3568 is a ARM-based SoC with a quad-core Cortex-A55. diff --git a/arch/arm/mach-rockchip/rk3568/rk3568.c b/arch/arm/mach-rockchip/rk3568/rk3568.c index 14396a3bef..314dfb9dc7 100644 --- a/arch/arm/mach-rockchip/rk3568/rk3568.c +++ b/arch/arm/mach-rockchip/rk3568/rk3568.c @@ -458,6 +458,9 @@ enum { UART5_IO_SEL_M1, }; +#ifdef CONFIG_ARM64 +#include + static struct mm_region rk3568_mem_map[] = { { .virt = 0x0UL, @@ -486,6 +489,7 @@ static struct mm_region rk3568_mem_map[] = { }; struct mm_region *mem_map = rk3568_mem_map; +#endif void board_debug_uart_init(void) {