Merge pull request #83 from Artem-Nesterenko2005/c_example

C_example
IvanArkhipov1999 · Dec 22, 2024 · d7a99e1 · d7a99e1
2 parents 5785059 + 239bee6
commit d7a99e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/examples/c-examples/xtensa-esp32/Makefile b/examples/c-examples/xtensa-esp32/Makefile
@@ -26,7 +26,7 @@ CFLAGS += -Os -g
 LDFLAGS += -L../../../c-library/xtensa-esp32/target/xtensa-esp32-none-elf/release/ -lxtensa_esp32_static_lib
 LDFLAGS += -nostdlib -T$(LDSCRIPT) -Wl,-Map=$@.map -Wl,--cref -Wl,--gc-sections
 LDFLAGS += $(LDFLAGS_PLATFORM)
-LDFLAGS += -lm -lc -lgcc -Wl,--allow-multiple-definition
+LDFLAGS += -lm -lgcc -Wl,--allow-multiple-definition -z noexecstack
 ASFLAGS += -c -O0 -Wall -fmessage-length=0
 ASFLAGS += $(ASFLAGS_PLATFORM)
 

diff --git a/examples/c-examples/xtensa-esp32/ld/esp32.ld b/examples/c-examples/xtensa-esp32/ld/esp32.ld
@@ -3,7 +3,7 @@
  */
 
 rom_i2c_writeReg = 0x400041a4;
-ets_delay_us = 0x40000040;
+ets_delay_us = 0x40008534;
 
 /* Default entry point */
 ENTRY( call_start_cpu0 );
@@ -14,8 +14,8 @@ MEMORY
   /* Use values from the ESP-IDF 'bootloader' component.
   /* TODO: Use human-readable lengths */
   /* TODO: Use the full memory map - this is just a test */
-  iram_seg ( RX )       : ORIGIN = 0x40080400, len = 0xF0000
-  dram_seg ( RW )       : ORIGIN = 0x3FFF0000, len = 0xA0000
+  iram_seg ( RX )       : ORIGIN = 0x40080400, len = 0xFC00
+  dram_seg ( RW )       : ORIGIN = 0x3FFF0000, len = 0x100A8
 }
 
 /* Define output sections */