coreboot-gerrit September 2021

coreboot-gerrit@coreboot.org

1 participants
6530 discussions

Change in coreboot[master]: drivers/intel/fsp2_0: add warning when ADD_FSP_BINARIES isn't selected
by Felix Held (Code Review) 05 Sep '21

05 Sep '21

Attention is currently required from: Andrey Petrov, Patrick Rudolph, Felix Held. Hello build bot (Jenkins), Nico Huber, Andrey Petrov, Patrick Rudolph, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/57368 to look at the new patch set (#2). Change subject: drivers/intel/fsp2_0: add warning when ADD_FSP_BINARIES isn't selected ...................................................................... drivers/intel/fsp2_0: add warning when ADD_FSP_BINARIES isn't selected Platforms that rely on the FSP for parts of the hardware initialization likely won't boot successfully when no FSP binaries are added during the build, so print a warning at the end of the build in this case. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Suggested-by: Nico Huber <nico.h(a)gmx.de> Suggested-by: Martin Roth <martinroth(a)google.com> Change-Id: I6efc184ecc4059818474937fd31574f703c9bdc6 --- M src/drivers/intel/fsp2_0/Makefile.inc 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/57368/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/57368 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I6efc184ecc4059818474937fd31574f703c9bdc6 Gerrit-Change-Number: 57368 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: soc/intel/broadwell: Drop unused PCH PCI device macros
by Nico Huber (Code Review) 05 Sep '21

05 Sep '21

Attention is currently required from: Matt DeVillier, Angel Pons, Arthur Heymans, Patrick Rudolph. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/55529 ) Change subject: soc/intel/broadwell: Drop unused PCH PCI device macros ...................................................................... Patch Set 11: (1 comment) Patchset: PS11: Wondering, could we rewrite these macros (rather, those where it would still compiles) with references to the devices in `build/static_devices.h`? -- To view, visit https://review.coreboot.org/c/coreboot/+/55529 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I366e064f3fe708b55fb381aee25b2795b1c61142 Gerrit-Change-Number: 55529 Gerrit-PatchSet: 11 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Comment-Date: Sun, 05 Sep 2021 17:54:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: drivers/intel/fsp/Makefile: error out when FSP files aren't specified
by Felix Held (Code Review) 05 Sep '21

05 Sep '21

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/57219 ) Change subject: drivers/intel/fsp/Makefile: error out when FSP files aren't specified ...................................................................... drivers/intel/fsp/Makefile: error out when FSP files aren't specified Error out when the FSP binaries that are supposed to be added aren't specified. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Suggested-by: Nico Huber <nico.h(a)gmx.de> Change-Id: Ie5f2d75d066f0b4e491e9c8420b7a0cbd4ba9e28 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57219 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Martin Roth <martinroth(a)google.com> Reviewed-by: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M src/drivers/intel/fsp2_0/Makefile.inc 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved Nico Huber: Looks good to me, approved Tim Wawrzynczak: Looks good to me, approved diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc index b472721..80dc93b 100644 --- a/src/drivers/intel/fsp2_0/Makefile.inc +++ b/src/drivers/intel/fsp2_0/Makefile.inc @@ -97,6 +97,21 @@ CPPFLAGS_common+=-I$(CONFIG_FSP_HEADER_PATH) endif +# check if the FSP files that are supposed to be added are specified +ifeq ($(CONFIG_ADD_FSP_BINARIES),y) +ifeq ($(CONFIG_FSP_CAR),y) +ifeq ($(call strip_quotes,$(CONFIG_FSP_T_FILE)),) +$(error No FSP-T binary file specified.) +endif # CONFIG_FSP_T_FILE +endif # CONFIG_FSP_CAR +ifeq ($(call strip_quotes,$(CONFIG_FSP_M_FILE)),) +$(error No FSP-M binary file specified.) +endif # CONFIG_FSP_M_FILE +ifeq ($(call strip_quotes,$(CONFIG_FSP_S_FILE)),) +$(error No FSP-S binary file specified.) +endif # CONFIG_FSP_S_FILE +endif # CONFIG_ADD_FSP_BINARIES + subdirs-y += ppi endif -- To view, visit https://review.coreboot.org/c/coreboot/+/57219 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie5f2d75d066f0b4e491e9c8420b7a0cbd4ba9e28 Gerrit-Change-Number: 57219 Gerrit-PatchSet: 7 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(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

