Commit Graph

308 Commits (673b144a4c2136ad1a17d746e70c0ae8825d8b2c)

Author SHA1 Message Date
Leah Rowe 676efbb0df build/clean/u-boot: improved coding style
tabs for indentation

simplify some checks
2023-05-20 21:47:10 +01:00
Leah Rowe 06a92f61a8 build/clean/ich9utils: don't use subshell
this also fixes error handling

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 21:38:54 +01:00
Leah Rowe 43e2dfe2bf build/u-boot: top-down, split-function code style
main() on top

top-down order of logic

logic split into separate functions

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 21:33:37 +01:00
Leah Rowe a8f0721a6f build/payload/u-boot: 79 chars or less per line
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 20:48:19 +01:00
Leah Rowe 89ac1ea5a9 build/payload/u-boot: fix wrong attributions
only alper and ferass have ownership of this file,
but ferass only submitted to it in 2022, not 2021

fix this

i've removed myself from the file, for now

i never touched this file before, so it's
not right that my name be here

put alper's name at the top, because alper
was the person who created this file first

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 20:32:40 +01:00
Leah Rowe c973b95909 build/payload/grub: rename functions for clarity
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 20:16:10 +01:00
Leah Rowe 51e0e40123 build/payload/grub: remove unnecessary check
sed does the same job as cp, in this situation

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 20:08:40 +01:00
Leah Rowe 8e206be7c8 build/payload/grub: split logic into functions
main() on top

top-down logic

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 20:07:22 +01:00
Leah Rowe db7e81612a build/payload/grub: 79 chars or less per line
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 19:55:40 +01:00
Leah Rowe 92bd18c45a build/release/roms: minor cleanup
split actual purging of blobs to a function

rename functions for clarity
2023-05-20 19:45:08 +01:00
Leah Rowe ec3d1006b3 build/release/roms: handle argument properly
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 19:40:31 +01:00
Leah Rowe e0b9766087 build/release/roms: remove superfluous comments
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 19:36:51 +01:00
Leah Rowe 681538a20c build/release/roms: handle errors inside subshell
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 19:35:36 +01:00
Leah Rowe a9bd54423c build/release/roms: split logic into functions
main() on top

top-down logic

79 chars or less, per line

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 19:33:29 +01:00
Leah Rowe 2983309006 build/release/roms: use tabs for indentation
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 19:15:50 +01:00
Leah Rowe fff5fa53ff build/release/src: 79 chars or less per code line
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 19:03:04 +01:00
Leah Rowe 1cdf1c7cf0 build/release/src: handle errors in subshells
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:59:59 +01:00
Leah Rowe 16f878e882 build/release/src: split logic into functions
main() on top

top-down logic

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:52:33 +01:00
Leah Rowe 4e2ee58ac5 build/ich9utils: simplify, fix error handling
errors weren't being handled inside a subshell

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:32:52 +01:00
Leah Rowe 93ec91e862 build/memtest86plus: use tabs for indentation
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:28:58 +01:00
Leah Rowe 4b80f250fb build/clean/crossgcc: better code style
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:28:17 +01:00
Leah Rowe 187d5fa418 build/descriptors: simplify and fix error handling
main() on top

some parts of the script weren't erroring properly

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:26:09 +01:00
Leah Rowe a05be16998 build/grub: fix inconsistent indentation
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:13:44 +01:00
Leah Rowe 02919c47ce build/grub: implement error handling
it uses a subshell, so errors weren't observed

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:10:41 +01:00
Leah Rowe 5bab3bbc33 build/grub: introduce main(), split it up
easier to read

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:06:15 +01:00
Leah Rowe 277e1df0af build/cbutils: remove unnecessary directory check
it will already fail if the coreboot download did.

if the coreboot download succeeds, the directory exists.

Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:01:02 +01:00
Leah Rowe ed9eb4624c build/cbutils: rename function for clarity
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 18:00:31 +01:00
Leah Rowe b12dced470 build/cbutil: avoid frivilous use of subshells
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 17:57:15 +01:00
Leah Rowe 355a45b435 build/cbutils: top-down coding style, main on top
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 17:53:03 +01:00
Leah Rowe 9f58d4e481 build/cbutils: 79 chars or less per line
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 16:13:02 +01:00
Leah Rowe 691f266441 build/cbutils: use tabs for indendation
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-20 16:12:25 +01:00
Leah Rowe 08ad9eb15f download/coreboot: minor cleanup 2023-05-18 12:37:55 +01:00
Leah Rowe 4ac0bc8d3e blobutil/download: minor code cleanup
Signed-off-by: Leah Rowe <leah@libreboot.org>
2023-05-18 11:41:56 +01:00
Leah Rowe 52d87f5f08 download/coreboot: minor code cleanup
i'm pretty much finished now

