Merge branch 'develop' into low-power-new

Author: will-v-pi

docs/Doxyfile.in

@@ -63,6 +63,7 @@ PREDEFINED             = __not_in_flash_func(x)= \
                          __no_inline_not_in_flash(x)= \
                          __attribute__(x)= \
                          DOXYGEN_GENERATION= \
+                         PICO_DOCS=1 \
                          @DOXY_PREDEFINED@
 
 ENABLED_SECTIONS       = @DOXY_ENABLED_SECTIONS@

src/boards/include/boards/soldered_nula_max_rp2350.h

@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2024 Raspberry Pi (Trading) Ltd.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// -----------------------------------------------------
+// NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLER SO
+//       SHOULD ONLY CONSIST OF PREPROCESSOR DIRECTIVES
+// -----------------------------------------------------
+// Board definition for the Soldered NULA Max RP2350
+//
+// This header may be included by other board headers as "boards/soldered_nula_max_rp2350.h"
+
+#ifndef _BOARDS_SOLDERED_NULA_MAX_RP2350_H
+#define _BOARDS_SOLDERED_NULA_MAX_RP2350_H
+
+pico_board_cmake_set(PICO_PLATFORM, rp2350)
+pico_board_cmake_set(PICO_CYW43_SUPPORTED, 1)
+
+// For board detection
+#define SOLDERED_NULA_MAX_RP2350
+
+// --- RP2350 VARIANT ---
+#define PICO_RP2350A 0 // 1 for RP2350A, 0 for RP2350B
+
+// --- BOARD SPECIFIC ---
+#define SOLDERED_NULA_MAX_RP2350_USER_BTN 27
+#define SOLDERED_NULA_MAX_RP2350_HDMI_CLK_N 12
+#define SOLDERED_NULA_MAX_RP2350_HDMI_CLK_P 13
+#define SOLDERED_NULA_MAX_RP2350_HDMI_D0_N 14
+#define SOLDERED_NULA_MAX_RP2350_HDMI_D0_P 15
+#define SOLDERED_NULA_MAX_RP2350_HDMI_D1_N 16
+#define SOLDERED_NULA_MAX_RP2350_HDMI_D1_P 17
+#define SOLDERED_NULA_MAX_RP2350_HDMI_D2_N 18
+#define SOLDERED_NULA_MAX_RP2350_HDMI_D2_P 19 
+
+// --- UART ---
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 1
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 40
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 41
+#endif
+
+// --- LED ---
+#ifndef PICO_DEFAULT_WS2812_PIN
+#define PICO_DEFAULT_WS2812_PIN 26
+#endif
+
+// --- I2C --- Qwiic connector is on these pins
+#ifndef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C 0
+#endif
+#ifndef PICO_DEFAULT_I2C_SDA_PIN
+#define PICO_DEFAULT_I2C_SDA_PIN 8
+#endif
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN 9
+#endif
+
+// --- SPI ---
+#ifndef PICO_DEFAULT_SPI
+#define PICO_DEFAULT_SPI 0
+#endif
+#ifndef PICO_DEFAULT_SPI_SCK_PIN
+#define PICO_DEFAULT_SPI_SCK_PIN 38
+#endif
+#ifndef PICO_DEFAULT_SPI_TX_PIN
+#define PICO_DEFAULT_SPI_TX_PIN 35
+#endif
+#ifndef PICO_DEFAULT_SPI_RX_PIN
+#define PICO_DEFAULT_SPI_RX_PIN 36
+#endif
+#ifndef PICO_DEFAULT_SPI_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 37
+#endif
+
+// --- FLASH ---
+
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
+#endif
+
+// Soldered NULA Max has an SD Card.
+#ifndef PICO_SD_CLK_PIN
+#define PICO_SD_CLK_PIN 2
+#endif
+#ifndef PICO_SD_CMD_PIN
+#define PICO_SD_CMD_PIN 0
+#endif
+#ifndef PICO_SD_DAT0_PIN
+#define PICO_SD_DAT0_PIN 3
+#endif
+#ifndef PICO_SD_DAT3_PIN
+#define PICO_SD_DAT3_PIN 1 // DAT3 of the SD card is the chip select pin
+#endif
+#ifndef PICO_SD_DAT_PIN_COUNT
+#define PICO_SD_DAT_PIN_COUNT 1
+#endif
+
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
+#ifndef PICO_RP2350_A2_SUPPORTED
+#define PICO_RP2350_A2_SUPPORTED 1
+#endif
+
+// --- CYW43 ---
+
+#ifndef CYW43_WL_GPIO_COUNT
+#define CYW43_WL_GPIO_COUNT 3
+#endif
+
+#ifndef CYW43_WL_GPIO_LED_PIN
+#define CYW43_WL_GPIO_LED_PIN 0
+#endif
+
+// cyw43 SPI pins can't be changed at runtime
+#ifndef CYW43_PIN_WL_DYNAMIC
+#define CYW43_PIN_WL_DYNAMIC 0
+#endif
+
+// gpio pin to power up the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_REG_ON
+#define CYW43_DEFAULT_PIN_WL_REG_ON 23u
+#endif
+
+// gpio pin for spi data out to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_DATA_OUT
+#define CYW43_DEFAULT_PIN_WL_DATA_OUT 24u
+#endif
+
+// gpio pin for spi data in from the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_DATA_IN
+#define CYW43_DEFAULT_PIN_WL_DATA_IN 24u
+#endif
+
+// gpio (irq) pin for the irq line from the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_HOST_WAKE
+#define CYW43_DEFAULT_PIN_WL_HOST_WAKE 24u
+#endif
+
+// gpio pin for the spi clock line to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_CLOCK
+#define CYW43_DEFAULT_PIN_WL_CLOCK 29u
+#endif
+
+// gpio pin for the spi chip select to the cyw43 chip
+#ifndef CYW43_DEFAULT_PIN_WL_CS
+#define CYW43_DEFAULT_PIN_WL_CS 25u
+#endif
+
+#endif // _BOARDS_SOLDERED_NULA_MAX_RP2350_H

