coreboot-gerrit November 2021

coreboot-gerrit@coreboot.org

1 participants
6394 discussions

Change in coreboot[master]: soc/amd/common/block/cpu: Add support for cbfs_cache region
by Raul Rangel (Code Review) 01 Nov '21

01 Nov '21

Attention is currently required from: Jason Glenesk, Furquan Shaikh, Marshall Dawson, Karthik Ramasubramanian, Felix Held. Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/56578 ) Change subject: soc/amd/common/block/cpu: Add support for cbfs_cache region ...................................................................... Patch Set 10: (1 comment) File src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld: https://review.coreboot.org/c/coreboot/+/56578/comment/b5604bf9_b3339d13 PS9, Line 26: * reserved_dram_end +--------------------------------+ > Nit: Can we update the layout picture here? Good idea. -- To view, visit https://review.coreboot.org/c/coreboot/+/56578 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I268b6bc10906932ee94f795684a28cfac247a68c Gerrit-Change-Number: 56578 Gerrit-PatchSet: 10 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Furquan Shaikh <furquan.m.shaikh(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Furquan Shaikh <furquan.m.shaikh(a)gmail.com> Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Mon, 01 Nov 2021 17:33:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: soc/amd/common/block/cpu: Add support for cbfs_cache region
by Raul Rangel (Code Review) 01 Nov '21

01 Nov '21

Attention is currently required from: Jason Glenesk, Furquan Shaikh, Marshall Dawson, Karthik Ramasubramanian, Felix Held. Hello build bot (Jenkins), Jason Glenesk, Furquan Shaikh, Marshall Dawson, Karthik Ramasubramanian, Felix Held, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/56578 to look at the new patch set (#10). Change subject: soc/amd/common/block/cpu: Add support for cbfs_cache region ...................................................................... soc/amd/common/block/cpu: Add support for cbfs_cache region This change adds the cbfs_cache region into the x86 memlayout. The SoC or mainboard can decide how big the region should be by specifying CBFS_CACHE_SIZE. BUG=b:179699789 TEST=Build guybrush and verify cbfs_cache region wasn't added. Signed-off-by: Raul E Rangel <rrangel(a)chromium.org> Change-Id: I268b6bc10906932ee94f795684a28cfac247a68c --- M src/soc/amd/common/block/cpu/Kconfig M src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/56578/10 -- To view, visit https://review.coreboot.org/c/coreboot/+/56578 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I268b6bc10906932ee94f795684a28cfac247a68c Gerrit-Change-Number: 56578 Gerrit-PatchSet: 10 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Furquan Shaikh <furquan.m.shaikh(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Furquan Shaikh <furquan.m.shaikh(a)gmail.com> Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: util/kconfig: Uprev to Linux 5.14's kconfig
by Martin Roth (Code Review) 01 Nov '21

01 Nov '21

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57880 ) Change subject: util/kconfig: Uprev to Linux 5.14's kconfig ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/57880 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5e5a2400bc3323938da4b946930e2ec119819672 Gerrit-Change-Number: 57880 Gerrit-PatchSet: 3 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Mon, 01 Nov 2021 16:44:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: util/kconfig: Add README.md documenting the uprev procedure
by Martin Roth (Code Review) 01 Nov '21

01 Nov '21

Attention is currently required from: Felix Singer. Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57879 ) Change subject: util/kconfig: Add README.md documenting the uprev procedure ...................................................................... Patch Set 3: (2 comments) File util/kconfig/README.md: https://review.coreboot.org/c/coreboot/+/57879/comment/f8574d12_ebc798e4 PS3, Line 4: , I don't think this comma is needed. https://review.coreboot.org/c/coreboot/+/57879/comment/455c8a1f_2b85c896 PS3, Line 37: Check kconfig Maybe: Check that kconfig still works. -- To view, visit https://review.coreboot.org/c/coreboot/+/57879 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2e74f1c5cb1657e11d4f7ea101549329274102db Gerrit-Change-Number: 57879 Gerrit-PatchSet: 3 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Comment-Date: Mon, 01 Nov 2021 16:44:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: util/kconfig: Rewrite patch in quilt's normal form
by Martin Roth (Code Review) 01 Nov '21

