mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-30 08:31:03 +00:00
1189bd513c
The size of the binary created with the default U-boot config is much
greater than the default offset for environment `0x60000`.
In case if that binary is used for booting via MMC it is overlapped with
the environment stored on MMC.
This leads to U-Boot corruption while saving environment with `saveenv`
command and non-bootable SabreLite board.
The offset for environment `CONFIG_ENV_OFFSET=0x60000` was added in
commit a09fea1 but did not count in the change to `0xC0000` if option
`CONFIG_ENV_IS_IN_MMC` is used.
The offset is also used for variant with environment saving onto SPI NOR
flash (with enabled option `CONFIG_ENV_IS_IN_SPI_FLASH`). In that case the
U-Boot binary flashed on SPI NOR is also corrupted after environment
saving with the original 0x60000 offset.
Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
84 lines
2 KiB
Text
84 lines
2 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_MX6=y
|
|
CONFIG_SYS_TEXT_BASE=0x17800000
|
|
CONFIG_SYS_MALLOC_F_LEN=0x4000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_ENV_SIZE=0x2000
|
|
CONFIG_ENV_OFFSET=0xC0000
|
|
CONFIG_MX6Q=y
|
|
CONFIG_TARGET_NITROGEN6X=y
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_CMD_HDMIDETECT=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabrelite"
|
|
CONFIG_AHCI=y
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,DDR_MB=1024,SABRELITE"
|
|
CONFIG_BOOTDELAY=3
|
|
# CONFIG_USE_BOOTCOMMAND is not set
|
|
CONFIG_USE_PREBOOT=y
|
|
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
|
|
CONFIG_MISC_INIT_R=y
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
CONFIG_CMD_MEMTEST=y
|
|
CONFIG_SYS_ALT_MEMTEST=y
|
|
CONFIG_SYS_MEMTEST_START=0x10000000
|
|
CONFIG_SYS_MEMTEST_END=0x10010000
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_GPT=y
|
|
# CONFIG_RANDOM_UUID is not set
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
# CONFIG_CMD_PINMUX is not set
|
|
CONFIG_CMD_SATA=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
CONFIG_CMD_BMP=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
# CONFIG_ISO_PARTITION is not set
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_NETCONSOLE=y
|
|
CONFIG_DM=y
|
|
CONFIG_DWC_AHSATA=y
|
|
CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
CONFIG_FASTBOOT_BUF_ADDR=0x12000000
|
|
CONFIG_DM_MMC=y
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_MTD=y
|
|
CONFIG_DM_SPI_FLASH=y
|
|
CONFIG_SF_DEFAULT_MODE=0
|
|
CONFIG_SF_DEFAULT_SPEED=25000000
|
|
CONFIG_SPI_FLASH_SST=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_MICREL=y
|
|
CONFIG_PHY_MICREL_KSZ90X1=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX6=y
|
|
CONFIG_MXC_UART=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_MXC_SPI=y
|
|
CONFIG_DM_THERMAL=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_KEYBOARD=y
|
|
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_MANUFACTURER="Boundary"
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
|
CONFIG_CI_UDC=y
|
|
CONFIG_USB_ETHER=y
|
|
CONFIG_USB_ETH_CDC=y
|
|
CONFIG_DM_VIDEO=y
|
|
CONFIG_SYS_WHITE_ON_BLACK=y
|
|
CONFIG_VIDEO_IPUV3=y
|
|
CONFIG_SPLASH_SCREEN=y
|
|
CONFIG_SPLASH_SCREEN_ALIGN=y
|