From 10b95a19985c3dfddff27d7556b9ba5e366e05c2 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Wed, 20 Sep 2023 21:48:24 -0400
Subject: [PATCH] add translate.h and linker.h includes back to runtime.h;
 remove linker.h refs; remove top-level lib/cyw43-driver

---
 lib/cyw43-driver | 1 -
 py/argcheck.c    | 2 --
 py/gc.c          | 2 --
 py/obj.c         | 2 --
 py/objdict.c     | 2 --
 py/objfun.c      | 2 --
 py/objproperty.c | 2 --
 py/qstr.c        | 2 --
 py/runtime.c     | 2 --
 py/runtime.h     | 3 +++
 py/stackctrl.c   | 2 --
 11 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 160000 lib/cyw43-driver

diff --git a/lib/cyw43-driver b/lib/cyw43-driver
deleted file mode 160000
index 36144f94be..0000000000
--- a/lib/cyw43-driver
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 36144f94bee69ad5e7b46fef06ce0c2405bafee5
diff --git a/py/argcheck.c b/py/argcheck.c
index 5607cef39e..db22545f64 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "supervisor/linker.h" // PLACE_IN_ITCM
-
 #include "py/runtime.h"
 
 void PLACE_IN_ITCM(mp_arg_check_num_sig)(size_t n_args, size_t n_kw, uint32_t sig) {
diff --git a/py/gc.c b/py/gc.c
index e22ed5e7a3..ac0acfcc10 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -29,8 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "supervisor/linker.h" // CIRCUITPY: PLACE_IN_ITCM
-
 #include "py/gc.h"
 #include "py/runtime.h"
 
diff --git a/py/obj.c b/py/obj.c
index aa109044a2..9c1cffc728 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -29,8 +29,6 @@
 #include <stdarg.h>
 #include <assert.h>
 
-#include "supervisor/linker.h" // CIRUCITPY: PLACE_IN_TCM
-
 #include "shared/runtime/interrupt_char.h"
 #include "py/obj.h"
 #include "py/objtype.h"
diff --git a/py/objdict.c b/py/objdict.c
index e58d03f74f..d0ba149fe6 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -28,8 +28,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "supervisor/linker.h" // CIRUCITPY: PLACE_IN_ITCM
-
 #include "py/runtime.h"
 #include "py/builtin.h"
 #include "py/objtype.h"
diff --git a/py/objfun.c b/py/objfun.c
index 52c3bd307e..e10b79d089 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -28,8 +28,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "supervisor/linker.h" // CIRUCITPY: PLACE_IN_ITCM
-
 #include "py/objtuple.h"
 #include "py/objfun.h"
 #include "py/runtime.h"
diff --git a/py/objproperty.c b/py/objproperty.c
index 1903986603..98011f2782 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "supervisor/linker.h" // CIRUCITPY: PLACE_IN_ITCM
-
 #include "py/nlr.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
diff --git a/py/qstr.c b/py/qstr.c
index dbc630a0d9..7a30892906 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -28,8 +28,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "supervisor/linker.h" // CIRCUITPY: PLACE_IN_ITCM
-
 #include "py/mpstate.h"
 #include "py/qstr.h"
 #include "py/gc.h"
diff --git a/py/runtime.c b/py/runtime.c
index 8c5e19423b..8bf7505727 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -31,8 +31,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "supervisor/linker.h" // PLACE_IN_ITCM
-
 #include "py/parsenum.h"
 #include "py/compile.h"
 #include "py/mperrno.h"
diff --git a/py/runtime.h b/py/runtime.h
index 4475a6a954..770e892de7 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -31,6 +31,9 @@
 #include "py/mpstate.h"
 #include "py/pystack.h"
 
+#include "supervisor/linker.h"
+#include "supervisor/shared/translate/translate.h"
+
 typedef enum {
     MP_VM_RETURN_NORMAL,
     MP_VM_RETURN_YIELD,
diff --git a/py/stackctrl.c b/py/stackctrl.c
index 475373fd24..fa5f16d662 100644
--- a/py/stackctrl.c
+++ b/py/stackctrl.c
@@ -24,8 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "supervisor/linker.h" // PLACE_IN_ITCM
-
 #include "py/runtime.h"
 #include "py/stackctrl.h"