diff options
| author | Leah Rowe <leah@libreboot.org> | 2022-11-19 14:56:54 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2022-11-19 14:56:54 +0000 |
| commit | 43196abc5d0e4436f087f51e949c0b7023141b29 (patch) | |
| tree | 141a6b6bcbe444adb85234be3e529765e3f7611a | |
| parent | f063190889a5fb44693e4fd70c9382aea7b8a4c1 (diff) | |
also fix crossgcc on cros/fhd coreboot trees
9 files changed, 177 insertions, 12 deletions
diff --git a/resources/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch b/resources/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch new file mode 100644 index 00000000..34a60be0 --- /dev/null +++ b/resources/coreboot/cros/patches/0001-fix-crossgcc-build-error.patch @@ -0,0 +1,55 @@ +From 0d5a5f3ee1ee5d6f757d5877b7adbe9839487ccf Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Sat, 19 Nov 2022 14:55:01 +0000 +Subject: [PATCH 1/1] fix crossgcc build error + +--- + util/crossgcc/patches/gcc-11.2.0_gnat.patch | 32 ++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) + +diff --git a/util/crossgcc/patches/gcc-11.2.0_gnat.patch b/util/crossgcc/patches/gcc-11.2.0_gnat.patch +index 2d7cecee24..c22cec45d0 100644 +--- a/util/crossgcc/patches/gcc-11.2.0_gnat.patch ++++ b/util/crossgcc/patches/gcc-11.2.0_gnat.patch +@@ -5,7 +5,37 @@ + + # Extra flags to pass to recursive makes. + -COMMON_ADAFLAGS= -gnatpg +-+COMMON_ADAFLAGS= -gnatpg -gnatwGUR +++COMMON_ADAFLAGS= -gnatpg -gnatwn + ifeq ($(TREECHECKING),) + CHECKING_ADAFLAGS= + else ++diff -Nurp gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in ++--- gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in 2022-06-03 00:31:57.993273717 +0200 +++++ gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in 2022-06-03 00:30:50.214166847 +0200 ++@@ -334,6 +334,7 @@ GNAT_ADA_OBJS = \ ++ ada/hostparm.o \ ++ ada/impunit.o \ ++ ada/inline.o \ +++ ada/libgnat/i-c.o \ ++ ada/libgnat/interfac.o \ ++ ada/itypes.o \ ++ ada/krunch.o \ ++@@ -364,7 +365,10 @@ GNAT_ADA_OBJS = \ ++ ada/rtsfind.o \ ++ ada/libgnat/s-addope.o \ ++ ada/libgnat/s-addima.o \ +++ ada/libgnat/s-aotase.o \ ++ ada/libgnat/s-assert.o \ +++ ada/libgnat/s-atoope.o \ +++ ada/libgnat/s-atopri.o \ ++ ada/libgnat/s-bitops.o \ ++ ada/libgnat/s-carun8.o \ ++ ada/libgnat/s-casuti.o \ ++@@ -548,6 +552,7 @@ GNATBIND_OBJS = \ ++ ada/hostparm.o \ ++ ada/init.o \ ++ ada/initialize.o \ +++ ada/libgnat/i-c.o \ ++ ada/libgnat/interfac.o \ ++ ada/krunch.o \ ++ ada/lib.o \ +-- +2.25.1 + diff --git a/resources/coreboot/fhd/patches/0001-fix-crossgcc-build-error.patch b/resources/coreboot/fhd/patches/0001-fix-crossgcc-build-error.patch new file mode 100644 index 00000000..6e34c6bc --- /dev/null +++ b/resources/coreboot/fhd/patches/0001-fix-crossgcc-build-error.patch @@ -0,0 +1,55 @@ +From d65dc4f977d095e4f4b71522d85fc22fcf452fe8 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Sat, 19 Nov 2022 14:55:44 +0000 +Subject: [PATCH 1/1] fix crossgcc build error + +--- + util/crossgcc/patches/gcc-11.2.0_gnat.patch | 32 ++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) + +diff --git a/util/crossgcc/patches/gcc-11.2.0_gnat.patch b/util/crossgcc/patches/gcc-11.2.0_gnat.patch +index 2d7cecee24..c22cec45d0 100644 +--- a/util/crossgcc/patches/gcc-11.2.0_gnat.patch ++++ b/util/crossgcc/patches/gcc-11.2.0_gnat.patch +@@ -5,7 +5,37 @@ + + # Extra flags to pass to recursive makes. + -COMMON_ADAFLAGS= -gnatpg +-+COMMON_ADAFLAGS= -gnatpg -gnatwGUR +++COMMON_ADAFLAGS= -gnatpg -gnatwn + ifeq ($(TREECHECKING),) + CHECKING_ADAFLAGS= + else ++diff -Nurp gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in ++--- gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in 2022-06-03 00:31:57.993273717 +0200 +++++ gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in 2022-06-03 00:30:50.214166847 +0200 ++@@ -334,6 +334,7 @@ GNAT_ADA_OBJS = \ ++ ada/hostparm.o \ ++ ada/impunit.o \ ++ ada/inline.o \ +++ ada/libgnat/i-c.o \ ++ ada/libgnat/interfac.o \ ++ ada/itypes.o \ ++ ada/krunch.o \ ++@@ -364,7 +365,10 @@ GNAT_ADA_OBJS = \ ++ ada/rtsfind.o \ ++ ada/libgnat/s-addope.o \ ++ ada/libgnat/s-addima.o \ +++ ada/libgnat/s-aotase.o \ ++ ada/libgnat/s-assert.o \ +++ ada/libgnat/s-atoope.o \ +++ ada/libgnat/s-atopri.o \ ++ ada/libgnat/s-bitops.o \ ++ ada/libgnat/s-carun8.o \ ++ ada/libgnat/s-casuti.o \ ++@@ -548,6 +552,7 @@ GNATBIND_OBJS = \ ++ ada/hostparm.o \ ++ ada/init.o \ ++ ada/initialize.o \ +++ ada/libgnat/i-c.o \ ++ ada/libgnat/interfac.o \ ++ ada/krunch.o \ ++ ada/lib.o \ +-- +2.25.1 + diff --git a/resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch b/resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch index 8edf992f..fb9ff8e7 100644 --- a/resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch +++ b/resources/coreboot/fhd/patches/0001-lenovo-x230-introduce-FHD-variant.patch @@ -1,7 +1,7 @@ -From d898a4300d614bd2927cbf61ba1901bf120edb4e Mon Sep 17 00:00:00 2001 +From 53ebc7b1b9b59cc831383ed71478536c9e183d00 Mon Sep 17 00:00:00 2001 From: Alexander Couzens <lynxis@fe80.eu> Date: Sat, 19 Mar 2022 13:42:33 +0000 -Subject: [PATCH 1/6] lenovo/x230: introduce FHD variant +Subject: [PATCH 1/7] lenovo/x230: introduce FHD variant There is a modification for the x230 which uses the 2nd DP from the dock as the integrated panel's connection, which allows using a custom eDP diff --git a/resources/coreboot/fhd/patches/0002-Lenovo-X230-patch-gfx_uma_size-224M-by-default.patch b/resources/coreboot/fhd/patches/0002-Lenovo-X230-patch-gfx_uma_size-224M-by-default.patch index c97551ec..c2b037da 100644 --- a/resources/coreboot/fhd/patches/0002-Lenovo-X230-patch-gfx_uma_size-224M-by-default.patch +++ b/resources/coreboot/fhd/patches/0002-Lenovo-X230-patch-gfx_uma_size-224M-by-default.patch @@ -1,7 +1,7 @@ -From 4f52c0880bd8fbf53a49e6a29318033fbf756ee0 Mon Sep 17 00:00:00 2001 +From cabd40fee5fddd9884f93cf0d93c3f03013fae8b Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Sun, 24 Jul 2022 14:46:54 +0100 -Subject: [PATCH 2/6] Lenovo X230 patch: gfx_uma_size 224M by default +Subject: [PATCH 2/7] Lenovo X230 patch: gfx_uma_size 224M by default --- src/mainboard/lenovo/x230/cmos.default | 1 + diff --git a/resources/coreboot/fhd/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch b/resources/coreboot/fhd/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch index 981e97ed..a8f53930 100644 --- a/resources/coreboot/fhd/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch +++ b/resources/coreboot/fhd/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch @@ -1,7 +1,7 @@ -From 1f4fc0fe77eef6e5042612ed11529c984fe0592a Mon Sep 17 00:00:00 2001 +From fb3aa1522900bd892d2ce0412bbecddf30ab5aa6 Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Sun, 24 Jul 2022 14:49:50 +0100 -Subject: [PATCH 3/6] lenovo/x230: set me_state=Disabled in cmos.default +Subject: [PATCH 3/7] lenovo/x230: set me_state=Disabled in cmos.default I only recently found out about this. It's possible to use me_cleaner to do the same thing, but some people might just flash coreboot and not do diff --git a/resources/coreboot/fhd/patches/0004-specifically-use-python3-in-scripts.patch b/resources/coreboot/fhd/patches/0004-specifically-use-python3-in-scripts.patch index 24e8a7ba..e82fedff 100644 --- a/resources/coreboot/fhd/patches/0004-specifically-use-python3-in-scripts.patch +++ b/resources/coreboot/fhd/patches/0004-specifically-use-python3-in-scripts.patch @@ -1,7 +1,7 @@ -From b5a03bb1800a067de0f05658af26b8d4a8055599 Mon Sep 17 00:00:00 2001 +From 92451357450641eb793904ad2654f0a4aa9ec08d Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Sun, 24 Jul 2022 14:52:26 +0100 -Subject: [PATCH 4/6] specifically use python3, in scripts +Subject: [PATCH 4/7] specifically use python3, in scripts --- src/drivers/intel/fsp2_0/Makefile.inc | 2 +- diff --git a/resources/coreboot/fhd/patches/0005-Revert-lenovo-x230-introduce-FHD-variant.patch b/resources/coreboot/fhd/patches/0005-Revert-lenovo-x230-introduce-FHD-variant.patch index 89373b0d..49362bfc 100644 --- a/resources/coreboot/fhd/patches/0005-Revert-lenovo-x230-introduce-FHD-variant.patch +++ b/resources/coreboot/fhd/patches/0005-Revert-lenovo-x230-introduce-FHD-variant.patch @@ -1,7 +1,7 @@ -From a05d4ff30806272eda4e57876bdc06eac0a23ed8 Mon Sep 17 00:00:00 2001 +From b91490d6f72010d49fd102373533a4c3a5034f15 Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Sun, 24 Jul 2022 18:23:24 +0100 -Subject: [PATCH 5/6] Revert "lenovo/x230: introduce FHD variant" +Subject: [PATCH 5/7] Revert "lenovo/x230: introduce FHD variant" This reverts commit d898a4300d614bd2927cbf61ba1901bf120edb4e. --- diff --git a/resources/coreboot/fhd/patches/0006-directly-modify-lenovo-x230-instead-for-fhd.patch b/resources/coreboot/fhd/patches/0006-directly-modify-lenovo-x230-instead-for-fhd.patch index ce53ca30..83eb922e 100644 --- a/resources/coreboot/fhd/patches/0006-directly-modify-lenovo-x230-instead-for-fhd.patch +++ b/resources/coreboot/fhd/patches/0006-directly-modify-lenovo-x230-instead-for-fhd.patch @@ -1,7 +1,7 @@ -From 9e9a46426414d3c5fc6f7714453f1a9da0d168d9 Mon Sep 17 00:00:00 2001 +From b07677830d698660f6a4a4dd15767fcbfb1e8478 Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Sun, 24 Jul 2022 18:29:01 +0100 -Subject: [PATCH 6/6] directly modify lenovo/x230 instead (for fhd) +Subject: [PATCH 6/7] directly modify lenovo/x230 instead (for fhd) i kept having build issues. it's a simple patch. --- diff --git a/resources/coreboot/fhd/patches/0007-fix-crossgcc-build-error.patch b/resources/coreboot/fhd/patches/0007-fix-crossgcc-build-error.patch new file mode 100644 index 00000000..d75bc733 --- /dev/null +++ b/resources/coreboot/fhd/patches/0007-fix-crossgcc-build-error.patch @@ -0,0 +1,55 @@ +From d65dc4f977d095e4f4b71522d85fc22fcf452fe8 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Sat, 19 Nov 2022 14:55:44 +0000 +Subject: [PATCH 7/7] fix crossgcc build error + +--- + util/crossgcc/patches/gcc-11.2.0_gnat.patch | 32 ++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) + +diff --git a/util/crossgcc/patches/gcc-11.2.0_gnat.patch b/util/crossgcc/patches/gcc-11.2.0_gnat.patch +index 2d7cecee24..c22cec45d0 100644 +--- a/util/crossgcc/patches/gcc-11.2.0_gnat.patch ++++ b/util/crossgcc/patches/gcc-11.2.0_gnat.patch +@@ -5,7 +5,37 @@ + + # Extra flags to pass to recursive makes. + -COMMON_ADAFLAGS= -gnatpg +-+COMMON_ADAFLAGS= -gnatpg -gnatwGUR +++COMMON_ADAFLAGS= -gnatpg -gnatwn + ifeq ($(TREECHECKING),) + CHECKING_ADAFLAGS= + else ++diff -Nurp gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in ++--- gcc-11.2.0/gcc/ada/gcc-interface/Make-lang.in 2022-06-03 00:31:57.993273717 +0200 +++++ gcc-11.2.0.new/gcc/ada/gcc-interface/Make-lang.in 2022-06-03 00:30:50.214166847 +0200 ++@@ -334,6 +334,7 @@ GNAT_ADA_OBJS = \ ++ ada/hostparm.o \ ++ ada/impunit.o \ ++ ada/inline.o \ +++ ada/libgnat/i-c.o \ ++ ada/libgnat/interfac.o \ ++ ada/itypes.o \ ++ ada/krunch.o \ ++@@ -364,7 +365,10 @@ GNAT_ADA_OBJS = \ ++ ada/rtsfind.o \ ++ ada/libgnat/s-addope.o \ ++ ada/libgnat/s-addima.o \ +++ ada/libgnat/s-aotase.o \ ++ ada/libgnat/s-assert.o \ +++ ada/libgnat/s-atoope.o \ +++ ada/libgnat/s-atopri.o \ ++ ada/libgnat/s-bitops.o \ ++ ada/libgnat/s-carun8.o \ ++ ada/libgnat/s-casuti.o \ ++@@ -548,6 +552,7 @@ GNATBIND_OBJS = \ ++ ada/hostparm.o \ ++ ada/init.o \ ++ ada/initialize.o \ +++ ada/libgnat/i-c.o \ ++ ada/libgnat/interfac.o \ ++ ada/krunch.o \ ++ ada/lib.o \ +-- +2.25.1 + |