rp2/boards: BOARD_VARIANT can now select flash size.

mattytrentini · mattytrentini · commit 40632dded0a3 · 2022-09-12T17:47:54.000+10:00
diff --git a/ports/rp2/boards/WEACTSTUDIO/board.json b/ports/rp2/boards/WEACTSTUDIO/board.json
@@ -12,7 +12,7 @@
         "weact_rp2040.jpg"
     ],
     "mcu": "rp2040",
-    "product": "WeAct Studio RP2040 (16MiB)",
+    "product": "WeAct Studio RP2040",
     "url": "https://github.com/WeActTC/WeActStudio.RP2040CoreBoard/tree/master",
     "vendor": "WeAct"
 }
diff --git a/ports/rp2/boards/WEACTSTUDIO/modules/board.py b/ports/rp2/boards/WEACTSTUDIO/modules/board.py
@@ -1,4 +1,3 @@
-from micropython import const
 from machine import Pin
 
 led = Pin(25, Pin.OUT, value=0)
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
@@ -1,27 +1,39 @@
-# cmake file for WeAct Studio RP2040 boards
+# CMake file for WeAct Studio RP2040 boards
 
 # The WeAct Studio boards don't have official pico-sdk support so we define it
 # here in weactstudio.h.
 # See also: https://github.com/raspberrypi/pico-sdk/tree/master/src/boards/include/boards
-#set(PICO_BOARD_HEADER_DIRS ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD})
 list(APPEND PICO_BOARD_HEADER_DIRS ${MICROPY_BOARD_DIR})
 
 # Freeze board.py
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
 
 # Provide different variants for the downloads page.
-#string(CONCAT BOARD_VARIANTS "${BOARD_VARIANTS} " "flash_2mb flash_4mb flash_8mb flash_16mb")
 set(BOARD_VARIANTS "flash_2mb flash_4mb flash_8mb flash_16mb")
 
 if("${BOARD_VARIANT}" STREQUAL "flash_2mb")
     set(FLASH_SIZE_MB 2)
-    math(EXPR PICO_FLASH_SIZE_BYTES "${FLASH_SIZE_MB} * 1024 * 1024")
-    #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPICO_FLASH_SIZE_BYTES=${PICO_FLASH_SIZE_BYTES}")
-    message("BOARD_VARIANT=" ${BOARD_VARIANT} " FLASH_SIZE_MB=" ${FLASH_SIZE_MB} " PICO_FLASH_SIZE_BYTES=" ${PICO_FLASH_SIZE_BYTES})
 endif()
 
-if (DEFINED PICO_FLASH_SIZE_BYTES)
+if("${BOARD_VARIANT}" STREQUAL "flash_4mb")
+    set(FLASH_SIZE_MB 4)
+endif()
+
+if("${BOARD_VARIANT}" STREQUAL "flash_8mb")
+    set(FLASH_SIZE_MB 8)
+endif()
+
+if("${BOARD_VARIANT}" STREQUAL "flash_16mb")
+    set(FLASH_SIZE_MB 16)
+endif()
+
+if (DEFINED FLASH_SIZE_MB)
+    math(EXPR PICO_FLASH_SIZE_BYTES "${FLASH_SIZE_MB} * 1024 * 1024")
     add_compile_definitions(
-        PICO_FLASH_SIZE_BYTES="${PICO_FLASH_SIZE_BYTES}"
+        PICO_FLASH_SIZE_BYTES=${PICO_FLASH_SIZE_BYTES}
+        FLASH_SIZE_MB=${FLASH_SIZE_MB}
+    )
+    list(
+        APPEND MICROPY_CPP_DEF_EXTRA PICO_FLASH_SIZE_BYTES=${PICO_FLASH_SIZE_BYTES}
     )
 endif()
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.h b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.h
@@ -1,3 +1,4 @@
-#define MICROPY_HW_BOARD_NAME          "WeAct Studio RP2040"
-// TODO(mst) Need to update this from "FLASH_SIZE_MB - 1", see mpconfigboard.cmake
-#define MICROPY_HW_FLASH_STORAGE_BYTES (15 * 1024 * 1024)
+#define MICROPY_HW_BOARD_NAME "WeAct Studio RP2040"
+
+// Allow 1MB for the firmware image itself, allocate the remainder to the filesystem
+#define MICROPY_HW_FLASH_STORAGE_BYTES ((FLASH_SIZE_MB - 1) * 1024 * 1024)
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio.h
@@ -4,11 +4,11 @@
 // Officially supported boards:
 //     https://github.com/raspberrypi/pico-sdk/tree/master/src/boards/include/boards
 
-#ifndef _BOARDS_WAVGAT_16MB_H
-#define _BOARDS_WAVGAT_16MB_H
+#ifndef _BOARDS_WEACTSTUDIO_H
+#define _BOARDS_WEACTSTUDIO_H
 
 // For board detection
-#define WAVGAT_16MB
+#define WEACTSTUDIO
 
 // --- UART ---
 #ifndef PICO_DEFAULT_UART
@@ -63,7 +63,7 @@
 
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (FLASH_SIZE_MB * 1024 * 1024)
-#error Fail!
+#error PICO_FLASH_SIZE_BYTES should always be set by selecting an appropriate BOARD_VARIANT
 #endif
 
 // All boards have B1 RP2040

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"weact_rp2040.jpg"`
`13`	`13`	`],`
`14`	`14`	`"mcu": "rp2040",`
`15`		`- "product": "WeAct Studio RP2040 (16MiB)",`
	`15`	`+ "product": "WeAct Studio RP2040",`
`16`	`16`	`"url": "https://github.com/WeActTC/WeActStudio.RP2040CoreBoard/tree/master",`
`17`	`17`	`"vendor": "WeAct"`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from micropython import const`
`2`	`1`	`from machine import Pin`
`3`	`2`
`4`	`3`	`led = Pin(25, Pin.OUT, value=0)`