Skip to content

Commit 02b98e5

Browse files
kilograhamkilograham
authored
Merge pull request #297 from raspberrypi/develop-1.1.1
Develop 1.1.1
2 parents fc10a97 + 7f2f186 commit 02b98e5

File tree

35 files changed

+306
-110
lines changed

35 files changed

+306
-110
lines changed

‎cmake/pico_pre_load_toolchain.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# PICO_CMAKE_CONFIG: PICO_TOOLCHAIN_PATH, Path to search for compiler, default=none (i.e. search system paths), group=build
2-
# Set your compiler path here if it's not in the PATH environment variable.
3-
set(PICO_TOOLCHAIN_PATH "" CACHE INTERNAL "")
2+
set(PICO_TOOLCHAIN_PATH "${PICO_TOOLCHAIN_PATH}" CACHE INTERNAL "")
43

54
# Set a default build type if none was specified
65
set(default_build_type "Release")

‎cmake/preload/toolchains/pico_arm_gcc.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
5252
option(PICO_DEOPTIMIZED_DEBUG "Build debug builds with -O0" 0)
5353

5454
# todo move to platform/Generix-xxx
55-
set(ARM_GCC_COMMON_FLAGS " -march=armv6-m -mcpu=cortex-m0plus -mthumb")
56-
#set(ARM_GCC_COMMON_FLAGS " -mcpu=cortex-m0plus -mthumb")
55+
56+
# on ARM -mcpu should not be mixed with -march
57+
set(ARM_GCC_COMMON_FLAGS " -mcpu=cortex-m0plus -mthumb")
5758
foreach(LANG IN ITEMS C CXX ASM)
5859
set(CMAKE_${LANG}_FLAGS_INIT "${ARM_GCC_COMMON_FLAGS}")
5960
if (PICO_DEOPTIMIZED_DEBUG)

‎pico_sdk_version.cmake

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_MAJOR, SDK major version number, type=int, pico_base
2-
# PICO_CONFIG: PICO_SDK_VERSION_MAJOR, SDK major version number, type=int, pico_base
1+
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_MAJOR, SDK major version number, type=int, group=pico_base
2+
# PICO_CONFIG: PICO_SDK_VERSION_MAJOR, SDK major version number, type=int, group=pico_base
33
set(PICO_SDK_VERSION_MAJOR 1)
4-
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_MINOR, SDK minor version number, type=int, pico_base
5-
# PICO_CONFIG: PICO_SDK_VERSION_MINOR, SDK minor version number, type=int, pico_base
4+
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_MINOR, SDK minor version number, type=int, group=pico_base
5+
# PICO_CONFIG: PICO_SDK_VERSION_MINOR, SDK minor version number, type=int, group=pico_base
66
set(PICO_SDK_VERSION_MINOR 1)
7-
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, pico_base
8-
# PICO_CONFIG: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, pico_base
9-
set(PICO_SDK_VERSION_REVISION 0)
7+
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, group=pico_base
8+
# PICO_CONFIG: PICO_SDK_VERSION_REVISION, SDK version revision, type=int, group=pico_base
9+
set(PICO_SDK_VERSION_REVISION 1)
10+
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_PRE_RELEASE_ID, optional SDK pre-release version identifier, type=string, group=pico_base
11+
# PICO_CONFIG: PICO_SDK_VERSION_PRE_RELEASE_ID, optional SDK pre-release version identifier, type=string, group=pico_base
12+
set(PICO_SDK_VERSION_PRE_RELEASE_ID develop)
13+
1014
# PICO_BUILD_DEFINE: PICO_SDK_VERSION_STRING, SDK version, type=string, group=pico_base
1115
# PICO_CONFIG: PICO_SDK_VERSION_STRING, SDK version, type=string, group=pico_base
1216
set(PICO_SDK_VERSION_STRING "${PICO_SDK_VERSION_MAJOR}.${PICO_SDK_VERSION_MINOR}.${PICO_SDK_VERSION_REVISION}")
17+
18+
if (PICO_SDK_VERSION_PRE_RELEASE_ID)
19+
set(PICO_SDK_VERSION_STRING "${PICO_SDK_VERSION_STRING}-${PICO_SDK_VERSION_PRE_RELEASE_ID}")
20+
endif()

‎src/boards/include/boards/adafruit_feather_rp2040.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,16 @@
6868
#endif
6969

7070
//------------- FLASH -------------//
71+
72+
// Use slower generic flash access
73+
#define PICO_BOOT_STAGE2_CHOOSE_GENERIC_03H 1
74+
7175
#ifndef PICO_FLASH_SPI_CLKDIV
72-
#define PICO_FLASH_SPI_CLKDIV 2
76+
#define PICO_FLASH_SPI_CLKDIV 4
7377
#endif
7478

7579
#ifndef PICO_FLASH_SIZE_BYTES
76-
#define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
80+
#define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
7781
#endif
7882

7983
// All boards have B1 RP2040

‎src/boards/include/boards/adafruit_itsybitsy_rp2040.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
#endif
7373

7474
//------------- FLASH -------------//
75+
76+
#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
77+
7578
#ifndef PICO_FLASH_SPI_CLKDIV
7679
#define PICO_FLASH_SPI_CLKDIV 2
7780
#endif

‎src/boards/include/boards/adafruit_qtpy_rp2040.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
#endif
7272

7373
//------------- FLASH -------------//
74+
75+
#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
76+
7477
#ifndef PICO_FLASH_SPI_CLKDIV
7578
#define PICO_FLASH_SPI_CLKDIV 2
7679
#endif

‎src/boards/include/boards/pico.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@
6161

6262
// --- FLASH ---
6363

64+
#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
65+
6466
#ifndef PICO_FLASH_SPI_CLKDIV
6567
#define PICO_FLASH_SPI_CLKDIV 2
6668
#endif

‎src/boards/include/boards/pimoroni_keybow2040.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,12 @@
107107
#define KEYBOW2040_SW15_PIN 6
108108
#endif
109109

110-
#ifndef KEYBOW2040_NUM_SWITCHES
110+
#ifndef KEYBOW2040_NUM_SWITCHES_PINS
111111
#define KEYBOW2040_NUM_SWITCHES_PINS 16
112112
#endif
113113

114+
#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
115+
114116
#ifndef PICO_FLASH_SPI_CLKDIV
115117
#define PICO_FLASH_SPI_CLKDIV 2
116118
#endif

‎src/boards/include/boards/pimoroni_picosystem.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@
124124
#define PICO_DEFAULT_LED_PIN_INVERTED 1
125125
#endif
126126

127+
#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
128+
127129
#ifndef PICO_FLASH_SPI_CLKDIV
128130
#define PICO_FLASH_SPI_CLKDIV 2
129131
#endif

‎src/boards/include/boards/pimoroni_tiny2040.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
#define PICO_DEFAULT_LED_PIN_INVERTED 1
7777
#endif
7878

79+
#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
80+
7981
#ifndef PICO_FLASH_SPI_CLKDIV
8082
#define PICO_FLASH_SPI_CLKDIV 2
8183
#endif

0 commit comments

Comments
 (0)