3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: Changes to rp2040 build files to work in Klipper build system 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-06-19 21:42:40 -04:00
parent cc0969dd05
commit 20c5976356
4 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/README
View File

@ -56,7 +56,9 @@ version 1.24.0 (extracted 20190723).
The rp2040 directory contains code from the pico sdk: The rp2040 directory contains code from the pico sdk:
https://github.com/raspberrypi/pico-sdk.git https://github.com/raspberrypi/pico-sdk.git
version 1.2.0 (bfcbefafc5d2a210551a4d9d80b4303d4ae0adf7). version 1.2.0 (bfcbefafc5d2a210551a4d9d80b4303d4ae0adf7). It has been
modified so that it can build outside of the pico sdk. See
rp2040.patch for the modifications.
The hub-ctrl directory contains code from: The hub-ctrl directory contains code from:
https://github.com/codazoda/hub-ctrl.c/ https://github.com/codazoda/hub-ctrl.c/

2
lib/rp2040/boot_stage2/boot2_w25q080.S
View File

@ -26,7 +26,7 @@
// 4-byte checksum. Therefore code size cannot exceed 252 bytes. // 4-byte checksum. Therefore code size cannot exceed 252 bytes.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "pico/asm_helper.S" //#include "pico/asm_helper.S"
#include "hardware/regs/addressmap.h" #include "hardware/regs/addressmap.h"
#include "hardware/regs/ssi.h" #include "hardware/regs/ssi.h"
#include "hardware/regs/pads_qspi.h" #include "hardware/regs/pads_qspi.h"

4
lib/rp2040/hardware/address_mapped.h
View File

@ -7,7 +7,9 @@
#ifndef _HARDWARE_ADDRESS_MAPPED_H #ifndef _HARDWARE_ADDRESS_MAPPED_H
#define _HARDWARE_ADDRESS_MAPPED_H #define _HARDWARE_ADDRESS_MAPPED_H
#include "pico.h" //#include "pico.h"
#define __force_inline inline
#define static_assert(a,b)
#include "hardware/regs/addressmap.h" #include "hardware/regs/addressmap.h"
/** \file address_mapped.h /** \file address_mapped.h

28
lib/rp2040/rp2040.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/lib/rp2040/boot_stage2/boot2_w25q080.S b/lib/rp2040/boot_stage2/boot2_w25q080.S
index ad3238e2..8fb3def4 100644
--- a/lib/rp2040/boot_stage2/boot2_w25q080.S
+++ b/lib/rp2040/boot_stage2/boot2_w25q080.S
@@ -26,7 +26,7 @@
// 4-byte checksum. Therefore code size cannot exceed 252 bytes.
// ----------------------------------------------------------------------------
-#include "pico/asm_helper.S"
+//#include "pico/asm_helper.S"
#include "hardware/regs/addressmap.h"
#include "hardware/regs/ssi.h"
#include "hardware/regs/pads_qspi.h"
diff --git a/lib/rp2040/hardware/address_mapped.h b/lib/rp2040/hardware/address_mapped.h
index b58f1e50..d651f598 100644
--- a/lib/rp2040/hardware/address_mapped.h
+++ b/lib/rp2040/hardware/address_mapped.h
@@ -7,7 +7,9 @@
#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)
#include "hardware/regs/addressmap.h"
/** \file address_mapped.h