Merge remote-tracking branch 'upstream/master' into dev/fetch-script-fail-on-error

Author: lschuermann

.github/workflows/ci.yml

@@ -22,18 +22,9 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: false # LVGL makefile manually installs the submodule
-
-      - uses: carlosperate/arm-none-eabi-gcc-action@v1
-        with:
-          release: '10.3-2021.07' # The arm-none-eabi-gcc release to use.
-
-      - name: setup-riscv-toolchain
-        run: sudo apt-get install -y gcc-riscv64-unknown-elf
-
       - name: Disable wget progress output
         run: |
           echo "verbose = off" >> $HOME/.wgetrc
-
       - name: ci-format
         run: pushd examples; ./format_all.sh || exit; popd
 
@@ -49,20 +40,14 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-
       - uses: carlosperate/arm-none-eabi-gcc-action@v1
-        with:
-          release: '10.3-2021.07' # The arm-none-eabi-gcc release to use.
-
+      - run: arm-none-eabi-gcc --version
       - name: setup-riscv-toolchain
         run: sudo apt-get install -y gcc-riscv64-unknown-elf
-
       - name: Disable wget progress output
         run: |
           echo "verbose = off" >> $HOME/.wgetrc
-
       - name: ci-build
         run: pushd examples; ./build_all.sh || exit; popd
-
       - name: ci-debug-build
         run: pushd examples/blink; make debug RAM_START=0x20004000 FLASH_INIT=0x30051 || exit; popd

.gitmodules

@@ -1,12 +1,23 @@
 [submodule "lua53/lua"]
 	path = lua53/lua
 	url = https://github.com/lua/lua.git
+	shallow = true
 [submodule "lvgl/lvgl"]
 	path = lvgl/lvgl
 	url = https://github.com/littlevgl/lvgl.git
+	shallow = true
 [submodule "libopenthread/openthread"]
 	path = libopenthread/openthread
 	url = https://github.com/openthread/openthread.git
+	shallow = true
 [submodule "RadioLib/RadioLib"]
 	path = RadioLib/RadioLib
 	url = https://github.com/jgromes/RadioLib.git
+	shallow = true
+[submodule "lwip/lwip"]
+	path = lwip/lwip
+	# Using GitHub mirror, as git.savannah.gnu.org seems to cause
+	# problems with `git submodule sync`
+	#url = https://git.savannah.gnu.org/git/lwip.git
+	url =  https://github.com/lwip-tcpip/lwip.git
+	shallow = true

AppMakefile.mk

@@ -39,6 +39,10 @@ include $(TOCK_USERLAND_BASE_DIR)/libtock-sync/Makefile
 # Include the makefile that has the programming functions for each board.
 include $(TOCK_USERLAND_BASE_DIR)/Program.mk
 
+# Remove any leading or trailing spaces from PACKAGE_NAME and then verify there
+# are no spaces within the PACKAGE_NAME variable.
+override PACKAGE_NAME := $(strip $(PACKAGE_NAME))
+$(call check_no_spaces, PACKAGE_NAME)
 
 # Rules to call library makefiles to build required libraries.
 #
@@ -53,14 +57,29 @@ include $(TOCK_USERLAND_BASE_DIR)/Program.mk
 # Arguments:
 # - $(1): Pattern matching all arch-specific library files.
 # - $(2): The path to the library.
+# - $(3): The uppercase name of the library.
 define EXTERN_LIB_BUILD_RULE
 
 ifneq "$$(wildcard $(2)/Makefile.setup)" ""
 # Since a Makefile.setup exists, do any setup steps needed to fetch the library.
+
+ifneq "$$(wildcard $(2)/Makefile.version)" ""
+# Since a Makefile.version exists, use it to set the necessary dependency.
+include $(2)/Makefile.version
+
+$$($(3)_SENTINEL_FILE):
+	$$(MAKE) -C $(2) -f Makefile.setup all
+	$$(MAKE) -C $(2) -f Makefile all
+
+$(1): $$($(3)_SENTINEL_FILE) ;
+else
+# No Makefile.version, so this will work the first time the library is built.
 $(1):
 	$$(MAKE) -C $(2) -f Makefile.setup all
 	$$(MAKE) -C $(2) -f Makefile all
+endif
 else
+# No setup needed, just build the library the first time.
 $(1):
 	$$(MAKE) -C $(2) -f Makefile all
 endif
@@ -86,8 +105,8 @@ $$(notdir $(1))_BUILDDIR ?= $(1)/build
 $$(foreach arch, $$(TOCK_ARCHS), $$(eval LIBS_$$(arch) += $$($(notdir $(1))_BUILDDIR)/$$(arch)/$(notdir $(1)).a))
 
 # Generate rule for building the library.
