Test toolchain build in CI for grisp nano rtmes6 Experimental branch

.github/workflows/ci.yml

@@ -32,6 +32,8 @@ jobs:
               device-tree-compiler \
               u-boot-tools \
               lzop \
+              libgmp3-dev \
+              libmpfr-dev \
               libusb-1.0-0-dev \
               python3 \
               python-is-python3 \
@@ -47,6 +49,13 @@ jobs:
       - name: Build toolchain
         shell: bash
         run: |
+          # Hack: Downloading gmp often fails on github. Seems that the server
+          # is rate limited or something like that. So pre-fetch the file from a
+          # mirror.
+          make submodule-update
+          mkdir external/rtems-source-builder/rtems/sources
+          wget -O external/rtems-source-builder/rtems/sources/gmp-6.3.0.tar.bz2 https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.bz2
+          # Hack end
           make install
           if [ "$RUNNER_OS" == "Linux" ]; then
             make barebox

.gitignore

@@ -1,8 +1,11 @@
 /external/fdt/*.tar.gz
 /fdt/b-dtb
 /rtems/5
+/rtems/6
 build
 /demo*/b-*/
+/nano*/b-*/
 external/libinih/b-imx7
 external/libinih/b-atsamv
+external/libinih/b-stm32*
 /package

Dockerfile

@@ -7,13 +7,18 @@ RUN apt-get update && apt-get install -y \
     u-boot-tools lzop libusb-1.0-0-dev python3 python-is-python3 \
     unzip libpython3-dev python3-dev locales
 
-# https://devel.rtems.org/ticket/4726
-RUN echo "en_US.ISO-8859-15 ISO-8859-15" >> /etc/locale.gen \
+# Set locale to UTF-8
+RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen
-ENV LANG=en_US.iso885915
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
 
 WORKDIR /grisp2-rtems-toolchain
 COPY . .
+
+# Create necessary directory structure, fails without doing this...
+RUN mkdir -p rtems/6/arm-rtems6/imx7/lib/include/{machine,sys,vm,x86}
+
 RUN make install
 
 # ------------------------------------------------------------------------------
@@ -27,8 +32,8 @@ RUN apt-get update && apt-get install -y \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /grisp2-rtems-toolchain
-COPY --from=build-stage /grisp2-rtems-toolchain/rtems/5/ rtems/5/
+COPY --from=build-stage /grisp2-rtems-toolchain/rtems/6/ rtems/6/
 
-ENV GRISP_TOOLCHAIN=/grisp2-rtems-toolchain/rtems/5
-ENV GRISP_TC_ROOT=/grisp2-rtems-toolchain/rtems/5
-ENV PATH="/grisp2-rtems-toolchain/rtems/5/bin:${PATH}"
+ENV GRISP_TOOLCHAIN=/grisp2-rtems-toolchain/rtems/6
+ENV GRISP_TC_ROOT=/grisp2-rtems-toolchain/rtems/6
+ENV PATH="/grisp2-rtems-toolchain/rtems/6/bin:${PATH}"

Makefile

@@ -5,9 +5,10 @@
 MAKEFILE_DIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
 ARCH = arm
-BSP = imx7
+BSP_GRISP_NANO = stm32u5-grisp-nano
+BSP_GRISP2 = imx7
 BSP_GRISP1 = atsamv
-RTEMS_VERSION = 5
+RTEMS_VERSION = 6
 TARGET = $(ARCH)-rtems$(RTEMS_VERSION)
 PREFIX = $(MAKEFILE_DIR)/rtems/$(RTEMS_VERSION)
 RSB = $(MAKEFILE_DIR)/external/rtems-source-builder
@@ -20,11 +21,10 @@ SRC_OPENOCD = $(MAKEFILE_DIR)/external/openocd-code
 SRC_IMX_USB_LOADER = $(MAKEFILE_DIR)/external/imx_usb_loader
 SRC_CRYPTOAUTHLIB = $(MAKEFILE_DIR)/external/cryptoauthlib
 SRC_BLAS = $(MAKEFILE_DIR)/external/lapack