Change in coreboot[master]: utils/abuild: select FSP_USE_REPO instead of ADD_FSP_BINARIES
by Felix Held (Code Review) 05 Sep '21

05 Sep '21

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/57349 ) Change subject: utils/abuild: select FSP_USE_REPO instead of ADD_FSP_BINARIES ...................................................................... utils/abuild: select FSP_USE_REPO instead of ADD_FSP_BINARIES Like USE_AMD_BLOBS and USE_QC_BLOBS in the case of the AMD and Qualcomm repos, FSP_USE_REPO controls if the Intel FSP repo will get checked out and will be available during the Jenkins runs. ADD_FSP_BINARIES will get selected in drivers/intel/fsp2_0/Kconfig when FSP_USE_REPO is selected. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I72faa6f9e5f2b06ab7cd43595ae0b49bf4d39630 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57349 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Martin Roth <martinroth(a)google.com> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M util/abuild/abuild 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved Nico Huber: Looks good to me, approved diff --git a/util/abuild/abuild b/util/abuild/abuild index 407c3f1..5fe298e 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -731,7 +731,7 @@ shift;; -B|--blobs) shift customizing="${customizing}, blobs" - configoptions="${configoptions}CONFIG_USE_AMD_BLOBS=y\nCONFIG_USE_QC_BLOBS=y\nCONFIG_ADD_FSP_BINARIES=y\n" + configoptions="${configoptions}CONFIG_USE_AMD_BLOBS=y\nCONFIG_USE_QC_BLOBS=y\nCONFIG_FSP_USE_REPO=y\n" ;; -A|--any-toolchain) shift customizing="${customizing}, any-toolchain" -- To view, visit https://review.coreboot.org/c/coreboot/+/57349 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I72faa6f9e5f2b06ab7cd43595ae0b49bf4d39630 Gerrit-Change-Number: 57349 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: mb/intel/leafhill,minnow3: remove FSP_M_CBFS and FSP_S_CBFS override
by Felix Held (Code Review) 05 Sep '21

05 Sep '21

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/57350 ) Change subject: mb/intel/leafhill,minnow3: remove FSP_M_CBFS and FSP_S_CBFS override ...................................................................... mb/intel/leafhill,minnow3: remove FSP_M_CBFS and FSP_S_CBFS override The overrides set the options to the same value as drivers/intel/fsp2_0/ Kconfig does, so drop the overrides. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I53922786382a2e7d29b3df560a1998f41e1d2ea8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57350 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M src/mainboard/intel/leafhill/Kconfig M src/mainboard/intel/minnow3/Kconfig 2 files changed, 0 insertions(+), 16 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig index bf59d00..8e81a2e 100644 --- a/src/mainboard/intel/leafhill/Kconfig +++ b/src/mainboard/intel/leafhill/Kconfig @@ -44,12 +44,4 @@ depends on NEED_IFWI default y -config FSP_S_CBFS - string - default "fsps.bin" - -config FSP_M_CBFS - string - default "fspm.bin" - endif # BOARD_INTEL_LEAFHILL diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig index 13a8591..018281f 100644 --- a/src/mainboard/intel/minnow3/Kconfig +++ b/src/mainboard/intel/minnow3/Kconfig @@ -44,12 +44,4 @@ depends on NEED_IFWI default y -config FSP_S_CBFS - string - default "fsps.bin" - -config FSP_M_CBFS - string - default "fspm.bin" - endif # BOARD_INTEL_MINNOW3 -- To view, visit https://review.coreboot.org/c/coreboot/+/57350 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I53922786382a2e7d29b3df560a1998f41e1d2ea8 Gerrit-Change-Number: 57350 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: mb/intel/leafhill,minnow3: remove FSP_M_FILE and FSP_S_FILE override
by Felix Held (Code Review) 05 Sep '21

