[TrackerM] Add platform support

.buildpackrc

@@ -15,10 +15,10 @@ export BUILDPACK_VARIATION=manifest
 export RELEASE_PLATFORMS=( )
 
 # Platforms for which this firmware is considered experimental
-export PRERELEASE_PLATFORMS=( argon boron bsom b5som tracker esomx p2 )
+export PRERELEASE_PLATFORMS=( argon boron bsom b5som tracker esomx p2 trackerm )
 # Note: a single platform should be only in release or prerelease list. If
 # added to both it will be considered a prerelease
 
 # Platforms which require modules to be prebuilt
-export MODULAR_PLATFORMS=( argon boron bsom b5som tracker esomx p2 )
+export MODULAR_PLATFORMS=( argon boron bsom b5som tracker esomx p2 trackerm )
 

.circleci/config.yml

@@ -14,7 +14,7 @@ orbs:
 
 aliases:
   - &tasks ["compile:all clean:all", "compile:user clean:user", "compile:debug clean:debug"]
-  - &platforms ["argon", "boron", "esomx", "bsom", "b5som", "tracker", "p2"]
+  - &platforms ["argon", "boron", "esomx", "bsom", "b5som", "tracker", "p2", "trackerm"]
 
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
@@ -475,7 +475,7 @@ workflows:
             - particle-ci-private
           matrix:
             parameters:
-              platform: ["argon", "boron", "esomx", "bsom", "b5som", "tracker", "p2", "unit-test newhal gcc"]
+              platform: ["argon", "boron", "esomx", "bsom", "b5som", "tracker", "p2", "trackerm", "unit-test newhal gcc"]
       - combine-binaries:
           requires:
             - build-and-test

.workbench/manifest.json