there might be a few more changes later,
like stricter error handling, more verbose
error messages, etc

right now, it relies on -e to kill lbmk
on error, and uses the exit command

another planned change it to support
other upstreams besides coreboot.org,
such as the dasharo codebase

the latter is *why* i refactored this
download script, for asus kgped-d16
2023-05-15 05:01:48 +01:00
Leah Rowe 7bd206b9e7 download/coreboot: remove errant code
the build_error file is obsolete
2023-05-15 04:53:14 +01:00
Leah Rowe bd82d90faf download/coreboot: tidy up variable names 2023-05-15 04:44:47 +01:00
Leah Rowe 66d06afd6c download/coreboot: run extra.sh from cbtree
to my knowledge, this feature has never been used,
but lbmk permits resources/coreboot/boardname/extra.sh
to execute, as provided by the maintainer, with working
directory set to: coreboot/boardname

this could be used to extend lbmk in a number of ways

for example, it could be used to patch 3rdparty/

it could also be used to break coreboot in creative
and novel ways. hint hint.
2023-05-15 04:17:50 +01:00
Leah Rowe c4b0825c5e download/coreboot: avoid variable conflict
the "board" variable in prepare_new_coreboot_tree()
is also declared in fetch_coreboot_trees

for the one in prepare_new_coreboot_tree, it's passed
as an argument to the function, so give it a new name

i learned that some shells have a global scope, when
using variables of the same name between functions
2023-05-15 04:14:50 +01:00
Leah Rowe 0e1e9c1773 download/coreboot: fix downloads without argument
this should download all trees:

	./download coreboot

without this patch, it doesn't

with this patch, it works

i overlooked this during earlier
refactoring. auditing revealed it.
2023-05-15 04:11:10 +01:00
Leah Rowe bea6735395 download/coreboot: much cleaner coding style
top-down order, and *still* rfc 3676 compliant

i finished simplifying the logic, and
i split everything into smaller functions

there is still more more polishing to do

final touches will be done in new revisions
2023-05-15 04:05:27 +01:00
Leah Rowe 2d69072a09 download/coreboot: clone upstream via ./gitclone
coreboot trees/patching is still handled
specifically by "./download coreboot"

command now available in lbmk:

./gitclone coreboot

this *only* creates the directory at:
coreboot/coreboot

this directory is never used in builds.
it is only used by download/coreboot to
create patched trees for each mainboard
2023-05-15 03:24:19 +01:00
Leah Rowe c17423e475 download/coreboot: simplify check 2023-05-15 02:51:15 +01:00
Leah Rowe 00cafd7022 download/coreboot: fix misnamed function 2023-05-15 02:39:29 +01:00
Leah Rowe 86512e84be download/coreboot: simplify small if statements 2023-05-15 02:38:22 +01:00
Leah Rowe d28584f3d0 download/coreboot: fetch config in new function 2023-05-15 02:30:14 +01:00
Leah Rowe 162f4bf5dd download/coreboot: use global variables
i'm going to move the config recursion check
into a separate function, and global variables
make it easier to handle
2023-05-15 02:17:39 +01:00
Leah Rowe 56b80c0a4c download/coreboot: rename function for clarity 2023-05-15 01:25:08 +01:00
Leah Rowe ee79d8ba95 download/coreboot: reduce indentation in loop 2023-05-15 01:21:20 +01:00
Leah Rowe f858baea93 download/coreboot allow downloading specific trees
this fixes a regression caused in previous (recent)
revisions. this script is a beast, and requires a
lot of taming, which is the purpose of my audit
2023-05-15 01:12:37 +01:00
Leah Rowe a33e5c67f3 download/coreboot: split config check to function 2023-05-15 01:07:32 +01:00
Leah Rowe 62038f1d03 download/coreboot: fix misnamed variable 2023-05-15 00:47:31 +01:00
Leah Rowe 342e846f28 download/coreboot: consistent function declaration 2023-05-15 00:44:26 +01:00
Leah Rowe c32ae5979f download/coreboot: rename function for clarity 2023-05-15 00:43:55 +01:00
Leah Rowe e47aaa8ff0 download/coreboot: prune errant comments 2023-05-15 00:42:36 +01:00
Leah Rowe 31d8fcd3fd download/coreboot: split main() 2023-05-15 00:40:54 +01:00
Leah Rowe 4c2cff5e7c download/coreboot functions: rename board variable 2023-05-15 00:27:08 +01:00
Leah Rowe 7a6f40fcbf download/coreboot: top-down re-ordering
main first