05 Sep '21

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/57347 ) Change subject: mb/intel/leafhill,minnow3: remove FSP_M_FILE and FSP_S_FILE override ...................................................................... mb/intel/leafhill,minnow3: remove FSP_M_FILE and FSP_S_FILE override Normally, selecting FSP_USE_REPO will select FSP_FULL_FD which then will configure the proper paths for FSP_M_FILE and FSP_S_FILE. The override in these two boards caused FSP_M_FILE and FSP_S_FILE being empty despite ADD_FSP_BINARIES being selected by FSP_USE_REPO which is an invalid case that needs to be avoided, so remove the board-level override of those two options. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I20c8cebea8327d59f0f33d05b824a74bf2121f4b Reviewed-on: https://review.coreboot.org/c/coreboot/+/57347 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M src/mainboard/intel/leafhill/Kconfig M src/mainboard/intel/minnow3/Kconfig 2 files changed, 0 insertions(+), 20 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig index dc2eff6..bf59d00 100644 --- a/src/mainboard/intel/leafhill/Kconfig +++ b/src/mainboard/intel/leafhill/Kconfig @@ -44,16 +44,6 @@ depends on NEED_IFWI default y -config FSP_M_FILE - string "path to FSP-M.Fv blob" - depends on ADD_FSP_BINARIES - default "" - -config FSP_S_FILE - string "path to FSP-S.Fv blob" - depends on ADD_FSP_BINARIES - default "" - config FSP_S_CBFS string default "fsps.bin" diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig index 41aacdd..13a8591 100644 --- a/src/mainboard/intel/minnow3/Kconfig +++ b/src/mainboard/intel/minnow3/Kconfig @@ -44,16 +44,6 @@ depends on NEED_IFWI default y -config FSP_M_FILE - string "path to FSP-M.Fv blob" - depends on ADD_FSP_BINARIES - default "" - -config FSP_S_FILE - string "path to FSP-S.Fv blob" - depends on ADD_FSP_BINARIES - default "" - config FSP_S_CBFS string default "fsps.bin" -- To view, visit https://review.coreboot.org/c/coreboot/+/57347 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I20c8cebea8327d59f0f33d05b824a74bf2121f4b Gerrit-Change-Number: 57347 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: mb/intel/leafhill,minnow3: remove ADD_FSP_BINARIES config override
by Felix Held (Code Review) 05 Sep '21

05 Sep '21

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/57346 ) Change subject: mb/intel/leafhill,minnow3: remove ADD_FSP_BINARIES config override ...................................................................... mb/intel/leafhill,minnow3: remove ADD_FSP_BINARIES config override The ADD_FSP_BINARIES override in the mainboard's Kconfig caused this option to not be selected when FSP_USE_REPO is selected. Remove the override to fix this problem. These two boards are the only ones in tree that had an override for this option, so now the ADD_FSP_BINARIES option is only defined in drivers/intel/fsp2_0/Kconfig. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I23439f3134eef9460625addbff7efd64c5f65ae5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57346 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M src/mainboard/intel/leafhill/Kconfig M src/mainboard/intel/minnow3/Kconfig 2 files changed, 0 insertions(+), 8 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig index 3d25aaa..dc2eff6 100644 --- a/src/mainboard/intel/leafhill/Kconfig +++ b/src/mainboard/intel/leafhill/Kconfig @@ -44,10 +44,6 @@ depends on NEED_IFWI default y -config ADD_FSP_BINARIES - bool "Add FSP blobs" - default n - config FSP_M_FILE string "path to FSP-M.Fv blob" depends on ADD_FSP_BINARIES diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig index 66bee2f..41aacdd 100644 --- a/src/mainboard/intel/minnow3/Kconfig +++ b/src/mainboard/intel/minnow3/Kconfig @@ -44,10 +44,6 @@ depends on NEED_IFWI default y -config ADD_FSP_BINARIES - bool "Add FSP blobs" - default n - config FSP_M_FILE string "path to FSP-M.Fv blob" depends on ADD_FSP_BINARIES -- To view, visit https://review.coreboot.org/c/coreboot/+/57346 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I23439f3134eef9460625addbff7efd64c5f65ae5 Gerrit-Change-Number: 57346 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin Roth <martinroth(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: mb/intel/leafhill,minnow3: remove ADD_FSP_BINARIES config override
by Felix Held (Code Review) 05 Sep '21

