From d423421995c5927dcfd2623da47216ea71b9de3d Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 11 May 2024 18:53:12 +0100 Subject: [PATCH] remove all status checks. only handle release. the release variable is all we need, turning a target on or off for a given release. the status checks were prone to bugs, and unnecessary; it also broke certain benchmark scripts. it's better to keep the cbmk logic simpler. board status will be moved to the documentation instead. Signed-off-by: Leah Rowe --- build | 1 - config/coreboot/d510mo/target.cfg | 1 - config/coreboot/d510mo/warn.txt | 1 - config/coreboot/d510mo_16mb/target.cfg | 1 - config/coreboot/d510mo_16mb/warn.txt | 1 - config/coreboot/d945gclf_512kb/target.cfg | 1 - config/coreboot/d945gclf_512kb/warn.txt | 1 - config/coreboot/d945gclf_8mb/target.cfg | 1 - config/coreboot/d945gclf_8mb/warn.txt | 1 - config/coreboot/e6400_4mb/target.cfg | 1 - config/coreboot/e6400_4mb/warn.txt | 1 - config/coreboot/g43t-am3/target.cfg | 1 - config/coreboot/g43t-am3_16mb/target.cfg | 1 - config/coreboot/ga-g41m-es2l/target.cfg | 1 - config/coreboot/gru_bob/target.cfg | 1 - config/coreboot/gru_bob/warn.txt | 1 - config/coreboot/gru_kevin/target.cfg | 1 - config/coreboot/gru_kevin/warn.txt | 1 - config/coreboot/kcma-d8-rdimm_16mb/target.cfg | 1 - config/coreboot/kcma-d8-rdimm_16mb/warn.txt | 1 - config/coreboot/kcma-d8-rdimm_2mb/target.cfg | 1 - config/coreboot/kcma-d8-rdimm_2mb/warn.txt | 1 - config/coreboot/kcma-d8-udimm_16mb/target.cfg | 1 - config/coreboot/kcma-d8-udimm_16mb/warn.txt | 1 - config/coreboot/kcma-d8-udimm_2mb/target.cfg | 1 - config/coreboot/kcma-d8-udimm_2mb/warn.txt | 1 - config/coreboot/kfsn4-dre_1mb/target.cfg | 1 - config/coreboot/kfsn4-dre_2mb/target.cfg | 1 - .../coreboot/kgpe-d16-rdimm_16mb/target.cfg | 1 - config/coreboot/kgpe-d16-rdimm_16mb/warn.txt | 1 - config/coreboot/kgpe-d16-rdimm_2mb/target.cfg | 1 - config/coreboot/kgpe-d16-rdimm_2mb/warn.txt | 1 - .../coreboot/kgpe-d16-udimm_16mb/target.cfg | 1 - config/coreboot/kgpe-d16-udimm_16mb/warn.txt | 1 - config/coreboot/kgpe-d16-udimm_2mb/target.cfg | 1 - config/coreboot/kgpe-d16-udimm_2mb/warn.txt | 1 - config/coreboot/macbook11/target.cfg | 1 - config/coreboot/macbook11_16mb/target.cfg | 1 - config/coreboot/macbook21/target.cfg | 1 - config/coreboot/macbook21_16mb/target.cfg | 1 - config/coreboot/qemu_arm64_12mb/target.cfg | 1 - config/coreboot/qemu_x86_12mb/target.cfg | 1 - config/coreboot/r400_16mb/target.cfg | 1 - config/coreboot/r400_4mb/target.cfg | 1 - config/coreboot/r400_8mb/target.cfg | 1 - config/coreboot/r500_4mb/target.cfg | 1 - config/coreboot/t400_16mb/target.cfg | 1 - config/coreboot/t400_4mb/target.cfg | 1 - config/coreboot/t400_8mb/target.cfg | 1 - config/coreboot/t500_16mb/target.cfg | 1 - config/coreboot/t500_4mb/target.cfg | 1 - config/coreboot/t500_8mb/target.cfg | 1 - config/coreboot/t60_16mb_intelgpu/target.cfg | 1 - config/coreboot/t60_intelgpu/target.cfg | 1 - config/coreboot/w500_16mb/target.cfg | 1 - config/coreboot/w500_4mb/target.cfg | 1 - config/coreboot/w500_8mb/target.cfg | 1 - config/coreboot/x200_16mb/target.cfg | 1 - config/coreboot/x200_4mb/target.cfg | 1 - config/coreboot/x200_8mb/target.cfg | 1 - config/coreboot/x301_16mb/target.cfg | 1 - config/coreboot/x301_4mb/target.cfg | 1 - config/coreboot/x301_8mb/target.cfg | 1 - config/coreboot/x60/target.cfg | 1 - config/coreboot/x60_16mb/target.cfg | 1 - include/option.sh | 11 +-- script/roms | 88 ++----------------- 67 files changed, 9 insertions(+), 155 deletions(-) delete mode 100644 config/coreboot/d510mo/warn.txt delete mode 100644 config/coreboot/d510mo_16mb/warn.txt delete mode 100644 config/coreboot/d945gclf_512kb/warn.txt delete mode 100644 config/coreboot/d945gclf_8mb/warn.txt delete mode 100644 config/coreboot/e6400_4mb/warn.txt delete mode 100644 config/coreboot/gru_bob/warn.txt delete mode 100644 config/coreboot/gru_kevin/warn.txt delete mode 100644 config/coreboot/kcma-d8-rdimm_16mb/warn.txt delete mode 100644 config/coreboot/kcma-d8-rdimm_2mb/warn.txt delete mode 100644 config/coreboot/kcma-d8-udimm_16mb/warn.txt delete mode 100644 config/coreboot/kcma-d8-udimm_2mb/warn.txt delete mode 100644 config/coreboot/kgpe-d16-rdimm_16mb/warn.txt delete mode 100644 config/coreboot/kgpe-d16-rdimm_2mb/warn.txt delete mode 100644 config/coreboot/kgpe-d16-udimm_16mb/warn.txt delete mode 100644 config/coreboot/kgpe-d16-udimm_2mb/warn.txt diff --git a/build b/build index e3e5c76..e2f2a45 100755 --- a/build +++ b/build @@ -119,7 +119,6 @@ usage() mkrelease() { export CBMK_RELEASE="y" - export CBMK_STATUS="n" vdir="release" while getopts d:m: option; do diff --git a/config/coreboot/d510mo/target.cfg b/config/coreboot/d510mo/target.cfg index 5c15f46..65330b7 100644 --- a/config/coreboot/d510mo/target.cfg +++ b/config/coreboot/d510mo/target.cfg @@ -4,5 +4,4 @@ payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" payload_memtest="y" -status="untested" release="n" diff --git a/config/coreboot/d510mo/warn.txt b/config/coreboot/d510mo/warn.txt deleted file mode 100644 index 7e2498a..0000000 --- a/config/coreboot/d510mo/warn.txt +++ /dev/null @@ -1 +0,0 @@ -this board has never been stable, and has not been tested in Libreboot 20240504 so no ROM images included for it in that release diff --git a/config/coreboot/d510mo_16mb/target.cfg b/config/coreboot/d510mo_16mb/target.cfg index 82e5218..ef75af4 100644 --- a/config/coreboot/d510mo_16mb/target.cfg +++ b/config/coreboot/d510mo_16mb/target.cfg @@ -3,5 +3,4 @@ xarch="i386-elf" payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" -status="untested" release="n" diff --git a/config/coreboot/d510mo_16mb/warn.txt b/config/coreboot/d510mo_16mb/warn.txt deleted file mode 100644 index 7e2498a..0000000 --- a/config/coreboot/d510mo_16mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -this board has never been stable, and has not been tested in Libreboot 20240504 so no ROM images included for it in that release diff --git a/config/coreboot/d945gclf_512kb/target.cfg b/config/coreboot/d945gclf_512kb/target.cfg index 2c2cf67..5843b4e 100644 --- a/config/coreboot/d945gclf_512kb/target.cfg +++ b/config/coreboot/d945gclf_512kb/target.cfg @@ -4,5 +4,4 @@ payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" payload_memtest="n" -status="untested" release="n" diff --git a/config/coreboot/d945gclf_512kb/warn.txt b/config/coreboot/d945gclf_512kb/warn.txt deleted file mode 100644 index 7e2498a..0000000 --- a/config/coreboot/d945gclf_512kb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -this board has never been stable, and has not been tested in Libreboot 20240504 so no ROM images included for it in that release diff --git a/config/coreboot/d945gclf_8mb/target.cfg b/config/coreboot/d945gclf_8mb/target.cfg index 2c2cf67..5843b4e 100644 --- a/config/coreboot/d945gclf_8mb/target.cfg +++ b/config/coreboot/d945gclf_8mb/target.cfg @@ -4,5 +4,4 @@ payload_grub="n" payload_grub_withseabios="n" payload_seabios="y" payload_memtest="n" -status="untested" release="n" diff --git a/config/coreboot/d945gclf_8mb/warn.txt b/config/coreboot/d945gclf_8mb/warn.txt deleted file mode 100644 index 7e2498a..0000000 --- a/config/coreboot/d945gclf_8mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -this board has never been stable, and has not been tested in Libreboot 20240504 so no ROM images included for it in that release diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg index fb7c7bf..3a458ee 100644 --- a/config/coreboot/e6400_4mb/target.cfg +++ b/config/coreboot/e6400_4mb/target.cfg @@ -7,4 +7,3 @@ payload_memtest="y" payload_seabios_withgrub="y" payload_seabios_grubonly="y" grub_scan_disk="ahci" -status="stable" # broken s3 diff --git a/config/coreboot/e6400_4mb/warn.txt b/config/coreboot/e6400_4mb/warn.txt deleted file mode 100644 index 4709a00..0000000 --- a/config/coreboot/e6400_4mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Battery indicator not working yet. May shut down instead of throttle on high CPU temperature; use the intel_pstate driver to cap speeds, and monitor performance via CPU stress test and lm-sensors/xsensors utility, before using the machine regularly. diff --git a/config/coreboot/g43t-am3/target.cfg b/config/coreboot/g43t-am3/target.cfg index 21b6872..13f2a26 100644 --- a/config/coreboot/g43t-am3/target.cfg +++ b/config/coreboot/g43t-am3/target.cfg @@ -3,4 +3,3 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" grub_timeout=10 -status="stable" diff --git a/config/coreboot/g43t-am3_16mb/target.cfg b/config/coreboot/g43t-am3_16mb/target.cfg index 01cd4d0..bbe8a9f 100644 --- a/config/coreboot/g43t-am3_16mb/target.cfg +++ b/config/coreboot/g43t-am3_16mb/target.cfg @@ -3,5 +3,4 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" grub_timeout=10 -status="stable" release="n" diff --git a/config/coreboot/ga-g41m-es2l/target.cfg b/config/coreboot/ga-g41m-es2l/target.cfg index dc53b74..ef85da4 100644 --- a/config/coreboot/ga-g41m-es2l/target.cfg +++ b/config/coreboot/ga-g41m-es2l/target.cfg @@ -4,4 +4,3 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ata" grub_timeout=10 -status="stable" diff --git a/config/coreboot/gru_bob/target.cfg b/config/coreboot/gru_bob/target.cfg index 86283f7..a7c3615 100644 --- a/config/coreboot/gru_bob/target.cfg +++ b/config/coreboot/gru_bob/target.cfg @@ -1,4 +1,3 @@ tree="default" xarch="aarch64-elf arm-eabi" payload_uboot="y" -status="stable" diff --git a/config/coreboot/gru_bob/warn.txt b/config/coreboot/gru_bob/warn.txt deleted file mode 100644 index 1dcc4e7..0000000 --- a/config/coreboot/gru_bob/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Incomplete UEFI implementation but should boot most distros fine. Debian Bookworm installed and the first 1GB or so of the partition got corrupted. Leave the first 2GB or so unpartitioned, when installing any distro. diff --git a/config/coreboot/gru_kevin/target.cfg b/config/coreboot/gru_kevin/target.cfg index 86283f7..a7c3615 100644 --- a/config/coreboot/gru_kevin/target.cfg +++ b/config/coreboot/gru_kevin/target.cfg @@ -1,4 +1,3 @@ tree="default" xarch="aarch64-elf arm-eabi" payload_uboot="y" -status="stable" diff --git a/config/coreboot/gru_kevin/warn.txt b/config/coreboot/gru_kevin/warn.txt deleted file mode 100644 index 1dcc4e7..0000000 --- a/config/coreboot/gru_kevin/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Incomplete UEFI implementation but should boot most distros fine. Debian Bookworm installed and the first 1GB or so of the partition got corrupted. Leave the first 2GB or so unpartitioned, when installing any distro. diff --git a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg index 3d0185e..d5d3729 100644 --- a/config/coreboot/kcma-d8-rdimm_16mb/target.cfg +++ b/config/coreboot/kcma-d8-rdimm_16mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" xlang="c" -status="unstable" diff --git a/config/coreboot/kcma-d8-rdimm_16mb/warn.txt b/config/coreboot/kcma-d8-rdimm_16mb/warn.txt deleted file mode 100644 index 639ecd4..0000000 --- a/config/coreboot/kcma-d8-rdimm_16mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -raminit has always been unreliable on this board; ymmv diff --git a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg index 3d0185e..d5d3729 100644 --- a/config/coreboot/kcma-d8-rdimm_2mb/target.cfg +++ b/config/coreboot/kcma-d8-rdimm_2mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" xlang="c" -status="unstable" diff --git a/config/coreboot/kcma-d8-rdimm_2mb/warn.txt b/config/coreboot/kcma-d8-rdimm_2mb/warn.txt deleted file mode 100644 index 639ecd4..0000000 --- a/config/coreboot/kcma-d8-rdimm_2mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -raminit has always been unreliable on this board; ymmv diff --git a/config/coreboot/kcma-d8-udimm_16mb/target.cfg b/config/coreboot/kcma-d8-udimm_16mb/target.cfg index 2c3bc30..35354c2 100644 --- a/config/coreboot/kcma-d8-udimm_16mb/target.cfg +++ b/config/coreboot/kcma-d8-udimm_16mb/target.cfg @@ -6,4 +6,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" xlang="c" -status="unstable" diff --git a/config/coreboot/kcma-d8-udimm_16mb/warn.txt b/config/coreboot/kcma-d8-udimm_16mb/warn.txt deleted file mode 100644 index 639ecd4..0000000 --- a/config/coreboot/kcma-d8-udimm_16mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -raminit has always been unreliable on this board; ymmv diff --git a/config/coreboot/kcma-d8-udimm_2mb/target.cfg b/config/coreboot/kcma-d8-udimm_2mb/target.cfg index 2c3bc30..35354c2 100644 --- a/config/coreboot/kcma-d8-udimm_2mb/target.cfg +++ b/config/coreboot/kcma-d8-udimm_2mb/target.cfg @@ -6,4 +6,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" xlang="c" -status="unstable" diff --git a/config/coreboot/kcma-d8-udimm_2mb/warn.txt b/config/coreboot/kcma-d8-udimm_2mb/warn.txt deleted file mode 100644 index 639ecd4..0000000 --- a/config/coreboot/kcma-d8-udimm_2mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -raminit has always been unreliable on this board; ymmv diff --git a/config/coreboot/kfsn4-dre_1mb/target.cfg b/config/coreboot/kfsn4-dre_1mb/target.cfg index e5b66b3..19c57b8 100644 --- a/config/coreboot/kfsn4-dre_1mb/target.cfg +++ b/config/coreboot/kfsn4-dre_1mb/target.cfg @@ -4,4 +4,3 @@ payload_seabios="y" payload_memtest="y" xlang="c" grub_timeout=10 -status="stable" diff --git a/config/coreboot/kfsn4-dre_2mb/target.cfg b/config/coreboot/kfsn4-dre_2mb/target.cfg index 8f4e6a8..9bd20d4 100644 --- a/config/coreboot/kfsn4-dre_2mb/target.cfg +++ b/config/coreboot/kfsn4-dre_2mb/target.cfg @@ -5,4 +5,3 @@ payload_seabios_withgrub="y" payload_memtest="y" xlang="c" grub_timeout=10 -status="stable" diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg index f469e6f..2867a73 100644 --- a/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_16mb/target.cfg @@ -5,4 +5,3 @@ payload_seabios_withgrub="y" payload_memtest="y" xlang="c" grub_timeout=10 -status="unstable" diff --git a/config/coreboot/kgpe-d16-rdimm_16mb/warn.txt b/config/coreboot/kgpe-d16-rdimm_16mb/warn.txt deleted file mode 100644 index 639ecd4..0000000 --- a/config/coreboot/kgpe-d16-rdimm_16mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -raminit has always been unreliable on this board; ymmv diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg index f469e6f..2867a73 100644 --- a/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-rdimm_2mb/target.cfg @@ -5,4 +5,3 @@ payload_seabios_withgrub="y" payload_memtest="y" xlang="c" grub_timeout=10 -status="unstable" diff --git a/config/coreboot/kgpe-d16-rdimm_2mb/warn.txt b/config/coreboot/kgpe-d16-rdimm_2mb/warn.txt deleted file mode 100644 index 639ecd4..0000000 --- a/config/coreboot/kgpe-d16-rdimm_2mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -raminit has always been unreliable on this board; ymmv diff --git a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg index 298d1f2..5b4010d 100644 --- a/config/coreboot/kgpe-d16-udimm_16mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_16mb/target.cfg @@ -6,4 +6,3 @@ payload_seabios_withgrub="y" payload_memtest="y" xlang="c" grub_timeout=10 -status="unstable" diff --git a/config/coreboot/kgpe-d16-udimm_16mb/warn.txt b/config/coreboot/kgpe-d16-udimm_16mb/warn.txt deleted file mode 100644 index 639ecd4..0000000 --- a/config/coreboot/kgpe-d16-udimm_16mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -raminit has always been unreliable on this board; ymmv diff --git a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg index 298d1f2..5b4010d 100644 --- a/config/coreboot/kgpe-d16-udimm_2mb/target.cfg +++ b/config/coreboot/kgpe-d16-udimm_2mb/target.cfg @@ -6,4 +6,3 @@ payload_seabios_withgrub="y" payload_memtest="y" xlang="c" grub_timeout=10 -status="unstable" diff --git a/config/coreboot/kgpe-d16-udimm_2mb/warn.txt b/config/coreboot/kgpe-d16-udimm_2mb/warn.txt deleted file mode 100644 index 639ecd4..0000000 --- a/config/coreboot/kgpe-d16-udimm_2mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -raminit has always been unreliable on this board; ymmv diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg index 3804665..dcf5d1d 100644 --- a/config/coreboot/macbook11/target.cfg +++ b/config/coreboot/macbook11/target.cfg @@ -4,4 +4,3 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg index 3804665..dcf5d1d 100644 --- a/config/coreboot/macbook11_16mb/target.cfg +++ b/config/coreboot/macbook11_16mb/target.cfg @@ -4,4 +4,3 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg index 27d71b5..bb56ec2 100644 --- a/config/coreboot/macbook21/target.cfg +++ b/config/coreboot/macbook21/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg index 27d71b5..bb56ec2 100644 --- a/config/coreboot/macbook21_16mb/target.cfg +++ b/config/coreboot/macbook21_16mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/qemu_arm64_12mb/target.cfg b/config/coreboot/qemu_arm64_12mb/target.cfg index 86283f7..a7c3615 100644 --- a/config/coreboot/qemu_arm64_12mb/target.cfg +++ b/config/coreboot/qemu_arm64_12mb/target.cfg @@ -1,4 +1,3 @@ tree="default" xarch="aarch64-elf arm-eabi" payload_uboot="y" -status="stable" diff --git a/config/coreboot/qemu_x86_12mb/target.cfg b/config/coreboot/qemu_x86_12mb/target.cfg index dba2c61..4d03eb4 100644 --- a/config/coreboot/qemu_x86_12mb/target.cfg +++ b/config/coreboot/qemu_x86_12mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="both" -status="stable" diff --git a/config/coreboot/r400_16mb/target.cfg b/config/coreboot/r400_16mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/r400_16mb/target.cfg +++ b/config/coreboot/r400_16mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/r400_4mb/target.cfg b/config/coreboot/r400_4mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/r400_4mb/target.cfg +++ b/config/coreboot/r400_4mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/r400_8mb/target.cfg b/config/coreboot/r400_8mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/r400_8mb/target.cfg +++ b/config/coreboot/r400_8mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/r500_4mb/target.cfg b/config/coreboot/r500_4mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/r500_4mb/target.cfg +++ b/config/coreboot/r500_4mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/t400_16mb/target.cfg b/config/coreboot/t400_16mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/t400_16mb/target.cfg +++ b/config/coreboot/t400_16mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/t400_4mb/target.cfg b/config/coreboot/t400_4mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/t400_4mb/target.cfg +++ b/config/coreboot/t400_4mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/t400_8mb/target.cfg b/config/coreboot/t400_8mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/t400_8mb/target.cfg +++ b/config/coreboot/t400_8mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/t500_16mb/target.cfg b/config/coreboot/t500_16mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/t500_16mb/target.cfg +++ b/config/coreboot/t500_16mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/t500_4mb/target.cfg b/config/coreboot/t500_4mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/t500_4mb/target.cfg +++ b/config/coreboot/t500_4mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/t500_8mb/target.cfg b/config/coreboot/t500_8mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/t500_8mb/target.cfg +++ b/config/coreboot/t500_8mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg index bb3decb..2daf00f 100644 --- a/config/coreboot/t60_16mb_intelgpu/target.cfg +++ b/config/coreboot/t60_16mb_intelgpu/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" grub_background="background1024x768.png" -status="stable" diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg index bb3decb..2daf00f 100644 --- a/config/coreboot/t60_intelgpu/target.cfg +++ b/config/coreboot/t60_intelgpu/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" grub_background="background1024x768.png" -status="stable" diff --git a/config/coreboot/w500_16mb/target.cfg b/config/coreboot/w500_16mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/w500_16mb/target.cfg +++ b/config/coreboot/w500_16mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/w500_4mb/target.cfg b/config/coreboot/w500_4mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/w500_4mb/target.cfg +++ b/config/coreboot/w500_4mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/w500_8mb/target.cfg b/config/coreboot/w500_8mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/w500_8mb/target.cfg +++ b/config/coreboot/w500_8mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/x200_16mb/target.cfg b/config/coreboot/x200_16mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/x200_16mb/target.cfg +++ b/config/coreboot/x200_16mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/x200_4mb/target.cfg b/config/coreboot/x200_4mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/x200_4mb/target.cfg +++ b/config/coreboot/x200_4mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/x200_8mb/target.cfg b/config/coreboot/x200_8mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/x200_8mb/target.cfg +++ b/config/coreboot/x200_8mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/x301_16mb/target.cfg b/config/coreboot/x301_16mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/x301_16mb/target.cfg +++ b/config/coreboot/x301_16mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/x301_4mb/target.cfg b/config/coreboot/x301_4mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/x301_4mb/target.cfg +++ b/config/coreboot/x301_4mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/x301_8mb/target.cfg b/config/coreboot/x301_8mb/target.cfg index f16a94a..8688df3 100644 --- a/config/coreboot/x301_8mb/target.cfg +++ b/config/coreboot/x301_8mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="stable" diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg index bb3decb..2daf00f 100644 --- a/config/coreboot/x60/target.cfg +++ b/config/coreboot/x60/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" grub_background="background1024x768.png" -status="stable" diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg index bb3decb..2daf00f 100644 --- a/config/coreboot/x60_16mb/target.cfg +++ b/config/coreboot/x60_16mb/target.cfg @@ -5,4 +5,3 @@ payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" grub_background="background1024x768.png" -status="stable" diff --git a/include/option.sh b/include/option.sh index b6191e3..aca142d 100755 --- a/include/option.sh +++ b/include/option.sh @@ -33,8 +33,8 @@ setvars() done printf "%s\n" "${_setvars% }" } -eval "$(setvars "" _nogit _dest board boarddir cbmk_release cbmk_status threads \ - version versiondate projectname)" +eval "$(setvars "" versiondate tmpdir _nogit version _dest board boarddir \ + cbmk_release threads projectname)" # if "y": a coreboot target won't be built if target.cfg says release="n" # (this is used to exclude certain build targets from releases) @@ -43,13 +43,6 @@ set | grep CBMK_RELEASE 1>/dev/null 2>/dev/null || cbmk_release="n" || : [ "$cbmk_release" = "n" ] || [ "$cbmk_release" = "y" ] || cbmk_release="n" export CBMK_RELEASE="$cbmk_release" -# if set to n via export, status checks will be skipped during -# all builds, and all targets will be built regardless of status. -# this replicates the old behaviour of cbmk, prior to the checks. -set | grep CBMK_STATUS 1>/dev/null 2>/dev/null && cbmk_status="$CBMK_STATUS" -[ "$cbmk_status" = "y" ] || [ "$cbmk_status" = "n" ] || cbmk_status="y" -export CBMK_STATUS="$cbmk_status" - set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n" if [ "${tmpdir_was_set}" = "y" ]; then [ "${TMPDIR%_*}" = "/tmp/cbmk" ] || tmpdir_was_set="n" diff --git a/script/roms b/script/roms index c752a7b..48a50b6 100755 --- a/script/roms +++ b/script/roms @@ -24,31 +24,23 @@ stm32_src_dir="src/stm32-vserprog" pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest t" pv="${pv} payload_seabios_withgrub payload_seabios_grubonly payload_uboot memtest_bin" v="romdir cbrom initmode displaymode cbcfg targetdir tree keymaps release" -v="${v} grub_timeout ubdir board grub_scan_disk uboot_config status" +v="${v} grub_timeout ubdir board grub_scan_disk uboot_config" eval "$(setvars "n" ${pv} serprog)" eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets \ - skipped listboards list_type serprog_boards_dir)" + serprog_boards_dir)" main() { check_project while [ $# -gt 0 ]; do - if [ "$listboards" = "y" ]; then - list_type="$list_type $1" - list_type="${list_type# }" - shift 1; continue - fi - case ${1} in help) usage exit 0 ;; list) - boards=$(items config/coreboot) || \ - $err "Cannot generate list of boards for list" - listboards="y" - shift 1; continue ;; + x_ items config/coreboot + return 0 ;; serprog) serprog="y" shift 1; break ;; @@ -74,14 +66,6 @@ main() done fi - [ "$listboards" = "y" ] && return 0 - - if [ -n "$skipped" ]; then - printf "\nThese targets were skipped:\n" - eval "printf \"${skipped}\"" - printf "^^ These targets were skipped.\n\n" - fi - [ -z "${targets}" ] && $err "No ROM images were compiled" printf "\nROM images available in these directories:\n" eval "printf \"${targets}\"" @@ -155,18 +139,11 @@ handle_coreboot_target() eval "$(setvars "n" ${pv}) $(setvars "" ${v})" grub_background="background1280x800.png" board="$1" - status="unknown" configure_target - [ "$board" = "$tree" ] && \ - return 0 - - print_target_name && return 0 - - # exclude certain targets from the release - if skip_board; then - printf "Skip target %s(%s)\n" "$board" "$status" - skipped="* $board($status)\n$skipped" + [ "$board" = "$tree" ] && return 0 + if [ "$cbmk_release" = "y" ] && [ "$release" = "n" ]; then + printf "Target '%s' disabled for release.\n" "$board" return 0 fi @@ -225,57 +202,6 @@ configure_target() eval "payload_${_payload}=y" } -print_target_name() -{ - [ "$listboards" = "y" ] || return 1 - - [ -z "$list_type" ] && printf "%s\n" "$board" - - for _list_type in $list_type; do - if [ "${_list_type#_}" = "$_list_type" ]; then - [ "$status" != "$_list_type" ] && \ - continue - printf "%s\n" "$board" - break - elif [ "$status" != "${_list_type#_}" ]; then - printf "%s\n" "$board" - break - fi - done -} - -skip_board() -{ - if [ "$listboards" != "y" ] && [ "$status" != "stable" ]; then - printf "\n\n\t!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" - printf "\t__WARNING: %s has status '%s'__\n" \ - "$board" "$status" - printf "\t!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n" - fi - - if [ -f "$targetdir/warn.txt" ] && [ "$listboards" != "y" ]; then - printf "Regarding target '%s' (status '%s'):\n\n" \ - "$board" "$status" - cat -u "$targetdir/warn.txt" || \ - $err "!cat $targetdir/warn.txt" - fi - - [ "$cbmk_release" = "y" ] && [ "$release" = "n" ] && return 0 - [ "$cbmk_release" = "y" ] && [ "$status" != "broken" ] && return 1 - [ "$cbmk_status" = "y" ] || return 1 - [ "$status" = "stable" ] && return 1 - - printf "\nTo disable this dialog when building, do:\n" - printf "export CBMK_STATUS=n\n\n" - while true; do - printf "Board %s has status '%s'. Skip? [y/n] " \ - "$board" "$status" - read -r skip - [ "$skip" = "y" ] && return 0 - [ "$skip" = "n" ] && return 1; continue - done -} - build_payloads() { romdir="bin/${board}"