Add LPC55xx HIC support to experimental_compilers

.github/workflows/linux.yml

@@ -70,7 +70,7 @@ jobs:
         python tools/progen_compile.py --release --parallel -v -v --ignore-failures
         (ls -lR firmware_*; ccache -s; arm-none-eabi-gcc -v) | tee log.txt
         mkdir bootloaders
-        cp projectfiles/make_gcc_arm/*_bl/build/*_crc.bin bootloaders
+        cp projectfiles/make_gcc_arm/*_bl/build/*_crc.{bin,hex} bootloaders
 
     - name: Upload test artifacts
       uses: actions/upload-artifact@v2

projects.yaml

@@ -62,6 +62,10 @@ module:
         - records/rtos/rtos-cm3.yaml
         - records/hic_hal/lpc4322.yaml
         - records/usb/usb-bulk.yaml
+    hic_lpc55s69: &module_hic_lpc55s69
+        - records/rtos/rtos-cm33.yaml
+        - records/hic_hal/lpc55s69.yaml
+        - records/usb/usb-bulk.yaml
     hic_sam3u2c: &module_hic_sam3u2c
         - records/rtos/rtos-cm3.yaml
         - records/hic_hal/sam3u2c.yaml
@@ -124,6 +128,15 @@ projects:
         - *module_if
         - *module_hic_lpc4322
         - records/family/all_family.yaml
+    lpc55s69_bl:
+        - *module_bl
+        - records/hic_hal/lpc55s69.yaml
+        - records/board/lpc55s69_bl.yaml
+    lpc55s69_if:
+        - *module_if
+        - *module_hic_lpc55s69
+        - records/board/lpc55s69_if.yaml # Sets the USB product string.
+        - records/family/all_family.yaml
     max32620_bl:
         - *module_bl
         - records/hic_hal/max32620.yaml

records/board/lpc55s69_bl.yaml

@@ -0,0 +1,6 @@
+common:
+    macros:
+        - USB_PROD_STR="LPC55xx DAPLink Bootloader"
+    sources:
+        board:
+            - source/board/lpc55s69_bl.c

records/board/lpc55s69_if.yaml

@@ -0,0 +1,3 @@
+common:
+    macros:
+        - USB_PROD_STR="LPC55xx DAPLink CMSIS-DAP"

records/hic_hal/lpc55s69.yaml

@@ -0,0 +1,74 @@
+common:
+    target:
+        - cortex-m33
+    core:
+        - Cortex-M33
+    macros:
+        - INTERFACE_LPC55XX
+        - CPU_LPC55S69JBD64_cm33_core0
+        - DAPLINK_HIC_ID=0x4C504355  # DAPLINK_HIC_ID_LPC55XX
+        - OS_CLOCK=150000000
+    includes:
+        - source/hic_hal/nxp/lpc55xx
+        - source/hic_hal/nxp/lpc55xx/LPC55S69
+        - source/hic_hal/nxp/lpc55xx/LPC55S69/drivers
+    sources:
+        hic_hal:
+            - source/hic_hal/nxp/lpc55xx
+            - source/hic_hal/nxp/lpc55xx/LPC55S69
+            - source/hic_hal/nxp/lpc55xx/LPC55S69/drivers
+
+tool_specific:
+    uvision:
+        misc:
+            ld_flags:
+                - --predefine="-I../../../source/hic_hal/nxp/lpc55xx"
+            c_flags:
+                - --no_unaligned_access
+                - --diag_suppress=66 # disable warning about enums not fitting in signed 32-bit
+            cxx_flags:
+                - --no_unaligned_access
+            asm_flags:
+                - --no_unaligned_access
+        includes:
+            - projectfiles/uvision/lpc55xx_bl/build
+        sources:
+            hic_hal:
+                - source/hic_hal/nxp/lpc55xx/armcc
+                - source/hic_hal/nxp/lpc55xx/LPC55S69/armcc/keil_lib_power_cm33_core0.lib
+    armcc:
+        misc:
+            ld_flags:
+                - --predefine="-Isource/hic_hal/nxp/lpc55xx"
+            c_flags:
+                - --no_unaligned_access
+                - --diag_suppress=66 # disable warning about enums not fitting in signed 32-bit
+            cxx_flags:
+                - --no_unaligned_access
+            asm_flags:
+                - --no_unaligned_access
+        includes:
+            - projectfiles/make_armcc/lpc55xx_bl/build
+        sources:
+            hic_hal:
+                - source/hic_hal/nxp/lpc55xx/armcc
+                - source/hic_hal/nxp/lpc55xx/LPC55S69/armcc/keil_lib_power_cm33_core0.lib
+    gcc_arm:
+        misc:
+            c_flags:
+                - -march=armv8-m.main+fp+dsp
+                - -mfloat-abi=hard
+                - -mfpu=fpv5-sp-d16
+            ld_flags:
+                - -march=armv8-m.main+fp+dsp
+                - -mfloat-abi=hard
+                - -mfpu=fpv5-sp-d16
+                - -Wl,--defsym=__stack_size__=0x800
+        linker_file:
+            - source/hic_hal/nxp/lpc55xx/gcc/lpc55xx.ld
+        includes:
+            - source/hic_hal/nxp/lpc55xx/gcc
+        sources:
+            hic_hal:
+                - source/hic_hal/nxp/lpc55xx/gcc
+                - source/hic_hal/nxp/lpc55xx/LPC55S69/gcc/libpower_hardabi.a

records/rtos/rtos-cm33.yaml

@@ -0,0 +1,36 @@
+common:
+    macros:
+        - OS_TICK_FREQ=100
+    includes:
+        - source/rtos2/Include
+        - source/rtos2/RTX/Include
+        - source/rtos2/RTX/Config
+    sources:
+        rtos:
+            - source/rtos2/RTX/Config/RTX_Config.c
+            - source/rtos2/RTX/Source/rtx_delay.c
+            - source/rtos2/RTX/Source/rtx_evr.c
+            - source/rtos2/RTX/Source/rtx_kernel.c
+            - source/rtos2/RTX/Source/rtx_lib.c
+            - source/rtos2/RTX/Source/rtx_memory.c
+            - source/rtos2/RTX/Source/rtx_mempool.c
+            - source/rtos2/RTX/Source/rtx_msgqueue.c
+            - source/rtos2/RTX/Source/rtx_mutex.c
+            - source/rtos2/RTX/Source/rtx_system.c
+            - source/rtos2/RTX/Source/rtx_thread.c
+            - source/rtos2/RTX/Source/rtx_timer.c
+            - source/rtos2/Source/os_systick.c
+
+# Note: For armcc, do not use NS version! We don't want the TZ context support.
+tool_specific:
+    uvision:
+        sources:
+            rtos:
+                - source/rtos2/RTX/Source/ARM/irq_armv8mml.s
+    armcc:
+        sources:
+            rtos:
+                - source/rtos2/RTX/Source/ARM/irq_armv8mml.s
+    gcc_arm:
+        sources:
+                - source/rtos2/RTX/Source/GCC/irq_armv8mml.S

records/tools/armcc.yaml

@@ -3,7 +3,7 @@ tool_specific:
         mcu:
             - cortex-m0
         macros:
-            -
+            - __PROGRAM_START
         linker_file:
             - source/daplink/daplink.sct
         misc:

records/tools/armclang.yaml

@@ -3,7 +3,7 @@ tool_specific:
         mcu:
             - cortex-m0
         macros:
-            -
+            - __PROGRAM_START
         linker_file:
             - source/daplink/daplink.sct
         misc:

records/tools/gcc_arm.yaml

@@ -1,9 +1,7 @@
 tool_specific:
     gcc_arm:
-        mcu:
-            - cortex-m0
         macros:
-            -
+            - __PROGRAM_START
         linker_file:
             - source/daplink/daplink.ld
         misc:

source/board/hani_iot.c

@@ -25,7 +25,7 @@
 const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0360",
-    .family_id = VENDOR_TO_FAMILY(kNXP_VendorID, 0), //ID not maching the predefined family ids
+    .family_id = kNXP_LPC55xx_FamilyID, //ID not maching the predefined family ids
     .flags = kEnablePageErase,
     .daplink_url_name =       "PRODINFOHTM",
     .daplink_drive_name =       "HANI_IOT",

source/board/lpc55S69xpresso.c

@@ -25,7 +25,7 @@
 const board_info_t g_board_info = {
     .info_version = kBoardInfoVersion,
     .board_id = "0236",
-    .family_id = VENDOR_TO_FAMILY(kNXP_VendorID, 0), //ID not maching the predefined family ids
+    .family_id = kNXP_LPC55xx_FamilyID,
     .flags = kEnablePageErase,
     .daplink_url_name =       "PRODINFOHTM",
     .daplink_drive_name =       "LPC55S69",

source/board/lpc55s69_bl.c

@@ -0,0 +1,100 @@
+/**
+ * @file    lpc55s69_bl.c
+ * @brief   board ID and meta-data for the hardware interface circuit (HIC) based on the NXP LPC55S69
+ *
+ * DAPLink Interface Firmware
+ * Copyright (c) 2019-2020, Arm Limited, All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "target_config.h"
+#include "daplink_addr.h"
+#include "compiler.h"
+#include "target_board.h"
+#include "target_family.h"
+#include "validation.h"
+#include "flash_hal.h"
+
+// Warning - changing the interface start will break backwards compatibility
+COMPILER_ASSERT(DAPLINK_ROM_IF_START == (DAPLINK_ROM_START + KB(64)));
+
+static uint8_t lpc55xx_bootloader_validate_nvic(const uint8_t *buf);
+
+/**
+* List of start and size for each size of flash sector
+* The size will apply to all sectors between the listed address and the next address
+* in the list.
+* The last pair in the list will have sectors starting at that address and ending
+* at address start + size.
+*/
+static const sector_info_t sectors_info[] = {
+    {DAPLINK_ROM_IF_START, DAPLINK_SECTOR_SIZE},
+ };
+
+// lpc55s69 target information
+target_cfg_t target_device = {
+    .sectors_info               = sectors_info,
+    .sector_info_length         = (sizeof(sectors_info))/(sizeof(sector_info_t)),
+    .flash_regions[0].start     = DAPLINK_ROM_IF_START,
+    .flash_regions[0].end       = DAPLINK_ROM_IF_START + DAPLINK_ROM_IF_SIZE,
+    .flash_regions[0].flags     = kRegionIsDefault,
+    .ram_regions[0].start       = 0x20000000,
+    .ram_regions[0].end         = 0x20040000,
+    /* .flash_algo not needed for bootloader */
+};
+
+/*!
+ * Special target family for the LPC55xx bootloader. It's only purpose is to override the
+ * validate_bin_nvic() routine to prevent bus faults from attempting to read erased flash.
+ */
+static const target_family_descriptor_t g_lpc55xx_bootloader_family = {
+    .family_id = 0,
+    .validate_bin_nvic = lpc55xx_bootloader_validate_nvic,
+};
+
+const target_family_descriptor_t *g_target_family = &g_lpc55xx_bootloader_family;
+
+const board_info_t g_board_info = {
+    .info_version = kBoardInfoVersion,
+    .board_id = "0000",
+    .daplink_url_name =   "HELP_FAQHTM",
+    .daplink_drive_name = "BOOTLOADER",
+    .daplink_target_url = "https://mbed.com/daplink",
+    .target_cfg = &target_device,
+};
+
+//! @brief Customized NVIC validator.
+//!
+//! This NVIC validator first checks if the passed-in address points to the internal flash
+//! memory. If so, an initial check is made to see if the flash is erased. If it is, then we
+//! can't read from it or the flash controller will generate a bus fault. If the address is
+//! either outside of flash, such as testing a new interface image in RAM, or the flash
+//! sector is programmed, then the standard NVIC validator is called.
+uint8_t lpc55xx_bootloader_validate_nvic(const uint8_t *buf)
+{
+    uint32_t addr = (uint32_t)buf;
+
+    // If the address within internal flash?
+    if (addr >= DAPLINK_ROM_START && addr < (DAPLINK_ROM_START + DAPLINK_ROM_SIZE)) {
+        // If the flash sector is erased, then report that the NVIC is invalid. Otherwise
+        // continue below and perform the usual NVIC validation test.
+        if (!flash_is_readable(addr, 32)) {
+            return 0;
+        }
+    }
+
+    // Call original implementation.
+    return validate_bin_nvic_base(buf);
+}