qemu-uboot-{arm64|x86}: bump to u-boot 2025.10-rc4

- rebase x86 patches
This commit is contained in:
Ricardo Pardini
2025-09-21 15:29:24 +02:00
committed by Igor
parent 55695c7d85
commit 2892da2b00
2 changed files with 7 additions and 6 deletions

View File

@@ -58,7 +58,7 @@ if [[ "${QEMU_UBOOT_BOOTCONFIG}" != "" ]]; then
declare -g ATF_COMPILE="no"
declare -g BOOTDIR="qemu-uboot-${LINUXFAMILY}"
declare -g BOOTBRANCH='tag:v2025.01'
declare -g BOOTBRANCH='tag:v2025.10-rc4'
declare -g BOOTSOURCE='https://github.com/u-boot/u-boot' # Gotta set this again, it is unset by grub extension
declare -g BOOTCONFIG="${QEMU_UBOOT_BOOTCONFIG}"

View File

@@ -12,7 +12,7 @@ diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 111111111111..222222222222 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -4,7 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x1000
@@ -5,7 +5,7 @@ CONFIG_BLOBLIST_SIZE_RELOC=0x40000
CONFIG_NR_DRAM_BANKS=8
CONFIG_ENV_SIZE=0x40000
CONFIG_MAX_CPUS=2
@@ -21,7 +21,7 @@ index 111111111111..222222222222 100644
CONFIG_DEBUG_UART_BASE=0x3f8
CONFIG_DEBUG_UART_CLOCK=1843200
CONFIG_DEBUG_UART=y
@@ -54,6 +54,7 @@ CONFIG_LBA48=y
@@ -61,6 +61,7 @@ CONFIG_LBA48=y
CONFIG_SYS_64BIT_LBA=y
CONFIG_CPU=y
CONFIG_NVME_PCI=y
@@ -29,12 +29,13 @@ index 111111111111..222222222222 100644
CONFIG_SYS_NS16550_PORT_MAPPED=y
CONFIG_SPI=y
CONFIG_USB_KEYBOARD=y
@@ -62,5 +63,6 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_USER=y
CONFIG_FRAMEBUFFER_VESA_MODE=0x144
@@ -68,6 +69,7 @@ CONFIG_CONSOLE_TRUETYPE=y
CONFIG_VIDEO_BOCHS=y
# CONFIG_VIDEO_VESA is not set
CONFIG_CONSOLE_SCROLL_LINES=5
+CONFIG_VIRTIO_MMIO=y
CONFIG_GENERATE_ACPI_TABLE=y
CONFIG_CMD_DHRYSTONE=y
# CONFIG_GZIP is not set
--
Armbian