[rtems commit] bsp/xilinx-zynqmp: Simplify linkcmds config

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    1e1afa3779e594e09387fba1812d3028fb00cd9e
Changeset: http://git.rtems.org/rtems/commit/?id=1e1afa3779e594e09387fba1812d3028fb00cd9e

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Oct 23 14:03:39 2019 +0200

bsp/xilinx-zynqmp: Simplify linkcmds config

Do all calculations in the linker command file.  This is a preparation
for the new build system.

---

 bsps/arm/xilinx-zynqmp/start/linkcmds.in        | 6 +++---
 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 a1eec7e..435af0e 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 752d8f6..89aed75 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}])