diff options
Diffstat (limited to 'user')
57 files changed, 1609 insertions, 492 deletions
diff --git a/user/bld/index.rst b/user/bld/index.rst index 411b3a2..dbad167 100644 --- a/user/bld/index.rst +++ b/user/bld/index.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019, 2020 embedded brains GmbH +.. Copyright (C) 2019, 2020 embedded brains GmbH & Co. KG .. Copyright (C) 2019, 2020 Sebastian Huber .. index:: BSP build system @@ -25,7 +25,7 @@ RTEMS sources * the `waf <https://waf.io/>`_ meta build system command line tool, -* a `wscript <https://git.rtems.org/rtems/tree/wcript>`_ file used by ``waf``, +* a `wscript <https://git.rtems.org/rtems/tree/wscript>`_ file used by ``waf``, and * a @@ -54,7 +54,7 @@ Work Flow There are five steps necessary to build and install one or more BSPs. 1. Select which BSPs you want to build. See also :ref:`BSPs` and - ``./waf bsp_list``. + ``./waf bsplist``. 2. Write a BSP build configuration file (e.g. ``config.ini``) which determines which BSPs are built and how they are configured. @@ -93,7 +93,7 @@ Use ``./waf --help`` to get a list of commands and options. BSP List -------- -The BSP list command ``./waf bsp_list`` loads the build specification items and +The BSP list command ``./waf bsplist`` loads the build specification items and generates a list of base BSPs from it. The list is sorted by architecture and base BSP name. Which base BSPs are listed can be controlled by the ``--rtems-bsps`` command line option. It expects a comma-separated list of @@ -103,7 +103,7 @@ items can be specified by the ``--rtems-specs`` command line option. .. code-block:: none - $ ./waf bsp_list --rtems-bsps=sparc/ + $ ./waf bsplist --rtems-bsps=sparc/ sparc/at697f sparc/erc32 sparc/gr712rc @@ -115,7 +115,7 @@ items can be specified by the ``--rtems-specs`` command line option. .. code-block:: none - $ ./waf bsp_list --rtems-bsps='/leon,/rv64imac$' + $ ./waf bsplist --rtems-bsps='/leon,/rv64imac$' riscv/rv64imac sparc/leon2 sparc/leon3 @@ -123,7 +123,7 @@ items can be specified by the ``--rtems-specs`` command line option. BSP Defaults ------------ -The BSP defaults command ``./waf bsp_defaults`` loads the build specification +The BSP defaults command ``./waf bspdefaults`` loads the build specification items and generates a list options with default values for each base BSP from it. The list is sorted by architecture and base BSP name. Which base BSPs are listed can be controlled by the ``--rtems-bsps`` command line option. Default @@ -134,12 +134,12 @@ option. .. code-block:: none - $ ./waf bsp_defaults --rtems-bsps=gr712rc --rtems-compiler=gcc | grep ABI_FLAGS + $ ./waf bspdefaults --rtems-bsps=gr712rc --rtems-compiler=gcc | grep ABI_FLAGS ABI_FLAGS = -mcpu=leon3 -mfix-gr712rc .. code-block:: none - $ ./waf bsp_defaults --rtems-bsps=gr712rc --rtems-compiler=clang | grep ABI_FLAGS + $ ./waf bspdefaults --rtems-bsps=gr712rc --rtems-compiler=clang | grep ABI_FLAGS ABI_FLAGS = -mcpu=gr712rc Configure @@ -186,7 +186,7 @@ name. This one line configuration file is sufficient to build the base BSP `sparc/erc32` with default values for all options. The base BSPs are determined -by the build specification. The ``./waf bsp_list`` command lists all base BSPs. +by the build specification. The ``./waf bsplist`` command lists all base BSPs. You can create your own BSP names. However, in this case you have to inherit from a base BSP. The inheritance works only within an architecture, e.g. a `riscv` BSP cannot inherit options from an `arm` BSP. @@ -222,12 +222,12 @@ option. INHERIT = gr740 COMPILER = clang -Use the ``./waf bsp_defaults`` command to get a list of all configuration +Use the ``./waf bspdefaults`` command to get a list of all configuration options with default values. .. code-block:: none - $ ./waf bsp_defaults --rtems-bsps=sparc/erc32 + $ ./waf bspdefaults --rtems-bsps=sparc/erc32 [sparc/erc32] # Flags passed to the library archiver ARFLAGS = crD @@ -246,7 +246,7 @@ options with default values. INSTALL_LEGACY_MAKEFILES = True It is not recommended to blindly add all the options obtained through the -``./waf bsp_defaults`` command to custom configuration files. The specified +``./waf bspdefaults`` command to custom configuration files. The specified options should be kept at the necessary minimum to get the desired build. Some projects may still want to specify all options in a configuration file to @@ -255,9 +255,9 @@ the user and base BSP values with the ``diff`` command. .. code-block:: none - $ ./waf bsp_defaults --rtems-bsps=sparc/erc32 > config.ini + $ ./waf bspdefaults --rtems-bsps=sparc/erc32 > config.ini $ sed -i 's/BUILD_TESTS = False/BUILD_TESTS = True/' config.ini - $ ./waf bsp_defaults --rtems-bsps=sparc/erc32 | diff -u - config.ini + $ ./waf bspdefaults --rtems-bsps=sparc/erc32 | diff -u - config.ini --- config.ini 2019-12-04 08:21:36.049335872 +0100 +++ - 2019-12-04 08:21:41.187432405 +0100 @@ -31,7 +31,7 @@ diff --git a/user/bsps/aarch64/raspberrypi4.rst b/user/bsps/aarch64/raspberrypi4.rst new file mode 100644 index 0000000..efb09b6 --- /dev/null +++ b/user/bsps/aarch64/raspberrypi4.rst @@ -0,0 +1,109 @@ +.. SPDX-License-Identifier: CC-BY-SA-4.0 + +.. Copyright (C) 2022 Mohd Noor Aman + +.. _BSP_aarch64_Raspberrypi_4: + +Raspberry Pi 4B +=============== + +The 'raspberrypi4b' BSP currently supports only the LP64 ABI. ILP32 is not +supported. Raspberry pi 4B all variants and Raspberry Pi 400 are supported. The +default bootloader which is used by the Raspbian OS or other OS can be used to +boot RTEMS. SMP is currently not supported. + +Raspberry Pi 4B has 2 types of interrupt controller, GIC-400 (GICv2) and ARM +legacy generic controller. Both are supported. By default, raspberrypi 4B uses +ARM legacy generic controller. Set ``enable_gic=1`` in the ``config.txt`` file +to enable GIC. + +Clock Driver +------------ + +The clock driver uses the `ARM Generic Timer`. + +Console Driver +-------------- + +Raspberry pi 4B has 2 types of UARTs, ARM PL011 and Mini-uart. The PL011 is a +capable, broadly 16550-compatible UART, while the mini UART has a reduced +feature set. The console driver supports the default Qemu emulated ARM PL011 +PrimeCell UART as well as the physical ARM PL011 PrimeCell UART in the +raspberrypi hardware. Mini-uart is not supported. + +Preparing to boot +------------------ + +Raspberry Pi uses a different mechanism to boot when compared with any ARM SoC. +First the GPU initializes, loads the bootloader (Raspberry pi firmware) and then +looks for the kernel img. This whole process is done by the GPU (VideoCore IV) +till the kernel is loaded. More information can be found on the `Raspberry pi +documentation page +<https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#boot-sequence>`_. +By default the arm64 mode looks for the ``kernel8.img``. Any other kernel can be +loaded by adding ``kernel=<img_name>`` to the ``config.txt`` file. + +The Firmware files are required in order to boot RTEMS. The latest firmware can +be downloaded from the `Raspberry Pi Firmware Repository +<https://github.com/raspberrypi/firmware/>`_. USB boot is supported. All the +files (Firmwares and kernel) must be place in the FAT32 partition only. Add +``arm_64bit=1`` in the ``config.txt`` file in order to boot the BSP in 64bit +kernel mode. + + +UART Setup +^^^^^^^^^^ + +Connect your serial device to the GPIO15 and GPIO14. Add the following to the +``config.txt`` file in order to use the PL011 UART0 and thus disabling the +default Mini-uart. + +.. code-block:: none + + # if user wants to enable GIC, uncomment the next line + # enable_gic=1 + arm_64bit=1 + dtoverlay = disable-bt + enable_uart=1 + +.. note:: + The Raspberry Pi 4B and 400 have an additional four PL011 UARTs. They are not + supported. + +Generating kernel image +^^^^^^^^^^^^^^^^^^^^^^^ + +The following steps show how to run ``hello.exe`` on the BSP. Other executables +can be processed in a similar way. + +To create the kernel image: + +.. code-block:: shell + + $ aarch64-rtems@rtems-ver-major@-objcopy -Obinary hello.exe kernel8.img + +Copy the kernel image to the SD card. + +JTAG Setup +---------- + +The Raspberry Pi 4 doesn't have dedicated JTAG pins. Instead, you must configure +the GPIO pins (GPIO22-GPIO27) to activate the JTAG functionality. The RPi 4 +documentation refers to this as Alt4 functions of those pins. Alt5 does exist +too, which goes from GPIO4, 5, 6, 12 and 13. you can check this out from +`pinout.xyz <https://pinout.xyz/pinout/jtag#>`_ or `eLinux +<https://elinux.org/RPi_BCM2835_GPIOs>`_ + +One more thing to note on JTAG with Raspberry pi 4B is that, by default, All the +GPIO pins are pulled down, according to the `BCM2711 documentation +<https://datasheets.raspberrypi.com/bcm2711/bcm2711-peripherals.pdf>`_. This +wasn't the case in the earlier models. So in order to let the data flow freely, +we will have to disable them. + +.. code-block:: none + + # Disable pull downs + gpio=22-27=np + + # Enable jtag pins (i.e. GPIO22-GPIO27) + enable_jtag_gpio=1 diff --git a/user/bsps/aarch64/xilinx-zynqmp.rst b/user/bsps/aarch64/xilinx-zynqmp.rst index 2b28132..4de0115 100644 --- a/user/bsps/aarch64/xilinx-zynqmp.rst +++ b/user/bsps/aarch64/xilinx-zynqmp.rst @@ -6,19 +6,39 @@ .. _BSP_aarch64_qemu_xilinx_zynqmp_lp64_qemu: .. _BSP_aarch64_qemu_xilinx_zynqmp_ilp32_zu3eg: .. _BSP_aarch64_qemu_xilinx_zynqmp_lp64_zu3eg: +.. _BSP_aarch64_qemu_xilinx_zynqmp_lp64_cfc400x: Qemu Xilinx ZynqMP ================== -This BSP supports four variants: `xilinx-zynqmp-ilp32-qemu`, -`xilinx-zynqmp-lp64-qemu`, `xilinx-zynqmp-ilp32-zu3eg`, and -`xilinx-zynqmp-lp64-zu3eg`. Platform-specific hardware initialization is -performed by ARM Trusted Firmware (ATF). Other basic hardware initialization is -performed by the BSP. These BSPs support the GICv2 interrupt controller present -in all ZynqMP systems. The zu3eg BSPs have also been tested to be fully -functional on zu2cg boards and should also work on any other ZynqMP chip variant -since the Processing Subsystem (PS) does not vary among chip variants other than -the number of CPU cores available. +This BSP family supports the following variants: + +* `xilinx-zynqmp-ilp32-qemu` + +* `xilinx-zynqmp-lp64-qemu` + +* `xilinx-zynqmp-ilp32-zu3eg` + +* `xilinx-zynqmp-lp64-zu3eg` + +* `xilinx-zynqmp-lp64-cfc400x` + +Platform-specific hardware initialization is performed by ARM Trusted Firmware +(ATF). Other basic hardware initialization is performed by the BSP. These BSPs +support the GICv2 interrupt controller present in all ZynqMP systems. The zu3eg +BSPs have also been tested to be fully functional on zu2cg boards and should +also work on any other ZynqMP chip variant since the Processing Subsystem (PS) +does not vary among chip variants other than the number of CPU cores available. + +This BSP family has been tested on the following hardware: + +* `Avnet UltraZed-EG SOM` + +* `Innoflight CFC-400X` + +* `Trenz TE0802` + +* `Xilinx ZCU102` Boot on QEMU ------------ @@ -33,6 +53,14 @@ will drop to EL1 for execution. For quick turnaround during testing, it is recommended to use the u-boot BOOT.bin that comes with the PetaLinux prebuilts for the board in question. +Some systems such as the CFC-400X may require a bitstream to be loaded into the +FPGA portion of the chip to operate as expected. This bitstream must be loaded +before RTEMS begins operation since accesses to programmable logic (PL) memory +space can cause the CPU to hang if the FPGA is not initialized. This can be +performed as part of BOOT.bin or by a bootloader such as u-boot. Loading +bitstreams from RTEMS has not been tested on the ZynqMP platform and requires +additional libraries from Xilinx. + Hardware Boot Image Generation ------------------------------ @@ -225,7 +253,7 @@ as well as the physical ARM PL011 PrimeCell UART in the ZynqMP hardware. SDHCI Driver ------------ -The ZynqMP bsp has an SDHCI driver which allows reading to and writing from SD +The ZynqMP bsp has an SDHCI driver which allows writing to and reading from SD cards. These can be tested in qemu using the "-sd" option. For example: .. code-block:: shell @@ -242,7 +270,7 @@ Network Configuration When used with LibBSD, these BSP variants support networking via the four Cadence GEM instances present on all ZynqMP hardware variants. All interfaces are enabled by default, but only interfaces with operational MII busses will be -recognized and usable in RTEMS. Most ZynqMP dev boards use CGEM3. +recognized and usable in RTEMS. Most ZynqMP dev boards use RGMII with CGEM3. When used with lwIP from the rtems-lwip integration repository, these BSP variants support networking via CGEM0 and one of the other CGEM* instances diff --git a/user/bsps/arm/altera-cyclone-v.rst b/user/bsps/arm/altera-cyclone-v.rst index eaa02e3..12e563e 100644 --- a/user/bsps/arm/altera-cyclone-v.rst +++ b/user/bsps/arm/altera-cyclone-v.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2017, 2019 embedded brains GmbH +.. Copyright (C) 2017, 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2017, 2019 Sebastian Huber altera-cyclone-v (Intel Cyclone V) diff --git a/user/bsps/arm/fvp.rst b/user/bsps/arm/fvp.rst new file mode 100644 index 0000000..b938e30 --- /dev/null +++ b/user/bsps/arm/fvp.rst @@ -0,0 +1,39 @@ +.. SPDX-License-Identifier: CC-BY-SA-4.0 + +.. Copyright (C) 2022 embedded brains GmbH & Co. KG + +fvp (Fixed Virtual Platform) +============================ + +The BSP for the +`Arm Fixed Virtual Platforms <https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms>`_ +offers one variant. You need a license from Arm to run the simulator. The +`fvp_cortex_r52` variant supports a simulation of the Cortex-R52 processor. +The BSP supports the SMP configuration. + +Run an Executable +----------------- + +To run an executable on a single Cortex-R52 processor use: + +.. code-block:: none + + FVP_BaseR_Cortex-R52x1 -C bp.vis.disable_visualisation=1 -a build/arm/fvp_cortex_r52/testsuites/samples/ticker.exe + +To run an executable on a four Cortex-R52 processors use: + +.. code-block:: none + + FVP_BaseR_Cortex-R52x4 -C bp.vis.disable_visualisation=1 -a build/arm/fvp_cortex_r52/testsuites/samples/ticker.exe + +Clock Driver +------------ + +The clock driver uses the `ARMv7-AR Generic Timer`. + +Console Driver +-------------- + +The console driver uses the +`semihosting <https://developer.arm.com/documentation/dui0471/g/Semihosting/Semihosting-operations?lang=en>`_ +``SYS_READC`` and ``SYS_WRITEC`` system calls. diff --git a/user/bsps/arm/imx.rst b/user/bsps/arm/imx.rst index f0ac928..47ad503 100644 --- a/user/bsps/arm/imx.rst +++ b/user/bsps/arm/imx.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2017, 2019 embedded brains GmbH +.. Copyright (C) 2017, 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2017, 2019 Sebastian Huber imx (NXP i.MX) diff --git a/user/bsps/arm/imxrt.rst b/user/bsps/arm/imxrt.rst index e185823..30b1437 100644 --- a/user/bsps/arm/imxrt.rst +++ b/user/bsps/arm/imxrt.rst @@ -1,29 +1,48 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2020 embedded brains GmbH +.. Copyright (C) 2020 embedded brains GmbH & Co. KG .. Copyright (C) 2020 Christian Mauderer imxrt (NXP i.MXRT) ================== -This BSP offers only one variant, the `imxrt1052`. This variant supports the -i.MXRT 1052 processor on a IMXRT1050-EVKB (tested with rev A1). You can also -configure it to work with custom boards. +This BSP offers multiple variants. The `imxrt1052` supports the i.MXRT 1052 +processor on a IMXRT1050-EVKB (tested with rev A1). Some possibilities to adapt +it to a custom board are described below. NOTE: The IMXRT1050-EVKB has an backlight controller that must not be enabled without load. Make sure to either attach a load, disable it by software or disable it by removing the 0-Ohm resistor on it's input. +The `imxrt1166-cm7-saltshaker` supports an application specific board. Adapting +it to another i.MXRT1166 based board works similar like for the `imxrt1052` BSP. + Build Configuration Options --------------------------- Please see the documentation of the `IMXRT_*` and `BSP_*` configuration options for that. You can generate a default set of options with:: - ./waf bsp_defaults --rtems-bsps=arm/imxrt1052 > config.ini + ./waf bspdefaults --rtems-bsps=arm/imxrt1052 > config.ini -Boot Process ------------- +Adapting to a different board +----------------------------- + +This is only a short overview for the most important steps to adapt the BSP to +another board. Details for most steps follow further below. + +#. The device tree has to be adapted to fit the target hardware. +#. A matching clock configuration is necessary (simplest method is to generate + it with the NXP PinMux tool) +#. The `dcd_data` has to be adapted. That is used for example to initialize + SDRAM. +#. `imxrt_flexspi_config` has to be adapted to match the Flash connected to + FlexSPI (if that is used). +#. `BOARD_InitDEBUG_UARTPins` should be adapted to match the used system + console. + +Boot Process of IMXRT1050-EVKB +------------------------------ There are two possible boot processes supported: @@ -82,18 +101,19 @@ ones that need different values): You can find the default definitions in `bsps/arm/imxrt/start/flash-*.c`. Take a look at the `i.MX RT1050 Processor Reference Manual, Rev. 4, 12/2019` chapter -`9.7 Program image` for details about the contents. +`9.7 Program image` or `i.MX RT1166 Processor Reference Manual, Rev. 0, 05/2021` +chapter `10.7 Program image` for details about the contents. FDT --- The BSP uses a FDT based initialization. The FDT is linked into the application. -You can find the default FDT used in the BSP in -`bsps/arm/imxrt/dts/imxrt1050-evkb.dts`. The FDT is split up into two parts. The -core part is put into an `dtsi` file and is installed together with normal -headers into `${PREFIX}/arm-rtems@rtems-ver-major@/imxrt1052/lib/include`. You -can use that to create your own device tree based on that. Basically use -something like:: +You can find the default FDT used in the BSPs in `bsps/arm/imxrt/dts`. The FDT +is split up into two parts. The controller specific part is put into an `dtsi` +file. The board specific one is in the dts file. Both are installed together +with normal headers into +`${PREFIX}/arm-rtems@rtems-ver-major@/${BSP}/lib/include`. You can use that to +create your own device tree based on that. Basically use something like:: /dts-v1/; @@ -137,26 +157,6 @@ You'll get a C file which defines the `imxrt_dtb` array. Make sure that your new C file is compiled and linked into the application. It will overwrite the existing definition of the `imxrt_dtb` in RTEMS. -PLL Settings ------------- - -The commercial variant of the i.MXRT1052 on the evaluation board allows a clock -up to 600MHz for the ARM core. For some industrial variants only up to 528MHz -are specified. To make it possible to adapt to these variants the application -can overwrite the following constant: - -.. code-block:: c - - #include "fsl_clock_config.h" - - const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN = { - .loopDivider = 100, - .src = 0, - }; - -With the default configuration of a 24MHz oscillator, the loopDivider has to be -88 for the 528MHz. - Clock Driver ------------ @@ -198,10 +198,38 @@ Note that the SPI-pins on the evaluation board are shared with the SD card. Populate R278, R279, R280, R281 on the IMXRT1050-EVKB (Rev A) to use the SPI pins on the Arduino connector. +By default, the native chip selects are used. If you want to use GPIOs as chip +select instead, you can use the `cs-gpios` and `num-cs` attributes just like on +a Linux SPI controller. A maximum of `IMXRT_LPSPI_MAX_CS` pins can be used. + +The hardware doesn't support selecting no native chip select during a transfer. +Therefore one native chip select has to be reserved as a dummy if you want to be +able to use GPIOs. The pin function for this chip select must not be configured +on any pin. Dummy will be the first of the first four chip selects that is not a +native one. Example configuration:: + + &lpspi4 { + status = "okay"; + pinctrl-0 = <&my_pinctrl_lpspi4>; + cs-gpios = <0>, <0>, <&gpio1 1 0>, <0>, <&gpio11 5 1>; + num-cs = <5>; + } + +In this case, CS2 will be the dummy chip select and no pin must be configured +with that function. CS0, CS1 and CS3 are just native chip selects and should be +used via pin functions. GPIO1.1 is used as a high active CS and GPIO11.5 a low +active one. + Limitations: * Only a basic SPI driver is implemented. This is mostly a driver limitation and not a hardware one. +* GPIO CS pins on i.MXRT10xx are not tested. The chip has a lot of errate so + they might not work. +* Switching from one mode (CPOL/CPHA) to another one can lead to single wrong + edges on the CLK line if GPIO CS pins are involved. Make sure to stuff a dummy + transfer with `SPI_NO_CS` set if you use multiple modes together with a GPIO + CS. Network Interface Driver ------------------------ @@ -225,13 +253,58 @@ the SDK. But please note that they are not tested and maybe won't work out of the box. Everything that works with interrupts most likely needs some special treatment. -Caveats -------- +The SDK files are imported to RTEMS from the NXP mcux-sdk git repository that +you can find here: https://github.com/nxp-mcuxpresso/mcux-sdk/ + +The directory structure has been preserved and all files are in a +`bsps/arm/imxrt/mcux-sdk` directory. All patches to the files are marked with +`#ifdef __rtems__` markers. + +The suggested method to import new or updated files is to apply all RTEMS +patches to the mcux-sdk repository, rebase them to the latest mcux-sdk release +and re-import the files. The new base revision should be mentioned in the commit +description to make future updates simpler. + +A import helper script (that might or might not work on newer releases of the +mcux-sdk) can be found here: +https://raw.githubusercontent.com/c-mauderer/nxp-mcux-sdk/d21c3e61eb8602b2cf8f45fed0afa50c6aee932f/export_to_RTEMS.py + +Clocks and SDRAM +---------------- The clock configuration support is quite rudimentary. The same is true for SDRAM. It mostly relies on the DCD and on a static clock configuration that is taken from the NXP SDK example projects. -The MPU settings are currently quite permissive. +If you need to adapt the DCD or clock config to support a different hardware, +you should generate these files using the NXP MCUXpresso Configuration Tools. +You can add the generated files to your application to overwrite the default +RTEMS ones or you can add them to RTEMS in a new BSP variant. + +As a special case, the imxrt1052 BSP will adapt it's PLL setting based on the +chip variant. The commercial variant of the i.MXRT1052 will use a core clock of +600MHz for the ARM core. The industrial variants only uses 528MHz. For other +chip or BSP variants, you should adapt the files generated with the MCUXpresso +Configuration Tools. + +Caveats +------- + +* The MPU settings are currently quite permissive. + +* There is no power management support. + +* On the i.MXRT1166, sleeping of the Cortex M7 can't be disabled even for + debugging purposes. That makes it hard for a debugger to access the + controller. To make debugging a bit easier, it's possible to overwrite the + idle thread with the following one in the application: + + .. code-block:: c -There is no power management support. + void * _CPU_Thread_Idle_body(uintptr_t ignored) + { + (void)ignored; + while (true) { + /* void */ + } + } diff --git a/user/bsps/arm/lpc24xx.rst b/user/bsps/arm/lpc24xx.rst index ecf1d84..f287dc8 100644 --- a/user/bsps/arm/lpc24xx.rst +++ b/user/bsps/arm/lpc24xx.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2017, 2019 embedded brains GmbH +.. Copyright (C) 2017, 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2017, 2019 Sebastian Huber lpc24xx (NXP LPC17XX/LPC24XX/LPC40XX) diff --git a/user/bsps/arm/realview-pbx-a9.rst b/user/bsps/arm/realview-pbx-a9.rst index 15d1fbf..bbe0269 100644 --- a/user/bsps/arm/realview-pbx-a9.rst +++ b/user/bsps/arm/realview-pbx-a9.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) +.. Copyright (C) 2020 embedded brains GmbH & Co. KG realview-pbx-a9 =============== diff --git a/user/bsps/arm/stm32h7.rst b/user/bsps/arm/stm32h7.rst index ec7440f..cdf4d43 100644 --- a/user/bsps/arm/stm32h7.rst +++ b/user/bsps/arm/stm32h7.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2020 embedded brains GmbH +.. Copyright (C) 2020 embedded brains GmbH & Co. KG .. Copyright (C) 2022 Karel Gardas <karel@functional.vision> @@ -248,7 +248,7 @@ installed. Please go to its *bin* directory. E.g. $ cd plugins/com.st.stm32cube.ide.mcu.externaltools.stlink-gdb-server.linux64_2.0.200.202202231230/tools/bin Now, you will need to edit provided *config.txt* file inside the -directory. Use your favorite editor. Open the file and scrolls +directory. Use your favorite editor. Open the file and scroll down to its end. You will see following comment: .. code-block:: none @@ -332,7 +332,7 @@ Generate default configuration for the board: .. code-block:: shell - $ ./waf bsp_defaults --rtems-bsps=arm/stm32h747i-disco > stm32h747i-disco.ini + $ ./waf bspdefaults --rtems-bsps=arm/stm32h747i-disco > stm32h747i-disco.ini Regenerate build specification cache (needs a couple of seconds)... To run basic hello world or ticker samples you do not need to modify diff --git a/user/bsps/arm/xilinx-zynqmp-rpu.rst b/user/bsps/arm/xilinx-zynqmp-rpu.rst new file mode 100644 index 0000000..0dfb77e --- /dev/null +++ b/user/bsps/arm/xilinx-zynqmp-rpu.rst @@ -0,0 +1,95 @@ +.. SPDX-License-Identifier: CC-BY-SA-4.0 + +.. Copyright (C) 2024 On-Line Applications Research Corporation (OAR) + +.. _BSP_arm_xilinx_zynqmp_rpu: + +Xilinx ZynqMP RPU +================= + +This BSP supports the Cortex-R5 processor on the Xilinx Zynq UltraScale+ MPSoC +platform. Basic hardware initialization is performed by the Cortex-R5 FSBL and +the BSP. This BSP supports the GICv2 interrupt controller available to the +Cortex-R5 subsystem. Since the Cortex-R5 subsystem only varies in speed, this +BSP should be functional across all chip variants as well as on Xilinx's QEMU +branch. SMP operation is not currently supported. + +Clock Driver +------------ + +The clock driver uses one of the available triple timer counters (TTCs) as the +timer interrupt source. + +Console Driver +-------------- + +The console driver supports the default Qemu emulated ARM PL011 PrimeCell UART +as well as the physical ARM PL011 PrimeCell UART in the ZynqMP hardware. + +Boot on ZynqMP Hardware +----------------------- + +On the ZynqMP RPU, RTEMS can be started by Cortes-R5 u-boot, Cortex-A53 u-boot, +via JTAG, or directly as part of BOOT.bin. For quick turnaround during testing, +it is recommended to use Cortex-A53 u-boot to avoid repeated BOOT.bin +generation since the provided Cortex-R5 u-boot is highly limited and has no +network or MMC/SD access. + +Note that if the RPU image is started by the Cortex-A53 u-boot, the program +sections located at ZYNQMP_RPU_RAM_INT_0_ORIGIN and ZYNQMP_RPU_RAM_INT_1_ORIGIN +must be manually relocated from DDR to TCM since the TCMs are not directly +available to the Cortex-A53 cores at their Cortex-R5 internal addresses. This +can be accomplished by disabling dcache in u-boot and using u-boot's "cp" +command. Once this is done, the program can be started at 0x0 by using u-boot's +"cpu" command to first disable core 4 and then release it in split mode. + +Hardware Boot Image Generation +------------------------------ + +When generating BOOT.bin from components, the BIF file should include at least +entries for the Cortex-R5 FSBL ([bootloader,destination_cpu=r5-0]) and the +Cortex-R5 application ([destination_cpu=r5-0]). The Cortex-R5 application should +be either a u-boot or RTEMS ELF binary. The Cortex-R5 u-boot binary can be +obtained by building it from Xilinx's u-boot repository. The Cortex-R5 FSBL can +be obtained setting up an appropriate platform project in Xilinx's current +development system. + +Boot on QEMU +------------ +The executable image is booted by Qemu in ELF format. + +Running Executables on QEMU +--------------------------- + +Xilinx's qemu-devicetrees repository must be used in conjunction with the Xilinx +QEMU available via RSB. Executables generated by this BSP can be run using the +following command: + +.. code-block:: shell + + qemu-system-aarch64 -no-reboot -nographic -M arm-generic-fdt -serial null \ + -serial mon:stdio -device loader,file=example.exe,cpu-num=4 \ + -device loader,addr=0xff5e023c,data=0x80088fde,data-len=4 \ + -device loader,addr=0xff9a0000,data=0x80000218,data-len=4 \ + -hw-dtb /xlnx-qemu-devtrees-path/LATEST/SINGLE_ARCH/board-zynqmp-zcu102.dtb \ + -m 4096 -display none + +Debugging Executables on QEMU +----------------------------- + +Debugging the RPU cores under QEMU presents unique challenges due to requiring +the AArch64 QEMU to emulate the entire processing subsystem. Debugging requires +a multi-arch GDB which can be created by adding "--enable-targets=all" to the +normal GDB configure line and then building as normal. + +To attach to the RPU core once QEMU is started with "-s -S", The following steps +are required: + +.. code-block:: shell + + aarch64-rtems6-gdb + (gdb) tar ext :1234 + (gdb) add-inferior + (gdb) inferior 2 + (gdb) file example.exe + (gdb) attach 2 diff --git a/user/bsps/arm/xilinx-zynqmp.rst b/user/bsps/arm/xilinx-zynqmp.rst index 9a605bb..fa60470 100644 --- a/user/bsps/arm/xilinx-zynqmp.rst +++ b/user/bsps/arm/xilinx-zynqmp.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG xilinx-zynqmp ============= diff --git a/user/bsps/bsps-aarch64.rst b/user/bsps/bsps-aarch64.rst index 933370f..f99843a 100644 --- a/user/bsps/bsps-aarch64.rst +++ b/user/bsps/bsps-aarch64.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG aarch64 (AArch64) ***************** @@ -9,3 +9,4 @@ aarch64 (AArch64) .. include:: aarch64/a72.rst .. include:: aarch64/xilinx-versal.rst .. include:: aarch64/xilinx-zynqmp.rst +.. include:: aarch64/raspberrypi4.rst
\ No newline at end of file diff --git a/user/bsps/bsps-arm.rst b/user/bsps/bsps-arm.rst index f1113e3..bd335fa 100644 --- a/user/bsps/bsps-arm.rst +++ b/user/bsps/bsps-arm.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2017, 2019 embedded brains GmbH +.. Copyright (C) 2017, 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2017, 2019 Sebastian Huber arm (ARM) @@ -14,6 +14,7 @@ arm (ARM) arm/csb336.rst arm/csb337.rst arm/edb7312.rst + arm/fvp.rst arm/gumstix.rst arm/imx.rst arm/imxrt.rst @@ -30,3 +31,4 @@ arm (ARM) arm/xen.rst arm/xilinx-zynq.rst arm/xilinx-zynqmp.rst + arm/xilinx-zynqmp-rpu.rst diff --git a/user/bsps/bsps-bfin.rst b/user/bsps/bsps-bfin.rst index db7f721..eeb426e 100644 --- a/user/bsps/bsps-bfin.rst +++ b/user/bsps/bsps-bfin.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG bfin (Blackfin) *************** diff --git a/user/bsps/bsps-i386.rst b/user/bsps/bsps-i386.rst index 0b273ee..81f5fd8 100644 --- a/user/bsps/bsps-i386.rst +++ b/user/bsps/bsps-i386.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG i386 **** diff --git a/user/bsps/bsps-lm32.rst b/user/bsps/bsps-lm32.rst index 2db5b12..98ffb91 100644 --- a/user/bsps/bsps-lm32.rst +++ b/user/bsps/bsps-lm32.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG lm32 (LatticeMicro32) ********************* diff --git a/user/bsps/bsps-m68k.rst b/user/bsps/bsps-m68k.rst index bdb516b..a820d96 100644 --- a/user/bsps/bsps-m68k.rst +++ b/user/bsps/bsps-m68k.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG m68k (Motorola 68000 / ColdFire) ******************************** diff --git a/user/bsps/bsps-microblaze.rst b/user/bsps/bsps-microblaze.rst index 32aad90..6fe4891 100644 --- a/user/bsps/bsps-microblaze.rst +++ b/user/bsps/bsps-microblaze.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG .. Copyright (C) 2022 On-Line Applications Research Corporation (OAR) microblaze (MicroBlaze) @@ -21,13 +21,21 @@ Clock Driver ------------ The clock driver supports the QEMU emulated Xilinx AXI Timer v2.0. It is -implemented as a simple downcounter. +implemented as a simple downcounter. If device tree support is enabled in the +build configuration, the clock driver will use the node that is compatible with +`xlnx,xps-timer-1.00.a` from the device tree to configure the clock. The +following device tree node properties are used to configure the clock driver: +``reg``, ``clock-frequency``, and ``interrupts``. Console Driver -------------- The console driver supports the QEMU emulated Xilinx AXI UART Lite v2.0. It is -initialized to a baud rate of 115200. +initialized to a baud rate of 115200. If device tree support is enabled in the +build configuration, the console driver will use the node that is compatible +with `xlnx,xps-uartlite-1.00.a` from the device tree to configure the console. +The following device tree node properties are used to configure the console +driver: ``reg``, ``status``, ``port-number``, and ``interrupts``. Network Driver -------------- @@ -61,6 +69,18 @@ to include it in the BSP build. BSP_MICROBLAZE_FPGA_DTB_HEADER_PATH = /path/to/my_dtb.c +QSPI NOR JFFS2 Driver +--------------------- + +The QSPI NOR JFFS2 driver supports the QEMU emulated n25q512a11 QSPI NOR flash +device. It is initialized to a page size of 256 bytes and a sector size of 64 +KiB. If device tree support is enabled in the build configuration, the QSPI NOR +JFFS2 driver will use the node that is compatible with `xlnx,xps-spi-2.00.a` +from the device tree to configure the QSPI NOR JFFS2 driver. The following +device tree node properties are used to configure the QSPI NOR JFFS2 driver: +``reg`` and ``interrupts``. + + Running Executables ------------------- @@ -114,12 +134,21 @@ Clock Driver ------------ The clock driver supports the Xilinx AXI Timer v2.0. It is implemented as a -simple downcounter. +simple downcounter. If device tree support is enabled in the +build configuration, the clock driver will use the node that is compatible with +`xlnx,xps-timer-1.00.a` from the device tree to configure the clock. The +following device tree node properties are used to configure the clock driver: +``reg``, ``clock-frequency``, and ``interrupts``. Console Driver -------------- -The console driver supports the Xilinx AXI UART Lite v2.0. +The console driver supports the Xilinx AXI UART Lite v2.0. It is initialized to +a baud rate of 115200. If device tree support is enabled in the build +configuration, the console driver will use the node that is compatible with +`xlnx,xps-uartlite-1.00.a` from the device tree to configure the console. The +following device tree node properties are used to configure the console driver: +``reg``, ``status``, ``port-number``, and ``interrupts``. Debugging --------- diff --git a/user/bsps/bsps-mips.rst b/user/bsps/bsps-mips.rst index 9f83811..f90732a 100644 --- a/user/bsps/bsps-mips.rst +++ b/user/bsps/bsps-mips.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG mips (MIPS) *********** diff --git a/user/bsps/bsps-moxie.rst b/user/bsps/bsps-moxie.rst index eab88cc..8548777 100644 --- a/user/bsps/bsps-moxie.rst +++ b/user/bsps/bsps-moxie.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG moxie ***** diff --git a/user/bsps/bsps-nios2.rst b/user/bsps/bsps-nios2.rst index ad21dd3..5280025 100644 --- a/user/bsps/bsps-nios2.rst +++ b/user/bsps/bsps-nios2.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG nios2 (Nios II) *************** diff --git a/user/bsps/bsps-or1k.rst b/user/bsps/bsps-or1k.rst index 6295c23..e7d9a10 100644 --- a/user/bsps/bsps-or1k.rst +++ b/user/bsps/bsps-or1k.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG or1k (OpenRISC 1000) ******************** diff --git a/user/bsps/bsps-powerpc.rst b/user/bsps/bsps-powerpc.rst index 3d1ce88..6b63936 100644 --- a/user/bsps/bsps-powerpc.rst +++ b/user/bsps/bsps-powerpc.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG powerpc (PowerPC) ***************** diff --git a/user/bsps/bsps-riscv.rst b/user/bsps/bsps-riscv.rst index 5faa87b..263796e 100644 --- a/user/bsps/bsps-riscv.rst +++ b/user/bsps/bsps-riscv.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG riscv (RISC-V) ************** @@ -8,7 +8,8 @@ riscv (RISC-V) riscv ===== -This BSP offers 13 variants: +**Each variant in this first group corresponds to a GCC multilib option with +different RISC-V standard extensions.** * rv32i @@ -26,26 +27,30 @@ This BSP offers 13 variants: * rv64imac -* rv64imac_medany - * rv64imafd -* rv64imafd_medany - * rv64imafdc -* rv64imafdc_medany +Each variant reflects an ISA with ABI and code model choice. All rv64 BSPs have +medany code model by default, while rv32 BSPs are medlow. The reason is that +RV32 medlow can access the entire 32-bit address space, while RV64 medlow can +only access addresses below 0x80000000. With RV64 medany, it's possible to +perform accesses above 0x80000000. The BSP must be started in machine mode. + +The reference platforms for the rv* variants include the QEMU `virt` and +`spike` machines and the Spike RISC-V ISA simulator. + +**The BSP also provides the following variants for specific hardware targets:** -* frdme310arty +* frdme310arty - The reference platform for this variant is the Arty FPGA board + with the SiFive Freedom E310 reference design. -Each variant corresponds to a GCC multilib. A particular variant reflects an -ISA with ABI and code model choice. +* mpfs64imafdc - The reference platform for this variant is the Microchip + PolarFire SoC Icicle Kit. -The basic hardware initialization is not performed by the BSP. A boot loader -with device tree support must be used to start the BSP, e.g. BBL. The BSP must -be started im machine mode. +* kendrytek210 - The reference platform for this variant is the Kendryte K210 + SoC on the Sipeed MAiX BiT or Maixduino board. -The reference platform for this BSP is the Qemu `virt` machine. Build Configuration Options --------------------------- @@ -68,31 +73,51 @@ configuration INI file. The ``waf`` defaults can be used to inspect the values. ``BSP_FDT_BLOB_SIZE_MAX`` The maximum size of the device tree blob in bytes (default is 65536). +``BSP_DTB_IS_SUPPORTED`` + If defined to a non-zero value, then the device tree blob is embedded in + the BSP. + +``BSP_DTB_HEADER_PATH`` + The path to the header file containing the device tree blob. + ``BSP_CONSOLE_BAUD`` - The default baud for console driver devices (default 115200). + The default baud for console driver devices (default is 115200). ``RISCV_MAXIMUM_EXTERNAL_INTERRUPTS`` The maximum number of external interrupts supported by the BSP (default - 64). + is 64). ``RISCV_ENABLE_HTIF_SUPPORT`` - Enables the HTIF support if defined to a non-zero value, otherwise it is - disabled (disabled by default). + Enable the Host/Target Interface (HTIF) support (enabled by default). ``RISCV_CONSOLE_MAX_NS16550_DEVICES`` - The maximum number of NS16550 devices supported by the console driver (2 - by default). + The maximum number of NS16550 devices supported by the console driver + (default is 2). + +``RISCV_ENABLE_SIFIVE_UART_SUPPORT`` + Enable the SiFive console UART (disabled by default). ``RISCV_RAM_REGION_BEGIN`` - The begin of the RAM region for linker command file (default is 0x70000000 - for 64-bit with -mcmodel=medlow and 0x80000000 for all other). + The begin of the RAM region for linker command file + (default is 0x80000000). ``RISCV_RAM_REGION_SIZE`` The size of the RAM region for linker command file (default 64MiB). ``RISCV_ENABLE_FRDME310ARTY_SUPPORT`` Enables support sifive Freedom E310 Arty board if defined to a non-zero - value,otherwise it is disabled (disabled by default) + value,otherwise it is disabled (disabled by default). + +``RISCV_ENABLE_MPFS_SUPPORT`` + Enables support Microchip PolarFire SoC if defined to a non-zero + value, otherwise it is disabled (disabled by default). + +``RISCV_ENABLE_KENDRYTE_K210_SUPPORT`` + Enables support for the Kendtryte K210 SoC if defined to a non-zero + value, otherwise it is disabled (disabled by default). + +``RISCV_BOOT_HARTID`` + The boot hartid (processor number) of risc-v cpu by default 0. Interrupt Controller -------------------- @@ -110,20 +135,341 @@ The clock driver uses the CLINT timer. Console Driver -------------- -The console driver supports devices compatible to +The console driver supports devices compatible to: * "ucb,htif0" (depending on the ``RISCV_ENABLE_HTIF_SUPPORT`` BSP option), -* "ns16550a" (see ``RISCV_CONSOLE_MAX_NS16550_DEVICES`` BSP option), and +* "ns16550a" (see ``RISCV_CONSOLE_MAX_NS16550_DEVICES`` BSP option), -* "ns16750" (see ``RISCV_CONSOLE_MAX_NS16550_DEVICES`` BSP option). +* "ns16750" (see ``RISCV_CONSOLE_MAX_NS16550_DEVICES`` BSP option), and -* "sifive,uart0" (see ``RISCV_ENABLE_FRDME310ARTY_SUPPORT`` BSP option). +* "sifive,uart0" (see ``RISCV_ENABLE_SIFIVE_UART_SUPPORT`` BSP option). They are initialized according to the device tree. The console driver does not configure the pins or peripheral clocks. The console device is selected according to the device tree "/chosen/stdout-path" property value. +QEMU +---- + +All of the BSP variants that start with rv can be run on QEMU's virt +and spike machines. For instance, to run the ``rv64imafdc`` BSP with the +following "config.ini" file. + +.. code-block:: none + + [riscv/rv64imafdc] + +Run the following QEMU command. + +.. code-block:: shell + + $ qemu-system-riscv64 -M virt -nographic -bios $RTEMS_EXE + $ qemu-system-riscv64 -M spike -nographic -bios $RTEMS_EXE + +Spike +---- + +All of the BSP variants that start with rv can be run on Spike. For instance, +to run the ``rv64imafdc`` BSP with the following "config.ini" file. + +.. code-block:: none + + [riscv/rv64imafdc] + +Run the following Spike command. + +.. code-block:: shell + + $ spike --isa=rv64imafdc $RTEMS_EXE + +Unlike QEMU, Spike supports enabling/disabling a subset of the imafdc +extensions and has support for further RISC-V extensions as well. A fault will +be triggered if an executable built with rv64imafdc RISC-V's -march option run +on Spike with --isa=rv64i option. If no --isa option is specified, the default +is rv64imafdc. + +Microchip PolarFire SoC +----------------------- + +The PolarFire SoC is the 4x 64-bit RISC-V U54 cores and a 64-bit RISC-V E51 +monitor core SoC from the Microchip. + +The ``mpfs64imafdc`` BSP variant supports the U54 cores but not the E51 because +the E51 monitor core is reserved for the first stage bootloader (Hart Software +Services). In order to boot from the first U54 core, ``RISCV_BOOT_HARTID`` is +set to 1 by default. + +The device tree blob is embedded in the ``mpfs64imafdc`` BSP variant by default +with the ``BSP_DTB_IS_SUPPORTED`` enabled and the DTB header path +``BSP_DTB_HEADER_PATH`` is set to bsp/mpfs-dtb.h. + +**SMP test procedure for the Microchip PolarFire Icicle Kit:** + +The "config.ini" file. + +.. code-block:: none + + [riscv/mpfs64imafdc] + BUILD_TESTS = True + RTEMS_POSIX_API=True + RTEMS_SMP = True + BSP_START_COPY_FDT_FROM_U_BOOT=False + BSP_VERBOSE_FATAL_EXTENSION = False + +Build RTEMS. + +.. code-block:: shell + + $ ./waf configure --prefix=$HOME/rtems-start/rtems/@rtems-ver-major@ + $ ./waf + +Convert .exe to .elf file. + +.. code-block:: shell + + $ riscv-rtems@rtems-ver-major@-objcopy build/riscv/mpfs64imafdc/testsuites/smptests/smp01.exe build/riscv/mpfs64imafdc/testsuites/smptests/smp01.elf + +Generate a payload for the `smp01.elf` using the `hss-payload-generator <https://github.com/polarfire-soc/hart-software-services/blob/master/tools/hss-payload-generator>`_. + +* Copy `smp01.elf` file to the HSS/tools/hss-payload-generator/test directory. + +* Go to hss-payload-generator source directory. + +.. code-block:: shell + + $ cd hart-software-services/tools/hss-payload-generator + +* Edit test/uboot.yaml file for the hart entry points and correct name of the + binary file. + +.. code-block:: none + + set-name: 'PolarFire-SoC-HSS::RTEMS' + hart-entry-points: {u54_1: '0x1000000000', u54_2: '0x1000000000', u54_3: '0x1000000000', u54_4: '0x1000000000'} + payloads: + test/smp01.elf: {exec-addr: '0x1000000000', owner-hart: u54_1, secondary-hart: u54_2, secondary-hart: u54_3, secondary-hart: u54_4, priv-mode: prv_m, skip-opensbi: true} + +* Generate payload + +.. code-block:: shell + + $ ./hss-payload-generator -c test/uboot.yaml payload.bin + +Once the payload binary is generated, it should be copied to the eMMC/SD. + +`FPGA design with HSS programming file <https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/boards/mpfs-icicle-kit-es/updating-icicle-kit/updating-icicle-kit-design-and-linux.md>`_. + +Program the eMMC/SD with the payload binary. + +* Power Cycle the Microchip PolarFire Icicle Kit and stop at the HSS. + +* type "mmc" and then "usbdmsc" on the HSS terminal(UART0). + +* Load the payload.bin from the Host PC. + +.. code-block:: shell + + $ sudo dd if=payload.bin of=/dev/sdb bs=512 + +Reset the Microchip PolarFire SoC Icicle Kit. + +Serial terminal UART1 displays the SMP example messages + +.. code-block:: none + + *** BEGIN OF TEST SMP 1 *** + *** TEST VERSION: 6.0.0.ef33f861e16de9bf4190a36e4d18062c7300986c + *** TEST STATE: EXPECTED_PASS + *** TEST BUILD: RTEMS_POSIX_API RTEMS_SMP + *** TEST TOOLS: 12.1.1 20220622 (RTEMS 6, RSB 3cb78b0b815ba05d17f5c6 + 5865d246a8333aa087, Newlib ea99f21) + + CPU 3 start task TA0 + CPU 2 running Task TA0 + CPU 3 start task TA1 + CPU 1 running Task TA1 + CPU 3 start task TA2 + CPU 0 running Task TA2 + + *** END OF TEST SMP 1 *** + +Kendryte K210 +------------- + +The Kendryte K210 SoC is a dual core 64-bit RISC-V SoC with an AI NPU, built in +SRAM, and a variety of peripherals. Currently just the console UART, interrupt +controller, and timer are supported. + +The device tree blob is embedded in the ``kendrytek210`` BSP variant by +default. When the kendrytek210 BSP variant is selected, +``BSP_DTB_IS_SUPPORTED`` enabled and the DTB header path +``BSP_DTB_HEADER_PATH`` is set to ``bsp/kendryte-k210-dtb.h``. + +The ``kendrytek210`` BSP variant has been tested on the following simulator and +boards: + +* Renode.io simulator using the Kendrtye k210 model +* Sipeed MAiX BiT board +* Sipeed Maixduino board +* Sipeed MAiX Dock board + +**Building the Kendryte K210 BSP** + +Configuration file ``config.ini``: + +.. code-block:: none + + [riscv/kendrytek210] + RTEMS_SMP = True + +Build RTEMS: + +.. code-block:: shell + + $ ./waf configure --prefix=$HOME/rtems-start/rtems/@rtems-ver-major@ + $ ./waf + +**Flash an executable to a supported K210 board** + +Binary images can be flashed to the Sipeed boards through the USB port using +the ``kflash.py`` utility available from the python pip utility. + +.. code-block:: shell + + $ riscv-rtems@rtems-ver-major@-objcopy -Obinary ticker.exe ticker.bin + $ kflash.py --uart /dev/ttyUSB0 ticker.bin + +After the image is flashed, the RTEMS image will automatically boot. It will +also run when the board is reset or powered through the USB cable. The USB port +provides the power and console UART. Plug the USB cable into a host PC and +bring up a terminal emulator at 115200 baud, 8 data bits, 1 stop bit, no +parity, and no flow control. On Linux the UART device is often +``/dev/ttyUSB0``. + +**Run a RTEMS application on the Renode.io simulator** + +RTEMS executables compiled with the kendrytek210 BSP can run on the renode.io +simulator using the built-in K210 model. The simulator currently supports the +console UART, interrupt controller, and timer. + +To install renode.io please refer to the `installation instructions <https://github.com/renode/renode#installation>`_. +Once installed, save the following file as `k210_rtems.resc`. + +.. code-block:: shell + + using sysbus + + $bin?=@ticker.exe + + mach create "K210" + + machine LoadPlatformDescription @platforms/cpus/kendryte_k210.repl + + showAnalyzer uart + + sysbus Tag <0x50440000 0x10000> "SYSCTL" + sysbus Tag <0x50440018 0x4> "pll_lock" 0xFFFFFFFF + sysbus Tag <0x5044000C 0x4> "pll1" + sysbus Tag <0x50440008 0x4> "pll0" + sysbus Tag <0x50440020 0x4> "clk_sel0" + sysbus Tag <0x50440028 0x4> "clk_en_cent" + sysbus Tag <0x5044002c 0x4> "clk_en_peri" + + macro reset + """ + sysbus LoadELF $bin + """ + runMacro $reset + +After saving the above file in in the same directory as your RTEMS ELF images, +start renode and load the `k210_rtems.resc` script to start the emulation. + +.. code-block:: shell + + (monitor) s @k210_rtems.resc + +You should see a renode UART window and the RTEMS ticker example output. If you +want to run a different RTEMS image, you can edit the file or enter the +following on the renode console. + +.. code-block:: shell + + (monitor) $bin=@smp08.exe + (monitor) s @k210_rtems.resc + +The above example will run the SMP08 example instead of ticker. + +**Generating the Device Tree Header** + +The kendrytek210 BSP uses a built in device tree blob. If additional peripheral +support is added to the BSP, the device tree may need to be updated. After +editing the device tree source, compile it to a device tree blob with the +following command: + +.. code-block:: shell + + $ dtc -O dtb -b 0 -o kendryte-k210.dtb kendryte-k210.dts + +The dtb file can then be converted to a C array using the rtems-bin2c tool. +The data for the device tree binary can then replace the existing device tree +binary data in the ``kendryte-k210-dtb.h`` header file. + +noel +==== + +This BSP supports the `NOEL-V <https://gaisler.com/noel-v>`_ systems from +Cobham Gaisler. The NOEL-V is a synthesizable VHDL model of a processor that +implements the RISC-V architecture. It is part of the open source `GRLIB +<https://gaisler.com/grlib>`_ IP Library. The following BSP variants correspond +to common NOEL-V configurations: + +* noel32im + +* noel32imafd + +* noel64imac + +* noel64imafd + +* noel64imafdc + +The start of the memory is set to 0x0 to match a standard NOEL-V system, but +can be changed using the ``RISCV_RAM_REGION_BEGIN`` configuration option. The +size of the memory is taken from the information available in the device tree. + +Reference Designs +----------------- + +The BSP has been tested with NOEL-V reference designs for `Digilent Arty A7 +<https://gaisler.com/noel-artya7>`_, `Microchip PolarFire Splash Kit +<https://gaisler.com/noel-pf>`_, and `Xilinx KCU105 +<https://gaisler.com/noel-xcku>`_. See the accompanying quickstart guide for +each reference design to determine which BSP configuration to use. + +Build Configuration Options +--------------------------- + +The following options can be used in the BSP section of the ``waf`` +configuration INI file. The ``waf`` defaults can be used to inspect the values. + +``BSP_CONSOLE_USE_INTERRUPTS`` + Use the Termios interrupt mode in the console driver (true by default). + +``BSP_FDT_BLOB_SIZE_MAX`` + The maximum size of the device tree blob in bytes (262144 by default). + +``RISCV_CONSOLE_MAX_APBUART_DEVICES`` + The maximum number of APBUART devices supported by the console driver + (2 by default). + +``RISCV_RAM_REGION_BEGIN`` + The begin of the RAM region for linker command file (0x0 by default). + +``RISCV_MAXIMUM_EXTERNAL_INTERRUPTS`` + The maximum number of external interrupts supported by the BSP (64 by + default). + griscv ====== diff --git a/user/bsps/bsps-sh.rst b/user/bsps/bsps-sh.rst index b147251..8c245c4 100644 --- a/user/bsps/bsps-sh.rst +++ b/user/bsps/bsps-sh.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG sh (SuperH) *********** diff --git a/user/bsps/bsps-sparc.rst b/user/bsps/bsps-sparc.rst index d0316a9..325c7fa 100644 --- a/user/bsps/bsps-sparc.rst +++ b/user/bsps/bsps-sparc.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG .. Copyright (C) 2020 Chris Johns sparc (SPARC / LEON) @@ -20,11 +20,81 @@ TODO. leon2 ===== -TODO. +This BSP supports LEON2 systems, in particular the `Microchip AT697F +<https://www.microchip.com/en-us/product/AT697F>`_. The following +default build configurations are provided: + +* leon2 - A generic LEON2 system with memory at 0x4000000. + +* at697f - For the AT697F. Built with ``-mcpu=leon -mfix-at697f``. + +The BSP contains UART, timer, and interrupt controller drivers. +Drivers for PCI are available through the :ref:`driver manager <BSP_sparc_leon3_drv_mgr>`. .. _BSP_sparc_leon3: leon3 ===== -TODO. +This BSP supports the LEON3/4/5 systems from Cobham Gaisler. +The following default build configurations are provided: + +* leon3 - A generic `LEON3/4/5 <https://www.gaisler.com/leon5>`_ system with memory at 0x4000000. + +* ut700 - For the `UT700 <https://caes.com/product/ut700>`_. Built with ``-mcpu=leon3 -mfix-ut700``. + +* ut699 - For the `UT699 <https://caes.com/product/ut699>`_. Built with ``-mcpu=leon -mfix-ut699``. + +* gr712rc - For the `GR712RC <https://www.gaisler.com/gr712rc>`_. Built with ``-mcpu=leon3 -mfix-gr712rc``. + +* gr740 - For the `GR740 <https://www.gaisler.com/gr740>`_. Memory located at address 0x0. + +The BSP contains UART, timer, and interrupt controller drivers. Drivers for additional +peripherals are available through the driver manager. + +.. _BSP_sparc_leon3_drv_mgr: + +Driver Manager +-------------- + +The leon3 BSP includes an optional driver manager that handles drivers and +devices on the AMBA and PCI Plug & Play buses. The driver manager can either +be initialized manually by the user, or started automatically on startup by +setting the ``RTEMS_DRVMGR_STARTUP`` option. It can be configured to +automatically instantiate a driver for each hardware device found. + +Drivers for the following devices are provided and handled via the driver manager: + +* SpaceWire (GRSPW, GRSPW2, GRSPW2_DMA) +* SpaceWire Router (GRSPWROUTER) +* SpaceWire Time Distribution Protocol (SPWTDP) +* CAN - non-DMA (OCCAN) and DMA (GRCAN, GRCANFD) +- GPIO (GRGPIO) +- L2 Cache (L2CACHE) +- IOMMU (GRIOMMU) +- ADC/DAC (GRADCDAC) +- Timers (GPTIMER, GRTIMER) +- 1553 BC, RT and BM support (GR1553B) +- I2C Master (I2CMST) +- PCI (GRPCI2, GRPCI, PCIF) +- Memory Controller (MCTRL) +- Memory Scrubber (MEMSCRUB) +- Pulse Width Modulation Generator (GRPWM) +- CCSDS/ECSS Telemetry Encoder/Decoder (GRTM/GRTC) +- CSDS Time Manager (GRCTM) +- Ethernet (GRETH 10/100/1000) (requires network stack) +- Performance counters (L4STAT) +- Serial Peripheral Interface (AHBSTAT) +- AHB Status (AHBSTAT) + +Build Configuration Options +--------------------------- + +The following options can be used in the BSP section of the ``waf`` +configuration INI file. The ``waf`` defaults can be used to inspect the values. + +``CONSOLE_USE_INTERRUPTS`` + Use the Termios interrupt mode in the console driver (false by default). + +``RTEMS_DRVMGR_STARTUP`` + Enable the Driver Manager at startup (false by default). diff --git a/user/bsps/bsps-sparc64.rst b/user/bsps/bsps-sparc64.rst index e7be4ea..7b598b7 100644 --- a/user/bsps/bsps-sparc64.rst +++ b/user/bsps/bsps-sparc64.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG sparc64 (SPARC V9) ****************** diff --git a/user/bsps/bsps-v850.rst b/user/bsps/bsps-v850.rst index 39973db..220ccc0 100644 --- a/user/bsps/bsps-v850.rst +++ b/user/bsps/bsps-v850.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG v850 (V850) *********** diff --git a/user/bsps/bsps-x86_64.rst b/user/bsps/bsps-x86_64.rst index a7f7326..38d84e4 100644 --- a/user/bsps/bsps-x86_64.rst +++ b/user/bsps/bsps-x86_64.rst @@ -1,7 +1,7 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 .. Copyright (C) 2018 Amaan Cheval <amaan.cheval@gmail.com> -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG x86_64 ****** diff --git a/user/bsps/index.rst b/user/bsps/index.rst index bf590e0..5c1b3b7 100644 --- a/user/bsps/index.rst +++ b/user/bsps/index.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2018 embedded brains GmbH +.. Copyright (C) 2018 embedded brains GmbH & Co. KG .. _BSPs: diff --git a/user/deployment/index.rst b/user/deployment/index.rst new file mode 100644 index 0000000..d1315af --- /dev/null +++ b/user/deployment/index.rst @@ -0,0 +1,426 @@ +.. SPDX-License-Identifier: CC-BY-SA-4.0 + +.. Copyright (C) 2022 Chris Johns + +.. _BSPs: + +Deployment +********** +.. index:: Deployment +.. index:: packages + +Deployment is a process companies, organizations or teams use to +control and manage delivery of RTEMS tools, kernels and third party +libraries. Deployed tools, kernels and libraries are packaged and +controlled so the same tools and libraries are used in all phases of a +project. + +The Quick Start guide details how tools are built using the RSB. The +tools are installed on your development computer and available for you +to build applications. That build can be viewed as the simplest form +of deployment because it is simple and easy however it does not +scale. Building the tools and kernel on each development machine in a +project or company is time consuming, difficult to get right and +costly to audit. + +This section covers the building of tools, kernels and third party +libraries using the RSB for deployment. Custom RSB buildset files are +supported across releases giving you an easy update path. The RSB can +generate a single tarfile for any prefix without needing to install +the pieces built helping ease integration with packaging systems and +continuous integration (CI) for automated workflows. + +RSB Deployment +-------------- + +The RSB provides support for deployment using custom buildset files. A +custom buildset file resides outside the RSB and can build tools for a +number of architectures and kernels for BSPs. Deployment can include +third party libraries if a single BSP is being built. + +The RSB ``--no-install`` option builds the tools and kernel without +the final installation phase. A prefix that is not accessible when +running the RSB can be used. This is important if a CI flow is being +used. + +The buildset tar file option ``--bset-tar-file`` packages the build's +staging directory tree into a single tar file. The tar file can be +used as the input source to a packaging system. + +Buildset configuration files can be tested by adding the ``--dry-run`` +option to the ``sb-set-builder`` command line. + +The buildset examples that follow assume the prefix path used does not +exist or is not writable and the environment path does not include any +RTEMS tools. + +Deployment Repository +^^^^^^^^^^^^^^^^^^^^^ + +Create a repository to hold a project's buildset configuration +files: + +.. code-block:: none + + $ mkdir a-project + $ cd a-project + $ git init + +Add the RSB as a sub-module: + +.. code-block:: none + + $ git submodule add git://git.rtems.org/rtems-source-builder.git + +Create a configuration directory: + +.. code-block:: none + + $ mkdir config + $ git add config + +Tools Configuration +^^^^^^^^^^^^^^^^^^^ + +This example will build a single tool set with a local configuration +file. + +Create a configuration file for the ``project``: + +.. code-block:: none + + $ vi config/project-tools.bset + +Add the following to the buildset configuration file: + +.. code-block:: none + + # + # Project Tools + # + @rtems-ver-major@/rtems-aarch64 + +Commit the changes to the repository: + +.. code-block:: none + + $ git add config/project-tools.bset + $ git commit -m "Add project aarch64 tools buildset" + +Build a tarfile containing the tools using the RSB submodule: + +.. code-block:: none + + $ ./rtems-source-builder/source-builder/sb-set-builder \ + --prefix=/opt/project --log=project.txt \ + --bset-tar-file --no-install \ + project-tools + +Once the build has finished the ``tar`` directory will contain the +``project`` tools in a tarfile: + +.. code-block:: none + + $ ls tar + project-tools.tar.bz2 + +Inspect the tarfile to check the path matches the prefix used to build +the tools (sizes may vary): + +.. code-block:: none + + $ tar Jtvf tar/project-tools.tar.bz2 | less + drwxr-xr-x 0 chris eng 0 Sep 6 14:27 opt/project/bin/ + -rwxr-xr-x 0 chris eng 1320888 Sep 6 14:20 opt/project/bin/aarch64-rtems@rtems-ver-major@-addr2line + -rwxr-xr-x 0 chris eng 1358688 Sep 6 14:20 opt/project/bin/aarch64-rtems@rtems-ver-major@-ar + -rwxr-xr-x 0 chris eng 2381976 Sep 6 14:20 opt/project/bin/aarch64-rtems@rtems-ver-major@-as + -rwxr-xr-x 0 chris eng 1328440 Sep 6 14:27 opt/project/bin/aarch64-rtems@rtems-ver-major@-c++ + -rwxr-xr-x 0 chris eng 1316240 Sep 6 14:20 opt/project/bin/aarch64-rtems@rtems-ver-major@-c++filt + -rwxr-xr-x 0 chris eng 1328440 Sep 6 14:27 opt/project/bin/aarch64-rtems@rtems-ver-major@-cpp + -rwxr-xr-x 0 chris eng 60792 Sep 6 14:20 opt/project/bin/aarch64-rtems@rtems-ver-major@-elfedit + -rwxr-xr-x 0 chris eng 1328440 Sep 6 14:27 opt/project/bin/aarch64-rtems@rtems-ver-major@-g++ + -rwxr-xr-x 0 chris eng 1328440 Sep 6 14:27 opt/project/bin/aarch64-rtems@rtems-ver-major@-gcc + -rwxr-xr-x 0 chris eng 1328440 Sep 6 14:27 opt/project/bin/aarch64-rtems@rtems-ver-major@-gcc-12.1.1 + -rwxr-xr-x 0 chris eng 48568 Sep 6 14:27 opt/project/bin/aarch64-rtems@rtems-ver-major@-gcc-ar + -rwxr-xr-x 0 chris eng 48568 Sep 6 14:27 opt/project/bin/aarch64-rtems@rtems-ver-major@-gcc-nm + -rwxr-xr-x 0 chris eng 48576 Sep 6 14:27 opt/project/bin/aarch64-rtems@rtems-ver-major@-gcc-ranlib + ..... + +Tools and Kernel +^^^^^^^^^^^^^^^^ + +This example builds a single tool set and an RTEMS kernel for a BSP +using a buildset defined BSP settings. + +We use the same ``a-project`` repository from the previous example and +add a new configuration. Add a configuration file to build the tools +and a BSP: + +.. code-block:: none + + $ vi config/project-tools-bsp.bset + +Add the following to the buildset configuration file and save: + +.. code-block:: none + + # + # Project Tools and BSP + # + %define with_rtems_bsp aarch64/xilinx_versal_aiedge + %define with_rtems_bspopts BSP_XILINX_VERSAL_NOCACHE_LENGTH=0x4000000 \ + BSP_XILINX_VERSAL_RAM_LENGTH=0x200000000 + @rtems-ver-major@/rtems-aarch64 + @rtems-ver-major@/rtems-kernel + +The configuration provides BSP options. Commit the changes to the +repository: + +.. code-block:: none + + $ git add config/project-tools-bsp.bset + $ git commit -m "Add project tools and BSP buildset" + +Build a tarfile of the tools and BSP using the RSB submodule: + +.. code-block:: none + + $ ./rtems-source-builder/source-builder/sb-set-builder \ + --prefix=/opt/project --log=project.txt \ + --bset-tar-file --no-install \ + project-tools-bsp + +A buildset configuration file that uses buildset BSP defines is +limited to a single architecture and the tools built need to match the +architecture of the BSP. + +You can specify more than one BSP to be built. An updated +configuration could be: + +.. code-block:: none + + %define with_rtems_bsp aarch64/xilinx_versal_aiedge \ + aarch64/xilinx_zynqmp_lp64_zu3eg + +This is useful when deploying more than one BSP. If you need multiple +architectures and BSPs consider the Tools and Kernel With Config +example. + +Buildset BSP options are applied to all BSPs in the BSP list. If they +are specific to a BSP only specify a single BSP in the BSP define. + +RTEMS 5 supports this type of buildset file. + +Tools and Kernel with Config +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This example builds tool sets for different architectures and multiple +BSPs for the architectures using a kernel configuration INI file. + +Tools for the ``arch64`` and ``arm`` architectures are built and three +BSPs each with different options. + +We use the same ``a-project`` repository from the previous example and +add the new configurations. Add a configuration file to build the +tools and BSPs: + +.. code-block:: none + + $ vi config/project-tools-bsp-config.bset + +Add the following to the buildset configuration file and save: + +.. code-block:: none + + # + # Project Tools and BSPs + # + %define with_rtems_bsp_config config/project-bsps.ini + @rtems-ver-major@/rtems-aarch64 + @rtems-ver-major@/rtems-arm + @rtems-ver-major@/rtems-kernel + +Add a kernel configuration INI file: + +.. code-block:: none + + $ vi config/project-bsps.bset + +Add the following to the kernel configuration INI file and save: + +.. code-block:: none + + # + # Project BSPs + # + [DEFAULT] + RTEMS_POSIX_API = True + BUILD_SAMPLES = True + BUILD_TESTS = False + + [aarch64/xilinx_versal_aiedge] + BSP_XILINX_VERSAL_NOCACHE_LENGTH = 0x4000000 + BSP_XILINX_VERSAL_RAM_LENGTH = 0x200000000 + + [aarch64/xilinx_zynqmp_lp64_zu3eg] + RTEMS_SMP = True + + [arm/xilinx_zynq_zc706] + RTEMS_SMP = True + BSP_XILINX_VERSAL_NOCACHE_LENGTH = 0x4000000 + BSP_XILINX_VERSAL_RAM_LENGTH = 0x200000000 + +Commit the changes to the repository: + +.. code-block:: none + + $ git add config/project-tools-bsp-config.bset + $ git add config/project-bsps.ini + $ git commit -m "Add project tools and BSPs buildset and kernel config" + +Build a tarfile of the tools and BSPs using the RSB submodule: + +.. code-block:: none + + $ ./rtems-source-builder/source-builder/sb-set-builder \ + --prefix=/opt/project --log=project.txt \ + --bset-tar-file --no-install \ + project-tools-bsp-config + +Tools, Kernel and Packages +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Third party libraries can be built as part of a single RSB +configuration if only one BSP is built at a time. The RSB support for +building packages does not support building for multiple BSPs. + +We use the same ``a-project`` repository from the previous example and +add a new configuration. Add a configuration file to build the tools, +BSPs and LibBSD: + +.. code-block:: none + + $ vi config/project-aarch64-tools-bsp-libbsd.bset + +Add the following to the buildset configuration file and save: + +.. code-block:: none + + # + # Project Tools, BSP and LibBSD + # + %define with_rtems_bsp aarch64/xilinx_versal_aiedge + %define with_rtems_bspopts BSP_XILINX_VERSAL_NOCACHE_LENGTH=0x4000000 \ + BSP_XILINX_VERSAL_RAM_LENGTH=0x200000000 + 6/rtems-aarch64 + 6/rtems-kernel + 6/rtems-libbsd + +Commit the changes to the repository: + +.. code-block:: none + + $ git add config/project-aarch64-tools-bsp-libbsd.bset + $ git commit -m "Add project aarch64 tools, BSP and libbsd" + +Build a tarfile of the tools, BSP and LibBSD using the RSB +submodule: + +.. code-block:: none + + $ ./rtems-source-builder/source-builder/sb-set-builder \ + --prefix=/opt/project --log=project.txt \ + --bset-tar-file --no-install \ + project-aarch64-tools-bsp-libbsd + +The tarfile can be reviewed to see the BSP libraries built (sizes may vary): + +.. code-block:: none + + $ tar jtvf tar/project-aarch64-tools-bsp-libbsd.tar.bz2 | \ + grep -e '\.a$' | grep -e 'xilinx_versal_aiedge' + -rw-r--r-- 0 chris eng 138936312 Sep 7 14:58 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/libbsd.a + -rw-r--r-- 0 chris eng 686190 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/libdebugger.a + -rw-r--r-- 0 chris eng 164086 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/libftpd.a + -rw-r--r-- 0 chris eng 107560 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/libftpfs.a + -rw-r--r-- 0 chris eng 978812 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/libjffs2.a + -rw-r--r-- 0 chris eng 412354 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/libmghttpd.a + -rw-r--r-- 0 chris eng 2099962 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/librtemsbsp.a + -rw-r--r-- 0 chris eng 29693496 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/librtemscpu.a + -rw-r--r-- 0 chris eng 435236 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/librtemscxx.a + -rw-r--r-- 0 chris eng 141234 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/librtemsdefaultconfig.a + -rw-r--r-- 0 chris eng 856514 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/librtemstest.a + -rw-r--r-- 0 chris eng 159004 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/libtelnetd.a + -rw-r--r-- 0 chris eng 137386 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/libtftpfs.a + -rw-r--r-- 0 chris eng 476692 Sep 7 14:56 opt/project/aarch64-rtems@rtems-ver-major@/xilinx_versal_aiedge/lib/libz.a + +Tools, Kernel with Config and Packages +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This example builds the tools, kernel and LibBSD using an RSB +configuration file and a kernel configuration file. The kernel +configuration provides easier kernel and BSP option management. + +Third party libraries can be built as part of a single RSB +configuration if only one BSP is built at a time. The RSB support for +building packages does not support building for multiple BSPs. + +We use the same ``a-project`` repository from the previous example and +add a new configuration. Add a configuration file to build the tools, +BSPs and LibBSD: + +.. code-block:: none + + $ vi config/project-aarch-tools-bsp-libbsd-config.bset + +Add the following to the buildset configuration file and save: + +.. code-block:: none + + # + # Project Tools, BSP and LibBSD + # + %define with_rtems_bsp_config config/project-aarch64-bsp.ini + 6/rtems-aarch64 + 6/rtems-kernel + 6/rtems-libbsd + +Add a kernel configuration INI file: + +.. code-block:: none + + $ vi config/project-aarch64-bsp.bset + +Add the following kernel configuration INI file and save: + +.. code-block:: none + + # + # Project Versal AI Edge BSP + # + [DEFAULT] + RTEMS_POSIX_API = True + BUILD_SAMPLES = True + BUILD_TESTS = False + + [aarch64/xilinx_versal_aiedge] + BSP_XILINX_VERSAL_NOCACHE_LENGTH = 0x4000000 + BSP_XILINX_VERSAL_RAM_LENGTH = 0x200000000 + +Commit the changes to the repository: + +.. code-block:: none + + $ git add config/project-aarch64-tools-bsp-libbsd-config.bset + $ git add config/project-aarch64-bsp.ini + $ git commit -m "Add project aarch64 tools, BSP (with config) and libbsd" + +Build the tarfile of the tools, BSP and LibBSD using the RSB +submodule: + +.. code-block:: none + + $ ./rtems-source-builder/source-builder/sb-set-builder \ + --prefix=/opt/project --log=project.txt \ + --bset-tar-file --no-install \ + project-aarch64-tools-bsp-libbsd-config diff --git a/user/exe/initialization.rst b/user/exe/initialization.rst index f4b5d7e..1100006 100644 --- a/user/exe/initialization.rst +++ b/user/exe/initialization.rst @@ -83,13 +83,12 @@ initialization is performed before multitasking is started. The RTEMS Tool ``rtems-exeinfo`` can provide some detail about the registered handlers. The following shows the initialization handlers for the Hello World -sample application in the RTEMS kernel's testsuite:: +sample application in the RTEMS kernel's testsuite: .. code-block:: none $ rtems-exeinfo --init arm-rtems@rtems-ver-major@/c/xilinx_zynq_zedboard/testsuites/samples/hello.exe RTEMS Executable Info @rtems-ver-major@.5416cfa39dd6 - $ rtems-exeinfo --init arm-rtems@rtems-ver-major@/c/xilinx_zynq_zedboard/testsuites/samples/hello.exe exe: arm-rtems@rtems-ver-major@/c/xilinx_zynq_zedboard/testsuites/samples/hello.exe Compilation: diff --git a/user/exe/loader.rst b/user/exe/loader.rst index be2e78e..fdc54a8 100644 --- a/user/exe/loader.rst +++ b/user/exe/loader.rst @@ -844,6 +844,7 @@ The following architectures are supported: - Intel x86 (i386) - LM32 - M68K + - MicroBlaze - MIPS - Moxie - PowerPC diff --git a/user/hardware/architectures.rst b/user/hardware/architectures.rst index b604782..2e0cb9e 100644 --- a/user/hardware/architectures.rst +++ b/user/hardware/architectures.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. Copyright (C) 2016 Chris Johns <chrisj@rtems.org> diff --git a/user/hosts/macos.rst b/user/hosts/macos.rst index 78cef88..75ac5a3 100644 --- a/user/hosts/macos.rst +++ b/user/hosts/macos.rst @@ -7,18 +7,105 @@ Apple macOS =========== -Apple's macOS is fully supported. You need to download and install a recent -version of the Apple developer application Xcode. Xocde is available in the App -Store. Make sure you install the Command Line Tools add on available for -download within Xcode and once installed open a Terminal shell and enter the -command ``cc`` and accept the license agreement. +Apple's macOS is supported. You need to download and install a recent +version of the Apple developer application Xcode. Xcode is available +in the App Store. Make sure you install the Command Line Tools add on +available for download within Xcode and once installed open a Terminal +shell and enter the command ``cc`` and accept the license agreement. -The normal prefix when working on macOS as a user is under your home directory. -Prefixes of :file:`$HOME/development/rtems` or :file:`$HOME/rtems` are -suitable. +The normal prefix when working on macOS as a user is under your home +directory. Prefixes of :file:`$HOME/development/rtems` or +:file:`$HOME/rtems` are suitable. :ref:`QuickStartPrefixes` details using Prefixes to manage the installation. +Homebrew and Macports should work but are not tested by the project as +they are rolling releases making it difficult to reproduce any +problems there may be. We recommend reaching out to those projects for +support. + +Intel and Apple silicon is supported. + +Python +~~~~~~ + +Building GDB requires the installation of Python's development +libraries. Building GDB includes the Python runtime header +``Python.h`` and linking to the Python runtime libraries. The RSB +detects a valid header and libraries before starting a GDB +build. + +It is recommended you run the RSB in a Python virtual environment. A +virtual environment manages paths for you, provides a ``python`` +executable mapped to the version the virtual environment is built with +and a command to find the appropiate runtime header and library files +GDB needs. Virtual environments make it easier to update Python to a +newer version if this is needed. + +Apple has removed support for Python's development libraries from +recent versions of MacOS as users can manage Python using the +installer packages provided by the Python project. + +To install: + +#. Download a Python installer for MacOS from https://www.python.org/. + +#. Run the installer and install Python. + +#. Open a terminal and update your shell profile using the command + Python provides. For Python 3.12 the command is: + + .. code-block:: shell + + /Applications/Python\ 3.12/Update\ Shell\ Profile.command + + Check with: + + .. code-block:: shell + + % type python3.12 + python3.12 is /Library/Frameworks/Python.framework/Versions/3.12/bin/python3.12 + +#. Create a virtual environment: + + .. code-block:: shell + + mkdir $HOME/development/rtems + cd $HOME/development/rtems + python3.12 -m venv py3.12 + + Activate the virtual environment: + + .. code-block:: shell + + . $HOME/development/rtems/py3.12/bin/activate + + You are now ready to the build the tools within the virtual + environment. + +.. _Sonoma: + +Sonoma +~~~~~~ + +The RSB is supported on Sonoma and Applie silicon. + +.. _Ventura: + +Ventura +~~~~~~~ + +The RSB is supported on Ventura and Intel silicon. + +.. _Monterey: + +Monterey +~~~~~~~~ + +The RSB is supported on Ventura and Intel silicon. + +.. _Catalina: + Catalina ~~~~~~~~ @@ -30,6 +117,8 @@ also Due to the deprecated Python 2.7 support, we recommend to install and use the `latest Python 3 release from python.org <https://www.python.org/downloads/mac-osx/>`_. +.. _Sierra: + Sierra ~~~~~~ diff --git a/user/hosts/posix.rst b/user/hosts/posix.rst index 9769e07..d79e183 100644 --- a/user/hosts/posix.rst +++ b/user/hosts/posix.rst @@ -137,16 +137,16 @@ prefix under your home directory as recommended and end up on the SD card. Ubuntu ~~~~~~ -The latest version is Ubuntu 20.04.3 LTS 64-bit. This section also includes +The latest version is Ubuntu 22.04 LTS 64-bit. This section also includes Xubuntu. A minimal installation was used and the following packages installed: .. code-block:: none - $ sudo apt-get build-dep build-essential gcc-defaults g++ gdb unzip \ - pax bison flex texinfo python3-dev libpython2-dev libncurses5-dev \ - zlib1g-dev + $ sudo apt install build-essential g++ gdb unzip pax bison flex texinfo \ + python3-dev python-is-python3 libpython2-dev libncurses5-dev zlib1g-dev \ + ninja-build pkg-config -Note that in previous versions of Ubuntu, the package libpython2-dev was +Note that in older versions of Ubuntu, the package libpython2-dev was python2.7-dev. The name of packages changes over time. You need the package with Python development libraries for C/C++ programs. The following is needed for recent versions: @@ -179,8 +179,19 @@ than the usual zlib-dev): openSUSE ~~~~~~~~ -This has been reported to work but no instructions were provided. This is an -opportunity to contribute. Please submit any guidance you can provide. +The RTEMS Source Builder has been tested on openSUSE Leap 15.4 64bit. +Starting with a clean install with source repositories enabled, the following +zypper command installs the required packages: + +.. code-block:: none + + # sudo zypper in -t pattern devel_C_C++ devel_python3 + +In addition, the following command can set python3 as the default python interpreter: + +.. code-block:: none + + # sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1 .. _FreeBSD: diff --git a/user/hosts/windows.rst b/user/hosts/windows.rst index fac1366..fd7ff55 100644 --- a/user/hosts/windows.rst +++ b/user/hosts/windows.rst @@ -156,6 +156,7 @@ The packages we require are: * python * mingw-w64-x86_64-python2 * mingw-w64-x86_64-gcc +* flex * git * bison * cvs @@ -176,7 +177,7 @@ Install the packages using ``pacman``: .. code-block:: none $ pacman -S python mingw-w64-x86_64-python2 mingw-w64-x86_64-gcc \ - bison cvs diffutils git make patch tar texinfo unzip + bison flex cvs diffutils git make patch tar texinfo unzip resolving dependencies... looking for conflicting packages... .... output shortened for brevity .... diff --git a/user/index.rst b/user/index.rst index a91aa55..5b7f3ce 100644 --- a/user/index.rst +++ b/user/index.rst @@ -18,9 +18,9 @@ RTEMS User Manual (|version|). | |copy| 2018 Shashvat Jain | |copy| 2018 Vidushi Vashishth | |copy| 2017 Tanu Hari Dixit - | |copy| 2016, 2019 embedded brains GmbH + | |copy| 2016, 2019 embedded brains GmbH & Co. KG | |copy| 2016, 2019 Sebastian Huber - | |copy| 2012, 2020 Chris Johns + | |copy| 2012, 2022 Chris Johns | |copy| 2012, 2020 Gedare Bloom | |copy| 1988, 2018 On-Line Applications Research Corporation (OAR) @@ -37,6 +37,7 @@ RTEMS User Manual (|version|). support/index hosts/index installation/index + deployment/index hardware/index bld/index diff --git a/user/installation/kernel.rst b/user/installation/kernel.rst index fca4ed7..d61f17f 100644 --- a/user/installation/kernel.rst +++ b/user/installation/kernel.rst @@ -18,10 +18,9 @@ Create a new location to build the RTEMS kernel: .. code-block:: none - $ cd - $ cd development/rtems - $ mkdir kernel - $ cd kernel + $ cd $HOME/development/rtems + $ mkdir src + $ cd src Clone the RTEMS respository: @@ -36,209 +35,72 @@ Clone the RTEMS respository: Resolving deltas: 100% (390053/390053), done. Checking connectivity... done. -Tools Path Set Up ------------------ - -We need to set our path to include the RTEMS tools we built in the previous -section. The RTEMS tools needs to be first in your path because RTEMS provides -specific versions of the ``autoconf`` and ``automake`` tools. We want to use -the RTEMS version and not your host's versions: - -.. code-block:: none - - $ export PATH=$HOME/development/rtems/5/bin:$PATH - -.. _bootstrapping: - -Bootstrapping -------------- - -The developers version of the code from git requires we ``bootstrap`` the -source code. This is an ``autoconf`` and ``automake`` bootstrap to create the -various files generated by ``autoconf`` and ``automake``. RTEMS does not keep -these generated files under version control. The bootstrap process is slow so -to speed it up we provide a command that can perform the bootstrap in -parallel using your available cores. We need to enter the cloned source -directory then run the bootstrap commands: - -.. code-block:: none - - $ cd rtems - $ ./bootstrap -c && ./rtems-bootstrap - removing automake generated Makefile.in files - removing configure files - removing aclocal.m4 files - RTEMS Bootstrap, 5 (089327b5dcf9) - 1/139: autoreconf: configure.ac - 2/139: autoreconf: cpukit/configure.ac - 3/139: autoreconf: tools/cpu/configure.ac - 4/139: autoreconf: tools/cpu/generic/configure.ac - 5/139: autoreconf: tools/cpu/sh/configure.ac - 6/139: autoreconf: tools/cpu/nios2/configure.ac - 7/139: autoreconf: tools/build/configure.ac - 8/139: autoreconf: doc/configure.ac - ...... - 124/139: autoreconf: c/src/make/configure.ac - 125/139: autoreconf: c/src/librtems++/configure.ac - 126/139: autoreconf: c/src/ada-tests/configure.ac - 127/139: autoreconf: testsuites/configure.ac - 128/139: autoreconf: testsuites/libtests/configure.ac - 129/139: autoreconf: testsuites/mptests/configure.ac - 130/139: autoreconf: testsuites/fstests/configure.ac - 131/139: autoreconf: testsuites/sptests/configure.ac - 132/139: autoreconf: testsuites/tmtests/configure.ac - 133/139: autoreconf: testsuites/smptests/configure.ac - 134/139: autoreconf: testsuites/tools/configure.ac - 135/139: autoreconf: testsuites/tools/generic/configure.ac - 136/139: autoreconf: testsuites/psxtests/configure.ac - 137/139: autoreconf: testsuites/psxtmtests/configure.ac - 138/139: autoreconf: testsuites/rhealstone/configure.ac - 139/139: autoreconf: testsuites/samples/configure.ac - Bootstrap time: 0:02:47.398824 - Building a BSP -------------- -We build RTEMS in a directory outside of the source tree we have just cloned -and ``bootstrapped``. You cannot build RTEMS while in the source tree. Lets -create a suitable directory using the name of the BSP we are going to build: +We build RTEMS in a directory within the source tree we have just cloned. For +the details, see the :ref:`BSPBuildSystem`. We will build for the ``erc32`` +BSP with POSIX enabled. Firstly, create the file :file:`config.ini` in the +source tree root directory with the BSP build configuration, for example: -.. code-block:: none +.. code-block:: ini - $ cd .. - $ mkdir erc32 - $ cd erc32 + [sparc/erc32] + RTEMS_POSIX_API = True -Configure RTEMS using the ``configure`` command. We use a full path to -``configure`` so the object files built contain the absolute path of the source -files. If you are source level debugging you will be able to access the source -code to RTEMS from the debugger. We will build for the ``erc32`` BSP with POSIX -enabled and the networking stack disabled: +Configure RTEMS using the ``waf configure`` command: .. code-block:: none - $ $HOME/development/rtems/kernel/rtems/configure --prefix=$HOME/development/rtems/5 \ - --target=sparc-rtems5 --enable-rtemsbsp=erc32 --enable-posix \ - --disable-networking - checking for gmake... no - checking for make... make - checking for RTEMS Version... 4.11.99.0 - checking build system type... x86_64-pc-linux-gnu - checking host system type... x86_64-pc-linux-gnu - checking target system type... sparc-unknown-rtems5 - checking for a BSD-compatible install... /usr/bin/install -c - checking whether build environment is sane... yes - checking for a thread-safe mkdir -p... /bin/mkdir -p - checking for gawk... no - checking for mawk... mawk - checking whether make sets $(MAKE)... yes - checking whether to enable maintainer-specific portions of Makefiles... no - checking that generated files are newer than configure... done - ...... - checking target system type... sparc-unknown-rtems5 - checking rtems target cpu... sparc - checking for a BSD-compatible install... /usr/bin/install -c - checking whether build environment is sane... yes - checking for sparc-rtems5-strip... sparc-rtems5-strip - checking for a thread-safe mkdir -p... /bin/mkdir -p - checking for gawk... no - checking for mawk... mawk - checking whether make sets $(MAKE)... yes - checking whether to enable maintainer-specific portions of Makefiles... no - checking that generated files are newer than configure... done - configure: creating ./config.status - config.status: creating Makefile - - target architecture: sparc. - available BSPs: erc32. - 'make all' will build the following BSPs: erc32. - other BSPs can be built with 'make RTEMS_BSP="bsp1 bsp2 ..."' - - config.status: creating Makefile - -Build RTEMS using two cores: + $ cd $HOME/development/rtems/src/rtems + $ ./waf configure --prefix=$HOME/development/rtems/6 + Setting top to : $HOME/development/rtems/src/rtems + Setting out to : $HOME/development/rtems/src/rtems/build + Regenerate build specification cache (needs a couple of seconds)... + Configure board support package (BSP) : sparc/erc32 + Checking for program 'sparc-rtems6-gcc' : $HOME/development/rtems/6/bin/sparc-rtems6-gcc + Checking for program 'sparc-rtems6-g++' : $HOME/development/rtems/6/bin/sparc-rtems6-g++ + Checking for program 'sparc-rtems6-ar' : $HOME/development/rtems/6/bin/sparc-rtems6-ar + Checking for program 'sparc-rtems6-ld' : $HOME/development/rtems/6/bin/sparc-rtems6-ld + Checking for program 'ar' : $HOME/development/rtems/6/bin/sparc-rtems6-ar + Checking for program 'g++, c++' : $HOME/development/rtems/6/bin/sparc-rtems6-g++ + Checking for program 'ar' : $HOME/development/rtems/6/bin/sparc-rtems6-ar + Checking for program 'gas, gcc' : $HOME/development/rtems/6/bin/sparc-rtems6-gcc + Checking for program 'ar' : $HOME/development/rtems/6/bin/sparc-rtems6-ar + Checking for program 'gcc, cc' : $HOME/development/rtems/6/bin/sparc-rtems6-gcc + Checking for program 'ar' : $HOME/development/rtems/6/bin/sparc-rtems6-ar + Checking for asm flags '-MMD' : yes + Checking for c flags '-MMD' : yes + Checking for cxx flags '-MMD' : yes + Checking for program 'rtems-bin2c' : $HOME/development/rtems/6/bin/rtems-bin2c + Checking for program 'gzip' : /usr/bin/gzip + Checking for program 'xz' : /usr/bin/xz + Checking for program 'rtems-ld' : $HOME/development/rtems/6/bin/rtems-ld + Checking for program 'rtems-syms' : $HOME/development/rtems/6/bin/rtems-syms + Checking for program 'rtems-bin2c' : $HOME/development/rtems/6/bin/rtems-bin2c + Checking for program 'gzip' : /usr/bin/gzip + Checking for program 'xz' : /usr/bin/xz + 'configure' finished successfully (7.996s) + +Build RTEMS: .. code-block:: none - $ make -j 2 - Making all in tools/build - make[1]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/build' - make all-am - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/build' - gcc -DHAVE_CONFIG_H -I. -I/home/chris/development/rtems/kernel/rtems/tools/build -g -O2 -MT cklength.o -MD -MP -MF .deps/cklength.Tpo -c -o cklength.o /home/chris/development/rtems/kernel/rtems/tools/build/cklength.c - gcc -DHAVE_CONFIG_H -I. -I/home/chris/development/rtems/kernel/rtems/tools/build -g -O2 -MT eolstrip.o -MD -MP -MF .deps/eolstrip.Tpo -c -o eolstrip.o /home/chris/development/rtems/kernel/rtems/tools/build/eolstrip.c - mv -f .deps/cklength.Tpo .deps/cklength.Po - mv -f .deps/eolstrip.Tpo .deps/eolstrip.Po - gcc -DHAVE_CONFIG_H -I. -I/home/chris/development/rtems/kernel/rtems/tools/build -g -O2 -MT compat.o -MD -MP -MF .deps/compat.Tpo -c -o compat.o /home/chris/development/rtems/kernel/rtems/tools/build/compat.c - gcc -DHAVE_CONFIG_H -I. -I/home/chris/development/rtems/kernel/rtems/tools/build -g -O2 -MT packhex.o -MD -MP -MF .deps/packhex.Tpo -c -o packhex.o /home/chris/development/rtems/kernel/rtems/tools/build/packhex.c - mv -f .deps/compat.Tpo .deps/compat.Po - gcc -DHAVE_CONFIG_H -I. -I/home/chris/development/rtems/kernel/rtems/tools/build -g -O2 -MT unhex.o -MD -MP -MF .deps/unhex.Tpo -c -o unhex.o /home/chris/development/rtems/kernel/rtems/tools/build/unhex.c - mv -f .deps/packhex.Tpo .deps/packhex.Po - gcc -DHAVE_CONFIG_H -I. -I/home/chris/development/rtems/kernel/rtems/tools/build -g -O2 -MT rtems-bin2c.o -MD -MP -MF .deps/rtems-bin2c.Tpo -c -o rtems-bin2c.o /home/chris/development/rtems/kernel/rtems/tools/build/rtems-bin2c.c - mv -f .deps/unhex.Tpo .deps/unhex.Po - gcc -DHAVE_CONFIG_H -I. -I/home/chris/development/rtems/kernel/rtems/tools/build -g -O2 -MT binpatch.o -MD -MP -MF .deps/binpatch.Tpo -c -o binpatch.o /home/chris/development/rtems/kernel/rtems/tools/build/binpatch.c - mv -f .deps/rtems-bin2c.Tpo .deps/rtems-bin2c.Po - gcc -g -O2 -o cklength cklength.o - mv -f .deps/binpatch.Tpo .deps/binpatch.Po - gcc -g -O2 -o eolstrip eolstrip.o compat.o - gcc -g -O2 -o packhex packhex.o - gcc -g -O2 -o rtems-bin2c rtems-bin2c.o compat.o - gcc -g -O2 -o unhex unhex.o compat.o - gcc -g -O2 -o binpatch binpatch.o - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/build' - make[1]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/build' - Making all in tools/cpu - make[1]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - Making all in generic - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/cpu/generic' - make[2]: Nothing to be done for 'all'. - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/cpu/generic' - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - make[2]: Nothing to be done for 'all-am'. - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - make[1]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - Making all in testsuites/tools - make[1]: Entering directory '/home/chris/development/rtems/kernel/erc32/testsuites/tools' - Making all in generic - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32/testsuites/tools/generic' - make[2]: Nothing to be done for 'all'. - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32/testsuites/tools/generic' - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32/testsuites/tools' - make[2]: Nothing to be done for 'all-am'. - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32/testsuites/tools' - make[1]: Leaving directory '/home/chris/development/rtems/kernel/erc32/testsuites/tools' - Making all in sparc-rtems5/c - make[1]: Entering directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/c' - Making all in . - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/c' - Configuring RTEMS_BSP=erc32 - checking for gmake... no - checking for make... make - checking build system type... x86_64-pc-linux-gnu - checking host system type... sparc-unknown-rtems5 - ...... - sparc-rtems5-gcc -B../../../../../erc32/lib/ -specs bsp_specs -qrtems -DHAVE_CONFIG_H -I. -I/home/chris/development/rtems/kernel/rtems/c/src/../../testsuites/samples/nsecs -I.. -I/home/chris/development/rtems/kernel/rtems/c/src/../../testsuites/samples/../support/include -mcpu=cypress -O2 -g -ffunction-sections -fdata-sections -Wall -Wmissing-prototypes -Wimplicit-function-declaration -Wstrict-prototypes -Wnested-externs -MT init.o -MD -MP -MF .deps/init.Tpo -c -o init.o /home/chris/development/rtems/kernel/rtems/c/src/../../testsuites/samples/nsecs/init.c - sparc-rtems5-gcc -B../../../../../erc32/lib/ -specs bsp_specs -qrtems -DHAVE_CONFIG_H -I. -I/home/chris/development/rtems/kernel/rtems/c/src/../../testsuites/samples/nsecs -I.. -I/home/chris/development/rtems/kernel/rtems/c/src/../../testsuites/samples/../support/include -mcpu=cypress -O2 -g -ffunction-sections -fdata-sections -Wall -Wmissing-prototypes -Wimplicit-function-declaration -Wstrict-prototypes -Wnested-externs -MT empty.o -MD -MP -MF .deps/empty.Tpo -c -o empty.o /home/chris/development/rtems/kernel/rtems/c/src/../../testsuites/samples/nsecs/empty.c - mv -f .deps/empty.Tpo .deps/empty.Po - mv -f .deps/init.Tpo .deps/init.Po - sparc-rtems5-gcc -B../../../../../erc32/lib/ -specs bsp_specs -qrtems -mcpu=cypress -O2 -g -ffunction-sections -fdata-sections -Wall -Wmissing-prototypes -Wimplicit-function-declaration -Wstrict-prototypes -Wnested-externs -Wl,--gc-sections -mcpu=cypress -o nsecs.exe init.o empty.o - sparc-rtems5-nm -g -n nsecs.exe > nsecs.num - sparc-rtems5-size nsecs.exe - text data bss dec hex filename - 121392 1888 6624 129904 1fb70 nsecs.exe - cp nsecs.exe nsecs.ralf - make[6]: Leaving directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/ c/erc32/testsuites/samples/nsecs' - make[5]: Leaving directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/ c/erc32/testsuites/samples' - make[4]: Leaving directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/ c/erc32/testsuites/samples' - make[4]: Entering directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/ c/erc32/testsuites' - make[4]: Nothing to be done for 'all-am'. - make[4]: Leaving directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/ c/erc32/testsuites' - make[3]: Leaving directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/ c/erc32/testsuites' - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/ c/erc32' - make[1]: Leaving directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/c' - make[1]: Entering directory '/home/chris/development/rtems/kernel/erc32' - make[1]: Nothing to be done for 'all-am'. - make[1]: Leaving directory '/home/chris/development/rtems/kernel/erc32' + $ ./waf + Waf: Entering directory `$HOME/development/rtems/src/rtems/build' + Waf: Leaving directory `$HOME/development/rtems/src/rtems/build' + 'build' finished successfully (0.051s) + Waf: Entering directory `$HOME/development/rtems/src/rtems/build/sparc/erc32' + [ 1/1524] Compiling bsps/shared/dev/serial/mc68681_reg2.c + [ 2/1524] Compiling bsps/shared/dev/rtc/mc146818a_ioreg.c + [ 3/1524] Compiling bsps/shared/dev/flash/am29lv160.c + ... + [1521/1524] Linking $HOME/development/rtems/src/rtems/build/sparc/erc32/libz.a + [1522/1524] Linking $HOME/development/rtems/src/rtems/build/sparc/erc32/librtemscxx.a + [1523/1524] Linking $HOME/development/rtems/src/rtems/build/sparc/erc32/testsuites/samples/paranoia.exe + [1524/1524] Linking $HOME/development/rtems/src/rtems/build/sparc/erc32/libmghttpd.a + Waf: Leaving directory `$HOME/development/rtems/src/rtems/build/sparc/erc32' + 'build_sparc/erc32' finished successfully (4.894s) Installing A BSP ---------------- @@ -252,46 +114,20 @@ RTEMS with the following command: .. code-block:: none - $ make install - Making install in tools/build - make[1]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/build' - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/build' - /bin/mkdir -p '/home/chris/development/rtems/5/bin' - /usr/bin/install -c cklength eolstrip packhex unhex rtems-bin2c '/home/chris/development/rtems/5/bin' - /bin/mkdir -p '/home/chris/development/rtems/5/bin' - /usr/bin/install -c install-if-change '/home/chris/development/rtems/5/bin' - make[2]: Nothing to be done for 'install-data-am'. - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/build' - make[1]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/build' - Making install in tools/cpu - make[1]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - Making install in generic - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/cpu/generic' - make[3]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/cpu/generic' - make[3]: Nothing to be done for 'install-exec-am'. - make[3]: Nothing to be done for 'install-data-am'. - make[3]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/cpu/generic' - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/cpu/generic' - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - make[3]: Entering directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - make[3]: Nothing to be done for 'install-exec-am'. - make[3]: Nothing to be done for 'install-data-am'. - make[3]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - make[1]: Leaving directory '/home/chris/development/rtems/kernel/erc32/tools/cpu' - .... - make[1]: Leaving directory '/home/chris/development/rtems/kernel/erc32/sparc-rtems5/c' - make[1]: Entering directory '/home/chris/development/rtems/kernel/erc32' - make[2]: Entering directory '/home/chris/development/rtems/kernel/erc32' - make[2]: Nothing to be done for 'install-exec-am'. - /bin/mkdir -p '/home/chris/development/rtems/5/make' - /usr/bin/install -c -m 644 /home/chris/development/rtems/kernel/rtems/make/main.cfg /home/chris/development/rtems/kernel/rtems/make/leaf.cfg '/home/chris/development/rtems/5/make' - /bin/mkdir -p '/home/chris/development/rtems/5/share/rtems5/make/Templates' - /usr/bin/install -c -m 644 /home/chris/development/rtems/kernel/rtems/make/Templates/Makefile.dir /home/chris/development/rtems/kernel/rtems/make/Templates/Makefile.leaf /home/chris/development/rtems/kernel/rtems/make/Templates/Makefile.lib '/home/chris/development/rtems/5/share/rtems5/make/Templates' - /bin/mkdir -p '/home/chris/development/rtems/5/make/custom' - /usr/bin/install -c -m 644 /home/chris/development/rtems/kernel/rtems/make/custom/default.cfg '/home/chris/development/rtems/5/make/custom' - make[2]: Leaving directory '/home/chris/development/rtems/kernel/erc32' - make[1]: Leaving directory '/home/chris/development/rtems/kernel/erc32' + $ ./waf install + Waf: Entering directory `$HOME/development/rtems/src/rtems/build' + Waf: Leaving directory `$HOME/development/rtems/src/rtems/build' + 'install' finished successfully (0.074s) + Waf: Entering directory `$HOME/development/rtems/src/rtems/build/sparc/erc32' + + install $HOME/development/rtems/6/sparc-rtems6/erc32/lib/include/libchip/am29lv160.h (from bsps/include/libchip/am29lv160.h) + + install $HOME/development/rtems/6/sparc-rtems6/erc32/lib/include/libchip/mc146818a.h (from bsps/include/libchip/mc146818a.h) + + install $HOME/development/rtems/6/sparc-rtems6/erc32/lib/include/libchip/mc68681.h (from bsps/include/libchip/mc68681.h) + ... + + install $HOME/development/rtems/6/sparc-rtems6/erc32/lib/include/rtems/version.h (from cpukit/include/rtems/version.h) + + install $HOME/development/rtems/6/sparc-rtems6/erc32/lib/include/rtems/vmeintr.h (from cpukit/include/rtems/vmeintr.h) + + install $HOME/development/rtems/6/sparc-rtems6/erc32/lib/include/rtems/watchdogdrv.h (from cpukit/include/rtems/watchdogdrv.h) + Waf: Leaving directory `$HOME/development/rtems/src/rtems/build/sparc/erc32' + 'install_sparc/erc32' finished successfully (0.637s) Contributing Patches -------------------- @@ -313,7 +149,7 @@ has changed: .. code-block:: none - $ cd ../rtems + $ cd $HOME/development/rtems/src/rtems $ git status On branch master Your branch is up-to-date with 'origin/master'. diff --git a/user/migration/v4_11-to-v5.rst b/user/migration/v4_11-to-v5.rst index bde84c2..2dc97ec 100644 --- a/user/migration/v4_11-to-v5.rst +++ b/user/migration/v4_11-to-v5.rst @@ -1,7 +1,7 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 .. Copyright (C) 2020 Chris Johns -.. Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) +.. Copyright (C) 2020 embedded brains GmbH & Co. KG .. _Migration_4_11_to_5: diff --git a/user/migration/v5-to-v6.rst b/user/migration/v5-to-v6.rst index d4691ff..98c7366 100644 --- a/user/migration/v5-to-v6.rst +++ b/user/migration/v5-to-v6.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) +.. Copyright (C) 2020 embedded brains GmbH & Co. KG .. _Migration_5_to_6: @@ -10,14 +10,28 @@ RTEMS 5 to RTEMS 6 This section provides helpful information when migrating from RTEMS 5 to RTEMS 6. -Update to GCC 10 ----------------- +Update to GCC 10 and Later +-------------------------- -The tool suite for RTEMS 6 uses GCC 10. GCC 10 enables ``-fno-common`` by -default. Code bases which never used this option before may observe now -multiple definition linker errors. For example, if global variables are -declared and defined in header files (usually a missing ``extern`` in the header -file). +The tool suite for RTEMS 6 uses at least GCC 10. GCC 10 and later enable +``-fno-common`` by default. Code bases which never used this option before may +observe now multiple definition linker errors. For example, if global +variables are declared and defined in header files (usually a missing +``extern`` in the header file). + +No -specs bsp_specs GCC Option +------------------------------ + +The ``-spec bsp_specs`` GCC Option is no longer needed to build RTEMS +applications and there is no :file:`bsp_specs` file installed. If you use this +option, then you get an error like this: + +.. code-block:: none + + sparc-rtems6-gcc: fatal error: cannot read spec file 'bsp_specs': No such file or directory + +You can remove this GCC option from your build to fix this error. +Alternatively, you can add an empty :file:`bsp_specs` file. Replacements for Removed APIs ----------------------------- diff --git a/user/rsb/project-sets.rst b/user/rsb/project-sets.rst index 54a3f8e..ce839c5 100644 --- a/user/rsb/project-sets.rst +++ b/user/rsb/project-sets.rst @@ -116,6 +116,15 @@ build sets: ``--with-objc`` Attempt to build a C++ compiler. +``--with-newlib-tls`` or ``--without-newlib-tls`` + Enable or disable the ``--enable-newlib-reent-thread-local`` Newlib + configuration option. This option is enabled by default on the aarch64, arm, + nios2, powerpc, riscv, and sparc targets. If this option is enabled, then + each member of the Newlib struct _reent is replaced by a dedicated + thread-local object. The thread-local objects are defined in translation + units which use the corresponding object so that only objects used by the + application are linked in. + The RSB provides build sets for some BSPs. These build sets will build: - Compiler, linker, debugger and RTEMS Tools. diff --git a/user/start/app.rst b/user/start/app.rst index ce9a44d..0599305 100644 --- a/user/start/app.rst +++ b/user/start/app.rst @@ -209,7 +209,7 @@ Run the executable: .. code-block:: none - $HOME/quick-start/rtems/@rtems-ver-major@/bin/rtems-run --rtems-bsps=erc32-sis build/sparc-rtems@rtems-ver-major@-erc32/hello.exe + rtems-run --rtems-bsps=erc32-sis build/sparc-rtems@rtems-ver-major@-erc32/hello.exe The output will be something close to: diff --git a/user/start/bsp-build.rst b/user/start/bsp-build.rst index 8401d71..962cd43 100644 --- a/user/start/bsp-build.rst +++ b/user/start/bsp-build.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. _QuickStartBSPBuild: @@ -45,7 +45,7 @@ To build the BSP with all the tests run this command: cd $HOME/quick-start/src/rsb/rtems ../source-builder/sb-set-builder --prefix=$HOME/quick-start/rtems/5 \ - --target=sparc-rtems@rtems-ver-major@ --with-rtems-bsp=erc32 --with-rtems-tests=yes @rtems-ver-major@/rtems-kernel + --target=sparc-rtems@rtems-ver-major@ --with-rtems-bsp=sparc/erc32 --with-rtems-tests=yes @rtems-ver-major@/rtems-kernel This command should output something like: @@ -99,16 +99,9 @@ If you have built a BSP with the RSB, you can move on to Manual BSP Build ---------------- -We manually build the BSP in four steps. The first step is to create a build -directory. It must be separate from the RTEMS source directory. We use -:file:`$HOME/quick-start/build/b-erc32`. - -.. code-block:: none - - mkdir -p $HOME/quick-start/build/b-erc32 - -The second step is to set your path. Prepend the RTEMS tool suite binary -directory to your ``$PATH`` throughout the remaining steps. Run the command: +We manually build the BSP in four steps. The first step is to set your path. +Prepend the RTEMS tool suite binary directory to your ``$PATH`` throughout the +remaining steps. Run the command: .. code-block:: none @@ -133,7 +126,7 @@ has not been correctly set. Check the contents of the path file cannot be found return to :ref:`QuickStartTools` and install the tools again. -The first step is to configure the BSP. There are various BSP build +The second step is to configure the BSP. There are various BSP build configuration options available. Some options are BSP-specific. Each section in the INI-style configuration file ``config.ini`` instructs the build system to build a particular BSP variant (`sparc/erc32` in our case). We enable the build @@ -179,7 +172,7 @@ by ``$BASE``. Checking for program 'xz' : $BASE/anaconda3/bin/xz 'configure' finished successfully (0.414s) -Building the BSP is the second step. +Building the BSP is the third step. .. code-block:: none diff --git a/user/start/bsp-test.rst b/user/start/bsp-test.rst index 575f19e..a354663 100644 --- a/user/start/bsp-test.rst +++ b/user/start/bsp-test.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. _QuickStartBSPTest: diff --git a/user/start/prefixes.rst b/user/start/prefixes.rst index 826ce85..aee7440 100644 --- a/user/start/prefixes.rst +++ b/user/start/prefixes.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. Copyright (C) 2016 Chris Johns <chrisj@rtems.org> diff --git a/user/start/preparation.rst b/user/start/preparation.rst index 3670885..4bfc214 100644 --- a/user/start/preparation.rst +++ b/user/start/preparation.rst @@ -1,7 +1,7 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 .. Copyright (C) 2018 Shashvat Jain -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. Copyright (C) 2020 Chris Johns .. Copyright (C) 2020 Gedare Bloom diff --git a/user/start/sources.rst b/user/start/sources.rst index 6585e3d..a6e66df 100644 --- a/user/start/sources.rst +++ b/user/start/sources.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. Copyright (C) 2020 Chris Johns diff --git a/user/start/tools.rst b/user/start/tools.rst index 2706f71..3656867 100644 --- a/user/start/tools.rst +++ b/user/start/tools.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. Copyright (C) 2020 Chris Johns .. Copyright (C) 2020 Utkarsh Rai diff --git a/user/support/bugs.rst b/user/support/bugs.rst index d75c9b4..02788d9 100644 --- a/user/support/bugs.rst +++ b/user/support/bugs.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. Copyright (C) 2015 Chris Johns <chrisj@rtems.org> .. Copyright (C) 2012 Gedare Bloom diff --git a/user/support/contrib.rst b/user/support/contrib.rst index c42d41b..5d61b46 100644 --- a/user/support/contrib.rst +++ b/user/support/contrib.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. Copyright (C) 2018 Joel Sherill .. Copyright (C) 2016 Chris Johns <chrisj@rtems.org> diff --git a/user/support/index.rst b/user/support/index.rst index 6147c06..5320488 100644 --- a/user/support/index.rst +++ b/user/support/index.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. index:: support diff --git a/user/support/support-project.rst b/user/support/support-project.rst index b782029..4aef902 100644 --- a/user/support/support-project.rst +++ b/user/support/support-project.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019 embedded brains GmbH +.. Copyright (C) 2019 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. Copyright (C) 2016 Chris Johns <chrisj@rtems.org> diff --git a/user/tracing/captureengine.rst b/user/tracing/captureengine.rst index a8bca53..137c555 100644 --- a/user/tracing/captureengine.rst +++ b/user/tracing/captureengine.rst @@ -14,22 +14,22 @@ runtime and does not require RTEMS or your application to be rebuilt in order to use it. The Capture Engine's sample testcase for the `sparc/erc32` is available in -build directory created when building RTEMS in the path -file: `sparc-rtems5/c/erc32/testsuites/samples`. In order to access the capture -testcase perform the following set of operations inside the RTEMS build -directory. +build directory created when building RTEMS in the path file: +`sparc-rtems@rtems-ver-major@/c/erc32/testsuites/samples`. In order to access +the capture testcase perform the following set of operations inside the RTEMS +build directory. .. code-block:: none - $ cd /sparc-rtems5/c/erc32/testsuites/samples - $ sparc-rtems5-run ./capture.exe + $ cd /sparc-rtems@rtems-ver-major@/c/erc32/testsuites/samples + $ sparc-rtems@rtems-ver-major@-run ./capture.exe *** BEGIN OF TEST CAPTURE ENGINE *** - *** TEST VERSION: 5.0.0.de9b7d712bf5da6593386fd4fbca0d5f8b8431d8 + *** TEST VERSION: @rtems-ver-major@.@rtems-ver-minor@.0.de9b7d712bf5da6593386fd4fbca0d5f8b8431d8 *** TEST STATE: USER_INPUT *** TEST BUILD: RTEMS_NETWORKING RTEMS_POSIX_API - *** TEST TOOLS: 7.3.0 20180125 (RTEMS 5, RSB a3a6c34c150a357e57769a26a460c475e188438f, Newlib 3.0.0) + *** TEST TOOLS: 7.3.0 20180125 (RTEMS @rtems-ver-major@, RSB a3a6c34c150a357e57769a26a460c475e188438f, Newlib 3.0.0) Press any key to start capture engine (20s remaining) Press any key to start capture engine (19s remaining) Press any key to start capture engine (18s remaining) @@ -101,10 +101,10 @@ number of context switches between tasks we are not interested in. .. code-block:: none *** BEGIN OF TEST CAPTURE ENGINE *** - *** TEST VERSION: 5.0.0.de9b7d712bf5da6593386fd4fbca0d5f8b8431d8 + *** TEST VERSION: @rtems-ver-major@.@rtems-ver-minor@.0.de9b7d712bf5da6593386fd4fbca0d5f8b8431d8 *** TEST STATE: USER_INPUT *** TEST BUILD: RTEMS_NETWORKING RTEMS_POSIX_API - *** TEST TOOLS: 7.3.0 20180125 (RTEMS 5, RSB a3a6c34c150a357e57769a26a460c475e188438f, Newlib 3.0.0) + *** TEST TOOLS: 7.3.0 20180125 (RTEMS @rtems-ver-major@, RSB a3a6c34c150a357e57769a26a460c475e188438f, Newlib 3.0.0) Press any key to start capture engine (20s remaining) Press any key to start capture engine (19s remaining) Press any key to start capture engine (18s remaining) diff --git a/user/tracing/eventrecording.rst b/user/tracing/eventrecording.rst index 7130658..c011000 100644 --- a/user/tracing/eventrecording.rst +++ b/user/tracing/eventrecording.rst @@ -1,6 +1,6 @@ .. SPDX-License-Identifier: CC-BY-SA-4.0 -.. Copyright (C) 2019, 2020 embedded brains GmbH +.. Copyright (C) 2019, 2020 embedded brains GmbH & Co. KG .. Copyright (C) 2019 Sebastian Huber .. _EventRecording: @@ -48,8 +48,11 @@ The application enables the event recording support via the configuration option :c:macro:`CONFIGURE_RECORD_PER_PROCESSOR_ITEMS`. The configuration option :c:macro:`CONFIGURE_RECORD_EXTENSIONS_ENABLED` enables the generation of thread create, start, restart, delete, switch, begin, exitted and terminate -events. Dumps of the event records in a fatal error handler can be enabled by -the mutually exclusive :c:macro:`CONFIGURE_RECORD_FATAL_DUMP_BASE64` and +events. The configuration option +:c:macro:`CONFIGURE_RECORD_INTERRUPTS_ENABLED` enables the generation of +interrupt entry and exit events. Dumps of the event records in a fatal error +handler can be enabled by the mutually exclusive +:c:macro:`CONFIGURE_RECORD_FATAL_DUMP_BASE64` and :c:macro:`CONFIGURE_RECORD_FATAL_DUMP_BASE64_ZLIB` configuration options. Custom events can be recorded for example with the @@ -98,64 +101,6 @@ instrumented functions: ); } -To generate interrupt handler entry/exit events, the following patch can be -used: - -.. code-block:: diff - - diff --git a/bsps/arm/shared/clock/clock-armv7m.c b/bsps/arm/shared/clock/clock-armv7m.c - index 255de1ca42..0d37c63ac6 100644 - --- a/bsps/arm/shared/clock/clock-armv7m.c - +++ b/bsps/arm/shared/clock/clock-armv7m.c - @@ -29,6 +29,7 @@ - #include <bsp/clock-armv7m.h> - - #include <rtems.h> - +#include <rtems/record.h> - #include <rtems/sysinit.h> - - #ifdef ARM_MULTILIB_ARCH_V7M - @@ -45,9 +46,11 @@ static uint32_t _ARMV7M_TC_get_timecount(struct timecounter *base) - - void _ARMV7M_Clock_handler(void) - { - + rtems_record_produce(RTEMS_RECORD_INTERRUPT_ENTRY, ARMV7M_VECTOR_SYSTICK); - _ARMV7M_Interrupt_service_enter(); - Clock_isr(NULL); - _ARMV7M_Interrupt_service_leave(); - + rtems_record_produce(RTEMS_RECORD_INTERRUPT_EXIT, ARMV7M_VECTOR_SYSTICK); - } - - static void _ARMV7M_Clock_handler_install(void) - diff --git a/bsps/include/bsp/irq-generic.h b/bsps/include/bsp/irq-generic.h - index 31835d07ba..2ab2f78b65 100644 - --- a/bsps/include/bsp/irq-generic.h - +++ b/bsps/include/bsp/irq-generic.h - @@ -30,6 +30,7 @@ - #include <stdbool.h> - - #include <rtems/irq-extension.h> - +#include <rtems/record.h> - #include <rtems/score/assert.h> - - #ifdef RTEMS_SMP - @@ -258,6 +259,7 @@ void bsp_interrupt_vector_disable(rtems_vector_number vector); - */ - static inline void bsp_interrupt_handler_dispatch(rtems_vector_number vector) - { - + rtems_record_produce(RTEMS_RECORD_INTERRUPT_ENTRY, vector); - if (bsp_interrupt_is_valid_vector(vector)) { - const bsp_interrupt_handler_entry *e = - &bsp_interrupt_handler_table [bsp_interrupt_handler_index(vector)]; - @@ -276,6 +278,7 @@ static inline void bsp_interrupt_handler_dispatch(rtems_vector_number vector) - } else { - bsp_interrupt_handler_default(vector); - } - + rtems_record_produce(RTEMS_RECORD_INTERRUPT_EXIT, vector); - } - - /** - Transfer of Event Records to the Host Computer ---------------------------------------------- diff --git a/user/tracing/examples.rst b/user/tracing/examples.rst index d0bef0b..ed0c722 100644 --- a/user/tracing/examples.rst +++ b/user/tracing/examples.rst @@ -48,20 +48,20 @@ BSP is configured with the following command - .. code-block:: none - ../rtems/configure --target=sparc-rtems5 --prefix=/development/rtems/5 \ + ../rtems/configure --target=sparc-rtems@rtems-ver-major@ --prefix=/development/rtems/5 \ --enable-networking --enable-tests --enable-rtemsbsp=erc32 --enable-cxx The next two commands are used to link the fileio executable.The `-B` option signifies the use of the complete path to the required directory or file. Write -the full path instead of the path file: `sparc-rtems5/erc32/lib/` in the +the full path instead of the path file: `sparc-rtems@rtems-ver-major@/erc32/lib/` in the following commands according to your installation. Also confirm the path of the fileio's executable and object files in the last line of the command according to your installation. .. code-block:: none - sparc-rtems5-gcc -Bsparc-rtems5/erc32/lib/ \ - -specs bsp_specs -qrtems -mcpu=cypress -O2 -g -ffunction-sections \ + sparc-rtems@rtems-ver-major@-gcc -Bsparc-rtems@rtems-ver-major@/erc32/lib/ \ + -qrtems -mcpu=cypress -O2 -g -ffunction-sections \ -fdata-sections -Wall -Wmissing-prototypes -Wimplicit-function-declaration \ -Wstrict-prototypes -Wnested-externs -Wl,--gc-sections -mcpu=cypress \ -o sparc-rtems5/c/erc32/testsuites/samples/fileio.exe sparc-rtems5/c/erc32/\ @@ -75,7 +75,7 @@ the wrapper c file. .. code-block:: none rtems-tld -C fileio-trace.ini -W fileio-wrapper -- -Bsparc-rtems5/erc32/lib/ \ - -specs bsp_specs -qrtems -mcpu=cypress -O2 -g -ffunction-sections \ + -qrtems -mcpu=cypress -O2 -g -ffunction-sections \ -fdata-sections -Wall -Wmissing-prototypes -Wimplicit-function-declaration \ -Wstrict-prototypes -Wnested-externs -Wl,--gc-sections -mcpu=cypress \ -o sparc-rtems5/c/erc32/testsuites/samples/fileio.exe sparc-rtems5/c/erc32/\ @@ -97,10 +97,10 @@ The output from the above commands will be as follows: .. code-block:: none *** BEGIN OF TEST FILE I/O *** - *** TEST VERSION: 5.0.0.de9b7d712bf5da6593386fd4fbca0d5f8b8431d8 + *** TEST VERSION: @rtems-ver-major@.@rtems-ver-minor@.0.de9b7d712bf5da6593386fd4fbca0d5f8b8431d8 *** TEST STATE: USER_INPUT *** TEST BUILD: RTEMS_NETWORKING RTEMS_POSIX_API - *** TEST TOOLS: 7.3.0 20180125 (RTEMS 5, RSB a3a6c34c150a357e57769a26a460c475e188438f, Newlib 3.0.0) + *** TEST TOOLS: 7.3.0 20180125 (RTEMS @rtems-ver-major@, RSB a3a6c34c150a357e57769a26a460c475e188438f, Newlib 3.0.0) Press any key to start file I/O sample (20s remaining) Press any key to start file I/O sample (19s remaining) Press any key to start file I/O sample (18s remaining) @@ -128,7 +128,7 @@ The output from the above commands will be as follows: starting shell ========================= - Welcome to rtems-5.0.0 (SPARC/w/FPU/erc32) + Welcome to rtems-@rtems-ver-major@.@rtems-ver-minor@.0 (SPARC/w/FPU/erc32) COPYRIGHT (c) 1989-2008. On-Line Applications Research Corporation (OAR). |