From a02c01ca0e4822c7ef03fdddc0ddf1187096ab61 Mon Sep 17 00:00:00 2001 From: Joshua Wong Date: Wed, 6 Dec 2023 18:47:54 -0500 Subject: [PATCH] Added definition for LPC552X --- records/hic_hal/lpc55s26.yaml | 2 +- source/board/override_nm180410/IO_Config_Override.h | 3 ++- source/daplink/daplink.h | 1 + source/hic_hal/nxp/lpc55xx/IO_Config.h | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/records/hic_hal/lpc55s26.yaml b/records/hic_hal/lpc55s26.yaml index fb0cde3866..56191ee926 100644 --- a/records/hic_hal/lpc55s26.yaml +++ b/records/hic_hal/lpc55s26.yaml @@ -6,7 +6,7 @@ common: macros: - INTERFACE_LPC55XX - CPU_LPC55S26JBD64 - - DAPLINK_HIC_ID=0x4C504355 # DAPLINK_HIC_ID_LPC55XX + - DAPLINK_HIC_ID=0x4C509955 # DAPLINK_HIC_ID_LPC552X - OS_CLOCK=96000000 includes: - source/hic_hal/nxp/lpc55xx diff --git a/source/board/override_nm180410/IO_Config_Override.h b/source/board/override_nm180410/IO_Config_Override.h index 464e87bd1c..de3d90495f 100644 --- a/source/board/override_nm180410/IO_Config_Override.h +++ b/source/board/override_nm180410/IO_Config_Override.h @@ -25,7 +25,8 @@ #include "daplink.h" // This GPIO configuration is only valid for the LPC55XX HIC -COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC55XX); +COMPILER_ASSERT((DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC55XX) || + (DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC552X)); // All pins are PIO0. #define PIN_PIO_PORT (0U) diff --git a/source/daplink/daplink.h b/source/daplink/daplink.h index a8cb441a8c..1fdf7e53a2 100644 --- a/source/daplink/daplink.h +++ b/source/daplink/daplink.h @@ -65,6 +65,7 @@ COMPILER_ASSERT(DAPLINK_RAM_SHARED_START + DAPLINK_RAM_SHARED_SIZE == DAPLINK_RA #define DAPLINK_HIC_ID_LPC54606 0x9796990C // reserving for future use #define DAPLINK_HIC_ID_STM32F723IE 0x9796990D // reserving for future use #define DAPLINK_HIC_ID_LPC55XX 0x4C504355 // 'LPC\x55' +#define DAPLINK_HIC_ID_LPC552X 0x4C509955 // 'LPC\x55' #define DAPLINK_HIC_ID_M48SSIDAE 0x97969921 #define DAPLINK_HIC_ID_PSOC5 0x2E127069 #define DAPLINK_HIC_ID_NRF52820 0x6E052820 // 'n\x05\x28\x20' diff --git a/source/hic_hal/nxp/lpc55xx/IO_Config.h b/source/hic_hal/nxp/lpc55xx/IO_Config.h index 64e6975cc5..aa707d1518 100644 --- a/source/hic_hal/nxp/lpc55xx/IO_Config.h +++ b/source/hic_hal/nxp/lpc55xx/IO_Config.h @@ -35,7 +35,8 @@ #include "daplink.h" // This GPIO configuration is only valid for the LPC55xx HIC -COMPILER_ASSERT(DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC55XX); +COMPILER_ASSERT((DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC55XX) || + (DAPLINK_HIC_ID == DAPLINK_HIC_ID_LPC552X)); // All pins are PIO0. #define PIN_PIO_PORT (0U)