diff options
Diffstat (limited to 'config/data')
| -rw-r--r-- | config/data/coreboot/build.list | 1 | ||||
| -rw-r--r-- | config/data/coreboot/mkhelper.cfg | 16 | ||||
| -rw-r--r-- | config/data/deguard/appdir.patch | 131 | ||||
| -rw-r--r-- | config/data/grub/mkhelper.cfg | 7 | ||||
| -rwxr-xr-x | config/data/grub/module/xhci | 2 | ||||
| -rw-r--r-- | config/data/pcsx-redux/mkhelper.cfg | 3 | ||||
| -rw-r--r-- | config/data/pico-serprog/mkhelper.cfg | 7 | ||||
| -rw-r--r-- | config/data/seabios/mkhelper.cfg | 0 | ||||
| -rw-r--r-- | config/data/stm32-vserprog/mkhelper.cfg | 6 |
9 files changed, 171 insertions, 2 deletions
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 new file mode 100644 index 00000000..73cc957d --- /dev/null +++ b/config/data/coreboot/mkhelper.cfg @@ -0,0 +1,16 @@ +. "include/rom.sh" + +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 newrom" +eval `setvars "n" $pv` +eval `setvars "" $v` + +premake="mkvendorfiles" +mkhelper="mkcorebootbin" +postmake="mkcoreboottar" diff --git a/config/data/deguard/appdir.patch b/config/data/deguard/appdir.patch new file mode 100644 index 00000000..722a6168 --- /dev/null +++ b/config/data/deguard/appdir.patch @@ -0,0 +1,131 @@ +From b978cbb651a4bdd84be4a92ae240c8ca99ef21eb Mon Sep 17 00:00:00 2001 +From: Leah Rowe <info@minifree.org> +Date: Tue, 24 Sep 2024 16:44:51 +0100 +Subject: [PATCH 1/1] Patch to integrate with lbmk + +Deguard is a standalone utility, but the way it works +doesn't integrate well with lbmk. + +Remove the download logic, because lbmk already downloads +the requisite zip file. + +Also not required, but nice, and included in this patch: + +Detect what python version is available, and make sure it's +python 3. + +Signed-off-by: Leah Rowe <info@minifree.org> +--- + RUNME.sh | 64 +++++++++++++++++++++++++++++++------------------------- + 1 file changed, 36 insertions(+), 28 deletions(-) + +diff --git a/RUNME.sh b/RUNME.sh +index 9809f89..7404ba6 100755 +--- a/RUNME.sh ++++ b/RUNME.sh +@@ -1,25 +1,33 @@ + #!/bin/sh + # SPDX-License-Identifier: GPL-2.0-only + ++# This version of deguard is patched to integrate with lbmk. ++# Do not run this version standalone. Please use src/deguard/ instead. ++ + set -e + +-if [ ! -f "me.bin" ]; then +- wget "https://download.asrock.com/BIOS/1151/H110M-DGS(7.30)ROM.zip" +- unzip "H110M-DGS(7.30)ROM.zip" H11MDGS7.30 +- rm "H110M-DGS(7.30)ROM.zip" +- dd if=H11MDGS7.30 of=me.bin skip=1 count=511 bs=4096 +- rm H11MDGS7.30 ++pyver="2" ++python="python3" ++which python3 || python="python" ++which $python || pyver="" ++[ -n "$pyver" ] && pyver="$($python --version | awk '{print $2}')" ++if [ "${pyver%%.*}" != "3" ]; then ++ printf "Wrong python version, or python missing. Must be python 3.\n" 1>&2 ++ exit 1 + fi + ++rm -f me.bin MFS.part ++dd if=../H11MDGS7.30 of=me.bin skip=1 count=511 bs=4096 ++ + dd if=me.bin of=MFS.part skip=168 count=100 bs=4096 + + # Extract file number 7 (fitc.cfg) +-python3 MFSUtil.py -m MFS.part -x -i 7 -o fitc.cfg ++$python MFSUtil.py -m MFS.part -x -i 7 -o fitc.cfg + + # Remove /home/mca/eom +-python3 MFSUtil.py -c fitc.cfg -r -f /home/mca/eom -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg -r -f /home/mca/eom -o fitc.cfg + # Remove /home/bup/ct +-python3 MFSUtil.py -c fitc.cfg -r -f /home/bup/ct -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg -r -f /home/bup/ct -o fitc.cfg + + # list off files differing in optiplex 3050 fw vs donor + files=" +@@ -39,40 +47,40 @@ secureboot/pubkeyhash + + for i in $files + do +- python3 MFSUtil.py -c fitc.cfg -r -f /home/$i -o fitc.cfg ++ $python MFSUtil.py -c fitc.cfg -r -f /home/$i -o fitc.cfg + done + + # Add /home/mca/eom + dd if=/dev/zero of=eom count=1 bs=1 +-python3 MFSUtil.py -c fitc.cfg --add eom --alignment 2 --mode ' --Irw-r-----' \ ++$python MFSUtil.py -c fitc.cfg --add eom --alignment 2 --mode ' --Irw-r-----' \ + --opt '?!-F' --uid 0 --gid 238 -f /home/mca/eom -o fitc.cfg + + # Add /home/bup/ct +-python3 gen_shellcode.py -p H -v 11.6.0.1126 --fake-fpfs=fpfs/optiplex_3050 -o ct +-python3 MFSUtil.py -c fitc.cfg --add ct --alignment 2 --mode ' ---rwxr-----' \ ++$python gen_shellcode.py -p H -v 11.6.0.1126 --fake-fpfs=fpfs/optiplex_3050 -o ct ++$python MFSUtil.py -c fitc.cfg --add ct --alignment 2 --mode ' ---rwxr-----' \ + --opt '?--F' --uid 3 --gid 351 -f /home/bup/ct -o fitc.cfg + + # Add dell files +-python3 MFSUtil.py -c fitc.cfg --add data/emu_fuse_map --alignment 2 --mode=' ---rw-r-----' --opt='?--F' --uid=3 --gid=238 -f /home/bup/bup_sku/emu_fuse_map -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/plat_n_sku --alignment 2 --mode=' ---rw-r-----' --opt='?--F' --uid=3 --gid=238 -f /home/bup/bup_sku/plat_n_sku -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/fwuoemid --alignment 2 --mode=' ---rw-rw----' --opt='?--F' --uid=32 --gid=238 -f /home/fwupdate/fwuoemid -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/prof0 --alignment 2 --mode=' ---rw-r-----' --opt='?--F' --uid=55 --gid=238 -f /home/icc/prof0 -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/device_ports --alignment 2 --mode=' ---rw-r-----' --opt='?--F' --uid=73 --gid=238 -f /home/mctp/device_ports -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/hdcp_ports --alignment 2 --mode=' -EIrw-r-----' --opt='?!-F' --uid=80 --gid=238 -f /home/pavp/hdcp_ports -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/cfg_rules --alignment 2 --mode=' ---rw-rw----' --opt='-!MF' --uid=85 --gid=238 -f /home/policy/cfgmgr/cfg_rules -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/bootpolres --alignment 2 --mode=' ---rw-rw----' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/bootpolres -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/bootpoltype --alignment 2 --mode=' ---rw-rw----' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/bootpoltype -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/enfpolicy --alignment 2 --mode=' ---rw-rw----' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/enfpolicy -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/kmid --alignment 2 --mode=' ---rw-r-----' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/kmid -o fitc.cfg +-python3 MFSUtil.py -c fitc.cfg --add data/pubkeyhash --alignment 2 --mode=' ---rw-rw-r--' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/pubkeyhash -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/emu_fuse_map --alignment 2 --mode=' ---rw-r-----' --opt='?--F' --uid=3 --gid=238 -f /home/bup/bup_sku/emu_fuse_map -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/plat_n_sku --alignment 2 --mode=' ---rw-r-----' --opt='?--F' --uid=3 --gid=238 -f /home/bup/bup_sku/plat_n_sku -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/fwuoemid --alignment 2 --mode=' ---rw-rw----' --opt='?--F' --uid=32 --gid=238 -f /home/fwupdate/fwuoemid -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/prof0 --alignment 2 --mode=' ---rw-r-----' --opt='?--F' --uid=55 --gid=238 -f /home/icc/prof0 -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/device_ports --alignment 2 --mode=' ---rw-r-----' --opt='?--F' --uid=73 --gid=238 -f /home/mctp/device_ports -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/hdcp_ports --alignment 2 --mode=' -EIrw-r-----' --opt='?!-F' --uid=80 --gid=238 -f /home/pavp/hdcp_ports -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/cfg_rules --alignment 2 --mode=' ---rw-rw----' --opt='-!MF' --uid=85 --gid=238 -f /home/policy/cfgmgr/cfg_rules -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/bootpolres --alignment 2 --mode=' ---rw-rw----' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/bootpolres -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/bootpoltype --alignment 2 --mode=' ---rw-rw----' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/bootpoltype -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/enfpolicy --alignment 2 --mode=' ---rw-rw----' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/enfpolicy -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/kmid --alignment 2 --mode=' ---rw-r-----' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/kmid -o fitc.cfg ++$python MFSUtil.py -c fitc.cfg --add data/pubkeyhash --alignment 2 --mode=' ---rw-rw-r--' --opt='?-MF' --uid=3 --gid=238 -f /home/secureboot/pubkeyhash -o fitc.cfg + + # Delete file id 7 (fitc.cfg) from the MFS partition +-python3 MFSUtil.py -m MFS.part -r -i 7 -o MFS.part ++$python MFSUtil.py -m MFS.part -r -i 7 -o MFS.part + # Delete file id 8 (home) from the MFS partition +-python3 MFSUtil.py -m MFS.part -r -i 8 -o MFS.part ++$python MFSUtil.py -m MFS.part -r -i 8 -o MFS.part + + # Add the modified fitc.cfg into the MFS partition +-python3 MFSUtil.py -m MFS.part -a fitc.cfg --deoptimize -i 7 -o MFS.part ++$python MFSUtil.py -m MFS.part -a fitc.cfg --deoptimize -i 7 -o MFS.part + + # Write + dd conv=notrunc if=MFS.part of=me.bin seek=168 count=100 bs=4096 +-- +2.39.5 + diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg new file mode 100644 index 00000000..b75cf9d7 --- /dev/null +++ b/config/data/grub/mkhelper.cfg @@ -0,0 +1,7 @@ +. "include/rom.sh" + +bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" +autoconfargs="--with-platform=coreboot --disable-werror" +makeargs="FS_PAYLOAD_MODULES=\"\"" +btype="autohell" +mkhelper="mkpayload_grub" diff --git a/config/data/grub/module/xhci b/config/data/grub/module/xhci index 8bf80bfe..6235bbad 100755 --- a/config/data/grub/module/xhci +++ b/config/data/grub/module/xhci @@ -8,6 +8,7 @@ usbserial_ftdi \ usbserial_pl2303 \ usbserial_usbdebug \ video_colors \ +xhci \ " # Modules (and always loaded) grub_modules=" \ @@ -35,7 +36,6 @@ crypto \ cryptodisk \ diskfilter \ echo \ -xhci \ ehci \ eval \ exfat \ diff --git a/config/data/pcsx-redux/mkhelper.cfg b/config/data/pcsx-redux/mkhelper.cfg new file mode 100644 index 00000000..379ad032 --- /dev/null +++ b/config/data/pcsx-redux/mkhelper.cfg @@ -0,0 +1,3 @@ +. "include/rom.sh" + +postmake="copyps1bios" diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg new file mode 100644 index 00000000..e424e2f4 --- /dev/null +++ b/config/data/pico-serprog/mkhelper.cfg @@ -0,0 +1,7 @@ +. "include/rom.sh" + +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/seabios/mkhelper.cfg b/config/data/seabios/mkhelper.cfg new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/config/data/seabios/mkhelper.cfg diff --git a/config/data/stm32-vserprog/mkhelper.cfg b/config/data/stm32-vserprog/mkhelper.cfg new file mode 100644 index 00000000..8f45d7fd --- /dev/null +++ b/config/data/stm32-vserprog/mkhelper.cfg @@ -0,0 +1,6 @@ +. "include/rom.sh" + +sersrc="src/stm32-vserprog" +serx="$sersrc/stm32-vserprog.hex" +serdir="$sersrc/boards" +mkhelper="mkserprog stm32" |