-BUILD_BSP = $(MAKEFILE_DIR)/build/b-$(BSP)
-BUILD_BSP_GRISP1 = $(MAKEFILE_DIR)/build/b-$(BSP_GRISP1)
 BUILD_LOGS = $(MAKEFILE_DIR)/build
 BUILD_OPENOCD = $(MAKEFILE_DIR)/build/b-openocd
 LIBBSD_BUILDSET = $(MAKEFILE_DIR)/src/libbsd.ini
+LIBBSD_NANO_BUILDSET = $(MAKEFILE_DIR)/src/libbsd-nano.ini
 CMAKE_TOOLCHAIN_TEMPLATE = $(MAKEFILE_DIR)/cryptoauthlib/grisp2-toolchain.cmake.in
 CMAKE_TOOLCHAIN_CONFIG = $(PREFIX)/share/grisp2-toolchain.cmake
 PACKAGE_DIR = package
@@ -83,28 +83,38 @@ help:
 
 .PHONY: install
 #H Build and install the complete toolchain, libraries, fdt and so on.
-install: submodule-update toolchain toolchain-revision bootstrap bsp bsp-grisp1 libbsd fdt bsp.mk libgrisp libinih cryptoauthlib barebox-install blas
+install: submodule-update toolchain toolchain-revision bsp libbsd fdt bsp.mk libgrisp libinih cryptoauthlib barebox-install blas
 
 .PHONY: submodule-update
 #H Update the submodules.
 submodule-update:
 	git submodule update --init
 	cd $(SRC_LIBBSD) && git submodule update --init rtems_waf
 
-.PHONY: bootstrap
-#H Run bootstrap for RTEMS.
-bootstrap:
-	cd $(SRC_RTEMS) && $(RSB)/source-builder/sb-bootstrap
-
 .PHONY: toolchain
 #H Build and install the toolchain.
 toolchain:
 	mkdir -p $(BUILD_LOGS)
 	rm -rf $(RSB)/rtems/build
+	# Downloading sometimes fails on the first try. So start with
+	# downloading twice
+	cd $(RSB)/rtems && ../source-builder/sb-set-builder \
+	    --source-only-download \
+	    --prefix=$(PREFIX) \
+	    --log=$(BUILD_LOGS)/rsb-toolchain.log \
+	    --with-fortran \
+	    $(RTEMS_VERSION)/rtems-$(ARCH) || true
+	cd $(RSB)/rtems && ../source-builder/sb-set-builder \
+	    --source-only-download \
+	    --prefix=$(PREFIX) \
+	    --log=$(BUILD_LOGS)/rsb-toolchain.log \
+	    --with-fortran \
+	    $(RTEMS_VERSION)/rtems-$(ARCH)
+	# Now build the tools
 	cd $(RSB)/rtems && ../source-builder/sb-set-builder \
 	    --prefix=$(PREFIX) \
 	    --log=$(BUILD_LOGS)/rsb-toolchain.log \
-		--with-fortran \
+	    --with-fortran \
 	    $(RTEMS_VERSION)/rtems-$(ARCH)
 	rm -rf $(RSB)/rtems/build
 
@@ -114,64 +124,34 @@ toolchain-revision:
 	mkdir -p ${PREFIX}
 	echo "${GRISP_TOOLCHAIN_REVISION}" > "${PREFIX}/GRISP_TOOLCHAIN_REVISION"
 	echo "${GRISP_TOOLCHAIN_PLATFORM}" > "${PREFIX}/GRISP_TOOLCHAIN_PLATFORM"
-	mkdir -p ${PREFIX}/${TARGET}/${BSP}/lib/include/grisp
-	echo "" > "${PREFIX}/${TARGET}/${BSP}/lib/include/grisp/grisp-buildinfo.h"
+	mkdir -p ${PREFIX}/${TARGET}/${BSP_GRISP2}/lib/include/grisp
+	echo "" > "${PREFIX}/${TARGET}/${BSP_GRISP2}/lib/include/grisp/grisp-buildinfo.h"
 	echo "$$GRISP_BUILDINFO_C" > \
