all: Update to point to files in new shared/ directory.

Signed-off-by: Damien George <damien@micropython.org>

ports/zephyr/CMakeLists.txt

@@ -54,14 +54,18 @@ set(MICROPY_SOURCE_PORT
 )
 list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/)
 
-set(MICROPY_SOURCE_LIB
+set(MICROPY_SOURCE_SHARED
+    libc/printf.c
+    readline/readline.c
+    runtime/interrupt_char.c
+    runtime/mpirq.c
+    runtime/pyexec.c
+    runtime/stdout_helpers.c
     timeutils/timeutils.c
-    utils/mpirq.c
-    utils/stdout_helpers.c
-    utils/printf.c
-    utils/pyexec.c
-    utils/interrupt_char.c
-    mp-readline/readline.c
+)
+list(TRANSFORM MICROPY_SOURCE_SHARED PREPEND ${MICROPY_DIR}/shared/)
+
+set(MICROPY_SOURCE_LIB
     oofatfs/ff.c
     oofatfs/ffunicode.c
     littlefs/lfs1.c
@@ -74,6 +78,7 @@ list(TRANSFORM MICROPY_SOURCE_LIB PREPEND ${MICROPY_DIR}/lib/)
 set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
+    ${MICROPY_SOURCE_SHARED}
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_PORT}
 )

ports/zephyr/machine_pin.c

@@ -35,7 +35,7 @@
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 #include "modmachine.h"
 
 #if MICROPY_PY_MACHINE

ports/zephyr/main.c

@@ -47,8 +47,8 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/stackctrl.h"
-#include "lib/utils/pyexec.h"
-#include "lib/mp-readline/readline.h"
+#include "shared/runtime/pyexec.h"
+#include "shared/readline/readline.h"
 #include "extmod/modbluetooth.h"
 
 #if MICROPY_VFS
@@ -59,9 +59,9 @@
 #include "modzephyr.h"
 
 #ifdef TEST
-#include "lib/upytesthelper/upytesthelper.h"
+#include "shared/upytesthelper/upytesthelper.h"
 #include "lib/tinytest/tinytest.c"
-#include "lib/upytesthelper/upytesthelper.c"
+#include "shared/upytesthelper/upytesthelper.c"
 #include TEST
 #endif
 

ports/zephyr/mpconfigport_bin_testsuite.h

@@ -26,6 +26,6 @@
 #include "mpconfigport.h"
 
 #ifdef TEST
-#include "lib/upytesthelper/upytesthelper.h"
+#include "shared/upytesthelper/upytesthelper.h"
 #define MP_PLAT_PRINT_STRN(str, len) upytest_output(str, len)
 #endif

ports/zephyr/mphalport.h

@@ -1,5 +1,5 @@
 #include <zephyr.h>
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 
 void mp_hal_init(void);
 void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms);