mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-21 03:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #734 from hathach/feather-rp2040-correct-bootstage2

Browse Source 
use boot2_generic_03h for adafruit feather rp2040
This commit is contained in:
Ha Thach 2021-03-18 20:10:35 +07:00 committed by GitHub
commit a380bbf4bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/device/audio_test/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

4
examples/device/board_test/CMakeLists.txt
View File

@ -9,15 +9,17 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "esp32s2") if(FAMILY STREQUAL "esp32s2")
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
project(${PROJECT}) project(${PROJECT})
elseif(FAMILY STREQUAL "rp2040") elseif(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/cdc_dual_ports/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/cdc_msc/CMakeLists.txt
View File

@ -17,9 +17,8 @@ elseif(FAMILY STREQUAL "rp2040")
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
# Example source # Example source

3
examples/device/dfu_runtime/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/dynamic_configuration/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/hid_composite/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/hid_generic_inout/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/hid_multiple_interface/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/midi_test/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/msc_dual_lun/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/net_lwip_webserver/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/uac2_headset/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

2
examples/device/usbtmc/CMakeLists.txt
View File

@ -11,8 +11,8 @@ if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/device/webusb_serial/CMakeLists.txt
View File

@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY STREQUAL "rp2040") if(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

3
examples/host/cdc_msc_hid/CMakeLists.txt
View File

@ -14,10 +14,11 @@ if(FAMILY STREQUAL "esp32s2")
elseif(FAMILY STREQUAL "rp2040") elseif(FAMILY STREQUAL "rp2040")
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
include(${PICO_SDK_PATH}/pico_sdk_init.cmake) include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
project(${PROJECT}) project(${PROJECT})
pico_sdk_init()
add_executable(${PROJECT}) add_executable(${PROJECT})
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

1
hw/bsp/rp2040/boards/adafruit_feather_rp2040/board.cmake Normal file
View File

@ -0,0 +1 @@
set(PICO_DEFAULT_BOOT_STAGE2_FILE "${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_generic_03h.S")

1
hw/bsp/rp2040/boards/adafruit_itsybitsy_rp2040/board.cmake Normal file
View File

@ -0,0 +1 @@
set(PICO_DEFAULT_BOOT_STAGE2_FILE "${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_generic_03h.S")

1
hw/bsp/rp2040/boards/adafruit_qt_rp2040/board.cmake Normal file
View File

@ -0,0 +1 @@
set(PICO_DEFAULT_BOOT_STAGE2_FILE "${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_generic_03h.S")

1
hw/bsp/rp2040/boards/raspberry_pi_pico/board.cmake Normal file
View File

@ -0,0 +1 @@
set(PICO_DEFAULT_BOOT_STAGE2_FILE "${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_w25q080.S")

6
hw/bsp/rp2040/family.cmake
View File

@ -1,3 +1,9 @@
# Board specific define e.g boot stage2
# PICO_DEFAULT_BOOT_STAGE2_FILE must be set before pico_sdk_init()
include(${TOP}/hw/bsp/${FAMILY}/boards/${BOARD}/board.cmake)
pico_sdk_init()
target_link_libraries(${PROJECT} target_link_libraries(${PROJECT}
pico_stdlib pico_stdlib
pico_bootsel_via_double_reset pico_bootsel_via_double_reset

10
hw/bsp/rp2040/family.mk
View File

@ -1,5 +1,8 @@
DEPS_SUBMODULES += hw/mcu/raspberrypi/pico-sdk DEPS_SUBMODULES += hw/mcu/raspberrypi/pico-sdk
JLINK_DEVICE = rp2040_m0_0
PYOCD_TARGET = rp2040
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CMAKE_DEFSYM += -DCMAKE_BUILD_TYPE=Debug CMAKE_DEFSYM += -DCMAKE_BUILD_TYPE=Debug
endif endif
@ -13,9 +16,6 @@ all: $(BUILD)
clean: clean:
$(RM) -rf $(BUILD) $(RM) -rf $(BUILD)
#flash: flash-pyocd flash: flash-pyocd
flash: flash-uf2:
@$(CP) $(BUILD)/$(PROJECT).uf2 /media/$(USER)/RPI-RP2 @$(CP) $(BUILD)/$(PROJECT).uf2 /media/$(USER)/RPI-RP2
JLINK_DEVICE = rp2040_m0_0
PYOCD_TARGET = rp2040