openpower: Default PNOR_SQUASHFS to n
Witherspoon is the only system that uses this option. Instead of
updating all of the non-Witherspoon systems to turn it off, this commit
defaults it to 'n' and updates the witherspoon defconfigs to enable it.
The change to zz is due to the new default.
Signed-off-by: Joel Stanley <joel@jms.id.au>
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 3e9455e..929560a 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -55,6 +55,7 @@
BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
BR2_OPENPOWER_TARGETING_BIN_FILENAME="WITHERSPOON_HB.targeting.bin"
BR2_OPENPOWER_TARGETING_ECC_FILENAME="WITHERSPOON_HB.targeting.bin.ecc"
+BR2_BUILD_PNOR_SQUASHFS=y
BR2_PACKAGE_PETITBOOT=y
BR2_PACKAGE_PETITBOOT_MTD=y
BR2_OCC_GPU_BIN_BUILD=y
diff --git a/openpower/configs/witherspoon_dev_defconfig b/openpower/configs/witherspoon_dev_defconfig
index 34eeb58..2821a85 100644
--- a/openpower/configs/witherspoon_dev_defconfig
+++ b/openpower/configs/witherspoon_dev_defconfig
@@ -56,6 +56,7 @@
BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
BR2_OPENPOWER_TARGETING_BIN_FILENAME="WITHERSPOON_HB.targeting.bin"
BR2_OPENPOWER_TARGETING_ECC_FILENAME="WITHERSPOON_HB.targeting.bin.ecc"
+BR2_BUILD_PNOR_SQUASHFS=y
BR2_PACKAGE_PETITBOOT=y
BR2_PACKAGE_PETITBOOT_MTD=y
BR2_OCC_GPU_BIN_BUILD=y
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index 7d2604f..4add25a 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -45,7 +45,6 @@
# BR2_PACKAGE_OPENPOWER_PNOR is not set
BR2_OPENPOWER_CONFIG_NAME="openpower-firenze"
# BR2_TARGET_SKIBOOT_XZ is not set
-# BR2_BUILD_PNOR_SQUASHFS is not set
BR2_PACKAGE_PETITBOOT=y
BR2_PACKAGE_PETITBOOT_MTD=y
# BR2_PACKAGE_HCODE is not set
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 92adf36..a673e2b 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -160,6 +160,6 @@
config BR2_BUILD_PNOR_SQUASHFS
bool "Create a virtual PNOR image along with the standard image"
- default y
+ default n
endmenu