-		"${PREFIX}/${TARGET}/${BSP}/lib/include/grisp/grisp-buildinfo.h"
+		"${PREFIX}/${TARGET}/${BSP_GRISP2}/lib/include/grisp/grisp-buildinfo.h"
 	echo "$$GRISP_BUILDINFO_ERL" > \
 		"${PREFIX}/grisp_buildinfo.hrl"
 
 .PHONY: bsp
 #H Build the RTEMS board support package.
 bsp:
-	rm -rf $(BUILD_BSP)
-	mkdir -p $(BUILD_BSP)
-	cd $(BUILD_BSP) && $(SRC_RTEMS)/configure \
-	    --target=$(ARCH)-rtems$(RTEMS_VERSION) \
-	    --prefix=$(PREFIX) \
-	    --enable-posix \
-	    --enable-rtemsbsp=$(BSP) \
-	    --enable-maintainer-mode \
-	    --disable-networking \
-	    $(EXTRA_BSP_OPTS) \
-	    IMX_CCM_IPG_HZ=66000000 \
-	    IMX_CCM_UART_HZ=80000000 \
-	    IMX_CCM_AHB_HZ=66000000 \
-	    IMX_CCM_SDHCI_HZ=198000000 \
-	    IMX_CCM_ECSPI_HZ=60000000
-	cd $(BUILD_BSP) && make -j $(NUMCORE)
-	cd $(BUILD_BSP) && make -j $(NUMCORE) install
-
-.PHONY: bsp-grisp1
-#H Build the RTEMS board support package for GRiSP1.
-bsp-grisp1:
-	rm -rf $(BUILD_BSP_GRISP1)
-	mkdir -p $(BUILD_BSP_GRISP1)
-	cd $(BUILD_BSP_GRISP1) && $(SRC_RTEMS)/configure \
-	    --target=$(ARCH)-rtems$(RTEMS_VERSION) \
-	    --prefix=$(PREFIX) \
-	    --enable-posix \
-	    --enable-rtemsbsp=$(BSP_GRISP1) \
-	    --enable-maintainer-mode \
-	    --disable-networking \
-	    --disable-tests \
-	    $(EXTRA_BSP_OPTS) \
-	    --enable-chip=same70q21 \
-	    --enable-sdram=is42s16320f-7bl \
-	    ATSAM_CONSOLE_DEVICE_TYPE=1 \
-	    ATSAM_CONSOLE_DEVICE_INDEX=2 \
-	    ATSAM_MEMORY_QSPIFLASH_SIZE=0x0 \
-	    ATSAM_MEMORY_NOCACHE_SIZE=0x8000
-	cd $(BUILD_BSP_GRISP1) && make -j $(NUMCORE)
-	cd $(BUILD_BSP_GRISP1) && make -j $(NUMCORE) install
+	cd $(SRC_RTEMS) && ./waf clean || true
+	cp src/config.ini $(SRC_RTEMS)
+	if [ "$(DEBUG)" == "1" ]; then cd $(SRC_RTEMS) && sed -i \
+		-e "s|OPTIMIZATION_FLAGS = -O2|OPTIMIZATION_FLAGS = -O0|g" \
+		-e "s|RTEMS_DEBUG = False|RTEMS_DEBUG = True|g" \
+		config.ini; \
+		fi
+	cd $(SRC_RTEMS) && ./waf configure --prefix=$(PREFIX)
+	cd $(SRC_RTEMS) && ./waf
+	cd $(SRC_RTEMS) && ./waf install
 
 .PHONY: bsp.mk
 #H Build a Makefile helper for the applications.