01 Nov '21

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57878 ) Change subject: util/kconfig: Rewrite patch in quilt's normal form ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/57878 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I8c8586da384b65fd5c21c1c1a093642534f83283 Gerrit-Change-Number: 57878 Gerrit-PatchSet: 3 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Mon, 01 Nov 2021 16:38:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: util/kconfig: Uprev to Linux 5.15's kconfig
by Martin Roth (Code Review) 01 Nov '21

01 Nov '21

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/58792 ) Change subject: util/kconfig: Uprev to Linux 5.15's kconfig ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/58792 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I39cbbfb8dc816b4f36f92e6bd53f40c733691242 Gerrit-Change-Number: 58792 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 01 Nov 2021 16:37:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: payloads/Tianocore: re-add CorebootPayload build option
by Martin Roth (Code Review) 01 Nov '21

01 Nov '21

Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/58710 ) Change subject: payloads/Tianocore: re-add CorebootPayload build option ...................................................................... payloads/Tianocore: re-add CorebootPayload build option Some older devices, like the x230 Thinkpad, do not boot with the newer Tianocore UefiPayloadPkg build target, and cannot easily be debugged without serial UART output. As a stopgap solution, re-add the older (now deprecated/removed) CorebootPayloadPkg build target. This partially reverts commit d3b49b4c, "payloads/Tianocore: Update default build target, simplify build options" Change-Id: I81490c277626fc69d95920868d80cb24c0763de4 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/58710 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Martin Roth <martinroth(a)google.com> --- M payloads/external/Makefile.inc M payloads/external/tianocore/Kconfig M payloads/external/tianocore/Makefile 3 files changed, 36 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 113dfbe..b8c2d57 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -150,6 +150,8 @@ CONFIG_TIANOCORE_ABOVE_4G_MEMORY=$(CONFIG_TIANOCORE_ABOVE_4G_MEMORY) \ CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \ CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \ + CONFIG_TIANOCORE_COREBOOTPAYLOAD=$(CONFIG_TIANOCORE_COREBOOTPAYLOAD) \ + CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \ GCC_CC_x86_32=$(GCC_CC_x86_32) \ GCC_CC_x86_64=$(GCC_CC_x86_64) \ GCC_CC_arm=$(GCC_CC_arm) \ diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index a3c9981..b7069aa 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -14,6 +14,9 @@ UefiPayload: MrChromebox's customized fork of Tianocore which works on most x86_64 devices Upstream: Use upstream Tianocore payload from https://github.com/tianocore/edk2 + CorebootPayload: MrChromebox's customized fork of the deprecated CorebootPayloadPkg + Tianocore build target. It may work better on some older hardware (eg, x230) + which does not work properly with the UefiPayloadPkg options. config TIANOCORE_UEFIPAYLOAD bool "UEFIPayload" @@ -26,6 +29,12 @@ help Select this option if you want to use upstream EDK2 to build Tianocore. +config TIANOCORE_COREBOOTPAYLOAD + bool "CorebootPayload" + help + Select this option to build using MrChromebox's older (now deprecated) + CorebootPayloadPkg-based Tianocore branch + endchoice config TIANOCORE_REVISION_ID @@ -105,6 +114,15 @@ endif +if TIANOCORE_COREBOOTPAYLOAD + +config TIANOCORE_USE_8254_TIMER + bool "TianoCore 8254 Timer" + help + Use 8254 Timer for legacy support. + +endif + config TIANOCORE_BOOT_TIMEOUT int default 2 diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 4fda8b8..0c5fdb3 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -11,6 +11,13 @@ build_flavor=-D BOOTLOADER=COREBOOT -D PCIE_BASE=$(CONFIG_MMCONF_BASE_ADDRESS) -DPS2_KEYBOARD_ENABLE +ifeq ($(CONFIG_TIANOCORE_COREBOOTPAYLOAD),y) +project_git_branch=coreboot_fb +bootloader=CorebootPayloadPkg +else +bootloader=UefiPayloadPkg +endif + ifeq ($(CONFIG_TIANOCORE_UPSTREAM),y) TAG=upstream/master else @@ -41,7 +48,15 @@ TIMEOUT=-D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) +ifneq ($(CONFIG_TIANOCORE_USE_8254_TIMER), y) +TIMER=-DUSE_HPET_TIMER +endif + +ifeq ($(CONFIG_TIANOCORE_COREBOOTPAYLOAD),y) +BUILD_STR=-q -a IA32 -a X64 -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -t COREBOOT -b $(BUILD_TYPE) $(TIMER) -DPS2_KEYBOARD_ENABLE +else BUILD_STR=-q -a IA32 -a X64 -p UefiPayloadPkg/UefiPayloadPkg.dsc -t COREBOOT -b $(BUILD_TYPE) $(TIMEOUT) $(build_flavor) $(CBMEM) $(4G) +endif all: clean build @@ -99,7 +114,7 @@ cat ../tools_def.txt >> $(project_dir)/Conf/tools_def.txt; \ fi; \ build $(BUILD_STR); \ - mv $(project_dir)/Build/UefiPayloadPkg*/*/FV/UEFIPAYLOAD.fd $(project_dir)/Build/UEFIPAYLOAD.fd; \ + mv $(project_dir)/Build/$(bootloader)*/*/FV/UEFIPAYLOAD.fd $(project_dir)/Build/UEFIPAYLOAD.fd; \ git checkout MdeModulePkg/Logo/Logo.bmp > /dev/null 2>&1 || true clean: -- To view, visit https://review.coreboot.org/c/coreboot/+/58710 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I81490c277626fc69d95920868d80cb24c0763de4 Gerrit-Change-Number: 58710 Gerrit-PatchSet: 2 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: payloads/Tianocore: re-add CorebootPayload build option
by Martin Roth (Code Review) 01 Nov '21

