From 1d22de7f19c7dbc24915ea41f28c37b9224493d1 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Fri, 25 Dec 2020 11:14:34 +0800 Subject: [PATCH] rockchip: rv1126: rename periph device region Adding to whitelist.txt: CONFIG_PERIPH_DEVICE_START_ADDR CONFIG_PERIPH_DEVICE_END_ADDR Signed-off-by: Joseph Chen Change-Id: Ia07a467489e52b7580351829768437dc67e71833 --- arch/arm/lib/cache-cp15.c | 6 +++--- include/configs/rv1126_common.h | 4 ++-- scripts/config_whitelist.txt | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index cd26ffcd5d..cd962effdd 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -122,9 +122,9 @@ static inline void mmu_setup(void) * only map periph device region to save boot time. */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_KERNEL_BOOT) && \ - defined(PERIPH_DEVICE_START_ADDR) - i = PERIPH_DEVICE_START_ADDR >> MMU_SECTION_SHIFT; - end = PERIPH_DEVICE_END_ADDR >> MMU_SECTION_SHIFT; + defined(CONFIG_PERIPH_DEVICE_START_ADDR) + i = CONFIG_PERIPH_DEVICE_START_ADDR >> MMU_SECTION_SHIFT; + end = CONFIG_PERIPH_DEVICE_END_ADDR >> MMU_SECTION_SHIFT; #else i = 0; end = (4096ULL * 1024 * 1024) >> MMU_SECTION_SHIFT; diff --git a/include/configs/rv1126_common.h b/include/configs/rv1126_common.h index 12fb3bb93a..6efba7bfbe 100644 --- a/include/configs/rv1126_common.h +++ b/include/configs/rv1126_common.h @@ -59,8 +59,8 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xfd000000 -#define PERIPH_DEVICE_START_ADDR (CONFIG_SYS_SDRAM_BASE + SDRAM_MAX_SIZE) -#define PERIPH_DEVICE_END_ADDR SZ_4G +#define CONFIG_PERIPH_DEVICE_START_ADDR (CONFIG_SYS_SDRAM_BASE + SDRAM_MAX_SIZE) +#define CONFIG_PERIPH_DEVICE_END_ADDR SZ_4G #define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */ #ifndef CONFIG_SPL_BUILD diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index da9096a402..25e82db3e3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1673,6 +1673,8 @@ CONFIG_PERIF1_FREQ CONFIG_PERIF2_FREQ CONFIG_PERIF3_FREQ CONFIG_PERIF4_FREQ +CONFIG_PERIPH_DEVICE_END_ADDR +CONFIG_PERIPH_DEVICE_START_ADDR CONFIG_PHYSMEM CONFIG_PHY_ADDR CONFIG_PHY_BASE_ADR