From 5e27c14b05028c089bca17b81c88b3f8f4e46b4f Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Tue, 19 Nov 2024 09:52:40 +0000 Subject: [PATCH] Update x86 U-Boot to v2024.10 (was v2024.07) It's a new experimental payload in Libreboot, so we may aswell start with the very latest release of U-Boot. Signed-off-by: Leah Rowe <leah@libreboot.org> --- config/u-boot/amd64coreboot/config/default | 35 ++++++++++++++-------- config/u-boot/i386coreboot/config/default | 35 +++++++++++++--------- config/u-boot/x86/target.cfg | 2 +- config/u-boot/x86_64/target.cfg | 2 +- 4 files changed, 45 insertions(+), 29 deletions(-) diff --git a/config/u-boot/amd64coreboot/config/default b/config/u-boot/amd64coreboot/config/default index 4c0585a..fdd0ccf 100644 --- a/config/u-boot/amd64coreboot/config/default +++ b/config/u-boot/amd64coreboot/config/default @@ -1,12 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# U-Boot 2024.07 Configuration +# U-Boot 2024.10 Configuration # # # Compiler: gcc (Debian 12.2.0-14) 12.2.0 # CONFIG_CREATE_ARCH_SYMLINK=y +CONFIG_SUPPORT_LITTLE_ENDIAN=y CONFIG_SYS_CACHE_SHIFT_6=y CONFIG_SYS_CACHELINE_SIZE=64 CONFIG_LINKER_LIST_ALIGN=8 @@ -51,13 +52,13 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x800 # CONFIG_SPL_HAS_BSS_LINKER_SECTION is not set # CONFIG_SPL_STACK_R is not set +CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_SPL_SYS_MALLOC_F=y CONFIG_ERR_PTR_OFFSET=0x0 CONFIG_SPL_SIZE_LIMIT=0x0 CONFIG_SPL=y CONFIG_PRE_CON_BUF_ADDR=0x100000 CONFIG_PRE_CON_BUF_SZ=4096 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_IDENT_STRING="" CONFIG_SYS_CLK_FREQ=0 # CONFIG_SPL_FS_FAT is not set @@ -132,6 +133,7 @@ CONFIG_COREBOOT_SYSINFO=y CONFIG_SPL_COREBOOT_SYSINFO=y CONFIG_ZBOOT=y # CONFIG_OF_BOARD_FIXUP is not set +CONFIG_SYS_LITTLE_ENDIAN=y # # General setup @@ -208,6 +210,7 @@ CONFIG_BOOTSTD_FULL=y CONFIG_BOOTSTD_DEFAULTS=y CONFIG_BOOTSTD_BOOTCOMMAND=y CONFIG_BOOTMETH_GLOBAL=y +# CONFIG_BOOTMETH_ANDROID is not set CONFIG_BOOTMETH_CROS=y CONFIG_BOOTMETH_EXTLINUX=y CONFIG_BOOTMETH_EXTLINUX_PXE=y @@ -236,7 +239,6 @@ CONFIG_SYS_BOOT_RAMDISK_HIGH=y # Boot timing # # CONFIG_BOOTSTAGE is not set -CONFIG_BOOTSTAGE_STASH_SIZE=0x1000 CONFIG_SHOW_BOOT_PROGRESS=y # CONFIG_SPL_SHOW_BOOT_PROGRESS is not set @@ -341,7 +343,9 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y # # Start-up hooks # -# CONFIG_CYCLIC is not set +CONFIG_CYCLIC=y +# CONFIG_SPL_CYCLIC is not set +CONFIG_CYCLIC_MAX_CPU_TIME_US=5000 CONFIG_EVENT=y CONFIG_EVENT_DYNAMIC=y # CONFIG_EVENT_DEBUG is not set @@ -393,6 +397,7 @@ CONFIG_SPL_SYS_STACK_F_CHECK_BYTE=0xaa # CONFIG_SPL_SHOW_ERRORS is not set CONFIG_SPL_BINMAN_SYMBOLS=y CONFIG_SPL_BINMAN_UBOOT_SYMBOLS=y +# CONFIG_SPL_SOC_INIT is not set # CONFIG_SPL_BOARD_INIT is not set # CONFIG_SPL_BOOTROM_SUPPORT is not set CONFIG_SPL_RAW_IMAGE_SUPPORT=y @@ -497,6 +502,7 @@ CONFIG_CMD_BOOTFLOW=y CONFIG_CMD_BOOTFLOW_FULL=y CONFIG_CMD_BOOTMETH=y CONFIG_BOOTM_EFI=y +CONFIG_BOOTM_ELF=y # CONFIG_CMD_BOOTZ is not set CONFIG_BOOTM_LINUX=y CONFIG_BOOTM_NETBSD=y @@ -520,7 +526,6 @@ CONFIG_CMD_FDT=y CONFIG_CMD_GO=y CONFIG_CMD_RUN=y CONFIG_CMD_IMI=y -# CONFIG_CMD_IMLS is not set CONFIG_CMD_XIMG=y # CONFIG_CMD_SPL is not set CONFIG_CMD_ZBOOT=y @@ -572,14 +577,12 @@ CONFIG_CMD_RANDOM=y # # Device access commands # -# CONFIG_CMD_ARMFLASH is not set # CONFIG_CMD_BCB is not set # CONFIG_CMD_BIND is not set # CONFIG_CMD_CLK is not set # CONFIG_CMD_DEMO is not set # CONFIG_CMD_DFU is not set CONFIG_CMD_DM=y -# CONFIG_CMD_FPGAD is not set # CONFIG_CMD_FUSE is not set # CONFIG_CMD_GPIO is not set # CONFIG_CMD_GPT is not set @@ -613,8 +616,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_SATA=y CONFIG_CMD_SCSI=y # CONFIG_CMD_SDRAM is not set -# CONFIG_CMD_TSI148 is not set -# CONFIG_CMD_UNIVERSE is not set CONFIG_CMD_USB=y # CONFIG_CMD_USB_SDP is not set # CONFIG_CMD_RKMTD is not set @@ -744,6 +745,7 @@ CONFIG_MTDPARTS_DEFAULT="" # Debug commands # CONFIG_CMD_CBSYSINFO=y +CONFIG_CMD_CYCLIC=y # CONFIG_CMD_DIAG is not set # CONFIG_CMD_EVENT is not set CONFIG_CMD_IRQ=y @@ -784,6 +786,7 @@ CONFIG_SPL_OF_CONTROL=y # CONFIG_OF_UPSTREAM is not set CONFIG_OF_SEPARATE=y # CONFIG_OF_EMBED is not set +# CONFIG_OF_INITIAL_DTB_READONLY is not set # CONFIG_OF_BOARD is not set # CONFIG_OF_OMIT_DTB is not set CONFIG_DEVICE_TREE_INCLUDES="" @@ -813,7 +816,6 @@ CONFIG_ENV_IS_NOWHERE=y # CONFIG_ENV_IS_IN_MMC is not set # CONFIG_ENV_IS_IN_NAND is not set # CONFIG_ENV_IS_IN_NVRAM is not set -# CONFIG_ENV_IS_IN_ONENAND is not set # CONFIG_ENV_IS_IN_REMOTE is not set # CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set CONFIG_SYS_RELOC_GD_ENV_ADDR=y @@ -897,6 +899,7 @@ CONFIG_DM_DEV_READ_INLINE=y # CONFIG_ACPIGEN is not set # CONFIG_BOUNCE_BUFFER is not set # CONFIG_ADC is not set +# CONFIG_SPL_ADC is not set CONFIG_SATA=y CONFIG_LIBATA=y CONFIG_SCSI_AHCI=y @@ -962,6 +965,7 @@ CONFIG_SYS_64BIT_LBA=y # CONFIG_CLK is not set # CONFIG_SPL_CLK_CCF is not set # CONFIG_CLK_CCF is not set +# CONFIG_COMMON_CLK_ADI_SHARED is not set # CONFIG_CLK_RCAR is not set # CONFIG_CLK_RCAR_CPG_LIB is not set # CONFIG_CPU is not set @@ -1061,7 +1065,6 @@ CONFIG_SPL_DM_GPIO=y # CONFIG_MPC8XX_GPIO is not set # CONFIG_NX_GPIO is not set # CONFIG_NOMADIK_GPIO is not set -# CONFIG_ZYNQMP_GPIO_MODEPIN is not set # CONFIG_SLG7XL45106_I2C_GPO is not set # CONFIG_FTGPIO010 is not set @@ -1200,6 +1203,7 @@ CONFIG_MTD=y # CONFIG_DM_MTD is not set # CONFIG_MTD_NOR_FLASH is not set # CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_BLOCK is not set # CONFIG_SYS_MTDPARTS_RUNTIME is not set # CONFIG_FLASH_CFI_DRIVER is not set # CONFIG_HBMC_AM654 is not set @@ -1228,6 +1232,7 @@ CONFIG_MTD=y # CONFIG_MV88E6352_SWITCH is not set CONFIG_PHYLIB=y # CONFIG_PHY_ADDR_ENABLE is not set +CONFIG_PHY_ANEG_TIMEOUT=4000 # CONFIG_B53_SWITCH is not set # CONFIG_MV88E61XX_SWITCH is not set # CONFIG_PHYLIB_10G is not set @@ -1277,6 +1282,7 @@ CONFIG_NETDEVICES=y # CONFIG_BCMGENET is not set # CONFIG_BNXT_ETH is not set # CONFIG_CALXEDA_XGMAC is not set +# CONFIG_DWC_ETH_XGMAC is not set # CONFIG_DRIVER_DM9000 is not set # CONFIG_DWC_ETH_QOS is not set CONFIG_E1000=y @@ -1524,6 +1530,7 @@ CONFIG_SOUND_I8254=y # SOC (System On Chip) specific Drivers # # CONFIG_SOC_DEVICE is not set +# CONFIG_SOC_QCOM is not set # CONFIG_SOC_SAMSUNG is not set # CONFIG_SOC_TI is not set # CONFIG_SPI is not set @@ -1700,6 +1707,8 @@ CONFIG_CONSOLE_TRUETYPE_SIZE=18 CONFIG_CONSOLE_TRUETYPE_MAX_METRICS=10 CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_NO_FB_CLEAR is not set +CONFIG_VIDEO_SYNC_MS=100 +CONFIG_VIDEO_SYNC_CYCLIC_MS=10 CONFIG_PANEL=y CONFIG_SIMPLE_PANEL=y # CONFIG_PANEL_HX8238D is not set @@ -1789,7 +1798,6 @@ CONFIG_VIDEO_BMP_RLE8=y # Watchdog Timer Support # # CONFIG_WATCHDOG is not set -CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 # CONFIG_IMX_WATCHDOG is not set # CONFIG_ULP_WATCHDOG is not set # CONFIG_WDT is not set @@ -1945,6 +1953,7 @@ CONFIG_EFI_DT_FIXUP=y CONFIG_EFI_LOADER_HII=y CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y CONFIG_EFI_UNICODE_CAPITALIZATION=y +# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set CONFIG_EFI_PLATFORM_LANG_CODES="en-US" CONFIG_EFI_HAVE_RUNTIME_RESET=y CONFIG_EFI_LOAD_FILE2_INITRD=y @@ -1990,6 +1999,6 @@ CONFIG_TOOLS_SHA1=y CONFIG_TOOLS_SHA256=y CONFIG_TOOLS_SHA384=y CONFIG_TOOLS_SHA512=y -# CONFIG_TOOLS_MKEFICAPSULE is not set +CONFIG_TOOLS_MKEFICAPSULE=y # CONFIG_FSPI_CONF_HEADER is not set # CONFIG_TOOLS_MKFWUMDATA is not set diff --git a/config/u-boot/i386coreboot/config/default b/config/u-boot/i386coreboot/config/default index fce63ef..d01984d 100644 --- a/config/u-boot/i386coreboot/config/default +++ b/config/u-boot/i386coreboot/config/default @@ -1,12 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# U-Boot 2024.07 Configuration +# U-Boot 2024.10 Configuration # # # Compiler: gcc (Debian 12.2.0-14) 12.2.0 # CONFIG_CREATE_ARCH_SYMLINK=y +CONFIG_SUPPORT_LITTLE_ENDIAN=y CONFIG_SYS_CACHE_SHIFT_6=y CONFIG_SYS_CACHELINE_SIZE=64 CONFIG_LINKER_LIST_ALIGN=8 @@ -39,11 +40,11 @@ CONFIG_BOARD_SPECIFIC_OPTIONS=y CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000 # CONFIG_DM_RESET is not set CONFIG_SYS_MONITOR_LEN=1048576 +CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ERR_PTR_OFFSET=0x0 # CONFIG_SPL is not set CONFIG_PRE_CON_BUF_ADDR=0x100000 CONFIG_PRE_CON_BUF_SZ=4096 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_IDENT_STRING="" CONFIG_SYS_CLK_FREQ=0 CONFIG_SYS_MEM_TOP_HIDE=0x0 @@ -109,6 +110,7 @@ CONFIG_SA_PCIEX_LENGTH=0x10000000 CONFIG_COREBOOT_SYSINFO=y CONFIG_ZBOOT=y # CONFIG_OF_BOARD_FIXUP is not set +CONFIG_SYS_LITTLE_ENDIAN=y # # General setup @@ -179,6 +181,7 @@ CONFIG_BOOTSTD_FULL=y CONFIG_BOOTSTD_DEFAULTS=y CONFIG_BOOTSTD_BOOTCOMMAND=y CONFIG_BOOTMETH_GLOBAL=y +# CONFIG_BOOTMETH_ANDROID is not set CONFIG_BOOTMETH_CROS=y CONFIG_BOOTMETH_EXTLINUX=y CONFIG_BOOTMETH_EXTLINUX_PXE=y @@ -204,7 +207,6 @@ CONFIG_SYS_BOOT_RAMDISK_HIGH=y # Boot timing # # CONFIG_BOOTSTAGE is not set -CONFIG_BOOTSTAGE_STASH_SIZE=0x1000 CONFIG_SHOW_BOOT_PROGRESS=y # @@ -306,7 +308,9 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y # # Start-up hooks # -# CONFIG_CYCLIC is not set +CONFIG_CYCLIC=y +# CONFIG_SPL_CYCLIC is not set +CONFIG_CYCLIC_MAX_CPU_TIME_US=5000 CONFIG_EVENT=y CONFIG_EVENT_DYNAMIC=y # CONFIG_EVENT_DEBUG is not set @@ -388,6 +392,7 @@ CONFIG_CMD_BOOTFLOW=y CONFIG_CMD_BOOTFLOW_FULL=y CONFIG_CMD_BOOTMETH=y CONFIG_BOOTM_EFI=y +CONFIG_BOOTM_ELF=y # CONFIG_CMD_BOOTZ is not set CONFIG_BOOTM_LINUX=y CONFIG_BOOTM_NETBSD=y @@ -411,7 +416,6 @@ CONFIG_CMD_FDT=y CONFIG_CMD_GO=y CONFIG_CMD_RUN=y CONFIG_CMD_IMI=y -# CONFIG_CMD_IMLS is not set CONFIG_CMD_XIMG=y CONFIG_CMD_ZBOOT=y @@ -462,14 +466,12 @@ CONFIG_CMD_RANDOM=y # # Device access commands # -# CONFIG_CMD_ARMFLASH is not set # CONFIG_CMD_BCB is not set # CONFIG_CMD_BIND is not set # CONFIG_CMD_CLK is not set # CONFIG_CMD_DEMO is not set # CONFIG_CMD_DFU is not set CONFIG_CMD_DM=y -# CONFIG_CMD_FPGAD is not set # CONFIG_CMD_FUSE is not set # CONFIG_CMD_GPIO is not set # CONFIG_CMD_GPT is not set @@ -503,8 +505,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_SATA=y CONFIG_CMD_SCSI=y # CONFIG_CMD_SDRAM is not set -# CONFIG_CMD_TSI148 is not set -# CONFIG_CMD_UNIVERSE is not set CONFIG_CMD_USB=y # CONFIG_CMD_USB_SDP is not set # CONFIG_CMD_RKMTD is not set @@ -634,6 +634,7 @@ CONFIG_MTDPARTS_DEFAULT="" # Debug commands # CONFIG_CMD_CBSYSINFO=y +CONFIG_CMD_CYCLIC=y # CONFIG_CMD_DIAG is not set # CONFIG_CMD_EVENT is not set CONFIG_CMD_IRQ=y @@ -665,6 +666,7 @@ CONFIG_OF_REAL=y # CONFIG_OF_UPSTREAM is not set CONFIG_OF_SEPARATE=y # CONFIG_OF_EMBED is not set +# CONFIG_OF_INITIAL_DTB_READONLY is not set # CONFIG_OF_BOARD is not set # CONFIG_OF_OMIT_DTB is not set CONFIG_DEVICE_TREE_INCLUDES="" @@ -690,7 +692,6 @@ CONFIG_ENV_IS_NOWHERE=y # CONFIG_ENV_IS_IN_MMC is not set # CONFIG_ENV_IS_IN_NAND is not set # CONFIG_ENV_IS_IN_NVRAM is not set -# CONFIG_ENV_IS_IN_ONENAND is not set # CONFIG_ENV_IS_IN_REMOTE is not set # CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set CONFIG_SYS_RELOC_GD_ENV_ADDR=y @@ -789,7 +790,7 @@ CONFIG_BLOCK_CACHE=y # CONFIG_BLKMAP is not set # CONFIG_EFI_MEDIA is not set CONFIG_IDE=y -CONFIG_SYS_IDE_MAXBUS=0x2 +CONFIG_SYS_IDE_MAXBUS=2 CONFIG_SYS_IDE_MAXDEVICE=4 CONFIG_SYS_ATA_BASE_ADDR=0x0 CONFIG_SYS_ATA_STRIDE=0x1 @@ -824,6 +825,7 @@ CONFIG_SYS_64BIT_LBA=y # # CONFIG_CLK is not set # CONFIG_CLK_CCF is not set +# CONFIG_COMMON_CLK_ADI_SHARED is not set # CONFIG_CLK_RCAR is not set # CONFIG_CLK_RCAR_CPG_LIB is not set # CONFIG_CPU is not set @@ -919,7 +921,6 @@ CONFIG_GPIO=y # CONFIG_MPC8XX_GPIO is not set # CONFIG_NX_GPIO is not set # CONFIG_NOMADIK_GPIO is not set -# CONFIG_ZYNQMP_GPIO_MODEPIN is not set # CONFIG_SLG7XL45106_I2C_GPO is not set # CONFIG_FTGPIO010 is not set @@ -1051,6 +1052,7 @@ CONFIG_MTD=y # CONFIG_DM_MTD is not set # CONFIG_MTD_NOR_FLASH is not set # CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_BLOCK is not set # CONFIG_SYS_MTDPARTS_RUNTIME is not set # CONFIG_FLASH_CFI_DRIVER is not set # CONFIG_HBMC_AM654 is not set @@ -1079,6 +1081,7 @@ CONFIG_MTD=y # CONFIG_MV88E6352_SWITCH is not set CONFIG_PHYLIB=y # CONFIG_PHY_ADDR_ENABLE is not set +CONFIG_PHY_ANEG_TIMEOUT=4000 # CONFIG_B53_SWITCH is not set # CONFIG_MV88E61XX_SWITCH is not set # CONFIG_PHYLIB_10G is not set @@ -1128,6 +1131,7 @@ CONFIG_NETDEVICES=y # CONFIG_BCMGENET is not set # CONFIG_BNXT_ETH is not set # CONFIG_CALXEDA_XGMAC is not set +# CONFIG_DWC_ETH_XGMAC is not set # CONFIG_DRIVER_DM9000 is not set # CONFIG_DWC_ETH_QOS is not set CONFIG_E1000=y @@ -1351,6 +1355,7 @@ CONFIG_SOUND_I8254=y # SOC (System On Chip) specific Drivers # # CONFIG_SOC_DEVICE is not set +# CONFIG_SOC_QCOM is not set # CONFIG_SOC_SAMSUNG is not set # CONFIG_SOC_TI is not set # CONFIG_SPI is not set @@ -1520,6 +1525,8 @@ CONFIG_CONSOLE_TRUETYPE_SIZE=18 CONFIG_CONSOLE_TRUETYPE_MAX_METRICS=10 CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_NO_FB_CLEAR is not set +CONFIG_VIDEO_SYNC_MS=100 +CONFIG_VIDEO_SYNC_CYCLIC_MS=10 CONFIG_PANEL=y CONFIG_SIMPLE_PANEL=y # CONFIG_PANEL_HX8238D is not set @@ -1608,7 +1615,6 @@ CONFIG_VIDEO_BMP_RLE8=y # Watchdog Timer Support # # CONFIG_WATCHDOG is not set -CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 # CONFIG_IMX_WATCHDOG is not set # CONFIG_ULP_WATCHDOG is not set # CONFIG_WDT is not set @@ -1735,6 +1741,7 @@ CONFIG_EFI_DT_FIXUP=y CONFIG_EFI_LOADER_HII=y CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y CONFIG_EFI_UNICODE_CAPITALIZATION=y +# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set CONFIG_EFI_PLATFORM_LANG_CODES="en-US" CONFIG_EFI_HAVE_RUNTIME_RESET=y CONFIG_EFI_LOAD_FILE2_INITRD=y @@ -1779,6 +1786,6 @@ CONFIG_TOOLS_SHA1=y CONFIG_TOOLS_SHA256=y CONFIG_TOOLS_SHA384=y CONFIG_TOOLS_SHA512=y -# CONFIG_TOOLS_MKEFICAPSULE is not set +CONFIG_TOOLS_MKEFICAPSULE=y # CONFIG_FSPI_CONF_HEADER is not set # CONFIG_TOOLS_MKFWUMDATA is not set diff --git a/config/u-boot/x86/target.cfg b/config/u-boot/x86/target.cfg index c9978dc..2a547e8 100644 --- a/config/u-boot/x86/target.cfg +++ b/config/u-boot/x86/target.cfg @@ -1,2 +1,2 @@ tree="x86" -rev="3f772959501c99fbe5aa0b22a36efe3478d1ae1c" # v2024.07 +rev="f919c3a889f0ec7d63a48b5d0ed064386b0980bd" # v2024.10 diff --git a/config/u-boot/x86_64/target.cfg b/config/u-boot/x86_64/target.cfg index dd554fc..45e85c2 100644 --- a/config/u-boot/x86_64/target.cfg +++ b/config/u-boot/x86_64/target.cfg @@ -1,2 +1,2 @@ tree="x86_64" -rev="3f772959501c99fbe5aa0b22a36efe3478d1ae1c" # v2024.07 +rev="f919c3a889f0ec7d63a48b5d0ed064386b0980bd" # v2024.10