From 8d57468ee53a9097305999ea5f31d26a5d4fced0 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Mon, 13 Feb 2023 21:55:40 +0300 Subject: u-boot: Update to v2023.01 Set default U-Boot revision to v2023.01 and rebase patches on top of that. Upstream kconfig status is a bit unstable, so updating configs with `make oldconfig` would miss important upstream changes. For each board, run `make savedefconfig` and `diffconfig -m` at the old version to get a diff from upstream defconfigs. Fix those affected by upstream changes, like SYS_TEXT_BASE being renamed to TEXT_BASE. Then append those to the new version's defconfigs and run `make olddefconfig` to get updated configs. Signed-off-by: Alper Nebi Yasak --- resources/u-boot/gru_bob/config/default | 88 +++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 26 deletions(-) (limited to 'resources/u-boot/gru_bob/config/default') diff --git a/resources/u-boot/gru_bob/config/default b/resources/u-boot/gru_bob/config/default index ceaf5447..c326f25e 100644 --- a/resources/u-boot/gru_bob/config/default +++ b/resources/u-boot/gru_bob/config/default @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# U-Boot 2022.10 Configuration +# U-Boot 2023.01 Configuration # # -# Compiler: gcc (Debian 12.2.0-9) 12.2.0 +# Compiler: gcc (Debian 12.2.0-14) 12.2.0 # CONFIG_CREATE_ARCH_SYMLINK=y CONFIG_SYS_CACHE_SHIFT_6=y @@ -62,8 +62,8 @@ CONFIG_SYS_ARM_CACHE_WRITEBACK=y # CONFIG_ARCH_CPU_INIT is not set CONFIG_SYS_ARCH_TIMER=y CONFIG_ARM_SMCCC=y -# CONFIG_SEMIHOSTING is not set -# CONFIG_SPL_SEMIHOSTING is not set +# CONFIG_SYS_L2_PL310 is not set +# CONFIG_SPL_SYS_L2_PL310 is not set # CONFIG_SYS_L2CACHE_OFF is not set CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_USE_ARCH_MEMCPY is not set @@ -78,10 +78,6 @@ CONFIG_ARM64_SUPPORT_AARCH32=y # CONFIG_ARCH_ORION5X is not set # CONFIG_TARGET_STV0991 is not set # CONFIG_ARCH_BCM283X is not set -# CONFIG_ARCH_BCM63158 is not set -# CONFIG_ARCH_BCM6753 is not set -# CONFIG_ARCH_BCM68360 is not set -# CONFIG_ARCH_BCM6858 is not set # CONFIG_ARCH_BCMSTB is not set # CONFIG_ARCH_BCMBCA is not set # CONFIG_TARGET_VEXPRESS_CA9X4 is not set @@ -122,6 +118,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_VERSAL_NET is not set # CONFIG_ARCH_VF610 is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP_R5 is not set @@ -178,7 +175,7 @@ CONFIG_ARCH_ROCKCHIP=y # CONFIG_TARGET_XENGUEST_ARM64 is not set # CONFIG_ARCH_GXP is not set # CONFIG_STATIC_MACH_TYPE is not set -CONFIG_SYS_TEXT_BASE=0x18000000 +CONFIG_TEXT_BASE=0x18000000 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_GPIO=y @@ -282,6 +279,8 @@ CONFIG_SYS_LOAD_ADDR=0x800800 # CONFIG_SPL_PAYLOAD="u-boot.bin" CONFIG_BUILD_TARGET="" +CONFIG_FWU_NUM_BANKS=2 +CONFIG_FWU_NUM_IMAGES_PER_BANK=2 CONFIG_DEBUG_UART=y # CONFIG_AHCI is not set # CONFIG_OF_BOARD_FIXUP is not set @@ -328,6 +327,7 @@ CONFIG_PLATFORM_ELFENTRY="_start" CONFIG_STACK_SIZE=0x1000000 CONFIG_SYS_SRAM_BASE=0x0 CONFIG_SYS_SRAM_SIZE=0x0 +CONFIG_SYS_MONITOR_LEN=0 # CONFIG_MP is not set # CONFIG_EXAMPLES is not set @@ -368,20 +368,24 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py" CONFIG_PXE_UTILS=y CONFIG_BOOTSTD=y # CONFIG_BOOTSTD_FULL is not set +# CONFIG_SPL_BOOTSTD is not set # CONFIG_BOOTSTD_BOOTCOMMAND is not set CONFIG_BOOTMETH_GLOBAL=y CONFIG_BOOTMETH_DISTRO=y CONFIG_BOOTMETH_DISTRO_PXE=y CONFIG_BOOTMETH_EFILOADER=y CONFIG_BOOTMETH_VBE=y +# CONFIG_SPL_BOOTMETH_VBE is not set CONFIG_BOOTMETH_VBE_SIMPLE=y +CONFIG_BOOTMETH_VBE_SIMPLE_OS=y +# CONFIG_SPL_BOOTMETH_VBE_SIMPLE is not set # CONFIG_BOOTMETH_SCRIPT is not set CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_OF_BOARD_SETUP is not set # CONFIG_OF_SYSTEM_SETUP is not set # CONFIG_OF_STDOUT_VIA_ALIAS is not set -CONFIG_HAVE_SYS_TEXT_BASE=y +CONFIG_HAVE_TEXT_BASE=y # CONFIG_DYNAMIC_SYS_CLK_FREQ is not set CONFIG_ARCH_FIXUP_FDT_MEMORY=y # CONFIG_CHROMEOS is not set @@ -439,7 +443,10 @@ CONFIG_MENU=y CONFIG_LOGLEVEL=4 CONFIG_SPL_LOGLEVEL=4 # CONFIG_SILENT_CONSOLE is not set +# CONFIG_SPL_SILENT_CONSOLE is not set +# CONFIG_TPL_SILENT_CONSOLE is not set CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_CONSOLE_FLUSH_SUPPORT=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set @@ -475,6 +482,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y # # Start-up hooks # +# CONFIG_CYCLIC is not set CONFIG_EVENT=y CONFIG_EVENT_DYNAMIC=y # CONFIG_EVENT_DEBUG is not set @@ -571,6 +579,7 @@ CONFIG_SPL_CRC32=y # CONFIG_SPL_FPGA is not set # CONFIG_SPL_I2C is not set # CONFIG_SPL_DM_MAILBOX is not set +# CONFIG_SPL_MEMORY is not set CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=1 # CONFIG_SPL_MPC8XXX_INIT_DDR is not set # CONFIG_SPL_MTD_SUPPORT is not set @@ -675,6 +684,7 @@ CONFIG_CMD_RUN=y CONFIG_CMD_IMI=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_XIMG=y +# CONFIG_CMD_XXD is not set # CONFIG_CMD_SPL is not set # CONFIG_CMD_THOR_DOWNLOAD is not set # CONFIG_CMD_ZBOOT is not set @@ -752,6 +762,10 @@ CONFIG_CMD_I2C=y CONFIG_CMD_LOADB=y # CONFIG_CMD_LOADM is not set CONFIG_CMD_LOADS=y +# CONFIG_LOADS_ECHO is not set +# CONFIG_CMD_SAVES is not set +# CONFIG_SYS_LOADS_BAUD_CHANGE is not set +CONFIG_CMD_LOADXY_TIMEOUT=90 # CONFIG_CMD_LSBLK is not set # CONFIG_CMD_MBR is not set # CONFIG_CMD_MISC is not set @@ -766,7 +780,6 @@ CONFIG_CMD_PINMUX=y # CONFIG_CMD_POWEROFF is not set # CONFIG_CMD_READ is not set # CONFIG_CMD_SATA is not set -# CONFIG_CMD_SAVES is not set # CONFIG_CMD_SCSI is not set # CONFIG_CMD_SDRAM is not set CONFIG_CMD_SF=y @@ -782,6 +795,7 @@ CONFIG_CMD_USB=y # # Shell scripting commands # +# CONFIG_CMD_CAT is not set CONFIG_CMD_ECHO=y CONFIG_CMD_ITEST=y CONFIG_CMD_SOURCE=y @@ -817,6 +831,7 @@ CONFIG_NET_TFTP_VARS=y CONFIG_CMD_NFS=y CONFIG_NFS_TIMEOUT=2000 # CONFIG_SYS_DISABLE_AUTOLOAD is not set +# CONFIG_CMD_WGET is not set CONFIG_CMD_MII=y CONFIG_CMD_MDIO=y CONFIG_CMD_PING=y @@ -836,12 +851,14 @@ CONFIG_CMD_PXE=y CONFIG_CMD_BLOCK_CACHE=y # CONFIG_CMD_CACHE is not set # CONFIG_CMD_CONITRACE is not set -# CONFIG_CMD_CLS is not set +CONFIG_CMD_CLS=y # CONFIG_CMD_EFIDEBUG is not set +# CONFIG_CMD_EFICONFIG is not set # CONFIG_CMD_EXCEPTION is not set # CONFIG_CMD_DATE is not set CONFIG_CMD_TIME=y # CONFIG_CMD_GETTIME is not set +# CONFIG_CMD_PAUSE is not set # CONFIG_CMD_RNG is not set # CONFIG_CMD_KASLRSEED is not set CONFIG_CMD_SLEEP=y @@ -851,6 +868,7 @@ CONFIG_CMD_SYSBOOT=y # CONFIG_CMD_PSTORE is not set # CONFIG_CMD_TERMINAL is not set # CONFIG_CMD_UUID is not set +CONFIG_CMD_VIDCONSOLE=y # # TI specific command line interface @@ -923,7 +941,7 @@ CONFIG_EFI_PARTITION_ENTRIES_OFF=0 CONFIG_SPL_EFI_PARTITION=y CONFIG_PARTITION_UUIDS=y CONFIG_SPL_PARTITION_UUIDS=y -# CONFIG_PARTITION_TYPE_GUID is not set +CONFIG_PARTITION_TYPE_GUID=y CONFIG_SUPPORT_OF_CONTROL=y CONFIG_PYLIBFDT=y CONFIG_DTOC=y @@ -1003,6 +1021,8 @@ CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS=100 # CONFIG_UDP_CHECKSUM is not set # CONFIG_BOOTP_SERVERIP is not set CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64 +# CONFIG_PROT_TCP is not set +# CONFIG_IPV6 is not set CONFIG_SYS_RX_ETH_BUFFER=4 # @@ -1038,6 +1058,7 @@ CONFIG_OF_TRANSLATE=y # CONFIG_SPL_OF_TRANSLATE is not set # CONFIG_TRANSLATION_OFFSET is not set CONFIG_DM_DEV_READ_INLINE=y +# CONFIG_OFNODE_MULTI_TREE is not set # CONFIG_ACPIGEN is not set CONFIG_BOUNCE_BUFFER=y CONFIG_ADC=y @@ -1057,7 +1078,6 @@ CONFIG_SARADC_ROCKCHIP=y # Bus devices # CONFIG_BLK=y -CONFIG_HAVE_BLOCK_DEVICE=y CONFIG_SPL_BLK=y CONFIG_BLOCK_CACHE=y # CONFIG_SPL_BLOCK_CACHE is not set @@ -1149,6 +1169,8 @@ CONFIG_ARM_PSCI_FW=y # CONFIG_FPGA_ALTERA is not set # CONFIG_FPGA_SOCFPGA is not set # CONFIG_FPGA_XILINX is not set +# CONFIG_DM_FPGA is not set +# CONFIG_FWU_MDATA is not set CONFIG_GPIO=y CONFIG_SPL_DM_GPIO=y # CONFIG_GPIO_HOG is not set @@ -1196,6 +1218,8 @@ CONFIG_ROCKCHIP_GPIO=y # CONFIG_ZYNQMP_GPIO_MODEPIN is not set # CONFIG_SLG7XL45106_I2C_GPO is not set # CONFIG_TURRIS_OMNIA_MCU is not set +# CONFIG_FTGPIO010 is not set +# CONFIG_ADP5585_GPIO is not set # # Hardware Spinlock Support @@ -1214,6 +1238,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y # CONFIG_SYS_I2C_DW is not set # CONFIG_SYS_I2C_INTEL is not set # CONFIG_SYS_I2C_IMX_LPI2C is not set +# CONFIG_SYS_I2C_MTK is not set # CONFIG_SYS_I2C_MICROCHIP is not set # CONFIG_SYS_I2C_MXC is not set # CONFIG_SYS_I2C_NEXELL is not set @@ -1234,7 +1259,6 @@ CONFIG_INPUT=y # CONFIG_SPL_INPUT is not set CONFIG_DM_KEYBOARD=y # CONFIG_SPL_DM_KEYBOARD is not set -# CONFIG_KEYBOARD is not set # CONFIG_APPLE_SPI_KEYB is not set CONFIG_CROS_EC_KEYB=y # CONFIG_I8042_KEYB is not set @@ -1261,6 +1285,7 @@ CONFIG_CROS_EC_KEYB=y # # Memory Controller drivers # +# CONFIG_MEMORY is not set # # Multifunction device drivers @@ -1319,6 +1344,7 @@ CONFIG_SPL_DM_MMC=y # CONFIG_MMC_SPI is not set # CONFIG_ARM_PL180_MMCI is not set CONFIG_MMC_QUIRKS=y +CONFIG_SYS_MMC_MAX_BLK_COUNT=65535 CONFIG_MMC_HW_PARTITIONING=y # CONFIG_SUPPORT_EMMC_RPMB is not set # CONFIG_SUPPORT_EMMC_BOOT is not set @@ -1443,6 +1469,7 @@ CONFIG_PHYLIB=y # CONFIG_PHY_VITESSE is not set # CONFIG_PHY_XILINX is not set # CONFIG_PHY_XILINX_GMII2RGMII is not set +# CONFIG_PHY_XWAY is not set # CONFIG_PHY_ETHERNET_ID is not set # CONFIG_PHY_FIXED is not set # CONFIG_PHY_NCSI is not set @@ -1475,6 +1502,7 @@ CONFIG_ETH_DESIGNWARE=y # CONFIG_MCFFEC is not set # CONFIG_FSLDMAFEC is not set # CONFIG_KS8851_MLL is not set +# CONFIG_LITEETH is not set # CONFIG_MACB is not set # CONFIG_NET_NPCM750 is not set # CONFIG_PCH_GBE is not set @@ -1521,7 +1549,6 @@ CONFIG_PHY=y # CONFIG_NOP_PHY is not set # CONFIG_MIPI_DPHY_HELPERS is not set # CONFIG_BCM_SR_PCIE_PHY is not set -# CONFIG_MSM8916_USB_PHY is not set # CONFIG_OMAP_USB2_PHY is not set # @@ -1533,6 +1560,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_TYPEC=y # CONFIG_PHY_CADENCE_SIERRA is not set # CONFIG_PHY_CADENCE_TORRENT is not set +# CONFIG_MSM8916_USB_PHY is not set # CONFIG_MVEBU_COMPHY_SUPPORT is not set # @@ -1595,13 +1623,14 @@ CONFIG_SPL_PMIC_CHILDREN=y # CONFIG_DM_PMIC_MAX8998 is not set # CONFIG_DM_PMIC_MC34708 is not set # CONFIG_PMIC_MAX8997 is not set -# CONFIG_PMIC_PM8916 is not set +# CONFIG_PMIC_QCOM is not set CONFIG_PMIC_RK8XX=y # CONFIG_SPL_PMIC_RK8XX is not set # CONFIG_PMIC_S2MPS11 is not set # CONFIG_DM_PMIC_SANDBOX is not set # CONFIG_PMIC_S5M8767 is not set # CONFIG_PMIC_RN5T567 is not set +# CONFIG_SPL_PMIC_RN5T567 is not set # CONFIG_PMIC_TPS65090 is not set # CONFIG_PMIC_PALMAS is not set # CONFIG_PMIC_LP873X is not set @@ -1753,6 +1782,7 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_SPI_MEM=y +# CONFIG_SPI_DIRMAP is not set # CONFIG_ALTERA_SPI is not set # CONFIG_APPLE_SPI is not set # CONFIG_ATCSPI200_SPI is not set @@ -1769,18 +1799,22 @@ CONFIG_SPI_MEM=y # CONFIG_ICH_SPI is not set # CONFIG_IPROC_QSPI is not set # CONFIG_KIRKWOOD_SPI is not set +# CONFIG_MICROCHIP_COREQSPI is not set # CONFIG_MPC8XXX_SPI is not set # CONFIG_MTK_SNOR is not set # CONFIG_MTK_SNFI_SPI is not set +# CONFIG_MTK_SPIM is not set # CONFIG_MVEBU_A3700_SPI is not set # CONFIG_MXS_SPI is not set # CONFIG_SPI_MXIC is not set # CONFIG_NPCM_FIU_SPI is not set +# CONFIG_NPCM_PSPI is not set # CONFIG_NXP_FSPI is not set # CONFIG_OMAP3_SPI is not set # CONFIG_PL022_SPI is not set # CONFIG_ROCKCHIP_SFC is not set CONFIG_ROCKCHIP_SPI=y +# CONFIG_SPI_ASPEED_SMC is not set # CONFIG_SPI_SIFIVE is not set # CONFIG_SOFT_SPI is not set # CONFIG_SPI_SUNXI is not set @@ -1853,7 +1887,6 @@ CONFIG_USB_OHCI_NEW=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y # CONFIG_USB_OHCI_DA8XX is not set -CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2 # CONFIG_SYS_OHCI_SWAP_REG_ACCESS is not set # CONFIG_USB_UHCI_HCD is not set # CONFIG_USB_DWC2 is not set @@ -1925,7 +1958,7 @@ CONFIG_USB_ETHER_SMSC95XX=y # # Graphics support # -CONFIG_DM_VIDEO=y +CONFIG_VIDEO=y CONFIG_VIDEO_LOGO=y CONFIG_BACKLIGHT=y CONFIG_VIDEO_PCI_DEFAULT_FB_SIZE=0 @@ -1933,7 +1966,6 @@ CONFIG_VIDEO_COPY=y CONFIG_VIDEO_DAMAGE=y CONFIG_BACKLIGHT_PWM=y # CONFIG_BACKLIGHT_GPIO is not set -CONFIG_CMD_VIDCONSOLE=y CONFIG_VIDEO_BPP8=y CONFIG_VIDEO_BPP16=y CONFIG_VIDEO_BPP32=y @@ -1942,11 +1974,11 @@ CONFIG_VIDEO_ANSI=y CONFIG_CONSOLE_NORMAL=y # CONFIG_CONSOLE_ROTATION is not set # CONFIG_CONSOLE_TRUETYPE is not set -# CONFIG_DM_PANEL_HX8238D is not set CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_NO_FB_CLEAR is not set CONFIG_PANEL=y CONFIG_SIMPLE_PANEL=y +# CONFIG_PANEL_HX8238D is not set # CONFIG_VIDEO_FONT_4X6 is not set CONFIG_VIDEO_FONT_8X16=y # CONFIG_VIDEO_FONT_SUN12X22 is not set @@ -1971,7 +2003,6 @@ CONFIG_I2C_EDID=y CONFIG_DISPLAY=y # CONFIG_NXP_TDA19988 is not set # CONFIG_ATMEL_HLCD is not set -# CONFIG_AM335X_LCD is not set # CONFIG_VIDEO_EXYNOS is not set # CONFIG_LOGICORE_DP_TX is not set CONFIG_VIDEO_ROCKCHIP=y @@ -1989,17 +2020,16 @@ CONFIG_DISPLAY_ROCKCHIP_EDP=y # CONFIG_VIDEO_MXS is not set # CONFIG_VIDEO_SEPS525 is not set CONFIG_CONSOLE_SCROLL_LINES=1 -# CONFIG_LCD is not set # CONFIG_VIDEO_SIMPLE is not set # CONFIG_VIDEO_DT_SIMPLEFB is not set # CONFIG_VIDEO_MCDE_SIMPLE is not set # CONFIG_OSD is not set # CONFIG_SPLASH_SCREEN is not set +CONFIG_VIDEO_LOGO_MAX_SIZE=0x100000 CONFIG_VIDEO_BMP_RLE8=y # CONFIG_BMP_16BPP is not set # CONFIG_BMP_24BPP is not set # CONFIG_BMP_32BPP is not set -# CONFIG_VIDEO_VCXK is not set # # VirtIO Drivers @@ -2041,6 +2071,7 @@ CONFIG_FAT_WRITE=y CONFIG_FS_FAT_MAX_CLUSTSIZE=65536 # CONFIG_FS_JFFS2 is not set # CONFIG_UBIFS_SILENCE_MSG is not set +# CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set # CONFIG_FS_CRAMFS is not set # CONFIG_YAFFS2 is not set # CONFIG_FS_SQUASHFS is not set @@ -2057,6 +2088,8 @@ CONFIG_BINMAN_FDT=y CONFIG_CHARSET=y # CONFIG_DYNAMIC_CRC_TABLE is not set CONFIG_LIB_UUID=y +# CONFIG_SEMIHOSTING is not set +# CONFIG_SPL_SEMIHOSTING is not set CONFIG_PRINTF=y CONFIG_SPL_PRINTF=y CONFIG_SPRINTF=y @@ -2143,7 +2176,6 @@ CONFIG_GENERATE_SMBIOS_TABLE=y # CONFIG_SMBIOS_PARSER is not set CONFIG_EFI_LOADER=y CONFIG_CMD_BOOTEFI_BOOTMGR=y -CONFIG_EFI_SETUP_EARLY=y CONFIG_EFI_VARIABLE_FILE_STORE=y # CONFIG_EFI_VARIABLE_NO_STORE is not set # CONFIG_EFI_VARIABLES_PRESEED is not set @@ -2162,7 +2194,7 @@ CONFIG_EFI_HAVE_RUNTIME_RESET=y CONFIG_EFI_RNG_PROTOCOL=y CONFIG_EFI_LOAD_FILE2_INITRD=y CONFIG_EFI_ECPT=y -CONFIG_EFI_EBBR_2_0_CONFORMANCE=y +CONFIG_EFI_EBBR_2_1_CONFORMANCE=y # CONFIG_OPTEE_LIB is not set # CONFIG_OPTEE_IMAGE is not set # CONFIG_BOOTM_OPTEE is not set @@ -2171,6 +2203,10 @@ CONFIG_LIB_ELF=y CONFIG_LMB=y CONFIG_LMB_USE_MAX_REGIONS=y CONFIG_LMB_MAX_REGIONS=8 + +# +# FWU Multi Bank Updates +# # CONFIG_UNIT_TEST is not set # CONFIG_SPL_UNIT_TEST is not set -- cgit v1.2.1 From 7932d5fa95a2c246b57a05f4f3da60a7d7b97783 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Mon, 13 Feb 2023 23:10:28 +0300 Subject: u-boot: Disable environment storage U-Boot can be configured via environment variables which can be saved to various storage devices. This usually defaults to MMC or SPI depending on where it boots from, but assumes the device's layout is controlled by U-Boot. We should store the environment in SPI flash, but we also need to configure coreboot FMAPs to reserve the area U-Boot would use as its environment storage. For now, disable environment storage by setting ENV_IS_NOWHERE=y to avoid overwriting random regions of SPI or MMC if someone tries to save the variables. Signed-off-by: Alper Nebi Yasak --- resources/u-boot/gru_bob/config/default | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'resources/u-boot/gru_bob/config/default') diff --git a/resources/u-boot/gru_bob/config/default b/resources/u-boot/gru_bob/config/default index c326f25e..64f5274f 100644 --- a/resources/u-boot/gru_bob/config/default +++ b/resources/u-boot/gru_bob/config/default @@ -184,7 +184,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL_LDSCRIPT="arch/arm/cpu/armv8/u-boot-spl.lds" CONFIG_ENV_SIZE=0x8000 -CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-gru-bob" @@ -977,12 +976,12 @@ CONFIG_SAVEENV=y # CONFIG_ENV_OVERWRITE is not set CONFIG_ENV_MIN_ENTRIES=64 CONFIG_ENV_MAX_ENTRIES=512 -# CONFIG_ENV_IS_NOWHERE is not set +CONFIG_ENV_IS_NOWHERE=y # CONFIG_ENV_IS_IN_EEPROM is not set # CONFIG_ENV_IS_IN_FAT is not set # CONFIG_ENV_IS_IN_EXT4 is not set # CONFIG_ENV_IS_IN_FLASH is not set -CONFIG_ENV_IS_IN_MMC=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 @@ -990,8 +989,6 @@ CONFIG_ENV_IS_IN_MMC=y # CONFIG_ENV_IS_IN_SPI_FLASH is not set # CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SYS_MMC_ENV_DEV=0 -CONFIG_SYS_MMC_ENV_PART=0 # CONFIG_USE_DEFAULT_ENV_FILE is not set # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set # CONFIG_ENV_IMPORT_FDT is not set -- cgit v1.2.1