From 2f3cc5d379089d3def876fdc276c321236b0698f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 6 Jul 2024 23:36:13 +0100 Subject: rom.sh: new file, to replace script/roms stub it from the trees script. the way it works now, there is less code in the build system. ./build roms this is no longer a thing ./build roms serprog this is also no longer a thing. instead, do: ./update trees -b coreboot targetnamehere ./update trees -b pico-serprog ./update trees -b stm32-vserprog the old commands still works, which causes the new commands to run coreboot roms now appear in elf/, not bin/, as before, but those images now contain payloads. NOTE: to contradict the above: ./build roms is no longer a thing, in that it's now deprecated, but backward compatibility is present for now. it will be removed in a future release. ./build roms list also still works! it will do: ./update trees -b coreboot list also: ./update trees -b grub list this is now possible too if a target "list" is provided, for multi-tree sources, the targets are shown. there is another difference: seagrub roms are now seagrub_, instead of seabios_withgrub. seabios-only roms are no longer provided, where grub is also enabled; only seagrub is used. the user can easily remove the bootorder file, if they want seabios to not try grub first. Signed-off-by: Leah Rowe --- config/data/coreboot/build.list | 1 - config/data/coreboot/mkhelper.cfg | 11 +++++++++++ config/data/pico-serprog/mkhelper.cfg | 5 +++++ config/data/stm32-vserprog/mkhelper.cfg | 4 ++++ 4 files changed, 20 insertions(+), 1 deletion(-) delete mode 100644 config/data/coreboot/build.list create mode 100644 config/data/pico-serprog/mkhelper.cfg create mode 100644 config/data/stm32-vserprog/mkhelper.cfg (limited to 'config/data') diff --git a/config/data/coreboot/build.list b/config/data/coreboot/build.list deleted file mode 100644 index f6535149..00000000 --- a/config/data/coreboot/build.list +++ /dev/null @@ -1 +0,0 @@ -build/coreboot.rom diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg index a6605672..c23ebdf4 100644 --- a/config/data/coreboot/mkhelper.cfg +++ b/config/data/coreboot/mkhelper.cfg @@ -1,2 +1,13 @@ makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" build_depend="seabios/default grub/default memtest86plus" + +seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin" + +pv="payload_uboot payload_seabios payload_memtest payload_grub" +v="initmode ubootelf grub_scan_disk uboot_config grubtree grubelf pname" +v="$v displaymode tmprom" +eval `setvars "n" $pv` +eval `setvars "" $v` + +mkhelper="mkcorebootbin" +postmake="mkcoreboottar" diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg new file mode 100644 index 00000000..9f6e54cc --- /dev/null +++ b/config/data/pico-serprog/mkhelper.cfg @@ -0,0 +1,5 @@ +sersrc="src/pico-serprog" +serx="$sersrc/build/pico_serprog.uf2" +picosdk="src/pico-sdk" +serdir="$picosdk/src/boards/include/boards" +premake="mkserprog rp2040" diff --git a/config/data/stm32-vserprog/mkhelper.cfg b/config/data/stm32-vserprog/mkhelper.cfg new file mode 100644 index 00000000..9d02f799 --- /dev/null +++ b/config/data/stm32-vserprog/mkhelper.cfg @@ -0,0 +1,4 @@ +sersrc="src/stm32-vserprog" +serx="$sersrc/stm32-vserprog.hex" +serdir="$sersrc/boards" +mkhelper="mkserprog stm32" -- cgit v1.2.1