05 Sep '21

Attention is currently required from: Martin Roth. Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57346 ) Change subject: mb/intel/leafhill,minnow3: remove ADD_FSP_BINARIES config override ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Felix, that sounds like a good plan. Let's make it overridable at the FSP level. there are also some other things i found in the fsp driver's Kconfig that could be improved, but not sure when/if i'll be looking into those, since those likely won't be a priority for me. but at least some of the problems are now more or less addressed, so i'd still count this as a win :) -- To view, visit https://review.coreboot.org/c/coreboot/+/57346 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I23439f3134eef9460625addbff7efd64c5f65ae5 Gerrit-Change-Number: 57346 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin Roth <martinroth(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-Comment-Date: Sun, 05 Sep 2021 17:52:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Martin Roth <martinroth(a)google.com> Comment-In-Reply-To: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: utils/abuild: select FSP_USE_REPO instead of ADD_FSP_BINARIES
by Felix Held (Code Review) 05 Sep '21

05 Sep '21

Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57349 ) Change subject: utils/abuild: select FSP_USE_REPO instead of ADD_FSP_BINARIES ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > So, if I understand this right, it only worked because for platforms […] yes, that was why adding paths of not existing fsp binaries made the jenkins build break. already ran into this when working on picasso, but didn't have the time to investigate that back then -- To view, visit https://review.coreboot.org/c/coreboot/+/57349 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I72faa6f9e5f2b06ab7cd43595ae0b49bf4d39630 Gerrit-Change-Number: 57349 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Sun, 05 Sep 2021 17:44:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: sb/amd/pi/hudson: drop HUDSON_UART option and corresponding code
by Felix Held (Code Review) 05 Sep '21

