diff --git a/.gitignore b/.gitignore index 28c90d32..015c7d22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build/** +build6/** .vscode/** .env diff --git a/CMakeLists.txt b/CMakeLists.txt index c925cdba..ffbc22cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,6 @@ set(PICO_BOARD_HEADER_DIRS ${CMAKE_CURRENT_LIST_DIR}/src/boards ) set(PICO_BOARD_CMAKE_DIRS ${CMAKE_CURRENT_LIST_DIR}/src/boards ) # Add my_pico_w # -#set(BP_PICO_PLATFORM "rp2350") if(DEFINED GIT_COMMIT_HASH) set(BP_FIRMWARE_HASH ${GIT_COMMIT_HASH}) diff --git a/hacks/build_server.md b/hacks/build_server.md index 1cfb4d7d..a0aa69fa 100644 --- a/hacks/build_server.md +++ b/hacks/build_server.md @@ -43,10 +43,18 @@ source /etc/profile.d/pico-sdk.sh ``` sudo git clone https://github.com/DangerousPrototypes/BusPirate5-firmware.git bp5-main cd bp5-main -md build -cd build +mkdir build +mkdir build6 + +pushd build cmake .. make +popd + +pushd build6 +cmake .. -DPICO_SDK_FETCH_FROM_GIT=TRUE -DBP_PICO_PLATFORM=rp2350 +make +popd ``` # Install build script and webhook diff --git a/readme.md b/readme.md index 80210138..a1b662fb 100644 --- a/readme.md +++ b/readme.md @@ -38,7 +38,8 @@ Bus Pirate 5 is the universal serial interface tool designed by hackers, for hac This project uses `cmake` as the build system, so building the project only takes 2 steps: 1. project configuration (needs to be ran once, or when you want to change configuration). - `cmake -S . -B build -DPICO_SDK_FETCH_FROM_GIT=TRUE` + `cmake -S . -B build -DPICO_SDK_FETCH_FROM_GIT=TRUE` + `cmake -S . -B build6 -DPICO_SDK_FETCH_FROM_GIT=TRUE -DBP_PICO_PLATFORM=rp2350` you may want to add the flags `-DPICO_SDK_PATH=/path/to/pico-sdk -DPICO_SDK_FETCH_FROM_GIT=FALSE` if you want to use pico-sdk that is in your local path. > NOTE: WINDOWS users: for some reason the automatic fetch fails because of git submodule, so you will need to clone pico-sdk your self, and then > apply the following commands inside the pico-sdk repo: @@ -48,8 +49,18 @@ This project uses `cmake` as the build system, so building the project only take > ``` 2. project build - `cmake --build ./build --target bus_pirate5_rev10` - you may set `bus_pirate5_rev10` to `bus_pirate5_rev8` if the have the development version. + `cmake --build ./build` + `cmake --build ./build6` + you may add a specific target, such as: + `cmake --build ./build --target bus_pirate5_rev8` + `cmake --build ./build --target bus_pirate5_rev10` + `cmake --build ./build6 --target bus_pirate5_xl` + `cmake --build ./build6 --target bus_pirate6` + you can manually clean via: + `cmake --build ./build --target clean` + `cmake --build ./build6 --target clean` + Finally, you can force a clean prior to building by adding `--clean-first`. + ### build using docker Instructions on the forum provide additional details; however, this repo provides a docker compose image for you to just get running quickly in the event you want to try patching/hacking.