diff options
| author | Alper Nebi Yasak <alpernebiyasak@gmail.com> | 2025-04-23 22:13:36 +0300 |
|---|---|---|
| committer | Alper Nebi Yasak <alpernebiyasak@gmail.com> | 2025-04-29 15:28:08 +0300 |
| commit | fd56d8ada13b2f73337edd05751467b7e1eb4cc5 (patch) | |
| tree | 004bad7812aaca6a9aec789a276e6bff8f4380a2 /config/u-boot/qemu_arm64_12mb | |
| parent | ed9ddd7415fddaabb60554b858b08f292084b92c (diff) | |
u-boot: arm64: Merge our modifications into new defconfigs
Apply our preserved changes to the new U-Boot defconfigs. Upstream
rearranged memory layouts for Rockchip boards to a unified layout, which
got rid of CUSTOM_SYS_INIT_SP_ADDR and HAS_CUSTOM_SYS_INIT_SP_ADDR, and
will need a change to a related INIT_SP_RELATIVE later.
Normalize the positions of each line in the config by regenerating the
defconfig by `./mk -l u-boot` and then `./mk -s u-boot`, so that the
diff looks all green when we actually expand it to the full config.
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Diffstat (limited to 'config/u-boot/qemu_arm64_12mb')
| -rw-r--r-- | config/u-boot/qemu_arm64_12mb/config/default | 5 | ||||
| -rw-r--r-- | config/u-boot/qemu_arm64_12mb/config/diffconfig | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/config/u-boot/qemu_arm64_12mb/config/default b/config/u-boot/qemu_arm64_12mb/config/default index 03028c76..972651b3 100644 --- a/config/u-boot/qemu_arm64_12mb/config/default +++ b/config/u-boot/qemu_arm64_12mb/config/default @@ -1,18 +1,17 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_QEMU=y +CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_BLOBLIST_SIZE_RELOC=0x2000 CONFIG_NR_DRAM_BANKS=1 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000 CONFIG_ENV_SIZE=0x40000 -CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64" CONFIG_SYS_LOAD_ADDR=0x40200000 CONFIG_DEBUG_UART_BASE=0x9000000 CONFIG_DEBUG_UART_CLOCK=0 CONFIG_ARMV8_CRYPTO=y -CONFIG_ENV_ADDR=0x4000000 CONFIG_PCI=y CONFIG_DEBUG_UART=y CONFIG_AHCI=y @@ -23,6 +22,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_BOOTSTD_FULL=y CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_BOOTCOMMAND="bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi" CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set @@ -38,7 +38,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TPM=y CONFIG_CMD_MTDPARTS=y -CONFIG_ENV_IS_IN_FLASH=y CONFIG_SCSI_AHCI=y CONFIG_AHCI_PCI=y CONFIG_DFU_TFTP=y diff --git a/config/u-boot/qemu_arm64_12mb/config/diffconfig b/config/u-boot/qemu_arm64_12mb/config/diffconfig deleted file mode 100644 index 447a5ad6..00000000 --- a/config/u-boot/qemu_arm64_12mb/config/diffconfig +++ /dev/null @@ -1,5 +0,0 @@ --ENV_ADDR 0x4000000 --ENV_IS_IN_FLASH y --ENV_SECT_SIZE 0x40000 -+BOOTCOMMAND "bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi" -+TEXT_BASE 0x50000000 |