05 Sep '21

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/56785 ) Change subject: sb/amd/pi/hudson: drop HUDSON_UART option and corresponding code ...................................................................... sb/amd/pi/hudson: drop HUDSON_UART option and corresponding code This option is neither selected nor usable for the only remaining SoC that uses this code, so drop the remaining parts. configure_hudson_uart isn't called anywhere and isn't even compiled, since it's guarded by an #if CONFIG(HUDSON_UART) block and the HUDSON_UART Kconfig option isn't selected anywhere. Both the offsets used in the iomux_write8 calls and the UART controller itself aren't listed in the BKDG #52740 Rev 3.05 for the AMD Family 16h Models 30h-3Fh APUs which is the only SoC that uses this code, so the code didn't even apply for this chip. TEST=Timeless build for pcengines/apu2 results in identical binary. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I3f462d1f83a0f1ba851329ebebb1f3263267fdc6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56785 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/southbridge/amd/pi/hudson/Kconfig M src/southbridge/amd/pi/hudson/Makefile.inc M src/southbridge/amd/pi/hudson/early_setup.c M src/southbridge/amd/pi/hudson/hudson.h D src/southbridge/amd/pi/hudson/uart.c 5 files changed, 0 insertions(+), 59 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig index c959e28..10277c1 100644 --- a/src/southbridge/amd/pi/hudson/Kconfig +++ b/src/southbridge/amd/pi/hudson/Kconfig @@ -205,18 +205,3 @@ This value must match the hardcoded value of AGESA. endif - -config HUDSON_UART - bool "UART controller on Kern" - default n - depends on SOUTHBRIDGE_AMD_PI_KERN - select DRIVERS_UART_8250MEM - select DRIVERS_UART_8250MEM_32 - select NO_UART_ON_SUPERIO - select UART_OVERRIDE_REFCLK - help - There are two UART controllers in Kern. - The UART registers are memory-mapped. UART - controller 0 registers range from FEDC_6000h - to FEDC_6FFFh. UART controller 1 registers - range from FEDC_8000h to FEDC_8FFFh. diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index fe78723..9309455 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -33,10 +33,8 @@ romstage-$(CONFIG_HUDSON_IMC_FWM) += imc.c romstage-y += smbus.c romstage-y += smbus_spd.c -romstage-$(CONFIG_HUDSON_UART) += uart.c verstage-y += early_setup.c -verstage-$(CONFIG_HUDSON_UART) += uart.c ramstage-y += enable_usbdebug.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c @@ -52,7 +50,6 @@ ramstage-y += sm.c ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi_util.c -ramstage-$(CONFIG_HUDSON_UART) += uart.c ramstage-y += usb.c all-y += reset.c diff --git a/src/southbridge/amd/pi/hudson/early_setup.c b/src/southbridge/amd/pi/hudson/early_setup.c index b2bdb8d..20597d4 100644 --- a/src/southbridge/amd/pi/hudson/early_setup.c +++ b/src/southbridge/amd/pi/hudson/early_setup.c @@ -13,33 +13,6 @@ #include "pci_devs.h" #include <Fch/Fch.h> -#if CONFIG(HUDSON_UART) - -#include <delay.h> - -void configure_hudson_uart(void) -{ - u8 byte; - - byte = aoac_read8(FCH_AOAC_REG56 + - CONFIG_UART_FOR_CONSOLE * sizeof(u16))); - byte |= 1 << 3; - aoac_write8(FCH_AOAC_REG56 + CONFIG_UART_FOR_CONSOLE * sizeof(u16)), - byte); - - aoac_write8(FCH_AOAC_REG62, aoac_read8(FCH_AOAC_REG62) | (1 << 3)); - iomux_write8(0x89, 0); /* UART0_RTS_L_EGPIO137 */ - iomux_write8(0x8a, 0); /* UART0_TXD_EGPIO138 */ - iomux_write8(0x8e, 0); /* UART1_RTS_L_EGPIO142 */ - iomux_write8(0x8f, 0); /* UART1_TXD_EGPIO143 */ - - udelay(2000); - write8((void *)(0xFEDC6000 + 0x2000 * CONFIG_UART_FOR_CONSOLE + 0x88), - 0x01); /* reset UART */ -} - -#endif - void hudson_pci_port80(void) { u8 byte; diff --git a/src/southbridge/amd/pi/hudson/hudson.h b/src/southbridge/amd/pi/hudson/hudson.h index d303c4f..e202824 100644 --- a/src/southbridge/amd/pi/hudson/hudson.h +++ b/src/southbridge/amd/pi/hudson/hudson.h @@ -170,7 +170,6 @@ void lpc_wideio_512_window(uint16_t base); void lpc_wideio_16_window(uint16_t base); void hudson_tpm_decode_spi(void); -void configure_hudson_uart(void); void hudson_enable(struct device *dev); void s3_resume_init_data(void *FchParams); diff --git a/src/southbridge/amd/pi/hudson/uart.c b/src/southbridge/amd/pi/hudson/uart.c deleted file mode 100644 index 996215d..0000000 --- a/src/southbridge/amd/pi/hudson/uart.c +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <console/uart.h> - -uintptr_t uart_platform_base(unsigned int idx) -{ - return (uintptr_t)(0xFEDC6000 + 0x2000 * (idx & 1)); -} - -unsigned int uart_platform_refclk(void) -{ - return 48000000; -} -- To view, visit https://review.coreboot.org/c/coreboot/+/56785 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3f462d1f83a0f1ba851329ebebb1f3263267fdc6 Gerrit-Change-Number: 56785 Gerrit-PatchSet: 5 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.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-MessageType: merged

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit September 2021