Commit be97e406 authored by Kumar Gala's avatar Kumar Gala Committed by Kumar Gala
Browse files

soc: nios2: Cleanup linker scripts to use new DTS macros 



Move defines for _RAM_ADDR, _RAM_SIZE, _ROM_ADDR, and _ROM_ADDR into
the linker.ld and thus remove dts_fixup.h.  We rework to use
DT_REG_ADDR and DT_REG_SIZE on DT_CHOSEN(zephyr_sram) and
DT_CHOSEN(zephyr_flash).

Also fixup use of _RAM_ADDR/_RAM_SIZE in newlib/libc-hooks.c.

Signed-off-by: default avatarKumar Gala <kumar.gala@linaro.org>
parent 42f3b6b7

lib/libc/newlib/libc-hooks.c

+4 −2
Original line number Diff line number Diff line
@@ -42,8 +42,10 @@ MALLOC_BSS static unsigned char __aligned(CONFIG_NEWLIB_LIBC_ALIGNED_HEAP_SIZE) 
#define MAX_HEAP_SIZE (PHYS_RAM_SIZE - USED_RAM_SIZE)

#elif CONFIG_NIOS2

#include <layout.h>

#define USED_RAM_SIZE  (USED_RAM_END_ADDR - _RAM_ADDR)

#define MAX_HEAP_SIZE (_RAM_SIZE - USED_RAM_SIZE)

#define RAM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_sram))

#define RAM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_sram))

#define USED_RAM_SIZE  (USED_RAM_END_ADDR - RAM_ADDR)

#define MAX_HEAP_SIZE (RAM_SIZE - USED_RAM_SIZE)

#elif CONFIG_RISCV

#include <soc.h>

#define USED_RAM_SIZE  (USED_RAM_END_ADDR - RISCV_RAM_BASE)

soc/nios2/nios2-qemu/dts_fixup.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: Apache-2.0 */



#define _RAM_ADDR				CONFIG_SRAM_BASE_ADDRESS



#define _RAM_SIZE				(CONFIG_SRAM_SIZE * 1024)



#define _ROM_ADDR				CONFIG_FLASH_BASE_ADDRESS



#define _ROM_SIZE				(CONFIG_FLASH_SIZE *1024)

soc/nios2/nios2-qemu/linker.ld

+7 −0
Original line number Diff line number Diff line
@@ -10,4 +10,11 @@ 


#include <layout.h>

#include <devicetree.h>



#define _RAM_ADDR	DT_REG_ADDR(DT_CHOSEN(zephyr_sram))

#define _RAM_SIZE	DT_REG_SIZE(DT_CHOSEN(zephyr_sram))



#define _ROM_ADDR	DT_REG_ADDR(DT_CHOSEN(zephyr_flash))

#define _ROM_SIZE	DT_REG_SIZE(DT_CHOSEN(zephyr_flash))



#include <arch/nios2/linker.ld>

soc/nios2/nios2f-zephyr/dts_fixup.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: Apache-2.0 */



#define _RAM_ADDR				CONFIG_SRAM_BASE_ADDRESS



#define _RAM_SIZE				(CONFIG_SRAM_SIZE * 1024)



#define _ROM_ADDR				CONFIG_FLASH_BASE_ADDRESS



#define _ROM_SIZE				(CONFIG_FLASH_SIZE *1024)

soc/nios2/nios2f-zephyr/linker.ld

+7 −0
Original line number Diff line number Diff line
@@ -10,4 +10,11 @@ 


#include <layout.h>

#include <devicetree.h>



#define _RAM_ADDR	DT_REG_ADDR(DT_CHOSEN(zephyr_sram))

#define _RAM_SIZE	DT_REG_SIZE(DT_CHOSEN(zephyr_sram))



#define _ROM_ADDR	DT_REG_ADDR(DT_CHOSEN(zephyr_flash))

#define _ROM_SIZE	DT_REG_SIZE(DT_CHOSEN(zephyr_flash))



#include <arch/nios2/linker.ld>

CRA Git | Maintained and supported by SUSTech CRA and CCSE