diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-10-23 14:03:39 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-10-23 14:19:47 +0200 |
| commit | 1e1afa3779e594e09387fba1812d3028fb00cd9e (patch) | |
| tree | 0d70a667cf2be17e3aad8e3983f484478b79c74b | |
| parent | bsp/xilinx-zynqmp: Simplify configure.ac (diff) | |
| download | rtems-1e1afa3779e594e09387fba1812d3028fb00cd9e.tar.bz2 | |
bsp/xilinx-zynqmp: Simplify linkcmds config
Do all calculations in the linker command file. This is a preparation
for the new build system.
| -rw-r--r-- | bsps/arm/xilinx-zynqmp/start/linkcmds.in | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/bsps/arm/xilinx-zynqmp/start/linkcmds.in b/bsps/arm/xilinx-zynqmp/start/linkcmds.in index a1eec7e10a..435af0e7e9 100644 --- a/bsps/arm/xilinx-zynqmp/start/linkcmds.in +++ b/bsps/arm/xilinx-zynqmp/start/linkcmds.in @@ -1,9 +1,9 @@ MEMORY { RAM_INT_0 : ORIGIN = @ZYNQMP_RAM_INT_0_ORIGIN@, LENGTH = @ZYNQMP_RAM_INT_0_LENGTH@ RAM_INT_1 : ORIGIN = @ZYNQMP_RAM_INT_1_ORIGIN@, LENGTH = @ZYNQMP_RAM_INT_1_LENGTH@ - RAM_MMU : ORIGIN = @ZYNQMP_RAM_MMU@, LENGTH = @ZYNQMP_RAM_MMU_LENGTH@ - RAM : ORIGIN = @ZYNQMP_RAM_ORIGIN_AVAILABLE@, LENGTH = @ZYNQMP_RAM_LENGTH_AVAILABLE@ - @ZYNQMP_RAM_NOCACHE_LENGTH@ - NOCACHE : ORIGIN = @ZYNQMP_RAM_ORIGIN_AVAILABLE@ + @ZYNQMP_RAM_LENGTH_AVAILABLE@ - @ZYNQMP_RAM_NOCACHE_LENGTH@, LENGTH = @ZYNQMP_RAM_NOCACHE_LENGTH@ + RAM_MMU : ORIGIN = @ZYNQMP_RAM_ORIGIN@, LENGTH = @ZYNQMP_RAM_MMU_LENGTH@ + RAM : ORIGIN = @ZYNQMP_RAM_ORIGIN@ + @ZYNQMP_RAM_MMU_LENGTH@, LENGTH = @BSP_ZYNQMP_RAM_LENGTH@ - @ZYNQMP_RAM_ORIGIN@ - @ZYNQMP_RAM_MMU_LENGTH@ - @ZYNQMP_RAM_NOCACHE_LENGTH@ + NOCACHE : ORIGIN = @BSP_ZYNQMP_RAM_LENGTH@ - @ZYNQMP_RAM_NOCACHE_LENGTH@, LENGTH = @ZYNQMP_RAM_NOCACHE_LENGTH@ } REGION_ALIAS ("REGION_START", RAM); diff --git a/c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac index 752d8f68c9..89aed75bc6 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac +++ b/c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac @@ -66,10 +66,7 @@ RTEMS_BSPOPTS_SET([BSP_ZYNQMP_NOCACHE_LENGTH],[*],[1M]) RTEMS_BSPOPTS_HELP([BSP_ZYNQMP_NOCACHE_LENGTH],[length of nocache RAM region]) ZYNQMP_RAM_ORIGIN="0x00100000" -ZYNQMP_RAM_MMU="${ZYNQMP_RAM_ORIGIN}" ZYNQMP_RAM_MMU_LENGTH="16k" -ZYNQMP_RAM_ORIGIN_AVAILABLE="${ZYNQMP_RAM_ORIGIN} + 0x00004000" -ZYNQMP_RAM_LENGTH_AVAILABLE="${BSP_ZYNQMP_RAM_LENGTH} - 1M - 16k" ZYNQMP_RAM_INT_0_ORIGIN="0x00000000" ZYNQMP_RAM_INT_0_LENGTH="64k + 64k + 64k" ZYNQMP_RAM_INT_1_ORIGIN="0xFFFF0000" @@ -82,10 +79,7 @@ AC_ARG_VAR([$1],[$2; default $3])dnl ZYNQMP_LINKCMD([ZYNQMP_RAM_ORIGIN],[normal RAM region origin],[${ZYNQMP_RAM_ORIGIN}]) ZYNQMP_LINKCMD([ZYNQMP_RAM_LENGTH],[normal RAM region length],[${BSP_ZYNQMP_RAM_LENGTH}]) -ZYNQMP_LINKCMD([ZYNQMP_RAM_MMU],[MMU region origin],[${ZYNQMP_RAM_MMU}]) ZYNQMP_LINKCMD([ZYNQMP_RAM_MMU_LENGTH],[MMU region length],[${ZYNQMP_RAM_MMU_LENGTH}]) -ZYNQMP_LINKCMD([ZYNQMP_RAM_ORIGIN_AVAILABLE],[origin of available RAM],[${ZYNQMP_RAM_ORIGIN_AVAILABLE}]) -ZYNQMP_LINKCMD([ZYNQMP_RAM_LENGTH_AVAILABLE],[length of available RAM],[${ZYNQMP_RAM_LENGTH_AVAILABLE}]) ZYNQMP_LINKCMD([ZYNQMP_RAM_NOCACHE_LENGTH],[length of nocache RAM region],[${BSP_ZYNQMP_NOCACHE_LENGTH}]) ZYNQMP_LINKCMD([ZYNQMP_RAM_INT_0_ORIGIN],[internal 0 RAM region origin],[${ZYNQMP_RAM_INT_0_ORIGIN}]) ZYNQMP_LINKCMD([ZYNQMP_RAM_INT_0_LENGTH],[internal 0 RAM region length],[${ZYNQMP_RAM_INT_0_LENGTH}]) |