-bsp.mk: $(PREFIX)/make/custom/$(BSP).mk $(PREFIX)/make/custom/$(BSP_GRISP1).mk
-$(PREFIX)/make/custom/$(BSP).mk: src/bsp.mk
+bsp.mk: $(PREFIX)/make/custom/$(BSP_GRISP2).mk $(PREFIX)/make/custom/$(BSP_GRISP1).mk $(PREFIX)/make/custom/$(BSP_GRISP_NANO).mk
+$(PREFIX)/make/custom/$(BSP_GRISP2).mk: src/bsp.mk
 	cat $^ | sed \
 	    -e "s/##RTEMS_API##/$(RTEMS_VERSION)/g" \
-	    -e "s/##RTEMS_BSP##/$(BSP)/g" \
+	    -e "s/##RTEMS_BSP##/$(BSP_GRISP2)/g" \
 	    -e "s/##RTEMS_CPU##/$(ARCH)/g" \
 	    > $@
 $(PREFIX)/make/custom/$(BSP_GRISP1).mk: src/bsp.mk
@@ -180,44 +160,69 @@ $(PREFIX)/make/custom/$(BSP_GRISP1).mk: src/bsp.mk
 	    -e "s/##RTEMS_BSP##/$(BSP_GRISP1)/g" \
 	    -e "s/##RTEMS_CPU##/$(ARCH)/g" \
 	    > $@
+$(PREFIX)/make/custom/$(BSP_GRISP_NANO).mk: src/bsp.mk
+	cat $^ | sed \
+	    -e "s/##RTEMS_API##/$(RTEMS_VERSION)/g" \
+	    -e "s/##RTEMS_BSP##/$(BSP_GRISP_NANO)/g" \
+	    -e "s/##RTEMS_CPU##/$(ARCH)/g" \
+	    > $@
 
 .PHONY: libbsd
 #H Build and install libbsd.
 libbsd:
 	rm -rf $(SRC_LIBBSD)/build
+	# Workaround for GRiSP1 and Nano
+	[ ! -e "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds.org" ] && \
+		mv "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds" \
+		    "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds.org" || \
+		true
+	echo "INCLUDE linkcmds.sdram" > \
+		"$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds"
+	[ ! -e "$(PREFIX)/$(TARGET)/$(BSP_GRISP_NANO)/lib/linkcmds.org" ] && \
+		mv "$(PREFIX)/$(TARGET)/$(BSP_GRISP_NANO)/lib/linkcmds" \
+		    "$(PREFIX)/$(TARGET)/$(BSP_GRISP_NANO)/lib/linkcmds.org" || \
+		true
+	echo "INCLUDE linkcmds.ospi" > \
+		"$(PREFIX)/$(TARGET)/$(BSP_GRISP_NANO)/lib/linkcmds"
+	# End of workaround for GRiSP1 and Nano
 	cd $(SRC_LIBBSD) && ./waf configure \
 	    --prefix=$(PREFIX) \
-	    --rtems-bsps=$(ARCH)/$(BSP),$(ARCH)/$(BSP_GRISP1) \
+	    --rtems-bsps=$(ARCH)/$(BSP_GRISP2),$(ARCH)/$(BSP_GRISP1) \
 	    --enable-warnings \
 	    --optimization=$(OPTIMIZATION) \
 	    --buildset=$(LIBBSD_BUILDSET) \
 	    --rtems-version=$(RTEMS_VERSION)
-	# Workaround for GRiSP1
-	[ ! -e "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds.org" ] && \
-		mv "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds" \
-		    "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds.org" || \
-		true
-	cp "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds.sdram" \
-	    "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds"
-	# End of workaround for GRiSP1
 	cd $(SRC_LIBBSD) && ./waf
 	cd $(SRC_LIBBSD) && ./waf install
