Re-enable BOOT2.S compiles in libpico

No actual changes to output boot2 files, but if they ever do update we'll
catch it.

Author: earlephilhower

tools/libpico/make-libpico.sh

@@ -14,43 +14,46 @@ cd build-rp2040
 CPU=rp2040 cmake ..
 make -j
 
-# The develop branch of the SDK seems to have busted the RP2040 boot2.S files.
-# These don't change and aren't lkikely to get any new additions, so comment out
-# for now and use the prior versions built under earlier SDK.
-#rm -rf boot
-#mkdir boot
-#cd boot
-#mkdir -p pico 
-#touch pico/config.h
-#for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
-#    for div in 2 4; do
-#        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
-#                         -DNDEBUG -DPICO_FLASH_SPI_CLKDIV=$div \
-#                         -c "$PICO_SDK_PATH/src/rp2040/boot_stage2/$type.S" \
-#                         -I "$PICO_SDK_PATH/src/boards/include/boards/" \
-#                         -I "$PICO_SDK_PATH/src/rp2040/hardware_regs/include/" \
-#                         -I "$PICO_SDK_PATH/src/rp2_common/pico_platform/include/" \
-#                         -I "$PICO_SDK_PATH/src/rp2_common/boot_stage2/asminclude/" \
-#                         -I "$PICO_SDK_PATH/src/rp2040/pico_platform/include/" \
-#                         -I "$PICO_SDK_PATH/src/rp2040/boot_stage2/asminclude/" \
-#                         -I .
-#
-#        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
-#                          -DNDEBUG -Wl,--build-id=none --specs=nosys.specs -nostartfiles \
-#                          -Wl,--script="$PICO_SDK_PATH/src/rp2040/boot_stage2/boot_stage2.ld" \
-#                          -Wl,-Map=$type.$div.elf.map $type.o -o $type.$div.elf 
-#
-#        arm-none-eabi-objdump -h $type.$div.elf >  $type.$div.dis
-#        arm-none-eabi-objdump -d $type.$div.elf >> $type.$div.dis
-#
-#        arm-none-eabi-objcopy -Obinary $type.$div.elf $type.$div.bin
-#
-#        python3 "$PICO_SDK_PATH/src/rp2040/boot_stage2/pad_checksum" \
-#                   -s 0xffffffff $type.$div.bin ${type}_${div}_padded_checksum.S
-#    done
-#done
-#mv *.S ../../../../boot2/rp2040/.
-#cd ../..
+rm -rf boot
+mkdir boot
+cd boot
+mkdir -p pico
+touch pico/config.h
+cp ../generated/pico_base/pico/*.h pico/.
+for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
+    for div in 2 4; do
+        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
+                         -DNDEBUG -DPICO_FLASH_SPI_CLKDIV=$div \
+                         -c "$PICO_SDK_PATH/src/rp2040/boot_stage2/$type.S" \
+                         -I "$PICO_SDK_PATH/src/common/pico_base_headers/include/" \
+                         -I "$PICO_SDK_PATH/src/rp2_common/pico_platform_compiler/include/" \
+                         -I "$PICO_SDK_PATH/src/rp2_common/pico_platform_sections/include/" \
+                         -I "$PICO_SDK_PATH/src/rp2_common/pico_platform_panic/include/" \
+                         -I "$PICO_SDK_PATH/src/rp2_common/pico_platform_common/include/" \
+                         -I "$PICO_SDK_PATH/src/boards/include/boards/" \
+                         -I "$PICO_SDK_PATH/src/rp2040/hardware_regs/include/" \
+                         -I "$PICO_SDK_PATH/src/rp2_common/pico_platform/include/" \
+                         -I "$PICO_SDK_PATH/src/rp2_common/boot_stage2/asminclude/" \
+                         -I "$PICO_SDK_PATH/src/rp2040/pico_platform/include/" \
+                         -I "$PICO_SDK_PATH/src/rp2040/boot_stage2/asminclude/" \
+                         -I .
+
+        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
+                          -DNDEBUG -Wl,--build-id=none --specs=nosys.specs -nostartfiles \
+                          -Wl,--script="$PICO_SDK_PATH/src/rp2040/boot_stage2/boot_stage2.ld" \
+                          -Wl,-Map=$type.$div.elf.map $type.o -o $type.$div.elf 
+
+        arm-none-eabi-objdump -h $type.$div.elf >  $type.$div.dis
+        arm-none-eabi-objdump -d $type.$div.elf >> $type.$div.dis
+
+        arm-none-eabi-objcopy -Obinary $type.$div.elf $type.$div.bin
+
+        python3 "$PICO_SDK_PATH/src/rp2040/boot_stage2/pad_checksum" \
+                   -s 0xffffffff $type.$div.bin ${type}_${div}_padded_checksum.S
+    done
+done
+mv *.S ../../../../boot2/rp2040/.
+cd ..
 
 cd ..
 rm -rf build-rp2350