Rename assembly dir to boot2, only has boot2.Ss (earlephilhower#230)

Robotonics · Jun 30, 2021 · d67329a · d67329a
1 parent 3a9703f
commit d67329a
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 2 deletions.
diff --git a/...bly/boot2_generic_03h_2_padded_checksum.S → boot2/boot2_generic_03h_2_padded_checksum.S b/...bly/boot2_generic_03h_2_padded_checksum.S → boot2/boot2_generic_03h_2_padded_checksum.S
diff --git a/...bly/boot2_generic_03h_4_padded_checksum.S → boot2/boot2_generic_03h_4_padded_checksum.S b/...bly/boot2_generic_03h_4_padded_checksum.S → boot2/boot2_generic_03h_4_padded_checksum.S
diff --git a/assembly/boot2_is25lp080_2_padded_checksum.S → boot2/boot2_is25lp080_2_padded_checksum.S b/assembly/boot2_is25lp080_2_padded_checksum.S → boot2/boot2_is25lp080_2_padded_checksum.S
diff --git a/assembly/boot2_is25lp080_4_padded_checksum.S → boot2/boot2_is25lp080_4_padded_checksum.S b/assembly/boot2_is25lp080_4_padded_checksum.S → boot2/boot2_is25lp080_4_padded_checksum.S
diff --git a/assembly/boot2_w25q080_2_padded_checksum.S → boot2/boot2_w25q080_2_padded_checksum.S b/assembly/boot2_w25q080_2_padded_checksum.S → boot2/boot2_w25q080_2_padded_checksum.S
diff --git a/assembly/boot2_w25q080_4_padded_checksum.S → boot2/boot2_w25q080_4_padded_checksum.S b/assembly/boot2_w25q080_4_padded_checksum.S → boot2/boot2_w25q080_4_padded_checksum.S
diff --git a/assembly/boot2_w25x10cl_2_padded_checksum.S → boot2/boot2_w25x10cl_2_padded_checksum.S b/assembly/boot2_w25x10cl_2_padded_checksum.S → boot2/boot2_w25x10cl_2_padded_checksum.S
diff --git a/assembly/boot2_w25x10cl_4_padded_checksum.S → boot2/boot2_w25x10cl_4_padded_checksum.S b/assembly/boot2_w25x10cl_4_padded_checksum.S → boot2/boot2_w25x10cl_4_padded_checksum.S
diff --git a/lib/libpico.a b/lib/libpico.a
diff --git a/platform.txt b/platform.txt
@@ -110,7 +110,7 @@ recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compil
 recipe.hooks.linking.prelink.1.pattern="{runtime.tools.pqt-python3.path}/python3" "{runtime.platform.path}/tools/simplesub.py" --input "{runtime.platform.path}/lib/memmap_default.ld" --out "{build.path}/memmap_default.ld" --sub __FLASH_LENGTH__ {build.flash_length} --sub __EEPROM_START__ {build.eeprom_start} --sub __FS_START__ {build.fs_start} --sub __FS_END__ {build.fs_end}
 
 ## Compile the boot stage 2 blob
-recipe.hooks.linking.prelink.2.pattern="{compiler.path}{compiler.S.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -c "{runtime.platform.path}/assembly/{build.boot2}.S" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_binary_info/include" -o "{build.path}/boot2.o"
+recipe.hooks.linking.prelink.2.pattern="{compiler.path}{compiler.S.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -c "{runtime.platform.path}/boot2/{build.boot2}.S" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_binary_info/include" -o "{build.path}/boot2.o"
 
 ## Combine gc-sections, archives, and objects
 recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {compiler.ldflags} "-Wl,--script={build.path}/memmap_default.ld" "-Wl,-Map,{build.path}/{build.project_name}.map" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/{archive_file}" "{build.path}/boot2.o" {compiler.libpico} -lm -lc -lstdc++ -lc -Wl,--end-group

diff --git a/tools/libpico/make-libpico.sh b/tools/libpico/make-libpico.sh
@@ -42,4 +42,4 @@ for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
                    -s 0xffffffff $type.$div.bin ${type}_${div}_padded_checksum.S
     done
 done
-mv *.S ../../../../assembly/.
+mv *.S ../../../../boot2/.