From c222f6f1119667f69da4d45df110da5b5cda5427 Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 1 Mar 2021 20:25:55 +0700 Subject: try to fetch needed mcu submodule while running make --- examples/rules.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'examples/rules.mk') diff --git a/examples/rules.mk b/examples/rules.mk index d248ed247..1d5a190fe 100644 --- a/examples/rules.mk +++ b/examples/rules.mk @@ -6,7 +6,9 @@ .DEFAULT_GOAL := all ifeq ($(FAMILY),esp32s2) +# --------------------------------------- # Espressif IDF use CMake build system, this add wrapper target to call idf.py +# --------------------------------------- .PHONY: all clean flash @@ -44,6 +46,9 @@ $(BUILD)/$(PROJECT).uf2: $(BUILD)/$(PROJECT).bin $(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f $(UF2_FAMILY_ID) -b 0x0 -c -o $@ $^ else ifeq ($(FAMILY),rp2040) +# --------------------------------------- +# RP2040 CMake +# --------------------------------------- ifeq ($(DEBUG), 1) CMAKE_DEFSYM += -DCMAKE_BUILD_TYPE=Debug @@ -62,7 +67,9 @@ flash: @$(CP) $(BUILD)/$(PROJECT).uf2 /media/$(USER)/RPI-RP2 else +# --------------------------------------- # GNU Make build system +# --------------------------------------- # libc LIBS += -lgcc -lm -lnosys -- cgit v1.3.1 From 71313d934d2258802a850cccecaf18f0cdccf386 Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 2 Mar 2021 11:50:57 +0700 Subject: update ci for msp430 family --- .github/workflows/build.yml | 69 ++++++++++++++++++++++++++++++++++----------- examples/rules.mk | 9 +++--- hw/bsp/msp430/family.mk | 7 +++-- 3 files changed, 61 insertions(+), 24 deletions(-) (limited to 'examples/rules.mk') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f90a6843d..5da033cf8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,8 +61,6 @@ jobs: - name: Checkout TinyUSB uses: actions/checkout@v2 - with: - submodules: 'false' - name: Checkout Submodules in lib run: git submodule update --init lib @@ -130,8 +128,33 @@ jobs: with: submodules: 'true' - - name: Setup Env + - name: Install Toolchains run: | + # ARM & RISC-V GCC from xpack + npm install --global xpm + xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@latest + xpm install --global @xpack-dev-tools/riscv-none-embed-gcc@latest + echo `echo $HOME/.local/xPacks/@xpack-dev-tools/arm-none-eabi-gcc/*/.content/bin` >> $GITHUB_PATH + echo `echo $HOME/.local/xPacks/@xpack-dev-tools/riscv-none-embed-gcc/*/.content/bin` >> $GITHUB_PATH + + - name: Build + run: python3 tools/build_board.py ${{ matrix.example }} + + # build all example for each family + build-msp430: + runs-on: ubuntu-latest + steps: + - name: Setup Python + uses: actions/setup-python@v2 + + - name: Checkout TinyUSB + uses: actions/checkout@v2 + + - name: Checkout Submodules in lib + run: git submodule update --init lib + + - run: | + echo family=msp430 >> $GITHUB_ENV # Add msp430-gcc url to env echo >> $GITHUB_ENV MSP430_GCC_URL=http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2 @@ -140,31 +163,43 @@ jobs: id: cache-msp430 with: path: ~/cache/ - key: ${{ runner.os }}-21-01-26-${{ env.MSP430_GCC_URL }} + key: ${{ runner.os }}-21-03-02-${{ env.MSP430_GCC_URL }} - name: Install MSP430-GCC if: steps.cache-msp430.outputs.cache-hit != 'true' run: | - # MSP430 GCC mkdir -p ~/cache/msp430-gcc wget --progress=dot:mega $MSP430_GCC_URL -O msp430-gcc.tar.bz2 tar -C ~/cache/msp430-gcc -xaf msp430-gcc.tar.bz2 - - name: Install Toolchains - run: | - # ARM & RISC-V GCC from xpack - npm install --global xpm - xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@latest - xpm install --global @xpack-dev-tools/riscv-none-embed-gcc@latest - echo `echo $HOME/.local/xPacks/@xpack-dev-tools/arm-none-eabi-gcc/*/.content/bin` >> $GITHUB_PATH - echo `echo $HOME/.local/xPacks/@xpack-dev-tools/riscv-none-embed-gcc/*/.content/bin` >> $GITHUB_PATH - - # TI MSP430 GCC - echo >> $GITHUB_PATH `echo ~/cache/msp430-gcc/msp430-gcc-*/bin` + - name: Set Toolchain Path + run: echo >> $GITHUB_PATH `echo ~/cache/msp430-gcc/msp430-gcc-*/bin` - name: Build - run: python3 tools/build_board.py ${{ matrix.example }} + run: python3 tools/build_family.py ${{ env.family }} + + - uses: actions/upload-artifact@v2 + with: + name: ${{ env.family }}-tinyusb-examples + path: _bin/ + - name: Create Release Asset + if: ${{ github.event_name == 'release' }} + run: | + cd _bin/ + zip -r ../${{ env.family }}-tinyusb-${{ github.event.release.tag_name }}-examples.zip * + + - name: Upload Release Asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + if: ${{ github.event_name == 'release' }} + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: ${{ env.family }}-tinyusb-${{ github.event.release.tag_name }}-examples.zip + asset_name: ${{ env.family }}-tinyusb-${{ github.event.release.tag_name }}-examples.zip + asset_content_type: application/zip + # Build ESP32S2 build-esp32s2: runs-on: ubuntu-latest diff --git a/examples/rules.mk b/examples/rules.mk index 1d5a190fe..2b28a4714 100644 --- a/examples/rules.mk +++ b/examples/rules.mk @@ -100,12 +100,11 @@ INC += $(TOP)/src CFLAGS += $(addprefix -I,$(INC)) -# TODO Skip nanolib for MSP430 -ifeq ($(BOARD), msp_exp430f5529lp) - LDFLAGS += $(CFLAGS) -fshort-enums -Wl,-T,$(TOP)/$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -else - LDFLAGS += $(CFLAGS) -fshort-enums -Wl,-T,$(TOP)/$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nosys.specs -specs=nano.specs +LDFLAGS += $(CFLAGS) -fshort-enums -Wl,-T,$(TOP)/$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections +ifneq ($(SKIP_NANOLIB), 1) +LDFLAGS += -specs=nosys.specs -specs=nano.specs endif + ASFLAGS += $(CFLAGS) # Assembly files can be name with upper case .S, convert it to .s diff --git a/hw/bsp/msp430/family.mk b/hw/bsp/msp430/family.mk index 870b27165..a982c2866 100644 --- a/hw/bsp/msp430/family.mk +++ b/hw/bsp/msp430/family.mk @@ -1,3 +1,7 @@ +CROSS_COMPILE = msp430-elf- +FAMILY_SUBMODULES = hw/mcu/ti +SKIP_NANOLIB = 1 + CFLAGS += \ -D__MSP430F5529__ \ -DCFG_TUSB_MCU=OPT_MCU_MSP430x5xx \ @@ -6,8 +10,7 @@ CFLAGS += \ #-mmcu=msp430f5529 -# Cross Compiler for MSP430 -CROSS_COMPILE = msp430-elf- + # All source paths should be relative to the top level. LD_FILE = hw/mcu/ti/msp430/msp430-gcc-support-files/include/msp430f5529.ld -- cgit v1.3.1 From ce942baad2b5601984662b428140e3cb9acdabbc Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 2 Mar 2021 22:57:33 +0700 Subject: update pico-sdk to more recent commit - move target_link_libraries() to family.cmake - enable pico_bootsel_via_double_reset --- examples/device/audio_test/CMakeLists.txt | 3 --- examples/device/board_test/CMakeLists.txt | 3 --- examples/device/cdc_dual_ports/CMakeLists.txt | 3 --- examples/device/cdc_msc/CMakeLists.txt | 3 --- examples/device/dfu_runtime/CMakeLists.txt | 3 --- examples/device/dynamic_configuration/CMakeLists.txt | 3 --- examples/device/hid_composite/CMakeLists.txt | 3 --- examples/device/hid_generic_inout/CMakeLists.txt | 3 --- examples/device/hid_multiple_interface/CMakeLists.txt | 3 --- examples/device/midi_test/CMakeLists.txt | 3 --- examples/device/msc_dual_lun/CMakeLists.txt | 3 --- examples/device/net_lwip_webserver/CMakeLists.txt | 3 --- examples/device/uac2_headset/CMakeLists.txt | 3 --- examples/device/usbtmc/CMakeLists.txt | 3 --- examples/device/webusb_serial/CMakeLists.txt | 3 --- examples/host/cdc_msc_hid/CMakeLists.txt | 3 --- examples/rules.mk | 3 ++- hw/bsp/rp2040/family.cmake | 8 ++++++++ hw/bsp/rp2040/family.mk | 2 ++ hw/mcu/raspberrypi/pico-sdk | 2 +- 20 files changed, 13 insertions(+), 50 deletions(-) (limited to 'examples/rules.mk') diff --git a/examples/device/audio_test/CMakeLists.txt b/examples/device/audio_test/CMakeLists.txt index a10473b79..7038dd041 100644 --- a/examples/device/audio_test/CMakeLists.txt +++ b/examples/device/audio_test/CMakeLists.txt @@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/board_test/CMakeLists.txt b/examples/device/board_test/CMakeLists.txt index b8b7e7297..4e6a9b3f8 100644 --- a/examples/device/board_test/CMakeLists.txt +++ b/examples/device/board_test/CMakeLists.txt @@ -37,9 +37,6 @@ elseif(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/cdc_dual_ports/CMakeLists.txt b/examples/device/cdc_dual_ports/CMakeLists.txt index f4bf75c26..5e3ec0909 100644 --- a/examples/device/cdc_dual_ports/CMakeLists.txt +++ b/examples/device/cdc_dual_ports/CMakeLists.txt @@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/cdc_msc/CMakeLists.txt b/examples/device/cdc_msc/CMakeLists.txt index 9e0d1f790..41dd167b7 100644 --- a/examples/device/cdc_msc/CMakeLists.txt +++ b/examples/device/cdc_msc/CMakeLists.txt @@ -39,9 +39,6 @@ elseif(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/dfu_runtime/CMakeLists.txt b/examples/device/dfu_runtime/CMakeLists.txt index f4bf75c26..5e3ec0909 100644 --- a/examples/device/dfu_runtime/CMakeLists.txt +++ b/examples/device/dfu_runtime/CMakeLists.txt @@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/dynamic_configuration/CMakeLists.txt b/examples/device/dynamic_configuration/CMakeLists.txt index b4c95652a..be6224360 100644 --- a/examples/device/dynamic_configuration/CMakeLists.txt +++ b/examples/device/dynamic_configuration/CMakeLists.txt @@ -34,9 +34,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/hid_composite/CMakeLists.txt b/examples/device/hid_composite/CMakeLists.txt index f4bf75c26..5e3ec0909 100644 --- a/examples/device/hid_composite/CMakeLists.txt +++ b/examples/device/hid_composite/CMakeLists.txt @@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/hid_generic_inout/CMakeLists.txt b/examples/device/hid_generic_inout/CMakeLists.txt index f4bf75c26..5e3ec0909 100644 --- a/examples/device/hid_generic_inout/CMakeLists.txt +++ b/examples/device/hid_generic_inout/CMakeLists.txt @@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/hid_multiple_interface/CMakeLists.txt b/examples/device/hid_multiple_interface/CMakeLists.txt index f4bf75c26..5e3ec0909 100644 --- a/examples/device/hid_multiple_interface/CMakeLists.txt +++ b/examples/device/hid_multiple_interface/CMakeLists.txt @@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/midi_test/CMakeLists.txt b/examples/device/midi_test/CMakeLists.txt index f4bf75c26..5e3ec0909 100644 --- a/examples/device/midi_test/CMakeLists.txt +++ b/examples/device/midi_test/CMakeLists.txt @@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/msc_dual_lun/CMakeLists.txt b/examples/device/msc_dual_lun/CMakeLists.txt index 6032308f2..0036dc685 100644 --- a/examples/device/msc_dual_lun/CMakeLists.txt +++ b/examples/device/msc_dual_lun/CMakeLists.txt @@ -34,9 +34,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/net_lwip_webserver/CMakeLists.txt b/examples/device/net_lwip_webserver/CMakeLists.txt index e3c8190f4..c9aabc636 100644 --- a/examples/device/net_lwip_webserver/CMakeLists.txt +++ b/examples/device/net_lwip_webserver/CMakeLists.txt @@ -80,9 +80,6 @@ if(FAMILY STREQUAL "rp2040") HTTPD_USE_CUSTOM_FSDATA=0 ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/uac2_headset/CMakeLists.txt b/examples/device/uac2_headset/CMakeLists.txt index f4bf75c26..5e3ec0909 100644 --- a/examples/device/uac2_headset/CMakeLists.txt +++ b/examples/device/uac2_headset/CMakeLists.txt @@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/usbtmc/CMakeLists.txt b/examples/device/usbtmc/CMakeLists.txt index 9a4aa382b..808bdbcf8 100644 --- a/examples/device/usbtmc/CMakeLists.txt +++ b/examples/device/usbtmc/CMakeLists.txt @@ -34,9 +34,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/device/webusb_serial/CMakeLists.txt b/examples/device/webusb_serial/CMakeLists.txt index f4bf75c26..5e3ec0909 100644 --- a/examples/device/webusb_serial/CMakeLists.txt +++ b/examples/device/webusb_serial/CMakeLists.txt @@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/host/cdc_msc_hid/CMakeLists.txt b/examples/host/cdc_msc_hid/CMakeLists.txt index dc2effde9..2302678b7 100644 --- a/examples/host/cdc_msc_hid/CMakeLists.txt +++ b/examples/host/cdc_msc_hid/CMakeLists.txt @@ -38,9 +38,6 @@ elseif(FAMILY STREQUAL "rp2040") CFG_TUSB_OS=OPT_OS_PICO ) - target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration) - pico_add_extra_outputs(${PROJECT}) - else() message(FATAL_ERROR "Invalid FAMILY specified") endif() diff --git a/examples/rules.mk b/examples/rules.mk index 2b28a4714..561494c6d 100644 --- a/examples/rules.mk +++ b/examples/rules.mk @@ -194,6 +194,8 @@ else $(RM) -rf $(BUILD) endif +endif # GNU Make + # Print out the value of a make variable. # https://stackoverflow.com/questions/16467718/how-to-print-out-a-variable-in-makefile print-%: @@ -227,7 +229,6 @@ flash-pyocd: $(BUILD)/$(PROJECT).hex pyocd flash -t $(PYOCD_TARGET) $< pyocd reset -t $(PYOCD_TARGET) -endif # GNU Make #-------------- Artifacts -------------- diff --git a/hw/bsp/rp2040/family.cmake b/hw/bsp/rp2040/family.cmake index 699ad174d..e779e4cbb 100644 --- a/hw/bsp/rp2040/family.cmake +++ b/hw/bsp/rp2040/family.cmake @@ -1,3 +1,11 @@ +target_link_libraries(${PROJECT} + pico_stdlib + pico_bootsel_via_double_reset + pico_fix_rp2040_usb_device_enumeration +) + +pico_add_extra_outputs(${PROJECT}) + # TinyUSB Stack source set(SRC_TINYUSB ${TOP}/src/tusb.c diff --git a/hw/bsp/rp2040/family.mk b/hw/bsp/rp2040/family.mk index 8e30e7eb6..9aacae37d 100644 --- a/hw/bsp/rp2040/family.mk +++ b/hw/bsp/rp2040/family.mk @@ -1 +1,3 @@ FAMILY_SUBMODULES = hw/mcu/raspberrypi/pico-sdk + +JLINK_DEVICE = rp2040_m0_0 diff --git a/hw/mcu/raspberrypi/pico-sdk b/hw/mcu/raspberrypi/pico-sdk index 2d5789eca..61978dc70 160000 --- a/hw/mcu/raspberrypi/pico-sdk +++ b/hw/mcu/raspberrypi/pico-sdk @@ -1 +1 @@ -Subproject commit 2d5789eca89658a7f0a01e2d6010c0f254605d72 +Subproject commit 61978dc707c7f2026efa4c3300bbb94baa89c78a -- cgit v1.3.1 From 590d8d4d5c94324fbd2ea3dcb96b7776c1171577 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 4 Mar 2021 22:53:02 +0700 Subject: rename FAMILY_SUBMODULES to DEPS_SUBMODULES --- examples/make.mk | 4 ++-- examples/rules.mk | 1 + hw/bsp/d5035_01/board.mk | 2 +- hw/bsp/ea4088qs/board.mk | 2 +- hw/bsp/ea4357/board.mk | 2 +- hw/bsp/frdm_kl25z/board.mk | 2 +- hw/bsp/imxrt/family.mk | 2 +- hw/bsp/lpc18/family.mk | 2 +- hw/bsp/lpc55/family.mk | 2 +- hw/bsp/lpcxpresso11u37/board.mk | 2 +- hw/bsp/lpcxpresso11u68/board.mk | 2 +- hw/bsp/lpcxpresso1347/board.mk | 2 +- hw/bsp/lpcxpresso1549/board.mk | 2 +- hw/bsp/lpcxpresso1769/board.mk | 2 +- hw/bsp/lpcxpresso51u68/board.mk | 2 +- hw/bsp/lpcxpresso54114/board.mk | 2 +- hw/bsp/mbed1768/board.mk | 2 +- hw/bsp/msp430/family.mk | 2 +- hw/bsp/ngx4330/board.mk | 2 +- hw/bsp/nrf/family.mk | 2 +- hw/bsp/nutiny_nuc121s/board.mk | 2 +- hw/bsp/nutiny_nuc125s/board.mk | 2 +- hw/bsp/nutiny_nuc126v/board.mk | 2 +- hw/bsp/nutiny_sdk_nuc120/board.mk | 2 +- hw/bsp/nutiny_sdk_nuc505/board.mk | 2 +- hw/bsp/rp2040/family.mk | 2 +- hw/bsp/samd11/family.mk | 2 +- hw/bsp/samd21/family.mk | 2 +- hw/bsp/samd51/family.mk | 2 +- hw/bsp/same54xplainedpro/board.mk | 2 +- hw/bsp/same70_xplained/board.mk | 2 +- hw/bsp/samg55xplained/board.mk | 2 +- hw/bsp/spresense/board.mk | 2 +- hw/bsp/stm32f070rbnucleo/board.mk | 2 +- hw/bsp/stm32f072disco/board.mk | 2 +- hw/bsp/stm32f103bluepill/board.mk | 2 +- hw/bsp/stm32f207nucleo/board.mk | 2 +- hw/bsp/stm32f303disco/board.mk | 2 +- hw/bsp/stm32f4/family.mk | 2 +- hw/bsp/stm32f7/family.mk | 2 +- hw/bsp/stm32h7/family.mk | 2 +- hw/bsp/stm32l0538disco/board.mk | 2 +- hw/bsp/stm32l476disco/board.mk | 2 +- hw/bsp/stm32l4r5nucleo/board.mk | 2 +- 44 files changed, 45 insertions(+), 44 deletions(-) (limited to 'examples/rules.mk') diff --git a/examples/make.mk b/examples/make.mk index b29d0e4a2..82fbd020b 100644 --- a/examples/make.mk +++ b/examples/make.mk @@ -53,8 +53,8 @@ fetch_submodule_if_empty = \ $(info $(shell git -C $(TOP) submodule update --init $1)) \ endif -ifdef FAMILY_SUBMODULES - $(foreach s,$(FAMILY_SUBMODULES),:$(call fetch_submodule_if_empty,$(s))) +ifdef DEPS_SUBMODULES + $(foreach s,$(DEPS_SUBMODULES),:$(call fetch_submodule_if_empty,$(s))) endif #-------------- Cross Compiler ------------ diff --git a/examples/rules.mk b/examples/rules.mk index 561494c6d..a97eb566a 100644 --- a/examples/rules.mk +++ b/examples/rules.mk @@ -63,6 +63,7 @@ all: $(BUILD) clean: $(RM) -rf $(BUILD) +#flash: flash-pyocd flash: @$(CP) $(BUILD)/$(PROJECT).uf2 /media/$(USER)/RPI-RP2 diff --git a/hw/bsp/d5035_01/board.mk b/hw/bsp/d5035_01/board.mk index 2ca44c3aa..dc364a70c 100644 --- a/hw/bsp/d5035_01/board.mk +++ b/hw/bsp/d5035_01/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/microchip +DEPS_SUBMODULES = hw/mcu/microchip HWREV ?= 1 CFLAGS += \ diff --git a/hw/bsp/ea4088qs/board.mk b/hw/bsp/ea4088qs/board.mk index 37cade022..51e5babe8 100644 --- a/hw/bsp/ea4088qs/board.mk +++ b/hw/bsp/ea4088qs/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/ea4357/board.mk b/hw/bsp/ea4357/board.mk index e70fa87e3..09c782cac 100644 --- a/hw/bsp/ea4357/board.mk +++ b/hw/bsp/ea4357/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/frdm_kl25z/board.mk b/hw/bsp/frdm_kl25z/board.mk index 8a0200f8e..5ad4d2052 100644 --- a/hw/bsp/frdm_kl25z/board.mk +++ b/hw/bsp/frdm_kl25z/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -mthumb \ diff --git a/hw/bsp/imxrt/family.mk b/hw/bsp/imxrt/family.mk index 91298d400..c07e68d2b 100644 --- a/hw/bsp/imxrt/family.mk +++ b/hw/bsp/imxrt/family.mk @@ -1,5 +1,5 @@ UF2_FAMILY_ID = 0x4fb2d5bd -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp include $(TOP)/$(BOARD_PATH)/board.mk diff --git a/hw/bsp/lpc18/family.mk b/hw/bsp/lpc18/family.mk index c9c4ce83a..05ff27c38 100644 --- a/hw/bsp/lpc18/family.mk +++ b/hw/bsp/lpc18/family.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp include $(TOP)/$(BOARD_PATH)/board.mk diff --git a/hw/bsp/lpc55/family.mk b/hw/bsp/lpc55/family.mk index d7bb444db..299975fb5 100644 --- a/hw/bsp/lpc55/family.mk +++ b/hw/bsp/lpc55/family.mk @@ -1,5 +1,5 @@ UF2_FAMILY_ID = 0x2abc77ec -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp include $(TOP)/$(BOARD_PATH)/board.mk diff --git a/hw/bsp/lpcxpresso11u37/board.mk b/hw/bsp/lpcxpresso11u37/board.mk index a496d859b..e1338c9a3 100644 --- a/hw/bsp/lpcxpresso11u37/board.mk +++ b/hw/bsp/lpcxpresso11u37/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/lpcxpresso11u68/board.mk b/hw/bsp/lpcxpresso11u68/board.mk index 14529312a..e038a9cd9 100644 --- a/hw/bsp/lpcxpresso11u68/board.mk +++ b/hw/bsp/lpcxpresso11u68/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/lpcxpresso1347/board.mk b/hw/bsp/lpcxpresso1347/board.mk index af13044d4..277282b9c 100644 --- a/hw/bsp/lpcxpresso1347/board.mk +++ b/hw/bsp/lpcxpresso1347/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/lpcxpresso1549/board.mk b/hw/bsp/lpcxpresso1549/board.mk index 5514f6539..8d98379dc 100644 --- a/hw/bsp/lpcxpresso1549/board.mk +++ b/hw/bsp/lpcxpresso1549/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/lpcxpresso1769/board.mk b/hw/bsp/lpcxpresso1769/board.mk index 2b31e96a8..4b77ac0c3 100644 --- a/hw/bsp/lpcxpresso1769/board.mk +++ b/hw/bsp/lpcxpresso1769/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/lpcxpresso51u68/board.mk b/hw/bsp/lpcxpresso51u68/board.mk index 0884391f8..57af215bb 100644 --- a/hw/bsp/lpcxpresso51u68/board.mk +++ b/hw/bsp/lpcxpresso51u68/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/lpcxpresso54114/board.mk b/hw/bsp/lpcxpresso54114/board.mk index eb75bdceb..431ad9122 100644 --- a/hw/bsp/lpcxpresso54114/board.mk +++ b/hw/bsp/lpcxpresso54114/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/mbed1768/board.mk b/hw/bsp/mbed1768/board.mk index c24731aa2..2b934aa16 100644 --- a/hw/bsp/mbed1768/board.mk +++ b/hw/bsp/mbed1768/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/msp430/family.mk b/hw/bsp/msp430/family.mk index a982c2866..53ebca1c0 100644 --- a/hw/bsp/msp430/family.mk +++ b/hw/bsp/msp430/family.mk @@ -1,5 +1,5 @@ CROSS_COMPILE = msp430-elf- -FAMILY_SUBMODULES = hw/mcu/ti +DEPS_SUBMODULES = hw/mcu/ti SKIP_NANOLIB = 1 CFLAGS += \ diff --git a/hw/bsp/ngx4330/board.mk b/hw/bsp/ngx4330/board.mk index c6c5af370..c78d4c02d 100644 --- a/hw/bsp/ngx4330/board.mk +++ b/hw/bsp/ngx4330/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nxp +DEPS_SUBMODULES = hw/mcu/nxp CFLAGS += \ -flto \ diff --git a/hw/bsp/nrf/family.mk b/hw/bsp/nrf/family.mk index 4c9e36ed0..f1eb625f9 100644 --- a/hw/bsp/nrf/family.mk +++ b/hw/bsp/nrf/family.mk @@ -1,5 +1,5 @@ UF2_FAMILY_ID = 0xADA52840 -FAMILY_SUBMODULES = hw/mcu/nordic/nrfx +DEPS_SUBMODULES = hw/mcu/nordic/nrfx include $(TOP)/$(BOARD_PATH)/board.mk diff --git a/hw/bsp/nutiny_nuc121s/board.mk b/hw/bsp/nutiny_nuc121s/board.mk index a8dbdffda..68688be76 100644 --- a/hw/bsp/nutiny_nuc121s/board.mk +++ b/hw/bsp/nutiny_nuc121s/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nuvoton +DEPS_SUBMODULES = hw/mcu/nuvoton CFLAGS += \ -flto \ diff --git a/hw/bsp/nutiny_nuc125s/board.mk b/hw/bsp/nutiny_nuc125s/board.mk index 9ccdc2f71..cb75f2ba2 100644 --- a/hw/bsp/nutiny_nuc125s/board.mk +++ b/hw/bsp/nutiny_nuc125s/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nuvoton +DEPS_SUBMODULES = hw/mcu/nuvoton CFLAGS += \ -flto \ diff --git a/hw/bsp/nutiny_nuc126v/board.mk b/hw/bsp/nutiny_nuc126v/board.mk index 8a34b107f..5beb5f457 100644 --- a/hw/bsp/nutiny_nuc126v/board.mk +++ b/hw/bsp/nutiny_nuc126v/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nuvoton +DEPS_SUBMODULES = hw/mcu/nuvoton CFLAGS += \ -flto \ diff --git a/hw/bsp/nutiny_sdk_nuc120/board.mk b/hw/bsp/nutiny_sdk_nuc120/board.mk index bc72db5b1..affa64058 100644 --- a/hw/bsp/nutiny_sdk_nuc120/board.mk +++ b/hw/bsp/nutiny_sdk_nuc120/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nuvoton +DEPS_SUBMODULES = hw/mcu/nuvoton CFLAGS += \ -flto \ diff --git a/hw/bsp/nutiny_sdk_nuc505/board.mk b/hw/bsp/nutiny_sdk_nuc505/board.mk index 367cc3d3d..8b2e53d44 100644 --- a/hw/bsp/nutiny_sdk_nuc505/board.mk +++ b/hw/bsp/nutiny_sdk_nuc505/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/nuvoton +DEPS_SUBMODULES = hw/mcu/nuvoton CFLAGS += \ -flto \ diff --git a/hw/bsp/rp2040/family.mk b/hw/bsp/rp2040/family.mk index b0fb58ff7..2778183f8 100644 --- a/hw/bsp/rp2040/family.mk +++ b/hw/bsp/rp2040/family.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/raspberrypi/pico-sdk +DEPS_SUBMODULES = hw/mcu/raspberrypi/pico-sdk JLINK_DEVICE = rp2040_m0_0 PYOCD_TARGET = rp2040 diff --git a/hw/bsp/samd11/family.mk b/hw/bsp/samd11/family.mk index 9faa246d4..e0005d853 100644 --- a/hw/bsp/samd11/family.mk +++ b/hw/bsp/samd11/family.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/microchip +DEPS_SUBMODULES = hw/mcu/microchip include $(TOP)/$(BOARD_PATH)/board.mk diff --git a/hw/bsp/samd21/family.mk b/hw/bsp/samd21/family.mk index 2d0a64e79..e748796fd 100644 --- a/hw/bsp/samd21/family.mk +++ b/hw/bsp/samd21/family.mk @@ -1,5 +1,5 @@ UF2_FAMILY_ID = 0x68ed2b88 -FAMILY_SUBMODULES = hw/mcu/microchip +DEPS_SUBMODULES = hw/mcu/microchip include $(TOP)/$(BOARD_PATH)/board.mk diff --git a/hw/bsp/samd51/family.mk b/hw/bsp/samd51/family.mk index 2c346680e..2cf8f0902 100644 --- a/hw/bsp/samd51/family.mk +++ b/hw/bsp/samd51/family.mk @@ -1,5 +1,5 @@ UF2_FAMILY_ID = 0x55114460 -FAMILY_SUBMODULES = hw/mcu/microchip +DEPS_SUBMODULES = hw/mcu/microchip include $(TOP)/$(BOARD_PATH)/board.mk diff --git a/hw/bsp/same54xplainedpro/board.mk b/hw/bsp/same54xplainedpro/board.mk index e6f623c1b..508ab20f8 100644 --- a/hw/bsp/same54xplainedpro/board.mk +++ b/hw/bsp/same54xplainedpro/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/microchip +DEPS_SUBMODULES = hw/mcu/microchip CONF_CPU_FREQUENCY ?= 120000000 diff --git a/hw/bsp/same70_xplained/board.mk b/hw/bsp/same70_xplained/board.mk index d0927c2f1..fd9dc5cf2 100644 --- a/hw/bsp/same70_xplained/board.mk +++ b/hw/bsp/same70_xplained/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/microchip +DEPS_SUBMODULES = hw/mcu/microchip CFLAGS += \ -mthumb \ diff --git a/hw/bsp/samg55xplained/board.mk b/hw/bsp/samg55xplained/board.mk index 184407ae9..3a783d310 100644 --- a/hw/bsp/samg55xplained/board.mk +++ b/hw/bsp/samg55xplained/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/microchip +DEPS_SUBMODULES = hw/mcu/microchip CFLAGS += \ -flto \ diff --git a/hw/bsp/spresense/board.mk b/hw/bsp/spresense/board.mk index 09d000b44..c04296cfa 100644 --- a/hw/bsp/spresense/board.mk +++ b/hw/bsp/spresense/board.mk @@ -1,4 +1,4 @@ -FAMILY_SUBMODULES = hw/mcu/sony/cxd56/spresense-exported-sdk +DEPS_SUBMODULES = hw/mcu/sony/cxd56/spresense-exported-sdk # Platforms are: Linux, Darwin, MSYS, CYGWIN PLATFORM := $(firstword $(subst _, ,$(shell uname -s 2>/dev/null))) diff --git a/hw/bsp/stm32f070rbnucleo/board.mk b/hw/bsp/stm32f070rbnucleo/board.mk index 35556b89e..ac5b0dc4d 100644 --- a/hw/bsp/stm32f070rbnucleo/board.mk +++ b/hw/bsp/stm32f070rbnucleo/board.mk @@ -1,5 +1,5 @@ ST_FAMILY = f0 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32f072disco/board.mk b/hw/bsp/stm32f072disco/board.mk index fe900a5ad..8aacdef3a 100644 --- a/hw/bsp/stm32f072disco/board.mk +++ b/hw/bsp/stm32f072disco/board.mk @@ -1,5 +1,5 @@ ST_FAMILY = f0 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32f103bluepill/board.mk b/hw/bsp/stm32f103bluepill/board.mk index 945c280f3..60beff78d 100644 --- a/hw/bsp/stm32f103bluepill/board.mk +++ b/hw/bsp/stm32f103bluepill/board.mk @@ -1,5 +1,5 @@ ST_FAMILY = f1 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32f207nucleo/board.mk b/hw/bsp/stm32f207nucleo/board.mk index 5ddddb15d..0a77d76e3 100644 --- a/hw/bsp/stm32f207nucleo/board.mk +++ b/hw/bsp/stm32f207nucleo/board.mk @@ -1,5 +1,5 @@ ST_FAMILY = f2 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32f303disco/board.mk b/hw/bsp/stm32f303disco/board.mk index 835c7da01..8ad1d0072 100644 --- a/hw/bsp/stm32f303disco/board.mk +++ b/hw/bsp/stm32f303disco/board.mk @@ -1,5 +1,5 @@ ST_FAMILY = f3 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32f4/family.mk b/hw/bsp/stm32f4/family.mk index 299f084de..cbda96e92 100644 --- a/hw/bsp/stm32f4/family.mk +++ b/hw/bsp/stm32f4/family.mk @@ -1,6 +1,6 @@ UF2_FAMILY_ID = 0x57755a57 ST_FAMILY = f4 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32f7/family.mk b/hw/bsp/stm32f7/family.mk index 60d189a30..c405973de 100644 --- a/hw/bsp/stm32f7/family.mk +++ b/hw/bsp/stm32f7/family.mk @@ -1,6 +1,6 @@ UF2_FAMILY_ID = 0x53b80f00 ST_FAMILY = f7 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32h7/family.mk b/hw/bsp/stm32h7/family.mk index 5e3c7cf35..2ec032ed9 100644 --- a/hw/bsp/stm32h7/family.mk +++ b/hw/bsp/stm32h7/family.mk @@ -1,6 +1,6 @@ UF2_FAMILY_ID = 0x6db66082 ST_FAMILY = h7 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32l0538disco/board.mk b/hw/bsp/stm32l0538disco/board.mk index e11403f91..6c8e89247 100644 --- a/hw/bsp/stm32l0538disco/board.mk +++ b/hw/bsp/stm32l0538disco/board.mk @@ -1,5 +1,5 @@ ST_FAMILY = l0 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32l476disco/board.mk b/hw/bsp/stm32l476disco/board.mk index 6f3c47981..ec02e0c1d 100644 --- a/hw/bsp/stm32l476disco/board.mk +++ b/hw/bsp/stm32l476disco/board.mk @@ -1,5 +1,5 @@ ST_FAMILY = l4 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver diff --git a/hw/bsp/stm32l4r5nucleo/board.mk b/hw/bsp/stm32l4r5nucleo/board.mk index 3a5b6c3db..8ff38594d 100644 --- a/hw/bsp/stm32l4r5nucleo/board.mk +++ b/hw/bsp/stm32l4r5nucleo/board.mk @@ -1,5 +1,5 @@ ST_FAMILY = l4 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver +DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver -- cgit v1.3.1