-# $$(info $$(call EXTERN_LIB_BUILD_RULE,$$(foreach arch,$$(TOCK_ARCHS),%/$$(arch)/$(notdir $(1)).a),$(1)))
-$$(eval $$(call EXTERN_LIB_BUILD_RULE,$$(foreach arch,$$(TOCK_ARCHS),%/$$(arch)/$(notdir $(1)).a),$(1)))
+# $$(info $$(call EXTERN_LIB_BUILD_RULE,$$(foreach arch,$$(TOCK_ARCHS),%/$$(arch)/$(notdir $(1)).a),$(1),$(shell echo '$(notdir $(1))' | tr '[:lower:]' '[:upper:]')))
+$$(eval $$(call EXTERN_LIB_BUILD_RULE,$$(foreach arch,$$(TOCK_ARCHS),%/$$(arch)/$(notdir $(1)).a),$(1),$(shell echo '$(notdir $(1))' | tr '[:lower:]' '[:upper:]')))
 
 endef
 

Configuration.mk

@@ -66,6 +66,10 @@ OPENTITAN_TOCK_TARGETS := rv32imc|rv32imc.0x20030080.0x10005000|0x20030080|0x100
 ARTY_E21_TOCK_TARGETS := rv32imac|rv32imac.0x40430080.0x80004000|0x40430080|0x80004000\
                          rv32imac|rv32imac.0x40440080.0x80007000|0x40440080|0x80007000
 
+# Specific addresses useful for the QEMU rv32i "virt" machine memory map.
+QEMU_RV32_VIRT_TOCK_TARGETS := rv32imac|rv32imac.0x80100080.0x80210000|0x80100080|0x80210000\
+                               rv32imac|rv32imac.0x80104080.0x80214000|0x80104080|0x80214000
+
 VEER_EL2_TOCK_TARGETS := rv32imc|rv32imc.0x20300080.0x20602000|0x20300080|0x20602000
 
 # Include the RISC-V targets.
@@ -83,7 +87,8 @@ TOCK_TARGETS ?= cortex-m0\
                 rv32imc|rv32imc.0x00080080.0x40008000|0x00080080|0x40008000\
                 $(OPENTITAN_TOCK_TARGETS) \
                 $(ARTY_E21_TOCK_TARGETS) \
-                $(VEER_EL2_TOCK_TARGETS)
+                $(VEER_EL2_TOCK_TARGETS) \
+                $(QEMU_RV32_VIRT_TOCK_TARGETS)
 
 # Generate `TOCK_ARCH_FAMILIES`, the set of architecture families which will be
 # used to determine toolchains to use in the build process.
