coreboot patches: remove lib/jpeg patches for heap increase and alloc failure. Add https://review.coreboot.org/c/coreboot/+/83895

tlaurion · tlaurion · commit 37f809e156c4 · 2024-09-11T18:06:54.000-04:00
Repro: rm patches/coreboot-24.02.01/0001* patches/coreboot-24.02.01/0002* git fetch https://review.coreboot.org/coreboot refs/changes/94/83894/2 && git format-patch -1 --stdout FETCH_HEAD > patches/coreboot-24.02.01/0001-vc_wuffs-upgrade-to-Wuffs_0.4.0-alpha.8.patch git fetch https://review.coreboot.org/coreboot refs/changes/95/83895/3 && git format-patch -1 --stdout FETCH_HEAD > patches/coreboot-24.02.01/0002-lib_jpeg-avoidcalling-malloc-and-free.patch cp patches/coreboot-24.02.01/0001* patches/coreboot-system76-unreleased/ cp patches/coreboot-24.02.01/0002* patches/coreboot-system76-unreleased/ sed -i 's/CONFIG_HEAP_SIZE=0x400000/CONFIG_HEAP_SIZE=0x100000/g' config/coreboot-* Signed-off-by: Thierry Laurion <insurgo@riseup.net>
diff --git a/config/coreboot-galp5.config b/config/coreboot-galp5.config
@@ -559,7 +559,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-librem_11.config b/config/coreboot-librem_11.config
@@ -478,7 +478,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-librem_13v2.config b/config/coreboot-librem_13v2.config
@@ -501,7 +501,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-librem_13v4.config b/config/coreboot-librem_13v4.config
@@ -501,7 +501,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-librem_14.config b/config/coreboot-librem_14.config
@@ -498,7 +498,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-librem_15v3.config b/config/coreboot-librem_15v3.config
@@ -501,7 +501,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-librem_15v4.config b/config/coreboot-librem_15v4.config
@@ -501,7 +501,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-librem_l1um_v2.config b/config/coreboot-librem_l1um_v2.config
@@ -498,7 +498,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-librem_mini.config b/config/coreboot-librem_mini.config
@@ -502,7 +502,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-librem_mini_v2.config b/config/coreboot-librem_mini_v2.config
@@ -504,7 +504,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-qemu-tpm1.config b/config/coreboot-qemu-tpm1.config
@@ -327,7 +327,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-qemu-tpm2.config b/config/coreboot-qemu-tpm2.config
@@ -324,7 +324,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-t420-maximized.config b/config/coreboot-t420-maximized.config
@@ -424,7 +424,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-t430-maximized.config b/config/coreboot-t430-maximized.config
@@ -424,7 +424,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-t440p.config b/config/coreboot-t440p.config
@@ -422,7 +422,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-t530-maximized.config b/config/coreboot-t530-maximized.config
@@ -424,7 +424,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-w530-maximized.config b/config/coreboot-w530-maximized.config
@@ -427,7 +427,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-w541.config b/config/coreboot-w541.config
@@ -422,7 +422,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-x220-maximized.config b/config/coreboot-x220-maximized.config
@@ -424,7 +424,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-x230-legacy-flash.config b/config/coreboot-x230-legacy-flash.config
@@ -413,7 +413,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-x230-legacy.config b/config/coreboot-x230-legacy.config
@@ -413,7 +413,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-x230-maximized-fhd_edp.config b/config/coreboot-x230-maximized-fhd_edp.config
@@ -425,7 +425,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-x230-maximized.config b/config/coreboot-x230-maximized.config
@@ -424,7 +424,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/config/coreboot-z220-cmt.config b/config/coreboot-z220-cmt.config
@@ -403,7 +403,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 CONFIG_BOOTSPLASH=y
-CONFIG_HEAP_SIZE=0x400000
+CONFIG_HEAP_SIZE=0x100000
 # end of Display
 
 CONFIG_PCI=y
diff --git a/patches/coreboot-24.02.01/0001-prevent_bootsplash_heap_allocation_failure_to_booting.patch b/patches/coreboot-24.02.01/0001-prevent_bootsplash_heap_allocation_failure_to_booting.patch
diff --git a/patches/coreboot-24.02.01/0001-vc_wuffs-upgrade-to-Wuffs_0.4.0-alpha.8.patch b/patches/coreboot-24.02.01/0001-vc_wuffs-upgrade-to-Wuffs_0.4.0-alpha.8.patch
diff --git a/patches/coreboot-24.02.01/0002-increase_heap_from1mb_to4mb_when_bootpslash_enabled.patch b/patches/coreboot-24.02.01/0002-increase_heap_from1mb_to4mb_when_bootpslash_enabled.patch
diff --git a/patches/coreboot-24.02.01/0002-lib_jpeg-avoidcalling-malloc-and-free.patch b/patches/coreboot-24.02.01/0002-lib_jpeg-avoidcalling-malloc-and-free.patch
diff --git a/patches/coreboot-system76-unreleased/0001-vc_wuffs-upgrade-to-Wuffs_0.4.0-alpha.8.patch b/patches/coreboot-system76-unreleased/0001-vc_wuffs-upgrade-to-Wuffs_0.4.0-alpha.8.patch
diff --git a/patches/coreboot-system76-unreleased/0002-increase_heap_from1mb_to4mb_when_bootpslash_enabled.patch b/patches/coreboot-system76-unreleased/0002-increase_heap_from1mb_to4mb_when_bootpslash_enabled.patch
diff --git a/patches/coreboot-system76-unreleased/0002-lib_jpeg-avoidcalling-malloc-and-free.patch b/patches/coreboot-system76-unreleased/0002-lib_jpeg-avoidcalling-malloc-and-free.patch
