dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-04 02:02:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG

Browse Source 
Perform a simple rename of CONFIG_ARM_GIC_BASE_ADDRESS to CFG_ARM_GIC_BASE_ADDRESS

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2022-12-04 10:03:36 -05:00
parent 137de2cf0d
commit 04501ecca2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/armv7/nonsec_virt.S
View File

@@ -112,8 +112,8 @@ ENTRY(_do_nonsec_entry)
ENDPROC(_do_nonsec_entry) ENDPROC(_do_nonsec_entry)
.macro get_cbar_addr addr .macro get_cbar_addr addr
#ifdef CONFIG_ARM_GIC_BASE_ADDRESS #ifdef CFG_ARM_GIC_BASE_ADDRESS
ldr \addr, =CONFIG_ARM_GIC_BASE_ADDRESS ldr \addr, =CFG_ARM_GIC_BASE_ADDRESS
#else #else
mrc p15, 4, \addr, c15, c0, 0 @ read CBAR mrc p15, 4, \addr, c15, c0, 0 @ read CBAR
bfc \addr, #0, #15 @ clear reserved bits bfc \addr, #0, #15 @ clear reserved bits

4
arch/arm/cpu/armv7/virt-v7.c
View File

@@ -26,8 +26,8 @@ static unsigned int read_id_pfr1(void)
static unsigned long get_gicd_base_address(void) static unsigned long get_gicd_base_address(void)
{ {
#ifdef CONFIG_ARM_GIC_BASE_ADDRESS #ifdef CFG_ARM_GIC_BASE_ADDRESS
return CONFIG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET; return CFG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET;
#else #else
unsigned periphbase; unsigned periphbase;

2
include/configs/arndale.h
View File

@@ -19,6 +19,6 @@
#define CONFIG_SMP_PEN_ADDR 0x02020000 #define CONFIG_SMP_PEN_ADDR 0x02020000
/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000 #define CFG_ARM_GIC_BASE_ADDRESS 0x10480000
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */