[PATCH] bsp/xilinx_zynq: Support configuraton of memory map. Remove SMP variants.

Ric Claus claus at slac.stanford.edu
Tue Jan 28 19:18:23 UTC 2014


Hi Chris,

  This looks great!  Thanks for doing it.  I was just starting to think about solving this problem, so I am grateful that you beat me to it. :-)

  Along similar lines, in a system where one has multiple different model ZYNQs running at different clock speeds, but otherwise identical from the software point of view, is it possible to make one RTEMS build satisfy them all?  In other words, can you think of a solution wherein the clock speed is determined or set at run time rather than build time?

	Thanks,
			Ric


On Jan 27, 2014, at 7:07 PM, Chris Johns wrote:

> Generate a linker command file from configure letting the user override the
> defaults to suite their custom needs. Refer to configure.ac for the details.
> 
> Remove the SMP variants and let --enable-smp control if a BSP is built for
> SMP.
> 
> Make FAST_IRQ 1 only for the realview qemu BSP.
> ---
> c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am       |  9 ---
> c/src/lib/libbsp/arm/xilinx-zynq/configure.ac      | 83 +++++++++++++++++++++-
> .../make/custom/xilinx_zynq_a9_qemu_smp.cfg        |  1 -
> .../make/custom/xilinx_zynq_zc702_smp.cfg          |  1 -
> .../make/custom/xilinx_zynq_zc706_smp.cfg          |  1 -
> .../make/custom/xilinx_zynq_zedboard_smp.cfg       |  1 -
> c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am     | 36 ----------
> .../lib/libbsp/arm/xilinx-zynq/startup/linkcmds.in | 36 ++++++++++
> .../arm/xilinx-zynq/startup/linkcmds.xilinx_zynq   | 27 -------
> .../startup/linkcmds.xilinx_zynq_a9_qemu           | 31 --------
> .../startup/linkcmds.xilinx_zynq_a9_qemu_smp       | 33 ---------
> .../xilinx-zynq/startup/linkcmds.xilinx_zynq_zc702 |  8 ---
> .../startup/linkcmds.xilinx_zynq_zc702_smp         |  3 -
> .../xilinx-zynq/startup/linkcmds.xilinx_zynq_zc706 |  8 ---
> .../startup/linkcmds.xilinx_zynq_zc706_smp         |  3 -
> .../startup/linkcmds.xilinx_zynq_zedboard          |  8 ---
> .../startup/linkcmds.xilinx_zynq_zedboard_smp      |  3 -
> 17 files changed, 116 insertions(+), 176 deletions(-)
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu_smp.cfg
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc702_smp.cfg
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc706_smp.cfg
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zedboard_smp.cfg
> create mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.in
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_a9_qemu
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_a9_qemu_smp
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc702
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc702_smp
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc706
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc706_smp
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zedboard
> delete mode 100644 c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zedboard_smp
> 
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
> index 52711fd..fd5d47a 100644
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
> +++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
> @@ -59,15 +59,6 @@ libbspstart_a_SOURCES = ../shared/start/start.S
> project_lib_DATA = start.$(OBJEXT)
> 
> project_lib_DATA += startup/linkcmds
> -project_lib_DATA += startup/linkcmds.xilinx_zynq
> -project_lib_DATA += startup/linkcmds.xilinx_zynq_a9_qemu
> -project_lib_DATA += startup/linkcmds.xilinx_zynq_a9_qemu_smp
> -project_lib_DATA += startup/linkcmds.xilinx_zynq_zc702
> -project_lib_DATA += startup/linkcmds.xilinx_zynq_zc702_smp
> -project_lib_DATA += startup/linkcmds.xilinx_zynq_zc706
> -project_lib_DATA += startup/linkcmds.xilinx_zynq_zc706_smp
> -project_lib_DATA += startup/linkcmds.xilinx_zynq_zedboard
> -project_lib_DATA += startup/linkcmds.xilinx_zynq_zedboard_smp
> 
> ###############################################################################
> #                  LibBSP                                                     #
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
> index 66b8333..bdc179d 100644
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
> +++ b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
> @@ -29,7 +29,10 @@ RTEMS_BSPOPTS_SET([BSP_ARM_A9MPCORE_PERIPHCLK],[xilinx_zynq_zedboard*],[66666666
> RTEMS_BSPOPTS_SET([BSP_ARM_A9MPCORE_PERIPHCLK],[*],[100000000U])
> RTEMS_BSPOPTS_HELP([BSP_ARM_A9MPCORE_PERIPHCLK],[ARM Cortex-A9 MPCore PERIPHCLK clock frequency in Hz])
> 
> -RTEMS_BSPOPTS_SET([CLOCK_DRIVER_USE_FAST_IDLE],[*qemu],[1])
> +USE_FAST_IDLE=0
> +AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_a9_qemu], [USE_FAST_IDLE=1])
> +
> +RTEMS_BSPOPTS_SET([CLOCK_DRIVER_USE_FAST_IDLE],[*qemu],[${USE_FAST_IDLE}])
> RTEMS_BSPOPTS_HELP([CLOCK_DRIVER_USE_FAST_IDLE],
> [This sets a mode where the time runs as fast as possible when a clock ISR
> occurs while the IDLE thread is executing.  This can significantly reduce
> @@ -38,11 +41,85 @@ simulation times.])
> RTEMS_BSPOPTS_SET([BSP_CONSOLE_MINOR],[*],[1])
> RTEMS_BSPOPTS_HELP([BSP_CONSOLE_MINOR],[minor number of console device])
> 
> +ZYNQ_CPUS="1"
> RTEMS_CHECK_SMP
> AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
> +AS_IF([test "$rtems_cv_HAS_SMP" = "yes"],
> +      [ZYNQ_CPUS="2"])
> +
> +#
> +# Zynq Memory map can be controlled from the configure command line. Use ...
> +#
> +#   ..../configure --target=arm-rtems4.11 ... ZYNQ_RAM_LENGTH=256M
> +#
> +AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_a9_qemu],
> +      [ZYNQ_RAM_ORIGIN="0x00000000"
> +       ZYNQ_RAM_LENGTH="256M"
> +       ZYNQ_RAM_MMU="0x0fffc000"
> +       ZYNQ_RAM_MMU_LENGTH="16k"
> +       ZYNQ_RAM_ORIGIN_AVAILABLE="${ZYNQ_RAM_ORIGIN}"
> +       ZYNQ_RAM_LENGTH_AVAILABLE="${ZYNQ_RAM_LENGTH} - 16k"
> +       ZYNQ_RAM_INT_0_ORIGIN="0x00000000"
> +       ZYNQ_RAM_INT_0_LENGTH="64k + 64k + 64k"
> +       ZYNQ_RAM_INT_1_ORIGIN="0xFFFF0000"
> +       ZYNQ_RAM_INT_1_LENGTH="64k - 512"])
> +
> +AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_zc702],
> +      [ZYNQ_RAM_ORIGIN="0x00100000"
> +       ZYNQ_RAM_LENGTH="1024M"
> +       ZYNQ_RAM_MMU="${ZYNQ_RAM_ORIGIN}"
> +       ZYNQ_RAM_MMU_LENGTH="16k"
> +       ZYNQ_RAM_ORIGIN_AVAILABLE="${ZYNQ_RAM_ORIGIN} + 0x00004000"
> +       ZYNQ_RAM_LENGTH_AVAILABLE="${ZYNQ_RAM_LENGTH} - 1M - 16k"
> +       ZYNQ_RAM_INT_0_ORIGIN="0x00000000"
> +       ZYNQ_RAM_INT_0_LENGTH="64k + 64k + 64k"
> +       ZYNQ_RAM_INT_1_ORIGIN="0xFFFF0000"
> +       ZYNQ_RAM_INT_1_LENGTH="64k - 512"])
> +
> +AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_zc706],
> +      [ZYNQ_RAM_ORIGIN="0x00400000"
> +       ZYNQ_RAM_LENGTH="1024M"
> +       ZYNQ_RAM_MMU="${ZYNQ_RAM_ORIGIN}"
> +       ZYNQ_RAM_MMU_LENGTH="16k"
> +       ZYNQ_RAM_ORIGIN_AVAILABLE="${ZYNQ_RAM_ORIGIN} + 0x00004000"
> +       ZYNQ_RAM_LENGTH_AVAILABLE="${ZYNQ_RAM_LENGTH} - 4M - 16k"
> +       ZYNQ_RAM_INT_0_ORIGIN="0x00000000"
> +       ZYNQ_RAM_INT_0_LENGTH="64k + 64k + 64k"
> +       ZYNQ_RAM_INT_1_ORIGIN="0xFFFF0000"
> +       ZYNQ_RAM_INT_1_LENGTH="64k - 512"])
> +
> +AS_IF([test "x${RTEMS_BSP}" == xxilinx_zynq_zedboard],
> +      [ZYNQ_RAM_ORIGIN="0x00100000"
> +       ZYNQ_RAM_LENGTH="512M"
> +       ZYNQ_RAM_MMU="${ZYNQ_RAM_ORIGIN}"
> +       ZYNQ_RAM_MMU_LENGTH="16k"
> +       ZYNQ_RAM_ORIGIN_AVAILABLE="${ZYNQ_RAM_ORIGIN} + 0x00004000"
> +       ZYNQ_RAM_LENGTH_AVAILABLE="${ZYNQ_RAM_LENGTH} - 1M - 16k"
> +       ZYNQ_RAM_INT_0_ORIGIN="0x00000000"
> +       ZYNQ_RAM_INT_0_LENGTH="64k + 64k + 64k"
> +       ZYNQ_RAM_INT_1_ORIGIN="0xFFFF0000"
> +       ZYNQ_RAM_INT_1_LENGTH="64k - 512"])
> +
> +AC_DEFUN([ZYNQ_LINKCMD],[
> +AC_ARG_VAR([$1],[$2; default $3])dnl
> +[$1]=[$]{[$1]:-[$3]}
> +])
> +
> +ZYNQ_LINKCMD([ZYNQ_CPUS],[Number of active cores],[${ZYNQ_CPUS}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_ORIGIN],[normal RAM region origin],[${ZYNQ_RAM_ORIGIN}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_LENGTH],[normal RAM region length],[${ZYNQ_RAM_LENGTH}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_MMU],[MMU region origin],[${ZYNQ_RAM_MMU}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_MMU_LENGTH],[MMU region length],[${ZYNQ_RAM_MMU_LENGTH}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_ORIGIN_AVAILABLE],[origin of available RAM],[${ZYNQ_RAM_ORIGIN_AVAILABLE}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_LENGTH_AVAILABLE],[length of available RAM],[${ZYNQ_RAM_LENGTH_AVAILABLE}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_INT_0_ORIGIN],[internal 0 RAM region origin],[${ZYNQ_RAM_INT_0_ORIGIN}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_INT_0_LENGTH],[internal 0 RAM region length],[${ZYNQ_RAM_INT_0_LENGTH}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_INT_1_ORIGIN],[internal 1 RAM region origin],[${ZYNQ_RAM_INT_1_ORIGIN}])
> +ZYNQ_LINKCMD([ZYNQ_RAM_INT_1_LENGTH],[internal 1 RAM region length],[${ZYNQ_RAM_INT_1_LENGTH}])
> 
> RTEMS_BSP_CLEANUP_OPTIONS(0, 1)
> -RTEMS_BSP_LINKCMDS
> 
> -AC_CONFIG_FILES([Makefile])
> +AC_CONFIG_FILES([
> +Makefile
> +startup/linkcmds])
> AC_OUTPUT
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu_smp.cfg b/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu_smp.cfg
> deleted file mode 100644
> index 2a0e35a..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_a9_qemu_smp.cfg
> +++ /dev/null
> @@ -1 +0,0 @@
> -include $(RTEMS_ROOT)/make/custom/xilinx_zynq_a9_qemu.cfg
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc702_smp.cfg b/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc702_smp.cfg
> deleted file mode 100644
> index 2de871d..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc702_smp.cfg
> +++ /dev/null
> @@ -1 +0,0 @@
> -include $(RTEMS_ROOT)/make/custom/xilinx_zynq.inc
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc706_smp.cfg b/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc706_smp.cfg
> deleted file mode 100644
> index 2de871d..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zc706_smp.cfg
> +++ /dev/null
> @@ -1 +0,0 @@
> -include $(RTEMS_ROOT)/make/custom/xilinx_zynq.inc
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zedboard_smp.cfg b/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zedboard_smp.cfg
> deleted file mode 100644
> index 2de871d..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/make/custom/xilinx_zynq_zedboard_smp.cfg
> +++ /dev/null
> @@ -1 +0,0 @@
> -include $(RTEMS_ROOT)/make/custom/xilinx_zynq.inc
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am b/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am
> index 1666ad9..3762d07 100644
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am
> +++ b/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am
> @@ -146,39 +146,3 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
>        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
> TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
> 
> -$(PROJECT_LIB)/linkcmds.xilinx_zynq: startup/linkcmds.xilinx_zynq $(PROJECT_LIB)/$(dirstamp)
> -       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xilinx_zynq
> -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xilinx_zynq
> -
> -$(PROJECT_LIB)/linkcmds.xilinx_zynq_a9_qemu: startup/linkcmds.xilinx_zynq_a9_qemu $(PROJECT_LIB)/$(dirstamp)
> -       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xilinx_zynq_a9_qemu
> -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xilinx_zynq_a9_qemu
> -
> -$(PROJECT_LIB)/linkcmds.xilinx_zynq_a9_qemu_smp: startup/linkcmds.xilinx_zynq_a9_qemu_smp $(PROJECT_LIB)/$(dirstamp)
> -       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xilinx_zynq_a9_qemu_smp
> -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xilinx_zynq_a9_qemu_smp
> -
> -$(PROJECT_LIB)/linkcmds.xilinx_zynq_zc702: startup/linkcmds.xilinx_zynq_zc702 $(PROJECT_LIB)/$(dirstamp)
> -       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xilinx_zynq_zc702
> -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xilinx_zynq_zc702
> -
> -$(PROJECT_LIB)/linkcmds.xilinx_zynq_zc702_smp: startup/linkcmds.xilinx_zynq_zc702_smp $(PROJECT_LIB)/$(dirstamp)
> -       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xilinx_zynq_zc702_smp
> -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xilinx_zynq_zc702_smp
> -
> -$(PROJECT_LIB)/linkcmds.xilinx_zynq_zc706: startup/linkcmds.xilinx_zynq_zc706 $(PROJECT_LIB)/$(dirstamp)
> -       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xilinx_zynq_zc706
> -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xilinx_zynq_zc706
> -
> -$(PROJECT_LIB)/linkcmds.xilinx_zynq_zc706_smp: startup/linkcmds.xilinx_zynq_zc706_smp $(PROJECT_LIB)/$(dirstamp)
> -       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xilinx_zynq_zc706_smp
> -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xilinx_zynq_zc706_smp
> -
> -$(PROJECT_LIB)/linkcmds.xilinx_zynq_zedboard: startup/linkcmds.xilinx_zynq_zedboard $(PROJECT_LIB)/$(dirstamp)
> -       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xilinx_zynq_zedboard
> -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xilinx_zynq_zedboard
> -
> -$(PROJECT_LIB)/linkcmds.xilinx_zynq_zedboard_smp: startup/linkcmds.xilinx_zynq_zedboard_smp $(PROJECT_LIB)/$(dirstamp)
> -       $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xilinx_zynq_zedboard_smp
> -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xilinx_zynq_zedboard_smp
> -
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.in b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.in
> new file mode 100644
> index 0000000..7239f0d
> --- /dev/null
> +++ b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.in
> @@ -0,0 +1,36 @@
> +MEMORY {
> +   RAM_INT_0 : ORIGIN = @ZYNQ_RAM_INT_0_ORIGIN@, LENGTH = @ZYNQ_RAM_INT_0_LENGTH@
> +   RAM_INT_1 : ORIGIN = @ZYNQ_RAM_INT_1_ORIGIN@, LENGTH = @ZYNQ_RAM_INT_1_LENGTH@
> +   RAM_MMU   : ORIGIN = @ZYNQ_RAM_MMU@, LENGTH = @ZYNQ_RAM_MMU_LENGTH@
> +   RAM       : ORIGIN = @ZYNQ_RAM_ORIGIN_AVAILABLE@, LENGTH = @ZYNQ_RAM_LENGTH_AVAILABLE@
> +}
> +
> +bsp_processor_count = DEFINED (bsp_processor_count) ? bsp_processor_count : @ZYNQ_CPUS@;
> +
> +REGION_ALIAS ("REGION_START",          RAM);
> +REGION_ALIAS ("REGION_VECTOR",         RAM);
> +REGION_ALIAS ("REGION_TEXT",           RAM);
> +REGION_ALIAS ("REGION_TEXT_LOAD",      RAM);
> +REGION_ALIAS ("REGION_RODATA",         RAM);
> +REGION_ALIAS ("REGION_RODATA_LOAD",    RAM);
> +REGION_ALIAS ("REGION_DATA",           RAM);
> +REGION_ALIAS ("REGION_DATA_LOAD",      RAM);
> +REGION_ALIAS ("REGION_FAST_TEXT",      RAM);
> +REGION_ALIAS ("REGION_FAST_TEXT_LOAD", RAM);
> +REGION_ALIAS ("REGION_FAST_DATA",      RAM);
> +REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM);
> +REGION_ALIAS ("REGION_BSS",            RAM);
> +REGION_ALIAS ("REGION_WORK",           RAM);
> +REGION_ALIAS ("REGION_STACK",          RAM);
> +
> +bsp_stack_irq_size = DEFINED (bsp_stack_irq_size) ? bsp_stack_irq_size : 4096;
> +bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024;
> +
> +bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M;
> +
> +bsp_vector_table_in_start_section = 1;
> +
> +bsp_translation_table_base = ORIGIN (RAM_MMU);
> +bsp_translation_table_end = ORIGIN (RAM_MMU) + LENGTH (RAM_MMU);
> +
> +INCLUDE linkcmds.armv4
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq
> deleted file mode 100644
> index ecac6df..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -REGION_ALIAS ("REGION_START",          RAM);
> -REGION_ALIAS ("REGION_VECTOR",         RAM);
> -REGION_ALIAS ("REGION_TEXT",           RAM);
> -REGION_ALIAS ("REGION_TEXT_LOAD",      RAM);
> -REGION_ALIAS ("REGION_RODATA",         RAM);
> -REGION_ALIAS ("REGION_RODATA_LOAD",    RAM);
> -REGION_ALIAS ("REGION_DATA",           RAM);
> -REGION_ALIAS ("REGION_DATA_LOAD",      RAM);
> -REGION_ALIAS ("REGION_FAST_TEXT",      RAM);
> -REGION_ALIAS ("REGION_FAST_TEXT_LOAD", RAM);
> -REGION_ALIAS ("REGION_FAST_DATA",      RAM);
> -REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM);
> -REGION_ALIAS ("REGION_BSS",            RAM);
> -REGION_ALIAS ("REGION_WORK",           RAM);
> -REGION_ALIAS ("REGION_STACK",          RAM);
> -
> -bsp_stack_irq_size = DEFINED (bsp_stack_irq_size) ? bsp_stack_irq_size : 4096;
> -bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024;
> -
> -bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M;
> -
> -bsp_vector_table_in_start_section = 1;
> -
> -bsp_translation_table_base = ORIGIN (RAM_MMU);
> -bsp_translation_table_end = ORIGIN (RAM_MMU) + LENGTH (RAM_MMU);
> -
> -INCLUDE linkcmds.armv4
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_a9_qemu b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_a9_qemu
> deleted file mode 100644
> index 0b5e3e0..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_a9_qemu
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -MEMORY {
> -       RAM : ORIGIN = 0x00000000, LENGTH = 256M - 16k
> -       RAM_MMU : ORIGIN = 0x0fffc000, LENGTH = 16k
> -}
> -
> -REGION_ALIAS ("REGION_START", RAM);
> -REGION_ALIAS ("REGION_VECTOR", RAM);
> -REGION_ALIAS ("REGION_TEXT", RAM);
> -REGION_ALIAS ("REGION_TEXT_LOAD", RAM);
> -REGION_ALIAS ("REGION_RODATA", RAM);
> -REGION_ALIAS ("REGION_RODATA_LOAD", RAM);
> -REGION_ALIAS ("REGION_DATA", RAM);
> -REGION_ALIAS ("REGION_DATA_LOAD", RAM);
> -REGION_ALIAS ("REGION_FAST_TEXT", RAM);
> -REGION_ALIAS ("REGION_FAST_TEXT_LOAD", RAM);
> -REGION_ALIAS ("REGION_FAST_DATA", RAM);
> -REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM);
> -REGION_ALIAS ("REGION_BSS", RAM);
> -REGION_ALIAS ("REGION_WORK", RAM);
> -REGION_ALIAS ("REGION_STACK", RAM);
> -
> -bsp_stack_irq_size = DEFINED (bsp_stack_irq_size) ? bsp_stack_irq_size : 4096;
> -bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024;
> -
> -bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M;
> -
> -bsp_vector_table_in_start_section = 1;
> -
> -bsp_translation_table_base = ORIGIN (RAM_MMU);
> -
> -INCLUDE linkcmds.armv4
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_a9_qemu_smp b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_a9_qemu_smp
> deleted file mode 100644
> index d76dd2e..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_a9_qemu_smp
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -MEMORY {
> -       RAM : ORIGIN = 0x00000000, LENGTH = 256M - 16k
> -       RAM_MMU : ORIGIN = 0x0fffc000, LENGTH = 16k
> -}
> -
> -REGION_ALIAS ("REGION_START", RAM);
> -REGION_ALIAS ("REGION_VECTOR", RAM);
> -REGION_ALIAS ("REGION_TEXT", RAM);
> -REGION_ALIAS ("REGION_TEXT_LOAD", RAM);
> -REGION_ALIAS ("REGION_RODATA", RAM);
> -REGION_ALIAS ("REGION_RODATA_LOAD", RAM);
> -REGION_ALIAS ("REGION_DATA", RAM);
> -REGION_ALIAS ("REGION_DATA_LOAD", RAM);
> -REGION_ALIAS ("REGION_FAST_TEXT", RAM);
> -REGION_ALIAS ("REGION_FAST_TEXT_LOAD", RAM);
> -REGION_ALIAS ("REGION_FAST_DATA", RAM);
> -REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM);
> -REGION_ALIAS ("REGION_BSS", RAM);
> -REGION_ALIAS ("REGION_WORK", RAM);
> -REGION_ALIAS ("REGION_STACK", RAM);
> -
> -bsp_stack_irq_size = DEFINED (bsp_stack_irq_size) ? bsp_stack_irq_size : 4096;
> -bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024;
> -
> -bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M;
> -
> -bsp_vector_table_in_start_section = 1;
> -
> -bsp_translation_table_base = ORIGIN (RAM_MMU);
> -
> -bsp_processor_count = DEFINED (bsp_processor_count) ? bsp_processor_count : 8;
> -
> -INCLUDE linkcmds.armv4
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc702 b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc702
> deleted file mode 100644
> index 2978aff..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc702
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -MEMORY {
> -   RAM_INT_0 : ORIGIN = 0x00000000, LENGTH = 64k + 64k + 64k
> -   RAM_INT_1 : ORIGIN = 0xFFFF0000, LENGTH = 64k - 512
> -   RAM_MMU   : ORIGIN = 0x00100000, LENGTH = 16k
> -   RAM       : ORIGIN = 0x00104000, LENGTH = 1024M - 1M - 16k
> -}
> -
> -INCLUDE linkcmds.xilinx_zynq
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc702_smp b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc702_smp
> deleted file mode 100644
> index 86ff4b1..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc702_smp
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -bsp_processor_count = DEFINED (bsp_processor_count) ? bsp_processor_count : 2;
> -
> -INCLUDE linkcmds.xilinx_zynq_zc702
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc706 b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc706
> deleted file mode 100644
> index 33b32ba..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc706
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -MEMORY {
> -   RAM_INT_0 : ORIGIN = 0x00000000, LENGTH = 64k + 64k + 64k
> -   RAM_INT_1 : ORIGIN = 0xFFFF0000, LENGTH = 64k - 512
> -   RAM_MMU   : ORIGIN = 0x00400000, LENGTH = 16k
> -   RAM       : ORIGIN = 0x00404000, LENGTH = 1024M - 4M - 16k
> -}
> -
> -INCLUDE linkcmds.xilinx_zynq
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc706_smp b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc706_smp
> deleted file mode 100644
> index d698425..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zc706_smp
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -bsp_processor_count = DEFINED (bsp_processor_count) ? bsp_processor_count : 2;
> -
> -INCLUDE linkcmds.xilinx_zynq_zc706
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zedboard b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zedboard
> deleted file mode 100644
> index 5c01676..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zedboard
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -MEMORY {
> -   RAM_INT_0 : ORIGIN = 0x00000000, LENGTH = 64k + 64k + 64k
> -   RAM_INT_1 : ORIGIN = 0xFFFF0000, LENGTH = 64k - 512
> -   RAM_MMU   : ORIGIN = 0x00100000, LENGTH = 16k
> -   RAM       : ORIGIN = 0x00104000, LENGTH = 512M - 1M - 16k
> -}
> -
> -INCLUDE linkcmds.xilinx_zynq
> diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zedboard_smp b/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zedboard_smp
> deleted file mode 100644
> index f01e278..0000000
> --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.xilinx_zynq_zedboard_smp
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -bsp_processor_count = DEFINED (bsp_processor_count) ? bsp_processor_count : 2;
> -
> -INCLUDE linkcmds.xilinx_zynq_zedboard
> --
> 1.8.3.4 (Apple Git-47)
> 
> _______________________________________________
> rtems-devel mailing list
> rtems-devel at rtems.org
> http://www.rtems.org/mailman/listinfo/rtems-devel





More information about the devel mailing list