@@ -2,7 +2,7 @@
     "version": "1.0.0",
     "toolchains": [
         {
-            "platforms": [12, 13, 15, 23, 25, 26, 32],
+            "platforms": [12, 13, 15, 23, 25, 26, 28, 32],
             "firmware": "deviceOS@source",
             "compilers": "[email protected]",
             "tools": "[email protected]",

bootloader/makefile

@@ -3,7 +3,7 @@ BOOTLOADER_MODULE_PATH=.
 PLATFORM_DFU=0x8000000
 BUILD_PATH_EXT = $(BOOTLOADER_BUILD_PATH_EXT)
 
-ifeq ("$(PLATFORM)","p2")
+ifeq ($(PLATFORM_MCU),rtl872x)
 RTL_BINARY_FLASH_START = 0x4000
 endif
 

bootloader/prebootloader/makefile

@@ -10,7 +10,7 @@ include $(PROJECT_ROOT)/build/macros.mk
 include $(PROJECT_ROOT)/build/module-defaults.mk
 include $(PROJECT_ROOT)/build/arm-tools.mk
 
-projects = $(sort $(wildcard $(current_dir)/src/$(PLATFORM_DYNALIB_MODULES)/*))
+projects = $(sort $(wildcard $(current_dir)/src/$(PLATFORM_MCU)/*))
 makefiles = $(foreach module,$(projects),$(and $(strip $(subst $(MODULE_EXCLUDE),,$(notdir $(module)))),$(wildcard $(module)/makefile)))
 
 SUBDIR_GOALS := $(MAKECMDGOALS)

bootloader/prebootloader/src/tron/part1/sources.mk → bootloader/prebootloader/src/rtl872x/part1/sources.mk

@@ -11,7 +11,8 @@ CSRC += $(PROJECT_ROOT)/hal/src/rtl872x/hal_irq_flag.c
 CPPSRC += $(PROJECT_ROOT)/hal/src/rtl872x/flash_common.cpp
 CPPSRC += $(PROJECT_ROOT)/hal/src/rtl872x/km0_km4_ipc.cpp
 CPPSRC += $(PROJECT_ROOT)/hal/src/rtl872x/pinmap_hal.cpp
-CPPSRC += $(PROJECT_ROOT)/hal/src/tron/pinmap_defines.cpp
+
+CPPSRC += $(PROJECT_ROOT)/hal/src/$(PLATFORM_NAME)/pinmap_defines.cpp
 
 LDFLAGS += -T$(PREBOOTLOADER_PART1_SRC_PATH)/linker.ld
 LINKER_DEPS += $(PREBOOTLOADER_PART1_SRC_PATH)/linker.ld

bootloader/src/main.c

@@ -32,7 +32,7 @@
 #include "button_hal.h"
 #include "dct.h"
 #include "feature_flags.h"
-#if PLATFORM_ID == PLATFORM_P2
+#if HAL_PLATFORM_RTL872X
 #include "rtl8721d.h"
 #include "nonsecure.h"
 #endif
@@ -48,7 +48,7 @@ extern void HAL_DFU_Process();
 
 void platform_startup();
 
-#if PLATFORM_ID == PLATFORM_P2
+#if HAL_PLATFORM_RTL872X
 static void jump_to_system(uint32_t addr, uint32_t sp) {
     nonsecure_jump_to_system(addr);
     (void) sp;

bootloader/src/trackerm/include.mk

@@ -0,0 +1,2 @@
+INCLUDE_DIRS += $(BOOTLOADER_MODULE_PATH)/src/$(PLATFORM_NAME)
+include $(BOOTLOADER_MODULE_PATH)/src/rtl872x/include.mk

bootloader/src/trackerm/sources.mk

@@ -0,0 +1,2 @@
+BOOTLOADER_SRC_PATH = $(BOOTLOADER_MODULE_PATH)/src/${PLATFORM_NAME}
+include $(BOOTLOADER_MODULE_PATH)/src/rtl872x/sources.mk

build/create_module.py

@@ -49,6 +49,7 @@ class Platform(IntEnum):
     BSOM = 23
     B5SOM = 25
     TRACKER = 26
+    TRACKERM = 28
     P2 = 32
 
 class StructSerializable(struct.Struct):
@@ -243,7 +244,7 @@ def parse_dependency(dep):
 GEN3_RADIO_STACK_DEPENDENCY = ModuleDependency(ModuleFunction.BOOTLOADER, 501)
 GEN3_RADIO_STACK_DEPENDENCY2 = ModuleDependency(ModuleFunction.SYSTEM_PART, 1321, 1)
 
-RTL_PLATFORMS = [Platform.P2]
+RTL_PLATFORMS = [Platform.P2, Platform.TRACKERM]
 RTL_MBR_OFFSET = 0x08000000
 RTL_KM0_PART1_OFFSET = 0x08014000
 

build/make_release.sh

@@ -131,7 +131,7 @@ function valid_platform()
     # Validate platform (result of expression returned to caller)
     [ "$platform" = "all" ] || [ "$platform" = "argon" ] || [ "$platform" = "asom" ] || \
             [ "$platform" = "boron" ] || [ "$platform" = "bsom" ] || [ "$platform" = "b5som" ] || \
-            [ "$platform" = "esomx" ] || [ "$platform" = "tracker" ] || [ "$platform" = "p2" ]
+            [ "$platform" = "esomx" ] || [ "$platform" = "tracker" ] || [ "$platform" = "p2" ] || [ "$platform" = "trackerm" ]
 }
 
 if !(valid_platform $PLATFORM); then
@@ -155,6 +155,7 @@ if [ $PLATFORM = "all" ]; then
 	release_platform "tracker"
     release_platform "esomx"
     release_platform "p2"
+    release_platform "trackerm"
 else
 	release_platform "$PLATFORM"
 fi

build/module.mk

@@ -102,7 +102,7 @@ exe: $(TARGET_BASE)$(EXECUTABLE_EXTENSION)
 none:
 	;
 
-ifeq ("$(PLATFORM)","p2")
+ifeq ($(PLATFORM_MCU),rtl872x)
 .PHONY: rtl-flash
 rtl_module_start_address = $(subst 0x08,0x00,$(call get_module_start_address))
 rtl-flash:

build/platform-id.mk

@@ -53,6 +53,10 @@ ifeq ("$(PLATFORM)","tracker")
 PLATFORM_ID=26
 endif
 
+ifeq ("$(PLATFORM)","trackerm")
+PLATFORM_ID=28
+endif
+
 ifeq ("$(PLATFORM)","p2")
 PLATFORM_ID=32
 endif
@@ -214,6 +218,32 @@ PLATFORM_THREADING=1
 PLATFORM_OPENTHREAD=nrf52840
 endif
 
+ifeq ("$(PLATFORM_ID)","28")
+PLATFORM=trackerm
+PLATFORM_NAME=trackerm
+PLATFORM_GEN=3
+PLATFORM_MCU=rtl872x
+PLATFORM_NET=rtl872x
+PLATFORM_WIZNET=W5500
+PRODUCT_DESC=Production TrackerM
+USBD_VID_PARTICLE=0x2B04
+USBD_PID_DFU=0xD01C
+USBD_PID_CDC=0xC01C
+DEFAULT_PRODUCT_ID=$(PLATFORM_ID)
+PLATFORM_DYNALIB_MODULES=trackerm
+PLATFORM_PREBOOTLOADER=1
+ifneq ("$(PLATFORM_MCU_CORE)","")
+ARM_CPU=cortex-$(PLATFORM_MCU_CORE)
+MCU_DEVICE=rtl872x_$(PLATFORM_MCU_CORE)
+else
+ARM_CPU=cortex-m33
+MCU_DEVICE=rtl872x
+endif
+PLATFORM_THREADING=1
+MODULE_SUFFIX_PRODUCT_DATA_OFFSET_FROM_END=42
+BOOTLOADER_USE_LTO=n
+endif
+
 ifeq ("$(PLATFORM_ID)","32")
 PLATFORM=p2
 PLATFORM_NAME=tron
@@ -268,8 +298,6 @@ ifeq ("$(MCU_DEVICE)","rtl872x")
     PLATFORM_THREADING=1
 endif
 
-
-
 ifeq ("$(PLATFORM_MCU)","")
 $(error PLATFORM_MCU not defined. Check platform id $(PLATFORM_ID))
 endif

build/release-publish.sh

@@ -94,7 +94,7 @@ function valid_platform()
     # Validate platform (result of expression returned to caller)
     [ "$platform" = "argon" ] || [ "$platform" = "asom" ] || [ "$platform" = "boron" ] || \
     [ "$platform" = "bsom" ] || [ "$platform" = "b5som" ] || [ "$platform" = "tracker" ] || \
-    [ "$platform" = "esomx" ] || [ "$platform" = "p2" ]
+    [ "$platform" = "esomx" ] || [ "$platform" = "p2" ] || [ "$platform" = "trackerm" ]
 }
 
 # Identify the absolute directory

build/release-tests.sh

@@ -109,7 +109,7 @@ function valid_platform ()
     # Validate platform (result of expression returned to caller)
     [ "$platform" = "argon" ] || [ "$platform" = "asom" ] || [ "$platform" = "boron" ] || \
             [ "$platform" = "bsom" ] || [ "$platform" = "b5som" ] || [ "$platform" = "tracker" ] || \
-            [ "$platform" = "esomx" ] || [ "$platform" = "p2" ]
+            [ "$platform" = "esomx" ] || [ "$platform" = "p2" ] || [ "$platform" = "trackerm" ]
 }
 
 # Handle invalid arguments
@@ -153,6 +153,9 @@ case "$PLATFORM" in
     "tracker")
         PLATFORM_ID="26"
         ;;
+    "trackerm")
+        PLATFORM_ID="28"
+        ;;
     "p2")
         PLATFORM_ID="32"
         ;;

build/release.sh

@@ -238,6 +238,10 @@ elif [ ! -z $PLATFORM ]; then
             PLATFORM_ID="26"
             GEN3=true
             ;;
+        "trackerm")
+            PLATFORM_ID="28"
+            GEN3=true
+            ;;
         "p2")
             PLATFORM_ID="32"
             GEN3=true
@@ -277,6 +281,10 @@ else
             PLATFORM="tracker"
             GEN3=true
             ;;
+        28)
+            PLATFORM="trackerm"
+            GEN3=true
+            ;;
         32)
             PLATFORM="p2"
             GEN3=true
@@ -321,7 +329,7 @@ rm -rf $ABSOLUTE_TARGET_DIRECTORY/
 #########################
 
 # GEN3
-if [ $PLATFORM_ID -eq 12 ] || [ $PLATFORM_ID -eq 13 ] || [ $PLATFORM_ID -eq 15 ] || [ $PLATFORM_ID -eq 22 ] || [ $PLATFORM_ID -eq 23 ] || [ $PLATFORM_ID -eq 25 ] || [ $PLATFORM_ID -eq 26 ] || [ $PLATFORM_ID -eq 32 ]; then
+if [ $PLATFORM_ID -eq 12 ] || [ $PLATFORM_ID -eq 13 ] || [ $PLATFORM_ID -eq 15 ] || [ $PLATFORM_ID -eq 22 ] || [ $PLATFORM_ID -eq 23 ] || [ $PLATFORM_ID -eq 25 ] || [ $PLATFORM_ID -eq 26 ] || [ $PLATFORM_ID -eq 28 ] || [ $PLATFORM_ID -eq 32 ]; then
     # Configure
     if [ $DEBUG = true ]; then
         cd ../main

ci/cf_generate_message.sh

@@ -53,7 +53,7 @@ EOF
 )
 
     fields=""
-    for p in Argon Boron BSoM B5SoM Tracker ESomX P2 GCC Newhal P2; do
+    for p in Argon Boron BSoM B5SoM Tracker TrackerM ESomX P2 GCC Newhal P2; do
         if echo -e "${failures}" | grep -q "PLATFORM=\"${p,,}\""; then
             msg=":scrum_closed: $p\\n"
         else

ci/enumerate_build_matrix.sh

@@ -47,7 +47,7 @@ MAKE=runmake
 # define build matrix dimensions
 # "" means execute execute the $MAKE command without that var specified
 DEBUG_BUILD=( y n )
-PLATFORM=( argon boron asom bsom b5som esomx p2 )
+PLATFORM=( argon boron asom bsom b5som esomx p2 trackerm )
 # All modules are now built by reease scripts instead, skip
 # Only building applications and tests here
 # PLATFORM_BOOTLOADER=( argon boron asom bsom b5som tracker esomx p2 )
@@ -57,7 +57,7 @@ PLATFORM_PREBOOTLOADER=()
 APP=( "" product_id_and_version )
 TEST=( wiring/api )
 
-MODULAR_PLATFORM=( argon boron asom bsom b5som tracker esomx p2 )
+MODULAR_PLATFORM=( argon boron asom bsom b5som tracker esomx p2 trackerm )
 
 filterPlatform PLATFORM
 filterPlatform MODULAR_PLATFORM
@@ -159,7 +159,7 @@ do
   do
     # Gen 3 overflows with modular DEBUG_BUILD=y, so skip those
     if [[ "$db" = "y" ]]; then
-      if [[ "$p" = "argon" ]] || [[ "$p" = "boron" ]] || [[ "$p" = "asom" ]] || [[ "$p" = "bsom" ]] || [[ "$p" = "b5som" ]] || [[ "$p" = "tracker" ]] || [[ "$p" = "esomx" ]] || [[ "$p" = "p2" ]]; then
+      if [[ "$p" = "argon" ]] || [[ "$p" = "boron" ]] || [[ "$p" = "asom" ]] || [[ "$p" = "bsom" ]] || [[ "$p" = "b5som" ]] || [[ "$p" = "tracker" ]] || [[ "$p" = "esomx" ]] || [[ "$p" = "p2" ]] || [[ "$p" = "trackerm" ]]; then
         continue
       fi
     fi

dynalib/inc/dynalib.h

@@ -125,7 +125,7 @@ constexpr T2* dynalib_checked_cast(T2 *p) {
         #define __S(x) #x
         #define __SX(x) __S(x)
 
-        #if PLATFORM_ID == 32
+        #if PLATFORM_ID == 32 || PLATFORM_ID == 28
         #define DYNALIB_FN_IMPORT(index, tablename, name, counter) \
             DYNALIB_STATIC_ASSERT(index == counter, "Index of the dynamically exported function has changed"); \
             const char check_name_##tablename_##name[0]={}; /* this will fail if the name is already defined */ \

dynalib/inc/module_info.inc

@@ -91,7 +91,7 @@ extern "C" {
 
 extern char link_module_start;
 extern char link_module_end;
-#if PLATFORM_ID == 32
+#if HAL_PLATFORM_RTL872X
 extern uintptr_t link_dynalib_start;
 extern uintptr_t link_dynalib_flash_start;
 #endif

hal/inc/hal_platform.h

@@ -36,11 +36,17 @@
 #define HAL_PLATFORM_WIFI_NCP_SDIO (0)
 #endif // HAL_PLATFORM_WIFI_NCP_SDIO
 
+#ifndef HAL_PLATFORM_ESP32_NCP
+#define HAL_PLATFORM_ESP32_NCP (0)
+#endif // HAL_PLATFORM_ESP32_NCP
+
+#if HAL_PLATFORM_ESP32_NCP
 #if HAL_PLATFORM_WIFI && HAL_PLATFORM_NCP_AT && !HAL_PLATFORM_WIFI_NCP_SDIO
 # ifndef HAL_PLATFORM_WIFI_SERIAL
 #  error "HAL_PLATFORM_WIFI_SERIAL is not defined"
 # endif /* HAL_PLATFORM_WIFI_SERIAL */
 #endif /* HAL_PLATFORM_WIFI */
+#endif /* HAL_PLATFORM_ESP32_NCP */
 
 #ifndef HAL_PLATFORM_CELLULAR
 #define HAL_PLATFORM_CELLULAR 0

hal/src/tracker/demux.cpp → hal/shared/demux.cpp

@@ -20,6 +20,9 @@
 #if HAL_PLATFORM_DEMUX
 
 #include "check.h"
+#if HAL_PLATFORM_RTL872X
+#include "gpio_hal.h"
+#endif
 #include "system_error.h"
 
 using namespace particle;
@@ -38,17 +41,33 @@ int Demux::write(uint8_t pin, uint8_t value) {
     DemuxLock lock();
     CHECK_TRUE(pin < DEMUX_MAX_PIN_COUNT && pin != 0, SYSTEM_ERROR_INVALID_ARGUMENT); // Y0 is not available for user's usage.
     CHECK_TRUE(initialized_, SYSTEM_ERROR_INVALID_STATE);
+#if HAL_PLATFORM_NRF52840
     // We can do it in this way for now, since the control pins are continuous.
     uint32_t currOut = (nrf_gpio_port_out_read(DEMUX_NRF_PORT) >> DEMUX_PINS_SHIFT) & 0x00000007;
     if ((currOut == pin && value == 0) || (currOut != pin && value == 1)) {
         return SYSTEM_ERROR_NONE;
     }
+#endif
+
     if (value) {
+#if HAL_PLATFORM_NRF52840
         // Select Y0 by default, so that all other pins output high.
         nrf_gpio_port_out_clear(DEMUX_NRF_PORT, DEMUX_PIN_2_MASK | DEMUX_PIN_1_MASK | DEMUX_PIN_0_MASK);
+#elif HAL_PLATFORM_RTL872X
+        // Select Y0 by default, so that all other pins output high.
+        hal_gpio_write(DEMUX_C, 0);
+        hal_gpio_write(DEMUX_B, 0);
+        hal_gpio_write(DEMUX_A, 0);
+#endif
         setPinValue(0, 0);
     } else {
+#if HAL_PLATFORM_NRF52840
         nrf_gpio_port_out_set(DEMUX_NRF_PORT, ((uint32_t)pin) << DEMUX_PINS_SHIFT);
+#elif HAL_PLATFORM_RTL872X
+        hal_gpio_write(DEMUX_C, (pin & DEMUX_PIN_2_MASK) ? 1 : 0);
+        hal_gpio_write(DEMUX_B, (pin & DEMUX_PIN_1_MASK) ? 1 : 0);
+        hal_gpio_write(DEMUX_A, (pin & DEMUX_PIN_0_MASK) ? 1 : 0);
+#endif
         setPinValue(pin, 0);
     }
     return SYSTEM_ERROR_NONE;
@@ -72,9 +91,19 @@ int Demux::unlock() {
 }
 
 void Demux::init() {
+#if HAL_PLATFORM_NRF52840
     nrf_gpio_port_dir_output_set(DEMUX_NRF_PORT, DEMUX_PIN_0_MASK | DEMUX_PIN_1_MASK | DEMUX_PIN_2_MASK);
     // Select Y0 by default.
     nrf_gpio_port_out_clear(DEMUX_NRF_PORT, DEMUX_PIN_0_MASK | DEMUX_PIN_1_MASK | DEMUX_PIN_2_MASK);
+#elif HAL_PLATFORM_RTL872X
+    hal_gpio_mode(DEMUX_A, OUTPUT);
+    hal_gpio_mode(DEMUX_B, OUTPUT);
+    hal_gpio_mode(DEMUX_C, OUTPUT);
+    // Select Y0 by default.
+    hal_gpio_write(DEMUX_C, 0);
+    hal_gpio_write(DEMUX_B, 0);
+    hal_gpio_write(DEMUX_A, 0);
+#endif
     initialized_ = true;
 }