src/common/boot_picoboot_headers/include/boot/picoboot_constants.h

@@ -9,18 +9,18 @@
 
 #define REBOOT2_TYPE_MASK  0x0f
 
-// note these match REBOOT_TYPE in pico/bootrom_constants.h
+// --- note these match BOOT_TYPE_ constants in pico/bootrom_constants.h
 // values 0-7 are secure/non-secure
 #define REBOOT2_FLAG_REBOOT_TYPE_NORMAL       0x0 // param0 = diagnostic partition
 #define REBOOT2_FLAG_REBOOT_TYPE_BOOTSEL      0x2 // param0 = gpio_pin_number, param1 = flags
 #define REBOOT2_FLAG_REBOOT_TYPE_RAM_IMAGE    0x3 // param0 = image_region_base, param1 = image_region_size
 #define REBOOT2_FLAG_REBOOT_TYPE_FLASH_UPDATE 0x4 // param0 = update_base
-
 // values 8-15 are secure only
 #define REBOOT2_FLAG_REBOOT_TYPE_PC_SP        0xd
 
 #define REBOOT2_FLAG_REBOOT_TO_ARM            0x10
 #define REBOOT2_FLAG_REBOOT_TO_RISCV          0x20
+// ---
 
 #define REBOOT2_FLAG_NO_RETURN_ON_SUCCESS    0x100
 

src/host/hardware_gpio/gpio.c

@@ -224,7 +224,7 @@ uint32_t PICO_WEAK_FUNCTION_IMPL_NAME(gpio_get_all)(void) {
     return 0;
 }
 
