Parcourir la source

clean up

some how lpc55 ci cannot build without pre-checkout lib/sct_neopixel
hathach il y a 5 ans
Parent
commit
7afe1d9e16
2 fichiers modifiés avec 3 ajouts et 12 suppressions
  1. 2 4
      .github/workflows/build.yml
  2. 1 8
      hw/bsp/lpc55/family.mk

+ 2 - 4
.github/workflows/build.yml

@@ -59,7 +59,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Checkout common submodules in lib
-      run: git submodule update --init lib/FreeRTOS-Kernel lib/lwip
+      run: git submodule update --init lib/FreeRTOS-Kernel lib/lwip lib/sct_neopixel
 
     - name: Set Toolchain URL
       run: echo >> $GITHUB_ENV TOOLCHAIN_URL=https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v10.2.1-1.1/xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-x64.tar.gz
@@ -197,8 +197,6 @@ jobs:
 
     - name: Checkout TinyUSB
       uses: actions/checkout@v2
-      with:
-        submodules: 'false'
 
     - name: Build
       run: docker run --rm -v $PWD:/project -w /project espressif/idf:latest python3 tools/build_esp32s2.py ${{ matrix.board }}
@@ -213,7 +211,7 @@ jobs:
       matrix:
         family:
         # Alphabetical order
-        - 'msp430'     
+        - 'msp430'
     steps:
     - name: Setup Python
       uses: actions/setup-python@v2

+ 1 - 8
hw/bsp/lpc55/family.mk

@@ -41,7 +41,7 @@ SRC_C += \
 	$(MCU_DIR)/drivers/fsl_reset.c \
 	$(MCU_DIR)/drivers/fsl_usart.c \
 	$(MCU_DIR)/drivers/fsl_flexcomm.c \
-	lib/sct_neopixel/sct_neopixel.c 
+	lib/sct_neopixel/sct_neopixel.c
 
 INC += \
 	$(TOP)/$(BOARD_PATH) \
@@ -60,10 +60,3 @@ CHIP_FAMILY = lpc_ip3511
 
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM33_NTZ/non_secure
-
-# For flash-jlink target
-#JLINK_DEVICE = LPC55S69
-
-# flash using pyocd
-#flash: $(BUILD)/$(PROJECT).hex
-#	pyocd flash -t LPC55S69 $<