Disable SPI memory software protection by default in zynqmp target

Additionally, MTD_SPI_NOR_USE_4K_SECTORS was set to make both targets match in prefering 4K erase blocks
PandABlocks · Sep 19, 2024 · 6ed4caf · 6ed4caf
1 parent aee0499
commit 6ed4caf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/kernel/zynq.config b/kernel/zynq.config
@@ -1041,8 +1041,8 @@ CONFIG_MTD_NAND_ECC_SW_HAMMING=y
 
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
-# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
-CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+CONFIG_MTD_SPI_NOR_SWP_DISABLE=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE is not set
 # CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
 # CONFIG_MTD_UBI is not set
 # CONFIG_MTD_HYPERBUS is not set

diff --git a/kernel/zynqmp.config b/kernel/zynqmp.config
@@ -1295,9 +1295,9 @@ CONFIG_MTD_NAND_ECC_SW_HAMMING=y
 # end of LPDDR & LPDDR2 PCM memory drivers
 
 CONFIG_MTD_SPI_NOR=y
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
-CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_MTD_SPI_NOR_SWP_DISABLE=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE is not set
 # CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096