-PICO_WEAK_FUNCTION_DEF(gpio_get_all46)
+PICO_WEAK_FUNCTION_DEF(gpio_get_all64)
 uint64_t PICO_WEAK_FUNCTION_IMPL_NAME(gpio_get_all64)(void) {
     return 0;
 }
@@ -244,7 +244,6 @@ void PICO_WEAK_FUNCTION_IMPL_NAME(gpio_set_mask_n)(__unused uint n, __unused uin
 
 }
 
-
 PICO_WEAK_FUNCTION_DEF(gpio_clr_mask)
 void PICO_WEAK_FUNCTION_IMPL_NAME(gpio_clr_mask)(__unused uint32_t mask) {
 

src/host/pico_platform/include/pico/platform.h

@@ -21,6 +21,10 @@
 extern "C" {
 #endif
 
+#ifndef __XSTRING
+#define __XSTRING(s) __STRING(s)
+#endif
+
 #define __not_in_flash(group)
 #define __not_in_flash_func(func) func
 #define __no_inline_not_in_flash_func(func) func

src/rp2040/pico_platform/include/pico/platform/cpu_regs.h

@@ -23,6 +23,7 @@
 #define arm_cpu_hw m0plus_hw
 #include "hardware/structs/nvic.h"
 #include "hardware/structs/scb.h"
+#include "hardware/structs/systick.h"
 #endif
 
 #endif

src/rp2350/pico_platform/include/pico/platform/cpu_regs.h

@@ -25,6 +25,7 @@
 #define arm_cpu_hw m33_hw
 #include "hardware/structs/nvic.h"
 #include "hardware/structs/scb.h"
+#include "hardware/structs/systick.h"
 #endif
 #endif
 #endif

src/rp2_common/boot_bootrom_headers/include/boot/bootrom_constants.h

@@ -70,18 +70,19 @@
 // note this is deliberately > MAX_PARTITIONs is likely to be, and also -1 as a signed byte
 #define PARTITION_TABLE_NO_PARTITION_INDEX 0xff
 
-// todo these are duplicated in picoboot_constants.h
+// values returned from \ref rom_get_last_boot_type()
+// --- note these match the REBOOT2_FLAG_REBOOT_TYPE_ constants in pico/bootrom_constants.h
 // values 0-7 are secure/non-secure
 #define BOOT_TYPE_NORMAL     0
 #define BOOT_TYPE_BOOTSEL    2
 #define BOOT_TYPE_RAM_IMAGE  3
 #define BOOT_TYPE_FLASH_UPDATE 4
-
 // values 8-15 are secure only
 #define BOOT_TYPE_PC_SP      0xd
 
 // ORed in if a bootloader chained into the image
 #define BOOT_TYPE_CHAINED_FLAG 0x80
+// ---
 
 // call from NS to S
 #ifndef __riscv

src/rp2_common/hardware_powman/include/hardware/powman.h

@@ -85,7 +85,7 @@ void powman_timer_set_ms(uint64_t time_ms);
 /*! \brief Set an alarm at an absolute time in ms
  *  \ingroup hardware_powman
  *
- * Note, the timer is stopped and then restarted as part of this function. This only controls the alarm
+ * Note, the alarm is disabled and then re-enabled as part of this function. This only controls the alarm;
  * if you want to use the alarm to wake up powman then you should use \ref powman_enable_alarm_wakeup_at_ms
  *
  * \param alarm_time_ms time at which the alarm will fire
@@ -325,4 +325,4 @@ static inline void powman_set_debug_power_request_ignored(bool ignored) {
 }
 #endif
 
-#endif
+#endif

src/rp2_common/pico_async_context/async_context_threadsafe_background.c

@@ -264,6 +264,7 @@ static void process_under_lock(async_context_threadsafe_background_t *self) {
             if (self->alarm_id > 0) {
                 alarm_pool_cancel_alarm(self->alarm_pool, self->alarm_id);
                 self->alarm_id = 0;
+                self->alarm_pending = false;
             }
             break;
         }