8000 Merge remote-tracking branch 'origin/main' · codetiger/circuitpython@18c1f99 · GitHub
[go: up one dir, main page]
Skip to content

Commit 18c1f99

Browse files
weblateweblate
committed
Merge remote-tracking branch 'origin/main'
2 parents b21daf3 + 26f682d commit 18c1f99

File tree

5 files changed

+14
-37
lines changed
< 10000 span class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q" data-block="true" data-size="medium" data-leading-visual="true" aria-busy="false">

5 files changed

+14
-37
lines changed

‎ports/raspberrypi/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,17 @@ $(INC_CYW43) \
145145
# Pico specific configuration
146146
CFLAGS += \
147147
-DRASPBERRYPI \
148+
-DLIB_PICO_MULTICORE=1 \
149+
-DPICO_NO_HARDWARE=0 \
148150
-DPICO_ON_DEVICE=1 \
151+
-DPICO_BUILD=1 \
149152
-DPICO_NO_BINARY_INFO=0 \
150153
-DPICO_TIME_DEFAULT_ALARM_POOL_DISABLED=0 \
151154
-DPICO_DIVIDER_CALL_IDIV0=0 \
152155
-DPICO_DIVIDER_CALL_LDIV0=0 \
153156
-DPICO_DIVIDER_HARDWARE=1 \
154157
-DPICO_DOUBLE_ROM=1 \
155158
-DPICO_FLOAT_ROM=1 \
156-
-DLIB_PICO_MULTICORE=1 \
157159
-DPICO_BITS_IN_RAM=0 \
158160
-DPICO_DIVIDER_IN_RAM=0 \
159161
-DPICO_DOUBLE_PROPAGATE_NANS=0 \
@@ -177,7 +179,9 @@ CFLAGS += \
177179
-DCFG_TUD_CDC_RX_BUFSIZE=256 \
178180
-DCFG_TUD_MIDI_TX_BUFSIZE=128 \
179181
-DCFG_TUD_CDC_TX_BUFSIZE=256 \
180-
-DCFG_TUD_MSC_BUFSIZE=1024
182+
-DCFG_TUD_MSC_BUFSIZE=1024 \
183+
-DPICO_RP2040_USB_DEVICE_UFRAME_FIX=1 \
184+
-DPICO_RP2040_USB_DEVICE_ENUMERATION_FIX=1 \
181185

182186
# option to override default optimization level, set in boards/$(BOARD)/mpconfigboard.mk
183187
CFLAGS += $(OPTIMIZATION_FLAGS)

‎ports/raspberrypi/audio_dma.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include "py/runtime.h"
1717

1818
#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
19+
#include "hardware/regs/intctrl.h" // For isr_ macro.
20+
1921

2022
#if CIRCUITPY_AUDIOCORE
2123

@@ -459,7 +461,7 @@ static void dma_callback_fun(void *arg) {
459461
}
460462
}
461463

462-
void isr_dma_0(void) {
464+
void __not_in_flash_func(isr_dma_0)(void) {
463465
for (size_t i = 0; i < NUM_DMA_CHANNELS; i++) {
464466
uint32_t mask = 1 << i;
465467
if ((dma_hw->intr & mask) == 0) {

‎ports/raspberrypi/sdk_config/pico/config_autogen.h

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,3 @@
11
#pragma once
22

3-
#include "pico-sdk-configboard.h"
4-
5-
// alphabetized
6-
#define LIB_CMSIS_CORE (1)
7-
#define LIB_PICO_BINARY_INFO (0)
8-
#define LIB_PICO_PRINTF_NONE (0)
9-
#define LIB_PICO_PRINTF_PICO (0)
10-
#define LIB_PICO_STDIO_SEMIHOSTING (0)
11-
#define LIB_PICO_STDIO_UART (0)
12-
#define LIB_PICO_STDIO_USB (0)
13-
#def 10000 ine PICO_DIVIDER_DISABLE_INTERRUPTS (0)
14-
#define PICO_DOUBLE_SUPPORT_ROM_V1 (1)
15-
#define PICO_ENTER_USB_BOOT_ON_EXIT (0)
16-
#define PICO_FLOAT_SUPPORT_ROM_V1 (1)
17-
#define PICO_IE_26_29_UNCHANGED_ON_RESET (0)
18-
#define PICO_INT64_OPS_IN_RAM (0)
19-
#define PICO_NO_HARDWARE (0)
20-
#define PICO_ON_DEVICE (1)
21-
#define PICO_PRINTF_ALWAYS_INCLUDED (1)
22-
#define PICO_RP2040_USB_DEVICE_ENUMERATION_FIX (1)
23-
#define PICO_RP2040_USB_DEVICE_UFRAME_FIX (1)
24-
#define PICO_STDIO_IGNORE_NESTED_STDOUT (0)
25-
#define PICO_USE_CRT_PRINTF (0)
26-
#define PICO_USE_OPTIMISTIC_SBRK (0)
27-
// Stack guards cause a hard fault when 32 bytes around the stack bottom are
28-
// accessed. These backtraces aren't always helpful and this conflicts with our
29-
// own stack checking.
30-
#define PICO_USE_STACK_GUARDS (0)
31-
323
#include "include/cmsis/rename_exceptions.h"

‎ports/raspberrypi/sdk_config/pico/version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#ifndef _PICO_VERSION_H
1212
#define _PICO_VERSION_H
1313

14-
#define PICO_SDK_VERSION_MAJOR 1
15-
#define PICO_SDK_VERSION_MINOR 2
14+
#define PICO_SDK_VERSION_MAJOR 2
15+
#define PICO_SDK_VERSION_MINOR 0
1616
#define PICO_SDK_VERSION_REVISION 0
17-
#define PICO_SDK_VERSION_STRING "1.2.0"
17+
#define PICO_SDK_VERSION_STRING "2.0.0"
1818

1919
#endif

‎ports/raspberrypi/supervisor/port.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,8 @@ void port_idle_until_interrupt(void) {
510510
/**
511511
* \brief Default interrupt handler for unused IRQs.
512512
*/
513-
extern void HardFault_Handler(void); // provide a prototype to avoid a missing-prototypes diagnostic
514-
__attribute__((used)) void __not_in_flash_func(HardFault_Handler)(void) {
513+
extern void isr_hardfault(void); // provide a prototype to avoid a missing-prototypes diagnostic
514+
__attribute__((used)) void __not_in_flash_func(isr_hardfault)(void) {
515515
// Only safe mode from core 0 which is running CircuitPython. Core 1 faulting
516516
// should not be fatal to CP. (Fingers crossed.)
517517
if (get_core_num() == 0) {

0 commit comments

Comments
 (0)
0