From: Adam Ford Date: Fri, 2 Aug 2019 12:03:39 +0000 (-0500) Subject: ARM: da850-evm: Increase environment NOR partition offset X-Git-Tag: v2019.10-rc2~3^2~4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d2c30190ee69869164c3bfafaed5143b0c316983;p=oweals%2Fu-boot.git ARM: da850-evm: Increase environment NOR partition offset The current size allocated to U-Boot is 384k, but U-Boot has grown to 436K which means that saving the environmental variables wipes out part of the U-Boot source and the board ceases to function. Due to the sector and erase size for the NOR part and a desire to not have to change partition sizes often, this patch moves the U-Boot environmental variables to an offset of 1M so saveenv does not brick the board. This patch also sets up MTDIDS and MTDPARTS to clearly show where U-Boot and U-Boot's environmental variables are located. Signed-off-by: Adam Ford --- diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 2eaa29fb8f..a8ebbd95ec 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -21,10 +21,11 @@ CONFIG_SYS_PROMPT="U-Boot > " CONFIG_CMD_IMLS=y CONFIG_CRC32_VERIFY=y CONFIG_CMD_DM=y -# CONFIG_CMD_GPIO is not set # CONFIG_CMD_GPT is not set # CONFIG_CMD_MMC is not set +CONFIG_CMD_MTD=y # CONFIG_CMD_PART is not set +# CONFIG_CMD_SF is not set # CONFIG_CMD_SPI is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_TIME is not set @@ -32,6 +33,9 @@ CONFIG_CMD_DM=y # CONFIG_CMD_EXT4 is not set # CONFIG_CMD_FAT is not set # CONFIG_CMD_FS_GENERIC is not set +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.2" +CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.2:1m(u-boot),128k(u-boot-env),-(spare)" CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" @@ -45,6 +49,8 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y +CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y +CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y CONFIG_DM_SPI_FLASH=y @@ -66,7 +72,6 @@ CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB=y -# CONFIG_SPL_DM_USB is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_DA8XX=y CONFIG_USB_MUSB_HOST=y diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 0281dbd7b4..9bd6da015e 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -192,7 +192,7 @@ #ifdef CONFIG_USE_NOR #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of flash banks */ #define CONFIG_SYS_FLASH_SECT_SZ (128 << 10) /* 128KB */ -#define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_SECT_SZ * 3) +#define CONFIG_ENV_OFFSET (SZ_1M) #define CONFIG_ENV_SIZE (10 << 10) /* 10KB */ #define CONFIG_SYS_FLASH_BASE DAVINCI_ASYNC_EMIF_DATA_CE2_BASE #define PHYS_FLASH_SIZE (8 << 20) /* Flash size 8MB */