From 1cdd1b02098be05b511571457165fa66a27af7bc Mon Sep 17 00:00:00 2001 From: Ha Thach Date: Wed, 10 Mar 2021 13:26:14 +0700 Subject: [PATCH] Update pico sdk 1.1.0 (#712) * update pico-sdk to 1.1.0 also correct fetch_submodule_if_empty behavior --- examples/make.mk | 10 ++-------- hw/mcu/raspberrypi/pico-sdk | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/examples/make.mk b/examples/make.mk index 82fbd020b..53f633b18 100644 --- a/examples/make.mk +++ b/examples/make.mk @@ -45,16 +45,10 @@ else SRC_C += $(subst $(TOP)/,,$(wildcard $(TOP)/$(FAMILY_PATH)/*.c)) endif -#TODO $(call fetch_submodule_if_empty,lib/sct_neopixel) - # Fetch submodules depended by family -fetch_submodule_if_empty = \ - ifeq ($(wildcard $(TOP)/$1/*),) \ - $(info $(shell git -C $(TOP) submodule update --init $1)) \ - endif - +fetch_submodule_if_empty = $(if $(wildcard $(TOP)/$1/*),,$(info $(shell git -C $(TOP) submodule update --init $1))) ifdef DEPS_SUBMODULES - $(foreach s,$(DEPS_SUBMODULES),:$(call fetch_submodule_if_empty,$(s))) + $(foreach s,$(DEPS_SUBMODULES),$(call fetch_submodule_if_empty,$(s))) endif #-------------- Cross Compiler ------------ diff --git a/hw/mcu/raspberrypi/pico-sdk b/hw/mcu/raspberrypi/pico-sdk index 61978dc70..fc10a97c3 160000 --- a/hw/mcu/raspberrypi/pico-sdk +++ b/hw/mcu/raspberrypi/pico-sdk @@ -1 +1 @@ -Subproject commit 61978dc707c7f2026efa4c3300bbb94baa89c78a +Subproject commit fc10a97c386f65c1a44c68684fe52a56aaf50df0