From 4ecab5865e4b823c32a6573427d678a1641ad21b Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 23 Oct 2019 13:55:00 +0200 Subject: bsp/xilinx-zynqmp: Simplify configure.ac Use NULL-pointer protection also for Qemu variant. --- c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac | 30 ++++++++----------------- 1 file changed, 9 insertions(+), 21 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac index f145435b4f..752d8f68c9 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac +++ b/c/src/lib/libbsp/arm/xilinx-zynqmp/configure.ac @@ -65,27 +65,15 @@ RTEMS_BSPOPTS_HELP([BSP_ZYNQMP_RAM_LENGTH],[override a BSP's default RAM length] RTEMS_BSPOPTS_SET([BSP_ZYNQMP_NOCACHE_LENGTH],[*],[1M]) RTEMS_BSPOPTS_HELP([BSP_ZYNQMP_NOCACHE_LENGTH],[length of nocache RAM region]) -AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynqmp_a53_qemu], - [ZYNQMP_RAM_ORIGIN="0x00000000" - ZYNQMP_RAM_MMU="0x0fffc000" - ZYNQMP_RAM_MMU_LENGTH="16k" - ZYNQMP_RAM_ORIGIN_AVAILABLE="${ZYNQMP_RAM_ORIGIN}" - ZYNQMP_RAM_LENGTH_AVAILABLE="${BSP_ZYNQMP_RAM_LENGTH} - 16k" - ZYNQMP_RAM_INT_0_ORIGIN="0x00000000" - ZYNQMP_RAM_INT_0_LENGTH="64k + 64k + 64k" - ZYNQMP_RAM_INT_1_ORIGIN="0xFFFF0000" - ZYNQMP_RAM_INT_1_LENGTH="64k - 512"]) - -AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynqmp_ultra96], - [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" - ZYNQMP_RAM_INT_1_LENGTH="64k - 512"]) +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" +ZYNQMP_RAM_INT_1_LENGTH="64k - 512" AC_DEFUN([ZYNQMP_LINKCMD],[ AC_ARG_VAR([$1],[$2; default $3])dnl -- cgit v1.2.3