rev 5: Final Flash config.

jakkra · Jul 12, 2024 · fd03967 · fd03967
1 parent c415c42
commit fd03967
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,9 @@
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/app/build/zephyr/zephyr.exe",
-            "args": ["--bt-dev=hci0"],
+            "args": [
+                "--bt-dev=hci0"
+            ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "preLaunchTask": "Disable BT",

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -27,9 +27,17 @@ if("nrf5340dk_nrf5340_cpuapp" STREQUAL "${BOARD}")
 endif()
 
 set(BOARD_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(ZSWatchFW)
 
+# These are XIP related anomalies and aren't applicable for us and cause
+# throughput issues and QSPI issues on NCS 2.6.0
+zephyr_compile_definitions(
+  -DNRF53_ERRATA_43_ENABLE_WORKAROUND=0
+  -DNRF52_ERRATA_215_ENABLE_WORKAROUND=0
+)
+
 add_subdirectory(drivers)
 add_subdirectory(src/history)
 add_subdirectory(src/applications)

diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay
@@ -105,12 +105,12 @@
 
 / {
 	chosen {
-		nordic,pm-ext-flash = &gd25lq128d;
+		nordic,pm-ext-flash = &mx25u51245g;
 		zephyr,console = &cdc_acm_uart0;
 	};
 
 	aliases {
-		spi-flash0 = &gd25lq128d;
+		spi-flash0 = &mx25u51245g;
 		buzzer-pwm = &buzzer_pwm;
 	};
 
@@ -286,23 +286,25 @@
 	pinctrl-0 = <&qspi_default>;
 	pinctrl-1 = <&qspi_sleep>;
 	pinctrl-names = "default", "sleep";
-	gd25lq128d: gd25lq128d@0 {
+	mx25u51245g: mx25u51245g@0 {
 		compatible = "nordic,qspi-nor";
 		reg = <0>;
 		sck-frequency = <96000000>;
-		jedec-id = [c8 60 18];
-		size = <DT_SIZE_M(16*8)>;
+		jedec-id = [c2 25 3a];
+		size = <DT_SIZE_M(64*8)>;
+		/*
 		has-dpd;
         // CS High to Power-Down Mode (tDP) - 3 us
         // Rev. S Table 26. AC Electrical Characteristic
 		t-enter-dpd = <20000>;
         // CS High to Standby Mode without Electronic Signature Read (tRES1) 3 us
         // Rev. S Table 26. AC Electrical Characteristic
 		t-exit-dpd = <20000>;
+		*/
 		// Configure to actully use Quad SPI data.
-		writeoc = "pp4o";
+		writeoc = "pp4io";
 		readoc = "read4io";
-		quad-enable-requirements = "S2B1v1";
+		quad-enable-requirements = "S1B6";
 	};
 };
 
@@ -325,7 +327,7 @@
 
 /delete-node/ &storage_partition;
 
-&gd25lq128d {
+&mx25u51245g {
 	partitions {
 		compatible = "fixed-partitions";
 		#address-cells = <1>;