diff options
author | Alper Nebi Yasak <alpernebiyasak@gmail.com> | 2025-04-23 14:44:45 +0300 |
---|---|---|
committer | Alper Nebi Yasak <alpernebiyasak@gmail.com> | 2025-04-29 15:26:22 +0300 |
commit | 976fc6890aee8929e4e1d8d51c620bd826bb610a (patch) | |
tree | de7d92437f0a6879feb6c8df979b9212a72445c6 /config/u-boot/qemu_arm64_12mb | |
parent | 418570a6172dd4dfc0455d36a622c30ed207f2c4 (diff) |
u-boot: arm64: Save our modifications to the upstream defconfigs
Run diffconfig from Linux to track our modifications to the old upstream
defconfigs, so we can apply them to the new ones. Restore the original
defconfigs to highlight our changes here, and upstream changes in the
next commit. Done manually, but something like:
do_diff() {
ours="$1"
theirs="$2"
tree="$3"
diffconfig \
src/u-boot/${tree}/configs/${theirs}_defconfig \
config/u-boot/${ours}/config/default \
>config/u-boot/${ours}/config/diffconfig
cp src/u-boot/${tree}/configs/${theirs}_defconfig \
config/u-boot/${ours}/config/default
}
do_diff amd64coreboot coreboot64 x86_64
do_diff i386coreboot coreboot x86
do_diff gru_bob chromebook_bob default
do_diff gru_kevin chromebook_kevin default
do_diff qemu_arm64_12mb qemu_arm64 default
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, 8 insertions, 2 deletions
diff --git a/config/u-boot/qemu_arm64_12mb/config/default b/config/u-boot/qemu_arm64_12mb/config/default index 73411226..088ba39f 100644 --- a/config/u-boot/qemu_arm64_12mb/config/default +++ b/config/u-boot/qemu_arm64_12mb/config/default @@ -1,17 +1,18 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_QEMU=y -CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000 CONFIG_ENV_SIZE=0x40000 +CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64" CONFIG_DEBUG_UART_BASE=0x9000000 CONFIG_DEBUG_UART_CLOCK=0 CONFIG_ARMV8_CRYPTO=y CONFIG_SYS_LOAD_ADDR=0x40200000 +CONFIG_ENV_ADDR=0x4000000 CONFIG_PCI=y CONFIG_DEBUG_UART=y CONFIG_AHCI=y @@ -21,7 +22,6 @@ 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 @@ -36,6 +36,7 @@ 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 new file mode 100644 index 00000000..447a5ad6 --- /dev/null +++ b/config/u-boot/qemu_arm64_12mb/config/diffconfig @@ -0,0 +1,5 @@ +-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 |