diff --git a/esp-hal-common/ld/sections/rodata.x b/esp-hal-common/ld/sections/rodata.x index 2d9bd9c05..1bdb9e815 100644 --- a/esp-hal-common/ld/sections/rodata.x +++ b/esp-hal-common/ld/sections/rodata.x @@ -8,10 +8,13 @@ SECTIONS { *(.rodata .rodata.*) *(.srodata .srodata.*) _rodata_end = ABSOLUTE(.); + . = ALIGN(4); } > RODATA .rodata.wifi : ALIGN(4) { + . = ALIGN(4); *( .rodata_wlog_*.* ) + . = ALIGN(4); } > RODATA } \ No newline at end of file diff --git a/esp-hal-common/ld/sections/rtc_fast.x b/esp-hal-common/ld/sections/rtc_fast.x index 59df8341e..3bf5e1dd2 100644 --- a/esp-hal-common/ld/sections/rtc_fast.x +++ b/esp-hal-common/ld/sections/rtc_fast.x @@ -3,7 +3,8 @@ SECTIONS { .rtc_fast.text : { . = ALIGN(4); - *(.rtc_fast.literal .rtc_fast.text .rtc_fast.literal.* .rtc_fast.text.*) + *(.rtc_fast.literal .rtc_fast.text .rtc_fast.literal.* .rtc_fast.text.*) + . = ALIGN(4); } > RTC_FAST_RWTEXT AT > RODATA .rtc_fast.data : @@ -12,6 +13,7 @@ SECTIONS { _rtc_fast_data_start = ABSOLUTE(.); *(.rtc_fast.data .rtc_fast.data.*) _rtc_fast_data_end = ABSOLUTE(.); + . = ALIGN(4); } > RTC_FAST_RWDATA AT > RODATA .rtc_fast.bss (NOLOAD) : @@ -20,11 +22,13 @@ SECTIONS { _rtc_fast_bss_start = ABSOLUTE(.); *(.rtc_fast.bss .rtc_fast.bss.*) _rtc_fast_bss_end = ABSOLUTE(.); + . = ALIGN(4); } > RTC_FAST_RWDATA .rtc_fast.noinit (NOLOAD) : { . = ALIGN(4); *(.rtc_fast.noinit .rtc_fast.noinit.*) + . = ALIGN(4); } > RTC_FAST_RWDATA } \ No newline at end of file diff --git a/esp-hal-common/ld/sections/rtc_slow.x b/esp-hal-common/ld/sections/rtc_slow.x index 0f90c5f27..035e95ca9 100644 --- a/esp-hal-common/ld/sections/rtc_slow.x +++ b/esp-hal-common/ld/sections/rtc_slow.x @@ -3,7 +3,8 @@ SECTIONS { .rtc_slow.text : { . = ALIGN(4); - *(.rtc_slow.literal .rtc_slow.text .rtc_slow.literal.* .rtc_slow.text.*) + *(.rtc_slow.literal .rtc_slow.text .rtc_slow.literal.* .rtc_slow.text.*) + . = ALIGN(4); } > rtc_slow_seg AT > RODATA .rtc_slow.data : @@ -12,6 +13,7 @@ SECTIONS { _rtc_slow_data_start = ABSOLUTE(.); *(.rtc_slow.data .rtc_slow.data.*) _rtc_slow_data_end = ABSOLUTE(.); + . = ALIGN(4); } > rtc_slow_seg AT > RODATA .rtc_slow.bss (NOLOAD) : @@ -20,11 +22,13 @@ SECTIONS { _rtc_slow_bss_start = ABSOLUTE(.); *(.rtc_slow.bss .rtc_slow.bss.*) _rtc_slow_bss_end = ABSOLUTE(.); + . = ALIGN(4); } > rtc_slow_seg .rtc_slow.noinit (NOLOAD) : { . = ALIGN(4); *(.rtc_slow.noinit .rtc_slow.noinit.*) + . = ALIGN(4); } > rtc_slow_seg } \ No newline at end of file diff --git a/esp-hal-common/ld/sections/rwdata.x b/esp-hal-common/ld/sections/rwdata.x index 61a1b024f..eda4cd332 100644 --- a/esp-hal-common/ld/sections/rwdata.x +++ b/esp-hal-common/ld/sections/rwdata.x @@ -9,6 +9,7 @@ SECTIONS { *(.data .data.*); *(.data1) _data_end = ABSOLUTE(.); + . = ALIGN(4); } > RWDATA AT > RODATA /* LMA of .data */ @@ -32,18 +33,21 @@ SECTIONS { *(.gnu.linkonce.b.*) *(COMMON) _bss_end = ABSOLUTE(.); + . = ALIGN(4); } > RWDATA .noinit (NOLOAD) : ALIGN(4) { . = ALIGN(4); *(.noinit .noinit.*) + . = ALIGN(4); } > RWDATA .data.wifi : { . = ALIGN(4); *( .dram1 .dram1.*) + . = ALIGN(4); } > RWDATA AT > RODATA /* must be last segment using RWDATA */