@@ -102,7 +107,7 @@ TOCK_ARCHS := $(sort $(foreach target, $(TOCK_TARGETS), $(firstword $(subst |, ,
 
 # Check if elf2tab exists, if not, install it using cargo.
 ELF2TAB ?= elf2tab
-ELF2TAB_REQUIRED_VERSION := 0.12.0
+ELF2TAB_REQUIRED_VERSION := 0.13.0
 ELF2TAB_EXISTS := $(shell $(SHELL) -c "command -v $(ELF2TAB)")
 ELF2TAB_VERSION := $(shell $(SHELL) -c "$(ELF2TAB) --version | cut -d ' ' -f 2")
 
@@ -158,7 +163,13 @@ endif
 # the dos/microsoft lineage chose `.cpp` to address this same issue, leading to
 # confusion nowadays about the meaning of 'cpp'.]
 override ASFLAGS += -mthumb
-override CFLAGS  += -std=gnu11
+# '-gnu2x' is a deprecated alias for '-gnu23'. We're close enough in time still
+# (spring 2025) to the formal ratification of C23 (October 2024) that some
+# folks likely still have toolchains which only support the 2x _name_ for the
+# now-official C23 standard (even if the toolchain supports all the features
+# we care about under the 2x name). Eventually we should replace this with
+# explicit C23 selection.
+override CFLAGS  += -std=gnu2x
 override CPPFLAGS += \
       -frecord-gcc-switches\
       -gdwarf-2\
@@ -244,8 +255,10 @@ CC_rv32imac := $(CC_rv32)
 
 # Determine the version of the RISC-V compiler. This is used to select the
 # version of the libgcc library that is compatible.
-CC_rv32_version := $(shell $(TOOLCHAIN_rv32)$(CC_rv32) -dumpfullversion)
-CC_rv32_version_major := $(shell echo $(CC_rv32_version) | cut -f1 -d.)
+ifneq ($(findstring rv32i,$(TOCK_ARCH_FAMILIES)),)
+  CC_rv32_version := $(shell $(TOOLCHAIN_rv32)$(CC_rv32) -dumpfullversion)
+  CC_rv32_version_major := $(shell echo $(CC_rv32_version) | cut -f1 -d.)
+endif
 
 # Match compiler version to support libtock-newlib versions.
 ifeq ($(CC_rv32_version_major),10)
@@ -388,8 +401,10 @@ CC_cortex-m7 := $(CC_cortex-m)
 
 # Determine the version of the ARM compiler. This is used to select the version
 # of the libgcc library that is compatible.
-CC_cortex-m_version := $(shell $(TOOLCHAIN_cortex-m)$(CC_cortex-m) -dumpfullversion)
-CC_cortex-m_version_major := $(shell echo $(CC_cortex-m_version) | cut -f1 -d.)
+ifneq ($(findstring cortex-m,$(TOCK_ARCH_FAMILIES)),)
+  CC_cortex-m_version := $(shell $(TOOLCHAIN_cortex-m)$(CC_cortex-m) -dumpfullversion)
+  CC_cortex-m_version_major := $(shell echo $(CC_cortex-m_version) | cut -f1 -d.)
+endif
 
 # Match compiler version to support libtock-newlib versions.
 ifeq ($(CC_cortex-m_version_major),10)
@@ -675,12 +690,17 @@ ifneq ($(V),)
   $(info **************************************************)
   $(info Config:)
   $(info GIT: $(shell git describe --always 2>&1))
+ifneq ($(findstring cortex-m,$(TOCK_ARCH_FAMILIES)),)
   $(info $(TOOLCHAIN_cortex-m4)$(CC_cortex-m4) --version: $(shell $(TOOLCHAIN_cortex-m4)$(CC_cortex-m4) --version))
+endif
+ifneq ($(findstring rv32i,$(TOCK_ARCH_FAMILIES)),)
   $(info $(TOOLCHAIN_rv32i)$(CC_rv32i) --version: $(shell $(TOOLCHAIN_rv32i)$(CC_rv32i) --version))
+endif
   $(info LAYOUT=$(LAYOUT))
   $(info MAKEFLAGS=$(MAKEFLAGS))
   $(info PACKAGE_NAME=$(PACKAGE_NAME))
   $(info TOCK_ARCHS=$(TOCK_ARCHS))
+  $(info TOCK_ARCH_FAMILIES=$(TOCK_ARCH_FAMILIES))
   $(info TOCK_TARGETS=$(TOCK_TARGETS))
   $(info TOCK_USERLAND_BASE_DIR=$(TOCK_USERLAND_BASE_DIR))
   $(info TOOLCHAIN=$(TOOLCHAIN))

Helpers.mk

@@ -23,6 +23,15 @@ __check_defined = \
     $(if $(value $1),, \
       $(error Undefined $1$(if $2, ($2))))
 
+# Check that the variable has no leading or trailing spaces, or spaces within
+# the variable.
+#
+# Params:
+#   1. Variable name to test.
+check_no_spaces = \
+    $(if $(findstring $(strip $($(strip $1))),$($(strip $1))),,$(error Error: Space in variable $(strip $1))) \
+    $(if $(word 2,$($(strip $1))),$(error Error: Multiple entries in variable $(strip $1)),)
+
 # Check for a ~/ at the beginning of a path variable (TOCK_USERLAND_BASE_DIR).
 # Make will not properly expand this.
 ifdef TOCK_USERLAND_BASE_DIR

RadioLib/RadioLib

@@ -169,7 +169,7 @@ class TockRadioLibHal : public RadioLibHal {
 #if !defined(RADIOLIB_CLOCK_DRIFT_MS)
       return ms;
 #else
-      return ms * 1000 / (1000 + RADIOLIB_CLOCK_DRIFT_MS);
+      return (uint64_t)ms * 1000 / (1000 + RADIOLIB_CLOCK_DRIFT_MS);
 #endif
     }
 

RadioLib/libtockHal.h

@@ -122,6 +122,10 @@ a prerequisite of building the app.
 The `Makefile.setup` file should have rules to download the source for the
 library.
 
+If a library includes a `Makefile.version` with a `<LIBRARY_NAME>_SENTINEL_FILE`
+variable set, that file will be used to determine if the library needs to be
+rebuilt.
+
 **Example:** the `u8g2` library uses this.
 
 ### Pre-built libraries