01 Nov '21

Attention is currently required from: Matt DeVillier, Stefan Reinauer. Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/58710 ) Change subject: payloads/Tianocore: re-add CorebootPayload build option ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/58710 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I81490c277626fc69d95920868d80cb24c0763de4 Gerrit-Change-Number: 58710 Gerrit-PatchSet: 1 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Comment-Date: Mon, 01 Nov 2021 16:35:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: util/crossgcc/Makefile: Clean up .PHONY definitions
by Martin Roth (Code Review) 01 Nov '21

01 Nov '21

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/58796 ) Change subject: util/crossgcc/Makefile: Clean up .PHONY definitions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/58796 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id58338a512d44111b41503d4c14c08be50d51cde Gerrit-Change-Number: 58796 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 01 Nov 2021 16:33:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: buildgcc: Remove GDB from crossgcc
by Patrick Georgi (Code Review) 01 Nov '21

01 Nov '21

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/58380 ) Change subject: buildgcc: Remove GDB from crossgcc ...................................................................... buildgcc: Remove GDB from crossgcc It was added for a specific defunct project by a specific defunct company. Change-Id: Ib56ae0fdc1a50d24ff44c7879c43f8e94a5bfa95 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/58380 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M util/crossgcc/.gitignore M util/crossgcc/Makefile M util/crossgcc/Makefile.inc M util/crossgcc/buildgcc D util/crossgcc/patches/gdb-9.2_amd64.patch D util/crossgcc/patches/gdb-9.2_no-doc.patch D util/crossgcc/patches/gdb-9.2_pythonhome.patch D util/crossgcc/sum/Python-3.8.5.tar.xz.cksum D util/crossgcc/sum/expat-2.4.1.tar.bz2.cksum D util/crossgcc/sum/gdb-9.2.tar.xz.cksum 10 files changed, 18 insertions(+), 161 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved diff --git a/util/crossgcc/.gitignore b/util/crossgcc/.gitignore index e6ff06c..fd50eef 100644 --- a/util/crossgcc/.gitignore +++ b/util/crossgcc/.gitignore @@ -2,26 +2,20 @@ binutils-*/ build-*BINUTILS/ build-*CMAKE/ -build-*EXPAT/ build-*GCC/ -build-*GDB/ build-*GMP/ build-*LIBELF/ build-*MPC/ build-*MPFR/ -build-*PYTHON/ build-*LVM/ build-*IASL/ cmake-*/ -expat-*/ gcc-*/ -gdb-*/ gmp-*/ libelf-*/ mingwrt-*/ mpc-*/ mpfr-*/ -Python-*/ *.src/ tarballs/ w32api-*/ diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile index bb30fa4..34fb244 100644 --- a/util/crossgcc/Makefile +++ b/util/crossgcc/Makefile @@ -7,18 +7,11 @@ # use BUILDGCC_OPTIONS= to set any other crossgcc command line options # Example: BUILDGCC_OPTIONS=-c to remove temporary files before build -all all_with_gdb: +all: $(MAKE) build-i386 build-x64 build-arm \ build-riscv build-aarch64 build-ppc64 build-nds32le \ build_clang build_iasl build_nasm -all_without_gdb: - $(MAKE) SKIP_GDB=1 build-i386 build-x64 build-arm \ - build-riscv build-aarch64 build-ppc64 build-nds32le \ - build_clang build_iasl build_nasm - -build_tools: build_gcc build_gdb - ########################################################### ### targets to do buildgcc builds @@ -26,12 +19,6 @@ bash ./buildgcc -p $(BUILD_PLATFORM) $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS) \ $(if $(BUILD_LANGUAGES),-l $(BUILD_LANGUAGES)) -d $(DEST) -build_gdb: -ifeq ($(SKIP_GDB),) - bash ./buildgcc -p $(BUILD_PLATFORM) -P gdb $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) \ - $(BUILDGCC_OPTIONS) -d $(DEST) -endif - build_iasl: bash ./buildgcc -P iasl $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS) -d $(DEST) @@ -48,33 +35,31 @@ ########################################################### build-i386: - @$(MAKE) build_tools build_nasm BUILD_PLATFORM=i386-elf + @$(MAKE) build_gcc build_nasm BUILD_PLATFORM=i386-elf build-x64: - @$(MAKE) build_tools build_nasm BUILD_PLATFORM=x86_64-elf + @$(MAKE) build_gcc build_nasm BUILD_PLATFORM=x86_64-elf build-arm: - @$(MAKE) build_tools BUILD_PLATFORM=arm-eabi + @$(MAKE) build_gcc BUILD_PLATFORM=arm-eabi build-aarch64: - @$(MAKE) build_tools BUILD_PLATFORM=aarch64-elf + @$(MAKE) build_gcc BUILD_PLATFORM=aarch64-elf build-riscv: - # GDB is currently not supported on RISC-V @$(MAKE) build_gcc BUILD_PLATFORM=riscv-elf build-ppc64: - @$(MAKE) build_tools BUILD_PLATFORM=powerpc64-linux-gnu + @$(MAKE) build_gcc BUILD_PLATFORM=powerpc64-linux-gnu build-nds32le: - @$(MAKE) build_tools BUILD_PLATFORM=nds32le-elf + @$(MAKE) build_gcc BUILD_PLATFORM=nds32le-elf clean_tempfiles: rm -rf build-* rm -rf binutils-* gcc-* gmp-* mpc-* mpfr-* rm -rf llvm-* clang-tools-* cfe-* compiler-rt-* rm -rf acpica-* - rm -rf gdb-* rm -f getopt clean: clean_tempfiles @@ -83,8 +68,8 @@ distclean: clean rm -rf tarballs -.PHONY: build_gcc build_iasl build_gdb build_clang all all_with_gdb \ - all_without_gdb build_tools build-i386 build-x64 build-arm \ +.PHONY: build_gcc build_iasl build_clang all \ + build-i386 build-x64 build-arm \ build-aarch64 build-riscv build-ppc64 build-nds32le build-nasm \ clean distclean clean_tempfiles .NOTPARALLEL: diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.inc index 74de5bd..a52fbf1 100644 --- a/util/crossgcc/Makefile.inc +++ b/util/crossgcc/Makefile.inc @@ -5,14 +5,12 @@ help_toolchain help:: @echo '*** Toolchain targets ***' @echo ' crossgcc - Build coreboot cross-compilers for all platforms' - @echo ' crosstools - Build coreboot cross-compiler and GDB for all platforms' @echo ' crossgcc-clean - Remove all built coreboot cross-compilers' @echo ' iasl - Build coreboot IASL compiler (built by all cross targets)' @echo ' clang - Build coreboot clang compiler' @echo ' nasm - Build coreboot nasm' @echo ' test-toolchain - Reports if toolchain components are out of date' @echo ' crossgcc-ARCH - Build cross-compiler for specific architecture' - @echo ' crosstools-ARCH - Build cross-compiler with GDB for specific architecture' @echo ' ARCH can be "$(subst $(spc),"$(comma) ",$(TOOLCHAIN_ARCHES))"' @echo ' Use "make [target] CPUS=#" to build toolchain using multiple cores' @echo ' Use "make [target] DEST=some/path" to install toolchain there' @@ -22,19 +20,14 @@ # use BUILDGCC_OPTIONS= to set any crossgcc command line options # Example: BUILDGCC_OPTIONS='-t' will keep temporary files after build crossgcc: clean-for-update - $(MAKE) -C util/crossgcc all_without_gdb SKIP_CLANG=1 + $(MAKE) -C util/crossgcc all SKIP_CLANG=1 .PHONY: crossgcc crossgcc-i386 crossgcc-x64 crossgcc-arm crossgcc-aarch64 \ crossgcc-riscv crossgcc-power8 crossgcc-clean iasl \ - clang crosstools-i386 crosstools-x64 crosstools-arm \ - crosstools-aarch64 crosstools-riscv crosstools-power8 \ - jenkins-build-toolchain nasm + clang jenkins-build-toolchain nasm $(foreach arch,$(TOOLCHAIN_ARCHES),crossgcc-$(arch)): clean-for-update - $(MAKE) -C util/crossgcc $(patsubst crossgcc-%,build-%,$@) build_iasl SKIP_GDB=1 - -crosstools: clean-for-update - $(MAKE) -C util/crossgcc all_with_gdb SKIP_CLANG=1 + $(MAKE) -C util/crossgcc $(patsubst crossgcc-%,build-%,$@) build_iasl iasl: clean-for-update $(MAKE) -C util/crossgcc build_iasl @@ -45,9 +38,6 @@ nasm: clean-for-update $(MAKE) -C util/crossgcc build_nasm -$(foreach arch,$(TOOLCHAIN_ARCHES),crosstools-$(arch)): clean-for-update - $(MAKE) -C util/crossgcc $(patsubst crosstools-%,build-%,$@) build_iasl - crossgcc-clean: clean-for-update $(MAKE) -C util/crossgcc clean @@ -63,7 +53,5 @@ jenkins-build-toolchain: BUILDGCC_OPTIONS ?= -y --nocolor jenkins-build-toolchain: $(MAKE) crossgcc clang KEEP_SOURCES=1 BUILDGCC_OPTIONS='$(BUILDGCC_OPTIONS)' - #TODO: Re-enable gdb build after the builders can build it again. - #$(MAKE) crosstools clang KEEP_SOURCES=1 BUILDGCC_OPTIONS='$(BUILDGCC_OPTIONS)' PATH=$(if $(DEST),$(DEST)/bin,$(top)/util/crossgcc/xgcc/bin):$$PATH; $(MAKE) what-jenkins-does PATH=$(if $(DEST),$(DEST)/bin,$(top)/util/crossgcc/xgcc/bin):$$PATH; $(MAKE) test-toolchain diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index ab8cba4..6c1a7a5 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -28,7 +28,6 @@ LANGUAGES= DESTDIR= SAVETEMPS=0 -SKIPPYTHON=1 BOOTSTRAP=0 THREADS=1 @@ -39,10 +38,7 @@ GCC_VERSION=11.2.0 GCC_AUTOCONF_VERSION=2.69 BINUTILS_VERSION=2.37 -GDB_VERSION=9.2 IASL_VERSION=20210331 -PYTHON_VERSION=3.8.5 -EXPAT_VERSION=2.4.1 # CLANG version number CLANG_VERSION=12.0.0 CMAKE_VERSION=3.20.3 @@ -57,10 +53,7 @@ MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz" GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz" BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz" -GDB_ARCHIVE="https://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz" IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz" -PYTHON_ARCHIVE="https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION…" -EXPAT_ARCHIVE="https://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.…" # CLANG toolchain archive locations LLVM_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERS…" CLANG_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERS…" @@ -70,8 +63,8 @@ NASM_ARCHIVE="https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERS…" ALL_ARCHIVES="$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE \ - $GCC_ARCHIVE $BINUTILS_ARCHIVE $GDB_ARCHIVE $IASL_ARCHIVE \ - $PYTHON_ARCHIVE $EXPAT_ARCHIVE $LLVM_ARCHIVE $CLANG_ARCHIVE \ + $GCC_ARCHIVE $BINUTILS_ARCHIVE $IASL_ARCHIVE \ + $LLVM_ARCHIVE $CLANG_ARCHIVE \ $CRT_ARCHIVE $CTE_ARCHIVE $CMAKE_ARCHIVE $NASM_ARCHIVE" # GCC toolchain directories @@ -82,10 +75,7 @@ GCC_DIR="gcc-${GCC_VERSION}" # shellcheck disable=SC2034 BINUTILS_DIR="binutils-${BINUTILS_VERSION}" -GDB_DIR="gdb-${GDB_VERSION}" IASL_DIR="acpica-unix2-${IASL_VERSION}" -PYTHON_DIR="Python-${PYTHON_VERSION}" -EXPAT_DIR="expat-${EXPAT_VERSION}" # CLANG toolchain directories LLVM_DIR="llvm-${CLANG_VERSION}.src" CLANG_DIR="clang-${CLANG_VERSION}.src" @@ -464,7 +454,7 @@ package_uses_targetarch() { - if [ "$1" = "GCC" ] || [ "$1" = "GDB" ] || [ "$1" = "BINUTILS" ]; then + if [ "$1" = "GCC" ] || [ "$1" = "BINUTILS" ]; then true else false @@ -573,7 +563,7 @@ printf " (defaults to $TARGETDIR)\n\n" printf " [-D|--destdir <dest dir>] destination directory to install cross compiler to\n" printf " (for RPM builds, default unset)\n" - printf " [-P|--package <package>] Build a specific package: GCC, CLANG, IASL, GDB\n" + printf " [-P|--package <package>] Build a specific package: GCC, CLANG, IASL\n" printf " (defaults to $PACKAGE)\n" printf "GCC specific options:\n" printf " [-b|--bootstrap] bootstrap the host compiler before building\n" @@ -582,11 +572,7 @@ printf " (defaults to $TARGETARCH)\n" printf " [-l|--languages <languages>] comma separated list of target languages\n" printf " (defaults to $DEFAULT_LANGUAGES)\n" - printf "GDB specific options:\n" - printf " [-p|--platform <platform>] target platform to build cross compiler for\n" - printf " (defaults to $TARGETARCH)\n" - printf " [-S|--scripting] build scripting support for GDB\n\n" - printf "Platforms for GCC & GDB:\n" + printf "Platforms for GCC:\n" printf " x86_64 i386-elf i386-mingw32 riscv-elf arm aarch64\n" printf " powerpc64le-linux-gnu nds32le-elf\n\n" } @@ -798,43 +784,6 @@ fi } -build_EXPAT() { - CC="$(hostcc host)" CXX="$(hostcxx host)" CFLAGS="$HOSTCFLAGS" - ../${EXPAT_DIR}/configure --disable-shared --prefix="$TARGETDIR" \ - || touch .failed - $MAKE || touch .failed - $MAKE install DESTDIR=$DESTDIR || touch .failed - - normalize_dirs -} - -build_PYTHON() { - CC="$(hostcc host)" CXX="$(hostcxx host)" CFLAGS="$HOSTCFLAGS" - ../${PYTHON_DIR}/configure --prefix="$TARGETDIR" \ - || touch .failed - # shellcheck disable=SC2086 - $MAKE $JOBS || touch .failed - $MAKE install DESTDIR=$DESTDIR || touch .failed - - normalize_dirs -} - -build_GDB() { - export PYTHONHOME=$DESTDIR$TARGETDIR - if [ "$UNAME" != "FreeBSD" ] && [ "$UNAME" != "NetBSD" ]; then - LIBDL="-ldl" - fi - LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \ - -lpthread $LIBDL -lutil" \ - CC="$(hostcc target)" CXX="$(hostcxx target)" \ - CFLAGS="$HOSTCFLAGS -I$DESTDIR$TARGETDIR/include" \ - ../${GDB_DIR}/configure --prefix="$TARGETDIR" \ - --target=${TARGETARCH} --disable-werror --disable-nls - # shellcheck disable=SC2086 - $MAKE $JOBS || touch .failed - $MAKE install DESTDIR=$DESTDIR || touch .failed -} - build_IASL() { RDIR=$PWD cd ../$IASL_DIR/generate/unix || exit 1 @@ -906,14 +855,11 @@ AUTOCONF|autoconf) printf "%s\n" "$GCC_AUTOCONF_VERSION";; BINUTILS|binutils) printf "%s\n" "$BINUTILS_VERSION";; CLANG|clang) printf "%s\n" "$CLANG_VERSION";; - EXPAT|expat) printf "%s\n" "$EXPAT_VERSION";; GCC|gcc) printf "%s\n" "$GCC_VERSION";; - GDB|gdb) printf "%s\n" "$GDB_VERSION";; GMP|gmp) printf "%s\n" "$GMP_VERSION";; IASL|iasl) printf "%s\n" "$IASL_VERSION";; MPC|mpc) printf "%s\n" "$MPC_VERSION";; MPFR|mpfr) printf "%s\n" "$MPFR_VERSION";; - PYTHON|python) printf "%s\n" "$PYTHON_VERSION";; NASM|nasm) printf "%s\n" "${NASM_VERSION}";; *) printf "Unknown tool %s\n" "$PRINTSUPPORTED";; esac @@ -960,7 +906,6 @@ -D|--destdir) shift; DESTDIR="$1"; shift;; -j|--jobs) shift; THREADS="$1"; JOBS="-j $1"; shift;; -P|--package) shift; PACKAGE="$1"; shift;; - -S|--scripting) shift; SKIPPYTHON=0;; -y|--ccache) shift; USECCACHE=1;; -s|--supported) shift; PRINTSUPPORTED="$1"; shift;; -u|--urls) shift; printf "%s\n" "$ALL_ARCHIVES"; exit 0;; @@ -1009,14 +954,6 @@ NAME="${TARGETARCH} cross GCC" PACKAGES="GMP MPFR MPC BINUTILS GCC" ;; - GDB|gdb) - NAME="${TARGETARCH} cross GDB" - if [ $SKIPPYTHON -eq 0 ]; then - PACKAGES="EXPAT PYTHON GDB" - else - PACKAGES="EXPAT GDB" - fi - ;; CLANG|clang) NAME="LLVM clang" LLVM_VERSION=${CLANG_VERSION} @@ -1036,7 +973,7 @@ PACKAGES=NASM ;; *) - printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, and NASM)${NC}\n\n"; + printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, CLANG, IASL, and NASM)${NC}\n\n"; exit 1 ;; esac diff --git a/util/crossgcc/patches/gdb-9.2_amd64.patch b/util/crossgcc/patches/gdb-9.2_amd64.patch deleted file mode 100644 index 47d9a72..0000000 --- a/util/crossgcc/patches/gdb-9.2_amd64.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN gdb-3.orig/gdb/configure.tgt gdb-8.3/gdb/configure.tgt ---- gdb-8.3.orig/gdb/configure.tgt 2019-02-27 05:51:48.000000000 +0100 -+++ gdb-8.3/gdb/configure.tgt 2019-05-12 08:07:45.624984535 +0200 -@@ -772,6 +772,10 @@ - x86_64-*-rtems*) - gdb_target_obs="${amd64_tobjs} ${i386_tobjs} i386-bsd-tdep.o" - ;; -+x86_64-*-*) -+ # Target: amd6 -+ gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o" -+ ;; - xtensa*-*-*linux*) - # Target: GNU/Linux Xtensa - gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o" diff --git a/util/crossgcc/patches/gdb-9.2_no-doc.patch b/util/crossgcc/patches/gdb-9.2_no-doc.patch deleted file mode 100644 index 59ca998..0000000 --- a/util/crossgcc/patches/gdb-9.2_no-doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gdb-9.1.orig/gdb/Makefile.in 2020-02-08 13:50:14.000000000 +0100 -+++ gdb-9.1/gdb/Makefile.in 2020-02-08 20:11:17.201244042 +0100 -@@ -1606,7 +1606,7 @@ - $(SUBDIR_TARGET_OBS) \ - $(SUBDIR_GCC_COMPILE_OBS) - --SUBDIRS = doc @subdirs@ data-directory -+SUBDIRS = @subdirs@ data-directory - CLEANDIRS = $(SUBDIRS) - - # List of subdirectories in the build tree that must exist. diff --git a/util/crossgcc/patches/gdb-9.2_pythonhome.patch b/util/crossgcc/patches/gdb-9.2_pythonhome.patch deleted file mode 100644 index 51f74db..0000000 --- a/util/crossgcc/patches/gdb-9.2_pythonhome.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN gdb-8.2.1.orig/gdb/python/python.c gdb-8.2.1/gdb/python/python.c ---- gdb-8.2.1.org/gdb/python/python.c 2019-01-04 12:48:32.440687758 +0100 -+++ gdb-8.2.1/gdb/python/python.c 2019-01-04 12:54:09.917677688 +0100 -@@ -1727,6 +1727,15 @@ - #endif - #endif - -+ char readlinkbuffer[BUFSIZ]; -+ int readlinks = readlink("/proc/self/exe", readlinkbuffer, BUFSIZ - 1); -+ readlinkbuffer[readlinks] = 0; -+ char *executeablepath = dirname(readlinkbuffer); -+ char *pythonhome = malloc(strlen(executeablepath) + strlen("/../") + 2); -+ strcpy(pythonhome, executeablepath); -+ strcat(pythonhome, "/../"); -+ setenv("PYTHONHOME", pythonhome, 1); -+ - Py_Initialize (); - PyEval_InitThreads (); - diff --git a/util/crossgcc/sum/Python-3.8.5.tar.xz.cksum b/util/crossgcc/sum/Python-3.8.5.tar.xz.cksum deleted file mode 100644 index 2f4d4ad..0000000 --- a/util/crossgcc/sum/Python-3.8.5.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -68d6c7f948801cc755905162f5ee7589595edee4 tarballs/Python-3.8.5.tar.xz diff --git a/util/crossgcc/sum/expat-2.4.1.tar.bz2.cksum b/util/crossgcc/sum/expat-2.4.1.tar.bz2.cksum deleted file mode 100644 index 5b520f3..0000000 --- a/util/crossgcc/sum/expat-2.4.1.tar.bz2.cksum +++ /dev/null @@ -1 +0,0 @@ -b677b9a1cf3a1424fda183223fae2c58f50151af tarballs/expat-2.4.1.tar.bz2 diff --git a/util/crossgcc/sum/gdb-9.2.tar.xz.cksum b/util/crossgcc/sum/gdb-9.2.tar.xz.cksum deleted file mode 100644 index 8bbc448..0000000 --- a/util/crossgcc/sum/gdb-9.2.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -356ee474a24bfb2f133894730916557dfea9da2e tarballs/gdb-9.2.tar.xz -- To view, visit https://review.coreboot.org/c/coreboot/+/58380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib56ae0fdc1a50d24ff44c7879c43f8e94a5bfa95 Gerrit-Change-Number: 58380 Gerrit-PatchSet: 2 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Stefan Reinauer <reinauer(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2021