Skip to content

tools/rp{2040,23xx}: Ensure that picotool is found or built #16855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Aug 21, 2025
Merged

tools/rp{2040,23xx}: Ensure that picotool is found or built #16855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions tools/rp2040/Config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@

# POSTBUILD -- Perform post build operations

PICOTOOL_BIN_PATH?=$(PICO_SDK_PATH)$(DELIM)_deps$(DELIM)picotool$(DELIM)picotool
PICOTOOL_FOUND := $(shell command -v picotool 2> /dev/null)

PICOTOOL_BIN_PATH ?= $(PICO_SDK_PATH)$(DELIM)_deps$(DELIM)picotool$(DELIM)picotool

define GEN_PICO_UF2
$(Q)echo "Generating: nuttx.uf2"; \
Expand All @@ -36,23 +38,26 @@ define GEN_PICO_UF2
endef

ifeq ($(CONFIG_RP2040_UF2_BINARY),y)
ifneq ($(shell which picotool),)
ifdef PICOTOOL_FOUND
define POSTBUILD
$(call GEN_PICO_UF2, picotool)
endef
else ifdef PICO_SDK_PATH
define POSTBUILD
$(Q)(if ! $(PICOTOOL_BIN_PATH) help >&/dev/null; then \
echo "Building: picotool"; \
cd $(PICO_SDK_PATH); \
cmake . >&/dev/null; \
make picotoolBuild >&/dev/null; \
fi;)
$(call GEN_PICO_UF2, $(PICOTOOL_BIN_PATH))
endef
else
define POSTBUILD
$(Q) echo "PICO_SDK_PATH/picotool must be specified/installed for flash boot"
endef
ifdef PICO_SDK_PATH
define POSTBUILD
$(warning "picotool not found in $$PATH, it will be sourced from pico-sdk")
$(Q)if [[ ! -x "$(PICOTOOL_BIN_PATH)" ]]; then \
echo "Warning: building picotool from pico-sdk will skip USB support! See https://github.com/raspberrypi/pico-sdk/issues/1827" >&2; \
cd $(PICO_SDK_PATH); \
cmake . >&/dev/null; \
make picotoolBuild >/dev/null; \
fi
$(call GEN_PICO_UF2, $(PICOTOOL_BIN_PATH))
endef
else
define POSTBUILD
$(error "Generating UF2 files requires picotool to be available in $$PATH, or $$PICO_SDK_PATH must be specified")
endef
endif
endif
endif
37 changes: 22 additions & 15 deletions tools/rp23xx/Config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
############################################################################
# tools/rp23xx/Config.mk
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
Expand All @@ -24,7 +26,9 @@

# POSTBUILD -- Perform post build operations

PICOTOOL_BIN_PATH?=$(PICO_SDK_PATH)$(DELIM)_deps$(DELIM)picotool$(DELIM)picotool
PICOTOOL_FOUND := $(shell command -v picotool 2> /dev/null)

PICOTOOL_BIN_PATH ?= $(PICO_SDK_PATH)$(DELIM)_deps$(DELIM)picotool$(DELIM)picotool

define GEN_PICO_UF2
$(Q)echo "Generating: nuttx.uf2"; \
Expand All @@ -34,23 +38,26 @@ define GEN_PICO_UF2
endef

ifeq ($(CONFIG_RP23XX_UF2_BINARY),y)
ifneq ($(shell which picotool),)
ifdef PICOTOOL_FOUND
define POSTBUILD
$(call GEN_PICO_UF2, picotool)
endef
else ifdef PICO_SDK_PATH
define POSTBUILD
$(Q)(if ! $(PICOTOOL_BIN_PATH) help >&/dev/null; then \
echo "Building: picotool"; \
cd $(PICO_SDK_PATH); \
cmake . >&/dev/null; \
make picotoolBuild >&/dev/null; \
fi;)
$(call GEN_PICO_UF2, $(PICOTOOL_BIN_PATH))
endef
else
define POSTBUILD
$(Q) echo "PICO_SDK_PATH/picotool must be specified/installed for flash boot"
endef
ifdef PICO_SDK_PATH
define POSTBUILD
$(warning "picotool not found in $$PATH, it will be sourced from pico-sdk")
$(Q)if [[ ! -x "$(PICOTOOL_BIN_PATH)" ]]; then \
echo "Warning: building picotool from pico-sdk will skip USB support! See https://github.com/raspberrypi/pico-sdk/issues/1827" >&2; \
cd $(PICO_SDK_PATH); \
cmake . >&/dev/null; \
make picotoolBuild >/dev/null; \
fi
$(call GEN_PICO_UF2, $(PICOTOOL_BIN_PATH))
endef
else
define POSTBUILD
$(error "Generating UF2 files requires picotool to be available in $$PATH, or $$PICO_SDK_PATH must be specified")
endef
endif
endif
endif
Loading