Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
device/Kconfig: select linear framebuffer for Tianocore
Automatically select the linear framebuffer mode option if available when Tianocore selected as payload, since VGA text mode will not work properly with the default Tianocore payload.
Change-Id: Ic36fd035526f3efd00ffa12ad613fbac304b18cf Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M src/device/Kconfig 1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/39048/1
diff --git a/src/device/Kconfig b/src/device/Kconfig index 603c7eb..25123ea 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -413,6 +413,8 @@ prompt "Framebuffer mode" default VBE_LINEAR_FRAMEBUFFER if HAVE_VBE_LINEAR_FRAMEBUFFER && CHROMEOS default GENERIC_LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER && CHROMEOS + default VBE_LINEAR_FRAMEBUFFER if HAVE_VBE_LINEAR_FRAMEBUFFER && PAYLOAD_TIANOCORE + default GENERIC_LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER && PAYLOAD_TIANOCORE default VGA_TEXT_FRAMEBUFFER
config VGA_TEXT_FRAMEBUFFER
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
Patch Set 1: Code-Review+2
What Patrick meant on IRC: You can name a choice and then give it a default later (if it has no default yet). This seems to work, too:
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index 7717917f94..6d692ff8b0 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -102,4 +102,8 @@ config TIANOCORE_BOOTSPLASH_FILE If an absolute path is not given, the path will assumed to be relative to the coreboot root directory.
+choice FRAMEBUFFER_MODE + default GENERIC_LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER +endchoice + endif diff --git a/src/device/Kconfig b/src/device/Kconfig index 603c7eb8d1..89f1c67a71 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -409,11 +409,10 @@ config FRAMEBUFFER_VESA_MODE default 0x118 if FRAMEBUFFER_VESA_MODE_USER endif # FRAMEBUFFER_SET_VESA_MODE
-choice +choice FRAMEBUFFER_MODE prompt "Framebuffer mode" default VBE_LINEAR_FRAMEBUFFER if HAVE_VBE_LINEAR_FRAMEBUFFER && CHROMEOS default GENERIC_LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER && CHROMEOS - default VGA_TEXT_FRAMEBUFFER
config VGA_TEXT_FRAMEBUFFER bool "Legacy VGA text mode"
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
Patch Set 1:
Patch Set 1: Code-Review+2
What Patrick meant on IRC: You can name a choice and then give it a default later (if it has no default yet). This seems to work, too:
+choice FRAMEBUFFER_MODE
default GENERIC_LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER+endchoice
this would default to LFB mode over text mode for all payloads though, which SeaBIOS users might object to, and wouldn't set it for VBIOS init, which is needed for Baytrail (eg) since there's no other option
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
Patch Set 1:
Patch Set 1:
Patch Set 1: Code-Review+2
What Patrick meant on IRC: You can name a choice and then give it a default later (if it has no default yet). This seems to work, too:
+choice FRAMEBUFFER_MODE
default GENERIC_LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER+endchoice
this would default to LFB mode over text mode for all payloads though, which SeaBIOS users might object to, and wouldn't set it for VBIOS init, which is needed for Baytrail (eg) since there's no other option
It was just an example how the mechanism works :-p And you put it out of context, I placed it inside the `if PAYLOAD_TIANOCORE`.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
Patch Set 1: Code-Review+1
(3 comments)
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@10 PS1, Line 10: Tianocore TianoCore
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@11 PS1, Line 11: mode will not work properly with the default Tianocore payload. Is there a bug report for this?
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@11 PS1, Line 11: Tianocore TianoCore
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@11 PS1, Line 11: mode will not work properly with the default Tianocore payload.
Is there a bug report for this?
I think it's meant as a feature (non-legacy).
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@11 PS1, Line 11: mode will not work properly with the default Tianocore payload.
I think it's meant as a feature (non-legacy).
AFAIK there isn't an actual bug report filed anywhere, but it is known to not work.
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
Patch Set 1:
Patch Set 1:
It was just an example how the mechanism works :-p And you put it out of context, I placed it inside the `if PAYLOAD_TIANOCORE`.
you're right, I read too quickly and completely missed the context
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
Patch Set 1:
(3 comments)
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@10 PS1, Line 10: Tianocore
TianoCore
I'm just being consistent with what's used in the tree currently for the most part (and Kconfig.name). If someone wants to `sed -i 's/Tianocore/TianoCore/g' *` I'll begrudgingly +2 it.
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@11 PS1, Line 11: mode will not work properly with the default Tianocore payload.
AFAIK there isn't an actual bug report filed anywhere, but it is known to not work.
it's a "feature" of my fork of CorebootPayloadPkg
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@11 PS1, Line 11: Tianocore
TianoCore
Ack
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
Patch Set 1:
(3 comments)
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@10 PS1, Line 10: Tianocore
I'm just being consistent with what's used in the tree currently for the most part (and Kconfig. […]
Done
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@11 PS1, Line 11: Tianocore
Ack
Done
https://review.coreboot.org/c/coreboot/+/39048/1//COMMIT_MSG@11 PS1, Line 11: mode will not work properly with the default Tianocore payload.
it's a "feature" of my fork of CorebootPayloadPkg
Done
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39048 )
Change subject: device/Kconfig: select linear framebuffer for Tianocore ......................................................................
device/Kconfig: select linear framebuffer for Tianocore
Automatically select the linear framebuffer mode option if available when Tianocore selected as payload, since VGA text mode will not work properly with the default Tianocore payload.
Change-Id: Ic36fd035526f3efd00ffa12ad613fbac304b18cf Signed-off-by: Matt DeVillier matt.devillier@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/39048 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net --- M src/device/Kconfig 1 file changed, 2 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve
diff --git a/src/device/Kconfig b/src/device/Kconfig index 603c7eb..25123ea 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -413,6 +413,8 @@ prompt "Framebuffer mode" default VBE_LINEAR_FRAMEBUFFER if HAVE_VBE_LINEAR_FRAMEBUFFER && CHROMEOS default GENERIC_LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER && CHROMEOS + default VBE_LINEAR_FRAMEBUFFER if HAVE_VBE_LINEAR_FRAMEBUFFER && PAYLOAD_TIANOCORE + default GENERIC_LINEAR_FRAMEBUFFER if HAVE_LINEAR_FRAMEBUFFER && PAYLOAD_TIANOCORE default VGA_TEXT_FRAMEBUFFER
config VGA_TEXT_FRAMEBUFFER
-
Angel Pons (Code Review) -
Matt DeVillier (Code Review)
-
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)
-
Paul Menzel (Code Review)