splatink/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-03-25 13:29:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

bump flashprog rev: ffcf92fb, December 2025

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-12-24 19:02:08 +01:00
parent 68e0b5dddc
commit a4ad3afdbb
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/flashprog/patches/0001-Workaround-for-MX25-chips.patch
View File

@@ -1,7 +1,7 @@
From 9d7b97a0f08a3f0f62c389aee61e92377d82d645 Mon Sep 17 00:00:00 2001 From f57f12e4aac690ebbfda40d92d1d0c5ff2b74c0a Mon Sep 17 00:00:00 2001
From: consts <grudnevkv@gmail.com> From: consts <grudnevkv@gmail.com>
Date: Fri, 2 Mar 2018 07:03:37 +0000 Date: Fri, 2 Mar 2018 07:03:37 +0000
Subject: [PATCH 1/1] Workaround for MX25 chips Subject: [PATCH 1/2] Workaround for MX25 chips
TEST: In-system programming a ThinkPad X200 using a clip and TEST: In-system programming a ThinkPad X200 using a clip and
pico-serprog works now. It just doesn't without this hack. pico-serprog works now. It just doesn't without this hack.
@@ -17,7 +17,7 @@ Change-Id: I43a306b67862b59c1dcd02729e189f3bf73f481b
3 files changed, 16 insertions(+), 1 deletion(-) 3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/cli_classic.c b/cli_classic.c diff --git a/cli_classic.c b/cli_classic.c
index 26253dc..5a80394 100644 index a49e0458..0b85a80e 100644
--- a/cli_classic.c --- a/cli_classic.c
+++ b/cli_classic.c +++ b/cli_classic.c
@@ -68,6 +68,7 @@ static void cli_classic_usage(const char *name) @@ -68,6 +68,7 @@ static void cli_classic_usage(const char *name)
@@ -47,7 +47,7 @@ index 26253dc..5a80394 100644
show_progress = true; show_progress = true;
break; break;
diff --git a/include/programmer.h b/include/programmer.h diff --git a/include/programmer.h b/include/programmer.h
index 11d15a8..3b33d5a 100644 index 11d15a84..3b33d5ae 100644
--- a/include/programmer.h --- a/include/programmer.h
+++ b/include/programmer.h +++ b/include/programmer.h
@@ -372,6 +372,7 @@ enum ich_chipset { @@ -372,6 +372,7 @@ enum ich_chipset {
@@ -59,7 +59,7 @@ index 11d15a8..3b33d5a 100644
/* ichspi.c */ /* ichspi.c */
#if CONFIG_INTERNAL == 1 #if CONFIG_INTERNAL == 1
diff --git a/spi.c b/spi.c diff --git a/spi.c b/spi.c
index 748ef99..9bbdee9 100644 index 748ef994..9bbdee9a 100644
--- a/spi.c --- a/spi.c
+++ b/spi.c +++ b/spi.c
@@ -27,13 +27,22 @@ @@ -27,13 +27,22 @@
@@ -87,5 +87,5 @@ index 748ef99..9bbdee9 100644
readarr); readarr);
} }
-- --
2.39.5 2.47.3

10
config/flashprog/patches/0002-lbmk-hack-add-config-Makefile-options.patch
View File

@@ -1,7 +1,7 @@
From b7a4d2907d3358173510aa6e31af08afe4969b38 Mon Sep 17 00:00:00 2001 From 10b23a84799c7b81a8b0b974529e67cc3f22429d Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org> From: Leah Rowe <leah@libreboot.org>
Date: Thu, 22 May 2025 11:25:42 +0100 Date: Thu, 22 May 2025 11:25:42 +0100
Subject: [PATCH 1/1] lbmk hack: add config Makefile options Subject: [PATCH 2/2] lbmk hack: add config Makefile options
this prevents a build error when running the this prevents a build error when running the
-u, -m, -s, -l and -n options in lbmk without -u, -m, -s, -l and -n options in lbmk without
@@ -15,10 +15,10 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 17 insertions(+), 1 deletion(-) 1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 12adf61..701f842 100644 index 2d94afea..e514e300 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1113,7 +1113,23 @@ libpayload: clean @@ -1116,7 +1116,23 @@ libpayload: clean
gitconfig: gitconfig:
./util/getrevision.sh -c 2>/dev/null && ./util/git-hooks/install.sh ./util/getrevision.sh -c 2>/dev/null && ./util/git-hooks/install.sh
@@ -44,5 +44,5 @@ index 12adf61..701f842 100644
# Disable implicit suffixes and built-in rules (for performance and profit) # Disable implicit suffixes and built-in rules (for performance and profit)
.SUFFIXES: .SUFFIXES:
-- --
2.39.5 2.47.3

2
config/git/flashprog/pkg.cfg
View File

@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
rev="e060018655f802896dc226832d25e223102889c8" rev="ffcf92fbfd04a3ac1a5d882bcd5c4b78255af495"
url="https://review.sourcearcade.org/flashprog" url="https://review.sourcearcade.org/flashprog"
bkup_url="https://github.com/SourceArcade/flashprog.git" bkup_url="https://github.com/SourceArcade/flashprog.git"