summaryrefslogtreecommitdiff
path: root/config/module/pcsx-redux/default
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2026-09-18 21:04:00 +0100
committerLeah Rowe <leah@libreboot.org>2026-09-20 13:53:33 +0100
commit076c87ccf68f7fe5a3998e8cd8edd2033a2f2ef0 (patch)
tree9aaf04cfa16565227f733b917af3e3c485505544 /config/module/pcsx-redux/default
parent387e6dd771588b7f8426c8d0934e610626730d51 (diff)
xbmk: make all projects multi-tree
we currently distinguish, by virtue of logic, multi- and single-tree projects. this introduces a lot of complexity, so the following patch has removed this distinction. all single-tree projects are now multi tree, but with only one tree. other design changes: config/git removed. rev/tree now handled with mkhelper and target configs. this allows per-tree remote handling, so we could (for example) add the mrchromebox coreboot fork easily, for specific chromebook models. config/project is now config/module/project. this cleans up the main config/ directory. cfgname variable: .config no longer hardcoded when doing configs in projects. it is configurable with this variable. if unset, the previous .cfg is used noconfig variable: set this in target/mkhelper configs, and config/module/project/tree/config/ is unused; instead, make is called without config copying. a "noconfig" placeholder is used. this enables cleaner usage of previously single-tree projects in the new multi-tree-only structure. cfgvars: variables reinitialised in project config are cleaned more reliably. in particular, several variables e.g. autogenargs were not being reset between projects, although the autogenargs variable is currently unused. general cleanup has been conducted across the build system, as part of this redesign. several parts of the build system more over-engineered as a result of the previous design, and the new design enabled a severe reduction in sloccount (75 lines reduced in lbmk). yes, this change *adds features* but there are fewer lines of code than before. this is the best kind of change. way better than the 3-line-diff. yes. rev= and tree= are set more centrally in configs. the mkhelper config can be used to set url/url_bkup, but individual trees can override them. configs have been cleaned up, with several variables now much more heavily centralised. config/git/ was used before to first download the bare repository, and then the real clone was made with patches. this allows git repositories to be cached for future re-builds. with config/git/ gone, the download logic for projects is more centrally implemented. a separate call to ./mk -f is no longer performed, and in fact ./mk -f never needs to be used anymore as a result. ./mk -f now is basically the same thing as -b, just without any action performed. this change will allow rapid expansion of the libreboot project. i want to add hundreds of chromebooks to the project, using mrchromebox, but the previous design did not permit this. this change means that i can easily have unlimited upstreams per project. coreboot will, in some follow-up changes, have the following upstreams: coreboot/default: coreboot.org coreboot/fam15h: 15h.org fork coreboot/chromebook: mrchromebox fork this can now be done freely without massive changes to the build system. under the previous design, i worked on a now-abandoned patch to do N remotes per project, reading repo links from a file. this meant that i'd have coreboot.org first (main and backup), then mrchromebox. this meant that lbmk would failover through to mrchromebox, wasting time for the user. this new design is much cleaner, and will enable the project to be maintained much more easily. Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'config/module/pcsx-redux/default')
-rw-r--r--config/module/pcsx-redux/default/patches/0001-no-context-will-be-given.patch36
-rw-r--r--config/module/pcsx-redux/default/patches/0002-lbmk-hack-add-no-ops-for-config-commands.patch43
-rw-r--r--config/module/pcsx-redux/default/target.cfg13
3 files changed, 92 insertions, 0 deletions
diff --git a/config/module/pcsx-redux/default/patches/0001-no-context-will-be-given.patch b/config/module/pcsx-redux/default/patches/0001-no-context-will-be-given.patch
new file mode 100644
index 00000000..b2968c11
--- /dev/null
+++ b/config/module/pcsx-redux/default/patches/0001-no-context-will-be-given.patch
@@ -0,0 +1,36 @@
+From 6516ecaea03845cd07732bd4ca8c32cd08ea4281 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <info@minifree.org>
+Date: Wed, 25 Sep 2024 23:45:56 +0100
+Subject: [PATCH 1/1] no context will be given.
+
+Signed-off-by: Leah Rowe <info@minifree.org>
+---
+ lbmkbofhmakefile | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+ create mode 100644 lbmkbofhmakefile
+
+diff --git a/lbmkbofhmakefile b/lbmkbofhmakefile
+new file mode 100644
+index 00000000..fe2e36d2
+--- /dev/null
++++ b/lbmkbofhmakefile
+@@ -0,0 +1,16 @@
++# SPDX-License-Identifier: MIT
++# SPDX-FileCopyrightText: 2024 Leah Rowe <leah@libreboot.org>
++
++# This is not the original pcsx-redux Makefile.
++# We don't need to build all of PCSX-Redux, only the Open BIOS.
++# Due to idiosyncrasies of lbmk's design, it's simpler to just hack
++# the Makefile like this.
++
++all:
++ make -C src/mips/openbios
++
++clean:
++ make -C src/mips/openbios clean
++
++distclean:
++ make -C src/mips/openbios clean
+--
+2.39.5
+
diff --git a/config/module/pcsx-redux/default/patches/0002-lbmk-hack-add-no-ops-for-config-commands.patch b/config/module/pcsx-redux/default/patches/0002-lbmk-hack-add-no-ops-for-config-commands.patch
new file mode 100644
index 00000000..1a495d60
--- /dev/null
+++ b/config/module/pcsx-redux/default/patches/0002-lbmk-hack-add-no-ops-for-config-commands.patch
@@ -0,0 +1,43 @@
+From e4cd98fb5e3baf8260a3692cab745dea925b0764 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Thu, 22 May 2025 11:29:37 +0100
+Subject: [PATCH 1/1] lbmk hack: add no-ops for config commands
+
+./mk -u, -m, -s, -l and -n cause errors without
+arguments, because pcsx-redux's makefile doesn't
+have them. additionally, i use my own makefile here,
+so that only the openbios is compiled.
+
+add these so that lbmk doesn't crash during tests.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ lbmkbofhmakefile | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/lbmkbofhmakefile b/lbmkbofhmakefile
+index fe2e36d2..e0e2a11e 100644
+--- a/lbmkbofhmakefile
++++ b/lbmkbofhmakefile
+@@ -14,3 +14,18 @@ clean:
+
+ distclean:
+ make -C src/mips/openbios clean
++
++oldconfig:
++ :
++
++menuconfig:
++ :
++
++savedefconfig:
++ :
++
++olddefconfig:
++ :
++
++nconfig:
++ :
+--
+2.39.5
+
diff --git a/config/module/pcsx-redux/default/target.cfg b/config/module/pcsx-redux/default/target.cfg
new file mode 100644
index 00000000..b7245977
--- /dev/null
+++ b/config/module/pcsx-redux/default/target.cfg
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+url="https://github.com/grumpycoders/pcsx-redux"
+bkup_url="https://codeberg.org/vimuser/pcsx-redux"
+
+rev="b745534eb231d3699ec57949f16a9a7bd5b79385"
+
+tree="default"
+
+makeargs="-f lbmkbofhmakefile"
+cleanargs="-f lbmkbofhmakefile"
+
+noconfig="y"