-	# Workaround for GRiSP1
+	cd $(SRC_LIBBSD) && ./waf configure \
+	    --prefix=$(PREFIX) \
+	    --rtems-bsps=$(ARCH)/$(BSP_GRISP_NANO) \
+	    --enable-warnings \
+	    --optimization=$(OPTIMIZATION) \
+	    --buildset=$(LIBBSD_NANO_BUILDSET) \
+	    --rtems-version=$(RTEMS_VERSION)
+	cd $(SRC_LIBBSD) && ./waf
+	cd $(SRC_LIBBSD) && ./waf install
+	# Workarounds for GRiSP1 and Nano
 	cp "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds.org" \
 	    "$(PREFIX)/$(TARGET)/$(BSP_GRISP1)/lib/linkcmds"
-	# End of workaround for GRiSP1
+	cp "$(PREFIX)/$(TARGET)/$(BSP_GRISP_NANO)/lib/linkcmds.org" \
+	    "$(PREFIX)/$(TARGET)/$(BSP_GRISP_NANO)/lib/linkcmds"
+	# End of workarounds for GRiSP1 and Nano
 
 .PHONY: libgrisp
 #H Build and install libgrisp.
 libgrisp:
-	make RTEMS_ROOT=$(PREFIX) RTEMS_BSP=$(BSP) -C $(SRC_LIBGRISP) install
+	make RTEMS_ROOT=$(PREFIX) RTEMS_BSP=$(BSP_GRISP2) -C $(SRC_LIBGRISP) install
 	make RTEMS_ROOT=$(PREFIX) RTEMS_BSP=$(BSP_GRISP1) -C $(SRC_LIBGRISP) install
+	make RTEMS_ROOT=$(PREFIX) RTEMS_BSP=$(BSP_GRISP_NANO) -C $(SRC_LIBGRISP) install
 
 .PHONY: libinih
 #H Build and install libinih
 libinih:
-	make RTEMS_ROOT=$(PREFIX) RTEMS_BSP=$(BSP) -C $(SRC_LIBINIH) clean install
+	make RTEMS_ROOT=$(PREFIX) RTEMS_BSP=$(BSP_GRISP2) -C $(SRC_LIBINIH) clean install
 	make RTEMS_ROOT=$(PREFIX) RTEMS_BSP=$(BSP_GRISP1) -C $(SRC_LIBINIH) clean install
+	make RTEMS_ROOT=$(PREFIX) RTEMS_BSP=$(BSP_GRISP_NANO) -C $(SRC_LIBINIH) clean install
 
 .PHONY: fdt
 #H Build the flattened device tree.
@@ -309,7 +314,7 @@ imx_uart:
 cmake_toolchain_config:
 	cat $(CMAKE_TOOLCHAIN_TEMPLATE) | sed \
 	    -e "s|##PREFIX##|$(PREFIX)|g" \
-	    -e "s|##BSP##|$(BSP)|g" \
+	    -e "s|##BSP##|$(BSP_GRISP2)|g" \
 	    -e "s|##TARGET##|$(TARGET)|g" \
 	    > $(CMAKE_TOOLCHAIN_CONFIG)
 
@@ -342,11 +347,11 @@ cryptoauthlib: cmake_toolchain_config
 	cd $(SRC_CRYPTOAUTHLIB)/build && \
 		make DESTDIR=$(SRC_CRYPTOAUTHLIB)/install install && \
 		cp -r $(SRC_CRYPTOAUTHLIB)/install/usr/lib/libcryptoauth.a \
-			$(PREFIX)/$(TARGET)/$(BSP)/lib/ && \
+			$(PREFIX)/$(TARGET)/$(BSP_GRISP2)/lib/ && \
 		cp -r $(SRC_CRYPTOAUTHLIB)/install/usr/include/cryptoauthlib \
-			$(PREFIX)/$(TARGET)/$(BSP)/lib/include/ && \
-		touch $(PREFIX)/$(TARGET)/$(BSP)/lib/include/cryptoauthlib/atca_start_config.h && \
-		touch $(PREFIX)/$(TARGET)/$(BSP)/lib/include/cryptoauthlib/atca_start_iface.h
+			$(PREFIX)/$(TARGET)/$(BSP_GRISP2)/lib/include/ && \
+		touch $(PREFIX)/$(TARGET)/$(BSP_GRISP2)/lib/include/cryptoauthlib/atca_start_config.h && \
+		touch $(PREFIX)/$(TARGET)/$(BSP_GRISP2)/lib/include/cryptoauthlib/atca_start_iface.h
 
 
 BLAS_TOOLS=\
