Skip to contentSkip to conversation

ARM: stm32: Set environment sector size to 4k on DHSOM

PATCH In review Marek Vasut 2 participants 3 messages Aug 9, 2021 – Aug 16, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: stm32: Set environment sector size to 4k on DHSOM

The DHSOM SPI NOR is using 4k erase blocks, make use of it and define the default environment sector size to 4k.

Cc Patrice Chotard <[email protected]>
Cc Patrick Delaunay <[email protected]>
---
 configs/stm32mp15_dhcom_basic_defconfig | 2 +-
 configs/stm32mp15_dhcor_basic_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
configs/stm32mp15_dhcom_basic_defconfig +1 -1
index 266fdbd9028..7439cd268f6 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_SYS_MEMTEST_START=0xc0000000
 CONFIG_SYS_MEMTEST_END=0xc4000000
 CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcom-pdk2"
@@ -102,7 +103,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_DWC_ETH_QOS=y
configs/stm32mp15_dhcor_basic_defconfig +1 -1
index 9a449d76dff..7e2d7fed3d4 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_STM32MP=y
 CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcor-avenger96"
@@ -97,7 +98,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_DWC_ETH_QOS=y
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw

Hi Marek

Quoted 45 lines · Marek Vasut

The DHSOM SPI NOR is using 4k erase blocks, make use of it and define the default environment sector size to 4k.

Cc Patrice Chotard <[email protected]>
Cc Patrick Delaunay <[email protected]>
---
 configs/stm32mp15_dhcom_basic_defconfig | 2 +-
 configs/stm32mp15_dhcor_basic_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
configs/stm32mp15_dhcom_basic_defconfig +1 -1
index 266fdbd9028..7439cd268f6 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_SYS_MEMTEST_START=0xc0000000
 CONFIG_SYS_MEMTEST_END=0xc4000000
 CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcom-pdk2"
@@ -102,7 +103,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_DWC_ETH_QOS=y
configs/stm32mp15_dhcor_basic_defconfig +1 -0
index 9a449d76dff..7e2d7fed3d4 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_STM32MP=y
 CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcor-avenger96"

configs/stm32mp15_dhcor_basic_defconfig CONFIG_SPI_FLASH_MACRONIX=y · line 103

Quoted 7 lines
configs/stm32mp15_dhcor_basic_defconfig +0 -1
@@ -97,7 +98,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_DWC_ETH_QOS=y

Thanks
Patrice

#2 lore raw

Hi Marek

Quoted 57 lines · Patrice CHOTARD

Hi Marek

Quoted 45 lines · Marek Vasut

The DHSOM SPI NOR is using 4k erase blocks, make use of it and define the default environment sector size to 4k.

Cc Patrice Chotard <[email protected]>
Cc Patrick Delaunay <[email protected]>
---
 configs/stm32mp15_dhcom_basic_defconfig | 2 +-
 configs/stm32mp15_dhcor_basic_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
configs/stm32mp15_dhcom_basic_defconfig +1 -1
index 266fdbd9028..7439cd268f6 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_SYS_MEMTEST_START=0xc0000000
 CONFIG_SYS_MEMTEST_END=0xc4000000
 CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcom-pdk2"
@@ -102,7 +103,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_DWC_ETH_QOS=y
configs/stm32mp15_dhcor_basic_defconfig +1 -0
index 9a449d76dff..7e2d7fed3d4 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_STM32MP=y
 CONFIG_SYS_MALLOC_F_LEN=0x3000
 CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcor-avenger96"

configs/stm32mp15_dhcor_basic_defconfig CONFIG_SPI_FLASH_MACRONIX=y · line 103

Quoted 7 lines
configs/stm32mp15_dhcor_basic_defconfig +0 -1
@@ -97,7 +98,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_DM_ETH=y
 CONFIG_DWC_ETH_QOS=y
Quoted 3 lines

Thanks
Patrice

Applied to u-boot-stm/master

Thanks
Patrice