Changeset d2efc968 in rtems


Ignore:
Timestamp:
Oct 23, 2019, 12:16:47 PM (3 weeks ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
ca82ded
Parents:
8c66f1aa
git-author:
Sebastian Huber <sebastian.huber@…> (10/23/19 12:16:47)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/23/19 12:19:47)
Message:

bsp/xilinx-zynq: Simplify linkcmds config

Use NULL-pointer protection also for Qemu variant.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • bsps/arm/xilinx-zynq/start/linkcmds.in

    r8c66f1aa rd2efc968  
    22   RAM_INT_0 : ORIGIN = @ZYNQ_RAM_INT_0_ORIGIN@, LENGTH = @ZYNQ_RAM_INT_0_LENGTH@
    33   RAM_INT_1 : ORIGIN = @ZYNQ_RAM_INT_1_ORIGIN@, LENGTH = @ZYNQ_RAM_INT_1_LENGTH@
    4    RAM_MMU   : ORIGIN = @ZYNQ_RAM_MMU@, LENGTH = @ZYNQ_RAM_MMU_LENGTH@
    5    RAM       : ORIGIN = @ZYNQ_RAM_ORIGIN_AVAILABLE@, LENGTH = @ZYNQ_RAM_LENGTH_AVAILABLE@ - @ZYNQ_RAM_NOCACHE_LENGTH@
    6    NOCACHE   : ORIGIN = @ZYNQ_RAM_ORIGIN_AVAILABLE@ + @ZYNQ_RAM_LENGTH_AVAILABLE@ - @ZYNQ_RAM_NOCACHE_LENGTH@, LENGTH = @ZYNQ_RAM_NOCACHE_LENGTH@
     4   RAM_MMU   : ORIGIN = @ZYNQ_RAM_ORIGIN@, LENGTH = @ZYNQ_RAM_MMU_LENGTH@
     5   RAM       : ORIGIN = @ZYNQ_RAM_ORIGIN@ + @ZYNQ_RAM_MMU_LENGTH@, LENGTH = @BSP_ZYNQ_RAM_LENGTH@ - @ZYNQ_RAM_ORIGIN@ - @ZYNQ_RAM_MMU_LENGTH@ - @ZYNQ_RAM_NOCACHE_LENGTH@
     6   NOCACHE   : ORIGIN = @BSP_ZYNQ_RAM_LENGTH@ - @ZYNQ_RAM_NOCACHE_LENGTH@, LENGTH = @ZYNQ_RAM_NOCACHE_LENGTH@
    77}
    88
  • c/src/lib/libbsp/arm/xilinx-zynq/configure.ac

    r8c66f1aa rd2efc968  
    7474RTEMS_BSPOPTS_HELP([BSP_ZYNQ_NOCACHE_LENGTH],[length of nocache RAM region])
    7575
     76ZYNQ_RAM_ORIGIN="0x00100000"
    7677ZYNQ_RAM_MMU_LENGTH="16k"
    7778ZYNQ_RAM_INT_0_ORIGIN="0x00000000"
     
    8081ZYNQ_RAM_INT_1_LENGTH="64k - 512"
    8182
    82 AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_a9_qemu],
    83       [ZYNQ_RAM_ORIGIN="0x00000000"
    84        ZYNQ_RAM_MMU="0x0fffc000"
    85        ZYNQ_RAM_ORIGIN_AVAILABLE="${ZYNQ_RAM_ORIGIN}"
    86        ZYNQ_RAM_LENGTH_AVAILABLE="${BSP_ZYNQ_RAM_LENGTH} - 16k"])
    87 
    88 AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_zc702],
    89       [ZYNQ_RAM_ORIGIN="0x00100000"
    90        ZYNQ_RAM_MMU="${ZYNQ_RAM_ORIGIN}"
    91        ZYNQ_RAM_ORIGIN_AVAILABLE="${ZYNQ_RAM_ORIGIN} + 0x00004000"
    92        ZYNQ_RAM_LENGTH_AVAILABLE="${BSP_ZYNQ_RAM_LENGTH} - 1M - 16k"])
    93 
    9483AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_zc706],
    95       [ZYNQ_RAM_ORIGIN="0x00400000"
    96        ZYNQ_RAM_MMU="${ZYNQ_RAM_ORIGIN}"
    97        ZYNQ_RAM_ORIGIN_AVAILABLE="${ZYNQ_RAM_ORIGIN} + 0x00004000"
    98        ZYNQ_RAM_LENGTH_AVAILABLE="${BSP_ZYNQ_RAM_LENGTH} - 4M - 16k"])
    99 
    100 AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_zedboard],
    101       [ZYNQ_RAM_ORIGIN="0x00100000"
    102        ZYNQ_RAM_MMU="${ZYNQ_RAM_ORIGIN}"
    103        ZYNQ_RAM_ORIGIN_AVAILABLE="${ZYNQ_RAM_ORIGIN} + 0x00004000"
    104        ZYNQ_RAM_LENGTH_AVAILABLE="${BSP_ZYNQ_RAM_LENGTH} - 1M - 16k"])
     84      [ZYNQ_RAM_ORIGIN="0x00400000"])
    10585
    10686AC_DEFUN([ZYNQ_LINKCMD],[
     
    11090
    11191ZYNQ_LINKCMD([ZYNQ_RAM_ORIGIN],[normal RAM region origin],[${ZYNQ_RAM_ORIGIN}])
    112 ZYNQ_LINKCMD([ZYNQ_RAM_LENGTH],[normal RAM region length],[${BSP_ZYNQ_RAM_LENGTH}])
    113 ZYNQ_LINKCMD([ZYNQ_RAM_MMU],[MMU region origin],[${ZYNQ_RAM_MMU}])
     92ZYNQ_LINKCMD([BSP_ZYNQ_RAM_LENGTH],[normal RAM region length],[${BSP_ZYNQ_RAM_LENGTH}])
    11493ZYNQ_LINKCMD([ZYNQ_RAM_MMU_LENGTH],[MMU region length],[${ZYNQ_RAM_MMU_LENGTH}])
    115 ZYNQ_LINKCMD([ZYNQ_RAM_ORIGIN_AVAILABLE],[origin of available RAM],[${ZYNQ_RAM_ORIGIN_AVAILABLE}])
    116 ZYNQ_LINKCMD([ZYNQ_RAM_LENGTH_AVAILABLE],[length of available RAM],[${ZYNQ_RAM_LENGTH_AVAILABLE}])
    11794ZYNQ_LINKCMD([ZYNQ_RAM_NOCACHE_LENGTH],[length of nocache RAM region],[${BSP_ZYNQ_NOCACHE_LENGTH}])
    11895ZYNQ_LINKCMD([ZYNQ_RAM_INT_0_ORIGIN],[internal 0 RAM region origin],[${ZYNQ_RAM_INT_0_ORIGIN}])
Note: See TracChangeset for help on using the changeset viewer.