[rtems commit] bsp/xen: Use BSP options for all linkcmds vars

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Dec  5 07:51:12 2019 +0100

bsp/xen: Use BSP options for all linkcmds vars

Update #3818.

---

 bsps/arm/xen/start/linkcmds.in        |  6 +++---
 c/src/lib/libbsp/arm/xen/configure.ac | 23 ++++++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bsps/arm/xen/start/linkcmds.in b/bsps/arm/xen/start/linkcmds.in
index 9446876..e2d42b0 100644
--- a/bsps/arm/xen/start/linkcmds.in
+++ b/bsps/arm/xen/start/linkcmds.in
@@ -27,9 +27,9 @@
  */
 
 MEMORY {
-   RAM_MMU   : ORIGIN = @GUEST_RAM_BASE@, LENGTH = @GUEST_RAM_MMU_LENGTH@
-   RAM       : ORIGIN = @GUEST_RAM_BASE@ + @GUEST_LOAD_OFFSET@, LENGTH = @GUEST_RAM_LENGTH@ - @GUEST_LOAD_OFFSET@ - @GUEST_RAM_NOCACHE_LENGTH@
-   NOCACHE   : ORIGIN = @GUEST_RAM_BASE@ + @GUEST_RAM_LENGTH@ - @GUEST_RAM_NOCACHE_LENGTH@, LENGTH = @GUEST_RAM_NOCACHE_LENGTH@
+   RAM_MMU   : ORIGIN = @BSP_XEN_RAM_BASE@, LENGTH = @BSP_XEN_MMU_LENGTH@
+   RAM       : ORIGIN = @BSP_XEN_RAM_BASE@ + @BSP_XEN_LOAD_OFFSET@, LENGTH = @BSP_XEN_RAM_LENGTH@ - @BSP_XEN_LOAD_OFFSET@ - @BSP_XEN_NOCACHE_LENGTH@
+   NOCACHE   : ORIGIN = @BSP_XEN_RAM_BASE@ + @BSP_XEN_RAM_LENGTH@ - @BSP_XEN_NOCACHE_LENGTH@, LENGTH = @BSP_XEN_NOCACHE_LENGTH@
 }
 
 REGION_ALIAS ("REGION_START",          RAM);
diff --git a/c/src/lib/libbsp/arm/xen/configure.ac b/c/src/lib/libbsp/arm/xen/configure.ac
index effd498..86ec003 100644
--- a/c/src/lib/libbsp/arm/xen/configure.ac
+++ b/c/src/lib/libbsp/arm/xen/configure.ac
@@ -30,25 +30,30 @@ RTEMS_BSPOPTS_SET([BSP_START_ZIMAGE_HEADER],[*],[1])
 RTEMS_BSPOPTS_HELP([BSP_START_ZIMAGE_HEADER],[include zImage boot header])
 
 RTEMS_BSPOPTS_SET([BSP_XEN_RAM_LENGTH],[*],[8M])
-RTEMS_BSPOPTS_HELP([BSP_XEN_RAM_LENGTH],[override a BSP's default RAM length])
+RTEMS_BSPOPTS_HELP([BSP_XEN_RAM_LENGTH],[length of memory area available to the BSP])
 
 RTEMS_BSPOPTS_SET([BSP_XEN_NOCACHE_LENGTH],[*],[1M])
 RTEMS_BSPOPTS_HELP([BSP_XEN_NOCACHE_LENGTH],[length of nocache RAM region])
 
-GUEST_RAM_BASE="0x40000000"
-GUEST_LOAD_OFFSET="0x8000"
-GUEST_RAM_MMU_LENGTH="16k"
+RTEMS_BSPOPTS_SET([BSP_XEN_RAM_BASE],[*],[0x40000000])
+RTEMS_BSPOPTS_HELP([BSP_XEN_RAM_BASE],[base address of memory area available to the BSP])
+
+RTEMS_BSPOPTS_SET([BSP_XEN_LOAD_OFFSET],[*],[0x8000])
+RTEMS_BSPOPTS_HELP([BSP_XEN_LOAD_OFFSET],[offset of RAM region from memory area base])
+
+RTEMS_BSPOPTS_SET([BSP_XEN_MMU_LENGTH],[*],[16k])
+RTEMS_BSPOPTS_HELP([BSP_XEN_MMU_LENGTH],[length of MMU region])
 
 AC_DEFUN([XEN_LINKCMD],[
 AC_ARG_VAR([$1],[$2; default $3])dnl
 [$1]=[$]{[$1]:-[$3]}
 ])
 
-XEN_LINKCMD([GUEST_RAM_BASE],[normal RAM region origin],[${GUEST_RAM_BASE}])
-XEN_LINKCMD([GUEST_RAM_LENGTH],[normal RAM region length],[${BSP_XEN_RAM_LENGTH}])
-XEN_LINKCMD([GUEST_LOAD_OFFSET],[entry point of guest],[${GUEST_LOAD_OFFSET}])
-XEN_LINKCMD([GUEST_RAM_MMU_LENGTH],[MMU region length],[${GUEST_RAM_MMU_LENGTH}])
-XEN_LINKCMD([GUEST_RAM_NOCACHE_LENGTH],[length of nocache RAM region],[${BSP_XEN_NOCACHE_LENGTH}])
+XEN_LINKCMD([BSP_XEN_RAM_BASE],[normal RAM region origin],[${BSP_XEN_RAM_BASE}])
+XEN_LINKCMD([BSP_XEN_RAM_LENGTH],[normal RAM region length],[${BSP_XEN_RAM_LENGTH}])
+XEN_LINKCMD([BSP_XEN_LOAD_OFFSET],[entry point of guest],[${BSP_XEN_LOAD_OFFSET}])
+XEN_LINKCMD([BSP_XEN_MMU_LENGTH],[MMU region length],[${BSP_XEN_MMU_LENGTH}])
+XEN_LINKCMD([BSP_XEN_NOCACHE_LENGTH],[length of nocache RAM region],[${BSP_XEN_NOCACHE_LENGTH}])
 
 RTEMS_BSP_CLEANUP_OPTIONS