soc: xtensa: esp32_net: update linker

and adds newlibc fix for esp32_net SoC Signed-off-by: Felipe Neves <felipe.neves@linaro.org>
tobias-roehmel · Aug 16, 2022 · f01f8f3 · f01f8f3
1 parent d94dc98
commit f01f8f3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/soc/xtensa/esp32/linker.ld b/soc/xtensa/esp32/linker.ld
@@ -52,7 +52,7 @@ MEMORY
   ROM (RX): org = 0x40, len = ROM_SIZE - 0x40
 
   #ifdef CONFIG_ESP32_NETWORK_CORE
-  iram0_0_seg(RX): org = 0x40080000, len = 0x10000
+  iram0_0_seg(RX): org = 0x40080000, len = 0x08000
   #else
   iram0_0_seg(RX): org = 0x40080000, len = 0x20000
   #endif

diff --git a/soc/xtensa/esp32_net/CMakeLists.txt b/soc/xtensa/esp32_net/CMakeLists.txt
@@ -4,6 +4,8 @@ zephyr_sources(
   soc.c
   )
 
+zephyr_library_sources_ifdef(CONFIG_NEWLIB_LIBC newlib_fix.c)
+
 if(CONFIG_BUILD_OUTPUT_BIN)
   set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
     COMMAND ${PYTHON_EXECUTABLE} ${ESP_IDF_PATH}/components/esptool_py/esptool/esptool.py

diff --git a/soc/xtensa/esp32_net/linker.ld b/soc/xtensa/esp32_net/linker.ld
@@ -23,7 +23,7 @@
 
 MEMORY
 {
-  iram0_0_seg(RX): org = 0x40080000 + 0x10000, len = 0x10000
+  iram0_0_seg(RX): org = 0x40080000 + 0x08000, len = 0x18000
   dram0_shm0_seg(RW): org = 0x3FFE5230, len = 2K /* shared RAM reserved for IPM */
   dram0_sem0_seg(RW): org = 0x3FFE5A30, len = 8 /*shared data reserved for IPM data header */
   dram0_1_seg(RW): org = 0x3FFE5A38 + CONFIG_ESP32_BT_RESERVE_DRAM, len = 0x1BCB0 - 0xEE0 - CONFIG_ESP32_BT_RESERVE_DRAM
@@ -186,6 +186,7 @@ _net_buf_pool_list = _esp_net_buf_pool_list;
 
     KEEP(*(.jcr))
     *(.dram1 .dram1.*)
+    _end = ABSOLUTE(.);
     _data_end = ABSOLUTE(.);
     . = ALIGN(4);
   } GROUP_LINK_IN(RAMABLE_REGION)
@@ -424,6 +425,8 @@ __shell_root_cmds_end = __esp_shell_root_cmds_end;
 #include <zephyr/linker/intlist.ld>
 #endif
 
+_heap_sentry = 0x3ffe3f20;
+
 #include <zephyr/linker/debug-sections.ld>
 
   SECTION_PROLOGUE(.xtensa.info, 0,)

diff --git a/soc/xtensa/esp32_net/newlib_fix.c b/soc/xtensa/esp32_net/newlib_fix.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2019, Intel Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/toolchain.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include <reent.h>
+
+int __weak _gettimeofday_r(struct _reent *r, struct timeval *__tp, void *__tzp)
+{
+	ARG_UNUSED(r);
+	ARG_UNUSED(__tp);
+	ARG_UNUSED(__tzp);
+
+	return -1;
+}