From ba772eb6acd854d6a90f97823ca98b2f1d2eb656 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Sat, 30 Nov 2024 19:46:36 +0300 Subject: u-boot: Update ARM64 boards to v2024.10 Set default U-Boot revision to v2024.10 and rebase patches on top of that. The video subsystem now has switched to using the 'cyclic' mechanism, so the code around one of the video patches changed a bit. x86 boards were already switched to v2024.10. Update U-Boot for the remaining ARM64 boards as usual: - Turn old configs into defconfigs (./update trees -s u-boot) - Save the diff from old upstream defconfig (diffconfig $theirs $ours) - Update U-Boot revision, rebase patches, and clean old trees - Prepare new U-Boot tree (./update trees -f u-boot) - Review the diffconfigs to see if any options were renamed upstream - Copy over the new upstream defconfigs and apply earlier diff - Turn new defconfigs into configs (./update trees -l u-boot) Signed-off-by: Alper Nebi Yasak --- config/u-boot/gru_bob/config/default | 47 ++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 16 deletions(-) (limited to 'config/u-boot/gru_bob') diff --git a/config/u-boot/gru_bob/config/default b/config/u-boot/gru_bob/config/default index da088ef0..54ad1e4f 100644 --- a/config/u-boot/gru_bob/config/default +++ b/config/u-boot/gru_bob/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 13.3.0-2) 13.3.0 +# Compiler: gcc (Debian 14.2.0-8) 14.2.0 # CONFIG_CREATE_ARCH_SYMLINK=y +CONFIG_SUPPORT_LITTLE_ENDIAN=y CONFIG_SYS_CACHE_SHIFT_6=y CONFIG_64BIT=y CONFIG_SYS_CACHELINE_SIZE=64 @@ -123,6 +124,7 @@ CONFIG_ARM64_SUPPORT_AARCH32=y # CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_U8500 is not set # CONFIG_ARCH_VERSAL is not set +# CONFIG_ARCH_VERSAL2 is not set # CONFIG_ARCH_VERSAL_NET is not set # CONFIG_ARCH_VF610 is not set # CONFIG_ARCH_ZYNQ is not set @@ -162,6 +164,7 @@ CONFIG_ARM64_SUPPORT_AARCH32=y # CONFIG_TARGET_LS1046AQDS is not set # CONFIG_TARGET_LS1046ARDB is not set # CONFIG_TARGET_LS1046AFRWY is not set +# CONFIG_ARCH_SC5XX is not set # CONFIG_TARGET_SL28 is not set # CONFIG_TARGET_TEN64 is not set # CONFIG_ARCH_UNIPHIER is not set @@ -192,7 +195,7 @@ CONFIG_SPL_LDSCRIPT="arch/arm/cpu/armv8/u-boot-spl.lds" CONFIG_ENV_SOURCE_FILE="" CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_SF_DEFAULT_MODE=0x0 -CONFIG_ENV_SIZE=0x8000 +CONFIG_ENV_SIZE=0x1f000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-bob" @@ -254,13 +257,13 @@ CONFIG_SPL_BSS_START_ADDR=0xff8e0000 CONFIG_SPL_BSS_MAX_SIZE=0x10000 CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 +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=0x0f200000 CONFIG_PRE_CON_BUF_SZ=4096 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_DEBUG_UART_BASE=0xff1a0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_BOARD_INIT=y @@ -286,6 +289,7 @@ CONFIG_ARMV8_SET_SMPEN=y CONFIG_PSCI_RESET=y # CONFIG_ARMV8_PSCI is not set # CONFIG_ARMV8_EA_EL3_FIRST is not set +# CONFIG_ARMV8_UDELAY_EVENT_STREAM is not set CONFIG_ARMV8_CRYPTO=y CONFIG_ARMV8_CE_SHA1=y CONFIG_ARMV8_CE_SHA256=y @@ -315,6 +319,7 @@ CONFIG_DEBUG_UART=y # Functionality shared between NXP SoCs # # CONFIG_NXP_ESBC is not set +CONFIG_SYS_LITTLE_ENDIAN=y # # General setup @@ -322,7 +327,7 @@ CONFIG_DEBUG_UART=y CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130300 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set @@ -399,6 +404,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 is not set CONFIG_BOOTMETH_EXTLINUX=y CONFIG_BOOTMETH_EXTLINUX_PXE=y @@ -427,7 +433,6 @@ CONFIG_SYS_BOOT_RAMDISK_HIGH=y # Boot timing # # CONFIG_BOOTSTAGE is not set -CONFIG_BOOTSTAGE_STASH_SIZE=0x1000 # CONFIG_SHOW_BOOT_PROGRESS is not set # CONFIG_SPL_SHOW_BOOT_PROGRESS is not set @@ -532,7 +537,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 @@ -595,6 +602,7 @@ CONFIG_SPL_BINMAN_SYMBOLS=y CONFIG_SPL_BINMAN_UBOOT_SYMBOLS=y CONFIG_HANDOFF=y CONFIG_SPL_HANDOFF=y +# CONFIG_SPL_SOC_INIT is not set CONFIG_SPL_BOARD_INIT=y # CONFIG_SPL_BOOTROM_SUPPORT is not set # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set @@ -705,6 +713,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=y CONFIG_CMD_BOOTI=y CONFIG_BOOTM_LINUX=y @@ -729,7 +738,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_SYS_XIMG_LEN=0x800000 # CONFIG_CMD_SPL is not set @@ -784,7 +792,6 @@ CONFIG_CMD_UNZIP=y # # Device access commands # -# CONFIG_CMD_ARMFLASH is not set # CONFIG_CMD_ADC is not set # CONFIG_CMD_BCB is not set # CONFIG_CMD_BIND is not set @@ -792,7 +799,6 @@ CONFIG_CMD_UNZIP=y # 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=y # CONFIG_CMD_GPIO_READ is not set @@ -833,8 +839,6 @@ CONFIG_CMD_SF_TEST=y CONFIG_CMD_SPI=y CONFIG_DEFAULT_SPI_BUS=0 CONFIG_DEFAULT_SPI_MODE=0x0 -# 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 @@ -967,6 +971,7 @@ CONFIG_MTDPARTS_DEFAULT="" # # Debug commands # +CONFIG_CMD_CYCLIC=y # CONFIG_CMD_DIAG is not set # CONFIG_CMD_EVENT is not set CONFIG_CMD_LOG=y @@ -1010,6 +1015,7 @@ CONFIG_OF_UPSTREAM=y # CONFIG_OF_UPSTREAM_BUILD_VENDOR 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="" @@ -1041,7 +1047,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_ENV_IS_IN_SPI_FLASH is not set # CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set @@ -1122,6 +1127,7 @@ CONFIG_OFNODE_MULTI_TREE=y CONFIG_OFNODE_MULTI_TREE_MAX=4 CONFIG_BOUNCE_BUFFER=y CONFIG_ADC=y +# CONFIG_SPL_ADC is not set # CONFIG_ADC_EXYNOS is not set # CONFIG_ADC_SANDBOX is not set # CONFIG_SARADC_MESON is not set @@ -1180,6 +1186,7 @@ CONFIG_SPL_CLK=y # CONFIG_CLK_K210 is not set # CONFIG_CLK_MPC83XX is not set # CONFIG_CLK_XLNX_CLKWZRD is not set +# CONFIG_COMMON_CLK_ADI_SHARED is not set # CONFIG_CLK_AT91 is not set # CONFIG_CLK_RCAR is not set # CONFIG_CLK_RCAR_CPG_LIB is not set @@ -1297,7 +1304,6 @@ CONFIG_ROCKCHIP_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 # CONFIG_ADP5585_GPIO is not set @@ -1327,6 +1333,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y # CONFIG_SYS_I2C_OCORES is not set CONFIG_SYS_I2C_ROCKCHIP=y # CONFIG_SYS_I2C_SOFT is not set +# CONFIG_SYS_I2C_S3C24X0 is not set # CONFIG_SYS_I2C_MV is not set # CONFIG_SYS_I2C_MVTWSI is not set # CONFIG_SYS_I2C_XILINX_XIIC is not set @@ -1438,6 +1445,7 @@ CONFIG_MMC_HW_PARTITIONING=y # CONFIG_SUPPORT_EMMC_RPMB is not set # CONFIG_SUPPORT_EMMC_BOOT is not set CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_SUPPORTS_TUNING=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y @@ -1484,6 +1492,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 @@ -1539,6 +1548,7 @@ CONFIG_SPI_FLASH_USE_4K_SECTORS=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 @@ -1588,6 +1598,7 @@ CONFIG_PHY_GIGE=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_EEPRO100 is not set @@ -1828,6 +1839,7 @@ CONFIG_RNG_ROCKCHIP=y # CONFIG_RNG_IPROC200 is not set # CONFIG_RNG_SMCCC_TRNG is not set # CONFIG_RNG_ARM_RNDR is not set +# CONFIG_RNG_EXYNOS is not set # # Real Time Clock @@ -1910,6 +1922,7 @@ CONFIG_SYS_NS16550_MEM32=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=y @@ -2037,6 +2050,7 @@ CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_OMAP is not set CONFIG_USB_DWC3_GENERIC=y # CONFIG_SPL_USB_DWC3_GENERIC is not set +# CONFIG_USB_DWC3_AM62 is not set # CONFIG_USB_DWC3_LAYERSCAPE is not set # @@ -2119,6 +2133,8 @@ CONFIG_CONSOLE_NORMAL=y # CONFIG_CONSOLE_TRUETYPE is not set 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 @@ -2208,7 +2224,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 @@ -2403,6 +2418,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 -- cgit v1.2.1