usage last
2023-05-15 00:22:54 +01:00
Leah Rowe fd8b8084ee download/coreboot: simplified for loops 2023-05-15 00:21:16 +01:00
Leah Rowe b24fbc74c3 download/coreboot: move initial logic to main() 2023-05-15 00:10:37 +01:00
Leah Rowe 2871db159d download/coreboot: RFC 2646 compliance
yes, i know 3676 supersedes 2646

i still say 2646

saying 2646 is still technically valid,
for my purposes
2023-05-15 00:03:56 +01:00
Leah Rowe 8b4c1c1652 download/coreboot: consistent tab indentation 2023-05-14 22:46:59 +01:00
Leah Rowe 1388cccbc7 build/seabios: cleaner coding style
top-down logic, main() on top

moved some hardcoded strings to variables
2023-05-14 21:33:19 +01:00
Leah Rowe ddad8f00c6 build/seabios: simplify. stricter error handling 2023-05-14 21:22:06 +01:00
Leah Rowe b74e407806 blobutil/download: cleaner coding style
consistent indentation, and 80-line character limit
(RFC 2646)

top-down order, a main() is introduced, split into
more functions

non-zero-status exit (with message) now, when a non-
defined target is provided, e.g. nonexistentboard_4mb

puffy!
2023-05-14 20:36:06 +01:00
Leah Rowe 557272fa39 download/mrc: stricter error handling
the cbfstool command within subshell now also
exits with non-zero status, if it fails (most
likely because extraction failed, for some reason,
of the coreboot rom image for running through it)
2023-05-14 14:44:00 +01:00
Leah Rowe 7b36ffc1e5 download/mrc: handle exit status within subshell
the previous code merely exited from the subshell,
but the intended behaviour is for the entire script
to halt execution, and exit with non-zero status.

this patch fixes that bug.
2023-05-14 14:34:54 +01:00
Leah Rowe 963b524722 download/mrc: use cleaner coding style
top-down order for all logic, and shorter code lines,
conforming to rfc 2646 (no more than 80 characters)

