Aamir Bohra has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
drivers/intel/fsp2_0: honour FSP2_0_DISPLAY_LOGO Kconfig
The FSP logo support should only compile if board selects FSP2_0_DISPLAY_LOGO
Change-Id: Id92cc733562468a42ceee720861f5a1a4bcae9c3 Signed-off-by: Aamir Bohra aamir.bohra@intel.com --- M src/drivers/intel/fsp2_0/silicon_init.c 1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/37675/1
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index ebdbdbf..8cd63f2 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -57,13 +57,11 @@ /* Give SoC/mainboard a chance to populate entries */ platform_fsp_silicon_init_params_cb(upd);
-#if (CONFIG(HAVE_FSP_GOP)) - if (CONFIG(FSP2_0_DISPLAY_LOGO)) { +#if (CONFIG(FSP2_0_DISPLAY_LOGO)) upd->FspsConfig.LogoSize = 1 * MiB; logo_entry = cbmem_entry_add(CBMEM_ID_FSP_LOGO, upd->FspsConfig.LogoSize); upd->FspsConfig.LogoPtr = (UINT32)cbmem_entry_start(logo_entry); load_logo(upd); - } #endif
/* Call SiliconInit */
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 1:
(1 comment)
Please don't use preprocessor guards unless really necessary. What exactly are you trying to fix?
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... File src/drivers/intel/fsp2_0/silicon_init.c:
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... PS1, Line 60: #if (CONFIG(FSP2_0_DISPLAY_LOGO)) I think this should just be `if (CONFIG(FSP2_0_DISPLAY_LOGO))` without any preprocessor guards (Kconfig already takes care of the HAVE_FSP_GOP dependency, which should rather be RUN_FSP_GOP btw. no need to load the logo, if other means to initialize graphics are used). Garbage collection will remove the code here if the config is unset (otherwise we couldn't link, as `logo.c` is also guarded in the `Makefile.inc`).
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... File src/drivers/intel/fsp2_0/silicon_init.c:
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... PS1, Line 60: #if (CONFIG(FSP2_0_DISPLAY_LOGO))
I think this should just be `if (CONFIG(FSP2_0_DISPLAY_LOGO))` without any […]
note: upd->FspsConfig.LogoPtr is not a FSP architecture UPD that mean this name can't be same across all FSP. now this is without any #if will push FSP to maintain and mandate this UPD name, which might not true.
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... File src/drivers/intel/fsp2_0/silicon_init.c:
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... PS1, Line 60: #if (CONFIG(FSP2_0_DISPLAY_LOGO))
note: upd->FspsConfig. […]
See comment on CB:37515 The UPD specific items should be moved to SoC.
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... File src/drivers/intel/fsp2_0/silicon_init.c:
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... PS1, Line 60: #if (CONFIG(FSP2_0_DISPLAY_LOGO))
See comment on CB:37515 […]
Thanks, are you plan to do that ? if yes, can you please add me ?
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... File src/drivers/intel/fsp2_0/silicon_init.c:
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... PS1, Line 60: #if (CONFIG(FSP2_0_DISPLAY_LOGO))
See comment on CB:37515 […]
Ack, the assignments to `upd->FspsConfig` should move. Also, if not all platforms support this, FSP2_0_DISPLAY_LOGO should have proper dependencies to reflect this.
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... File src/drivers/intel/fsp2_0/silicon_init.c:
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... PS1, Line 60: #if (CONFIG(FSP2_0_DISPLAY_LOGO))
Ack, the assignments to `upd->FspsConfig` should move. Also, if not all […]
Will work on this.
Aamir Bohra has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... File src/drivers/intel/fsp2_0/silicon_init.c:
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... PS1, Line 60: #if (CONFIG(FSP2_0_DISPLAY_LOGO))
Will work on this.
Ok, can you give this CL a -1, to block merge.
Hello Patrick Rudolph, Subrata Banik, Frans Hendriks, Rizwan Qureshi, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37675
to look at the new patch set (#3).
Change subject: drivers/intel/fsp2_0: [DO NOT MERGE]honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
drivers/intel/fsp2_0: [DO NOT MERGE]honour FSP2_0_DISPLAY_LOGO Kconfig
The FSP logo support should only compile if board selects FSP2_0_DISPLAY_LOGO
Change-Id: Id92cc733562468a42ceee720861f5a1a4bcae9c3 Signed-off-by: Aamir Bohra aamir.bohra@intel.com --- M src/drivers/intel/fsp2_0/silicon_init.c 1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/37675/3
Aamir Bohra has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: [DO NOT MERGE]honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... File src/drivers/intel/fsp2_0/silicon_init.c:
https://review.coreboot.org/c/coreboot/+/37675/1/src/drivers/intel/fsp2_0/si... PS1, Line 60: #if (CONFIG(FSP2_0_DISPLAY_LOGO))
Ok, can you give this CL a -1, to block merge.
Updated the commit message for do not merge
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: [DO NOT MERGE]honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 5: Code-Review-1
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37675 )
Change subject: drivers/intel/fsp2_0: [DO NOT MERGE]honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Patch Set 5:
Patchset to solve the FSP logo support has been uploaded: FSP 1.0: CB:37791 FSP 2.0: CB:37792
Martin L Roth has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/37675?usp=email )
Change subject: drivers/intel/fsp2_0: [DO NOT MERGE]honour FSP2_0_DISPLAY_LOGO Kconfig ......................................................................
Abandoned
This patch has not been touched in over 12 months. Anyone who wants to take over work on this patch, please feel free to restore it and do any work needed to get it merged. If you create a new patch based on this work, please credit the original author.