mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-25 16:41:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm: Fix option dependency with Kconfig language

Browse Source 
Use Kconfig 'depends on' instead of #if macro to
express the option depdencies.

Signed-off-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
This commit is contained in:
Chia-Wei Wang 2021-08-03 10:50:09 +08:00 committed by Tom Rini
parent 4bb7de1b3c
commit aa29b21d62
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/Kconfig
View File

@ -9,9 +9,9 @@ config ARM64
select PHYS_64BIT select PHYS_64BIT
select SYS_CACHE_SHIFT_6 select SYS_CACHE_SHIFT_6
if ARM64
config POSITION_INDEPENDENT config POSITION_INDEPENDENT
bool "Generate position-independent pre-relocation code" bool "Generate position-independent pre-relocation code"
depends on ARM64
help help
U-Boot expects to be linked to a specific hard-coded address, and to U-Boot expects to be linked to a specific hard-coded address, and to
be loaded to and run from that address. This option lifts that be loaded to and run from that address. This option lifts that
@ -22,6 +22,7 @@ config POSITION_INDEPENDENT
config INIT_SP_RELATIVE config INIT_SP_RELATIVE
bool "Specify the early stack pointer relative to the .bss section" bool "Specify the early stack pointer relative to the .bss section"
depends on ARM64
default n if ARCH_QEMU default n if ARCH_QEMU
default y if POSITION_INDEPENDENT default y if POSITION_INDEPENDENT
help help
@ -37,6 +38,7 @@ config INIT_SP_RELATIVE
config SYS_INIT_SP_BSS_OFFSET config SYS_INIT_SP_BSS_OFFSET
int "Early stack offset from the .bss base address" int "Early stack offset from the .bss base address"
depends on ARM64
depends on INIT_SP_RELATIVE depends on INIT_SP_RELATIVE
default 524288 default 524288
help help
@ -46,6 +48,7 @@ config SYS_INIT_SP_BSS_OFFSET
do not overlap any appended DTB. do not overlap any appended DTB.
config LINUX_KERNEL_IMAGE_HEADER config LINUX_KERNEL_IMAGE_HEADER
depends on ARM64
bool bool
help help
Place a Linux kernel image header at the start of the U-Boot binary. Place a Linux kernel image header at the start of the U-Boot binary.
@ -54,14 +57,12 @@ config LINUX_KERNEL_IMAGE_HEADER
image header reports the amount of memory (BSS and similar) that image header reports the amount of memory (BSS and similar) that
U-Boot needs to use, but which isn't part of the binary. U-Boot needs to use, but which isn't part of the binary.
if LINUX_KERNEL_IMAGE_HEADER
config LNX_KRNL_IMG_TEXT_OFFSET_BASE config LNX_KRNL_IMG_TEXT_OFFSET_BASE
depends on LINUX_KERNEL_IMAGE_HEADER
hex hex
help help
The value subtracted from CONFIG_SYS_TEXT_BASE to calculate the The value subtracted from CONFIG_SYS_TEXT_BASE to calculate the
TEXT_OFFSET value written to the Linux kernel image header. TEXT_OFFSET value written to the Linux kernel image header.
endif
endif
config GICV2 config GICV2
bool bool