Merge pull request #39 from DHowett/fix-flash-layout-lotus-azalea

lotus,azalea: officially reserve the top 4k of flash for SPI_FLAGS
FrameworkComputer · Jan 3, 2024 · 28b064e · 28b064e
2 parents 1e24d95 + 817e220
commit 28b064e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/zephyr/program/lotus/azalea/overlay.dtsi b/zephyr/program/lotus/azalea/overlay.dtsi
@@ -161,3 +161,22 @@
 	>;
 	pinctrl-names = "default";
 };
+
+&binman {
+	ec-rw {
+		/*
+		 * Azalea uses the last 0x1000 bytes of flash for non-volatile settings storage.
+		 * Shrink the RW region by that much so that there is no conflict between RW_FWID
+		 * or RW text and non-volatile settings.
+		 */
+		size = <0x3f000>;
+		rw-fw {
+			rw-fwid {
+				offset = <(0x3f000 - 32)>;
+			};
+		};
+	};
+	/* The remaining 0x1000 bytes will be used for non-volatile settings storage. */
+	pad-after = <0x1000>;
+	pad-byte = <0xFF>;
+};
diff --git a/zephyr/program/lotus/lotus/overlay.dtsi b/zephyr/program/lotus/lotus/overlay.dtsi
@@ -139,3 +139,21 @@
 	pinctrl-names = "default";
 };
 
+&binman {
+	ec-rw {
+		/*
+		 * Lotus uses the last 0x1000 bytes of flash for non-volatile settings storage.
+		 * Shrink the RW region by that much so that there is no conflict between RW_FWID
+		 * or RW text and non-volatile settings.
+		 */
+		size = <0x3f000>;
+		rw-fw {
+			rw-fwid {
+				offset = <(0x3f000 - 32)>;
+			};
+		};
+	};
+	/* The remaining 0x1000 bytes will be used for non-volatile settings storage. */
+	pad-after = <0x1000>;
+	pad-byte = <0xFF>;
+};
diff --git a/zephyr/program/lotus/program.conf b/zephyr/program/lotus/program.conf
@@ -16,6 +16,7 @@ CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=y
 CONFIG_PLATFORM_EC_WP_DISABLE=y
 CONFIG_PLATFORM_EC_UNIMPLEMENTED_GPIO=y
 CONFIG_PLATFORM_EC_I2C_DEBUG=y
+CONFIG_CROS_EC_RW_SIZE=0x3F000
 
 # Port80
 CONFIG_PLATFORM_EC_PORT80_4_BYTE=y