@@ -378,22 +383,24 @@ blas:
 		$(AR) -qc libblas.a *.o &&\
 		rm *.o &&\
 		$(RANLIB) libblas.a
-	cp $(SRC_BLAS)/libblas.a $(PREFIX)/$(TARGET)/$(BSP)/lib/libblas.a
-	cp $(SRC_BLAS)/CBLAS/include/cblas.h $(PREFIX)/$(TARGET)/$(BSP)/lib/include/cblas.h
-	cp $(SRC_BLAS)/CBLAS/include/cblas_mangling.h $(PREFIX)/$(TARGET)/$(BSP)/lib/include/cblas_mangling.h
-	cp $(SRC_BLAS)/LAPACKE/include/*.h $(PREFIX)/$(TARGET)/$(BSP)/lib/include/
+	cp $(SRC_BLAS)/libblas.a $(PREFIX)/$(TARGET)/$(BSP_GRISP2)/lib/libblas.a
+	cp $(SRC_BLAS)/CBLAS/include/cblas.h $(PREFIX)/$(TARGET)/$(BSP_GRISP2)/lib/include/cblas.h
+	cp $(SRC_BLAS)/CBLAS/include/cblas_mangling.h $(PREFIX)/$(TARGET)/$(BSP_GRISP2)/lib/include/cblas_mangling.h
+	cp $(SRC_BLAS)/LAPACKE/include/*.h $(PREFIX)/$(TARGET)/$(BSP_GRISP2)/lib/include/
 
 .PHONY: demo
 #H Build the demo application.
 demo:
 	make -C demo
 	RTEMS_BSP=$(BSP_GRISP1) make -C demo
+	RTEMS_BSP=$(BSP_GRISP_NANO) make -C demo
 
 .PHONY: demo-clean
 #H Clean the demo application.
 demo-clean:
 	make -C demo clean
 	RTEMS_BSP=$(BSP_GRISP1) make -C demo clean
+	RTEMS_BSP=$(BSP_GRISP_NANO) make -C demo clean
 
 .PHONY: shell
 #H Start a shell with the environment for building for example the RTEMS BSP.

debug/trace-32-nano/bp.bak

@@ -0,0 +1,18 @@
+// T32 Wed Nov 27 12:36:08 2024
+
+B::
+
+Break.RESet
+Break.CONFIG.VarConvert OFF
+Break.CONFIG.InexactData ON
+Break.CONFIG.InexactTrigger OFF
+Break.CONFIG.InexactResume ON
+Break.CONFIG.InexactAddress ON
+Break.CONFIG.MatchZone OFF
+Break.CONFIG.AlwaysAlive OFF
+Break.Set     bsp_reset /Program
+Break.Set     rtems_bdbuf_read+0xF6 /Program
+Break.Set     rtems_bdbuf_peek+0x64 /Program
+Break.Set     _Terminate /Program
+
+ENDDO

debug/trace-32-nano/bp.cmm

@@ -0,0 +1,17 @@
+// T32 Wed Nov 27 13:17:02 2024
+
+B::
+
+Break.RESet
+Break.CONFIG.VarConvert OFF
+Break.CONFIG.InexactData ON
+Break.CONFIG.InexactTrigger OFF
+Break.CONFIG.InexactResume ON
+Break.CONFIG.InexactAddress ON
+Break.CONFIG.MatchZone OFF
+Break.CONFIG.AlwaysAlive OFF
+Break.Set     bsp_reset /Program
+Break.Set     jump_to_app\12 /Program
+Break.Set     _Terminate /Program
+
+ENDDO