the 80-character rule is violated for variables containing
long strings, such as wayback machine urls (can't be helped)

a few bugs were discovered, which will be fixed in follow-up
revisions, such as:

* exit status not handled inside subshell
* in general, exit status should be handled
  more explicitly, rather than relying on -e
2023-05-14 14:29:06 +01:00
Leah Rowe db3c1d9ccf download/grub: delete grub if gnulib cloning fails
for our purposes, grub and gnulib are one in the same

if one fails, both have failed

exit with non-zero status if gnulib fails

the script sets -e so it will fail if grub fails to
download, which is tried before gnulib, and if that
happens, the grub directory is not created
2023-05-14 11:21:56 +01:00
Leah Rowe d90dfb0a08 build/dependencies/*: RFC 2646 compliance 2023-05-14 10:33:35 +01:00
Leah Rowe 48bda9e051 update/coreboot: top-down coding style
also moved hardcoded strings into variables
2023-05-14 10:20:18 +01:00
Leah Rowe a35f0b650a blobutil/extract: minor code style cleanup 2023-05-14 09:57:34 +01:00
Leah Rowe 009bf3b67f blobutil/extract: split up extract_blobs() 2023-05-14 09:50:48 +01:00
Leah Rowe fd3936cc59 blobutil/extract: cleaner coding style
removed hardcoded strings, put them in variables

use easier to read lowercase for function names
2023-05-14 09:40:34 +01:00
Leah Rowe 1f8ad1e46a blobutil/extract: simplified main() 2023-05-14 09:24:31 +01:00
Leah Rowe 1ffb32b78f blobutil/extract: top-down logic 2023-05-14 09:19:44 +01:00
Leah Rowe 423e203399 blobutil/extract: RFC 2646 compliance (80 chars) 2023-05-14 09:09:14 +01:00
Leah Rowe 26dfda0c01 blobutil/inject: print script path on error 2023-05-14 08:54:58 +01:00
Leah Rowe 6289eeb55e blobutil/inject: fail if gbe.bin doesn't exist 2023-05-14 08:35:34 +01:00
Leah Rowe 54f8a45325 blobutil/inject: check that me.bin exists 2023-05-14 08:31:59 +01:00
Leah Rowe d34f381301 blobutil/inject: check me path 2023-05-14 08:30:21 +01:00
Leah Rowe 5da7554a3b blobutil/inject: remove errant debug message
i left this here by accident when testing something
during work on a prior revision
2023-05-14 08:27:39 +01:00
Leah Rowe 70e337afd0 blobutil/inject: use x86 top-aligned mrc offset
the old code was specifing an absolute offset for
insertion of mrc.bin - cbfstool interprets anything
above 0x80000000 as top-aligned memory address in
x86, and anything below as an obsolute offset in
the flash, like with the old number

where a top-aligned address is provided to cbfstool,
the absolute position is calculated for the flash,
and cbfstool inserts it in the correct rom location

the benefit of this change is that the absolute
offset is now calculated automatically, which means
that the code will be correct even if the flash
size changes. for example, if 16MB flash is used
whereas 12MB is currently the default an support
haswell hardware

coreboot does not provide anything readably like
Kconfig, for extracting this value. it's baked
into the source code of coreboot, so you have to
find it. the correct location is hardcoded for
each platform, and always the same on each platform,
regardless of mainboard
2023-05-14 08:16:12 +01:00
Leah Rowe 1742978858 remove errant code lines from last commit 2023-05-14 06:36:21 +01:00
Leah Rowe ee0b200fbe blobutil/inject: massively improved coding style
top-down function order, with specific functions for
each type of blob. startup logic moved into main(),
also split into smaller functions

"write one program that does one thing well"

blobutil is like that, and has this added philosophy:

"write one function that does one thing well"

during the course of this re-factoring, several bugs
and issues were found, that are pre-existing. these
will be corrected in follow-up revisions
2023-05-14 06:27:41 +01:00
Leah Rowe f2e3176708 modify/u-boot: cleaner coding style
similar to the previous revision
2023-05-13 04:22:34 +01:00
Leah Rowe 71cac86634 modify/coreboot: cleaner coding style
similar to the previous revision
2023-05-13 04:09:06 +01:00
Leah Rowe 174d3af7a6 modify/seabios: cleaner coding style
same as build/boot/roms
2023-05-13 03:51:58 +01:00
Leah Rowe c8dfc3ccaa build/build/roms: simplify mkCoreboot() arguments 2023-05-13 03:06:55 +01:00
Leah Rowe d8a8a1c622 build/boot/roms: don't use subshells frivilously
use make -BC instead of cd
2023-05-13 02:52:42 +01:00
Leah Rowe 834be77c1d build/boot/roms: remove errant debug line
i added this in the last revision

it was put there to debug something that
i fixed before pushing
2023-05-13 02:36:09 +01:00
Leah Rowe 39c143989c build/boot/roms: simplify build_rom_images() 2023-05-13 02:32:44 +01:00
Leah Rowe 65dfdd56da build/boot/roms: use fast dd command for ich9m ifd
bs 12k and count 1, rather than bs 1 and count 12k
2023-05-13 01:38:59 +01:00
Leah Rowe 6a4ce66f6e build/boot/roms: don't run ich9gen twice 2023-05-13 01:34:29 +01:00
Leah Rowe 1e9ed989d3 build/boot/roms: simplify moverom() 2023-05-13 01:27:00 +01:00
Leah Rowe 5811e53e82 build/boot/roms: remove unused legacy code
this cuttype is no longer used

lbmk creates truncated me setups now, on ifd platforms
2023-05-13 01:07:53 +01:00
Leah Rowe 3bd82b7679 build/boot/roms: reduced code indentation 2023-05-13 00:13:54 +01:00
Leah Rowe 9eee0fb483 build/boot/roms: split main() to topdown functions
the logic can now more or less be read chronologically
2023-05-12 23:09:39 +01:00
Leah Rowe bceb5f2eb4 build/roms_helper: move logic into main()
logic will be split from main into smaller
functions, in follow-up commits
2023-05-12 16:55:45 +01:00
Leah Rowe 6290f999e2 build/boot/roms_helper: further cleanup
consolidated some for loops

removed errant code
2023-05-10 20:23:18 +01:00
Leah Rowe 722c844ea7 build/boot/roms: top-down function order 2023-05-10 05:39:11 +01:00