diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2024-10-24 19:41:55 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2024-11-13 14:25:59 -0500 |
commit | c75eb53c0c6d81631849cfc49eba9b2efa93ddfb (patch) | |
tree | 27988b27e73ebd62d3e3325886a11e67c131c1de /lib/pico-sdk/pico-sdk.patch | |
parent | 9f328cab9536d73df697b325fab13dd7eb550522 (diff) | |
download | kutter-c75eb53c0c6d81631849cfc49eba9b2efa93ddfb.tar.gz kutter-c75eb53c0c6d81631849cfc49eba9b2efa93ddfb.tar.xz kutter-c75eb53c0c6d81631849cfc49eba9b2efa93ddfb.zip |
lib: Update lib/rp2040 to v2.0.0 SDK release
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'lib/pico-sdk/pico-sdk.patch')
-rw-r--r-- | lib/pico-sdk/pico-sdk.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/lib/pico-sdk/pico-sdk.patch b/lib/pico-sdk/pico-sdk.patch new file mode 100644 index 00000000..0cdd4229 --- /dev/null +++ b/lib/pico-sdk/pico-sdk.patch @@ -0,0 +1,49 @@ +diff --git a/lib/pico-sdk/hardware/address_mapped.h b/lib/pico-sdk/hardware/address_mapped.h +index b384f5572..635a275b5 100644 +--- a/lib/pico-sdk/hardware/address_mapped.h ++++ b/lib/pico-sdk/hardware/address_mapped.h +@@ -7,7 +7,10 @@ + #ifndef _HARDWARE_ADDRESS_MAPPED_H + #define _HARDWARE_ADDRESS_MAPPED_H + +-#include "pico.h" ++//#include "pico.h" ++#define __force_inline inline ++#define static_assert(a,b) ++#define valid_params_if(a,b) + #include "hardware/regs/addressmap.h" + + /** \file address_mapped.h +diff --git a/lib/pico-sdk/rp2040/cmsis_include/RP2040.h b/lib/pico-sdk/rp2040/cmsis_include/RP2040.h +index 8da431fae..be661392c 100644 +--- a/lib/pico-sdk/rp2040/cmsis_include/RP2040.h ++++ b/lib/pico-sdk/rp2040/cmsis_include/RP2040.h +@@ -2572,6 +2572,7 @@ typedef struct { /*!< RTC Structure + * @{ + */ + ++#if 0 + #define RESETS_BASE 0x4000C000UL + #define PSM_BASE 0x40010000UL + #define CLOCKS_BASE 0x40008000UL +@@ -2608,6 +2609,7 @@ typedef struct { /*!< RTC Structure + #define TBMAN_BASE 0x4006C000UL + #define VREG_AND_CHIP_RESET_BASE 0x40064000UL + #define RTC_BASE 0x4005C000UL ++#endif + + /** @} */ /* End of group Device_Peripheral_peripheralAddr */ + +diff --git a/lib/pico-sdk/rp2040/pico/asm_helper.S b/lib/pico-sdk/rp2040/pico/asm_helper.S +index aff1fc9ae..59c67db19 100644 +--- a/lib/pico-sdk/rp2040/pico/asm_helper.S ++++ b/lib/pico-sdk/rp2040/pico/asm_helper.S +@@ -4,7 +4,7 @@ + * SPDX-License-Identifier: BSD-3-Clause + */ + +-#include "pico.h" ++//#include "pico.h" + + # note we don't do this by default in this file for backwards comaptibility with user code + # that may include this file, but not use unified syntax. Note that this macro does equivalent |