Change in coreboot[master]: trogdor: add support for Bubs variant

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Change in coreboot[master]: Do not...

mturney mturney (Code Review)

20 Nov 2019 20 Nov '19

5:26 p.m.

mturney mturney has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

trogdor: add support for Bubs variant

Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Signed-off-by: T Michael Turney mturney@codeaurora.org --- A payloads/libpayload/configs/config.bubs M src/mainboard/google/trogdor/Kconfig M src/mainboard/google/trogdor/Kconfig.name M src/mainboard/google/trogdor/reset.c 4 files changed, 24 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/37069/1

diff --git a/payloads/libpayload/configs/config.bubs b/payloads/libpayload/configs/config.bubs new file mode 100644 index 0000000..7e162e5 --- /dev/null +++ b/payloads/libpayload/configs/config.bubs @@ -0,0 +1,8 @@ +CONFIG_LP_CHROMEOS=y +CONFIG_LP_ARCH_ARM64=y +CONFIG_LP_TIMER_ARM64_ARCH=y +CONFIG_LP_SERIAL_CONSOLE=y +CONFIG_LP_QUALCOMM_QUPV3_SERIAL_CONSOLE=y +CONFIG_LP_USB=y +CONFIG_LP_USB_EHCI=y +CONFIG_LP_USB_XHCI=y diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig index 56b3a72..6377c3a 100644 --- a/src/mainboard/google/trogdor/Kconfig +++ b/src/mainboard/google/trogdor/Kconfig @@ -8,20 +8,20 @@ def_bool y select BOARD_ROMSIZE_KB_8192 select COMMON_CBFS_SPI_WRAPPER - select EC_GOOGLE_CHROMEEC - select EC_GOOGLE_CHROMEEC_RTC - select EC_GOOGLE_CHROMEEC_SPI - select RTC + select EC_GOOGLE_CHROMEEC if BOARD_GOOGLE_TROGDOR + select EC_GOOGLE_CHROMEEC_RTC if BOARD_GOOGLE_TROGDOR + select EC_GOOGLE_CHROMEEC_SPI if BOARD_GOOGLE_TROGDOR + select RTC if BOARD_GOOGLE_TROGDOR select SOC_QUALCOMM_SC7180 select SPI_FLASH select SPI_FLASH_WINBOND select MAINBOARD_HAS_CHROMEOS

config VBOOT - select EC_GOOGLE_CHROMEEC_SWITCHES + select EC_GOOGLE_CHROMEEC_SWITCHES if BOARD_GOOGLE_TROGDOR select VBOOT_VBNV_FLASH - select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC - select VBOOT_MOCK_SECDATA + select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC if BOARD_GOOGLE_BUBS + select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_BUBS

config MAINBOARD_DIR string @@ -46,5 +46,6 @@ config MAINBOARD_PART_NUMBER string default "Trogdor" if BOARD_GOOGLE_TROGDOR + default "Bubs" if BOARD_GOOGLE_BUBS

endif # BOARD_GOOGLE_TROGDOR_COMMON diff --git a/src/mainboard/google/trogdor/Kconfig.name b/src/mainboard/google/trogdor/Kconfig.name index 425c9bf..ba17254 100644 --- a/src/mainboard/google/trogdor/Kconfig.name +++ b/src/mainboard/google/trogdor/Kconfig.name @@ -1,4 +1,10 @@ +comment "Trogdor"

config BOARD_GOOGLE_TROGDOR bool "Trogdor" select BOARD_GOOGLE_TROGDOR_COMMON + +config BOARD_GOOGLE_BUBS + bool "Bubs" + select BOARD_GOOGLE_TROGDOR_COMMON + diff --git a/src/mainboard/google/trogdor/reset.c b/src/mainboard/google/trogdor/reset.c index 558f63d..f099dda 100644 --- a/src/mainboard/google/trogdor/reset.c +++ b/src/mainboard/google/trogdor/reset.c @@ -21,5 +21,6 @@ but this works well enough for our purposes. */ void do_board_reset(void) { - google_chromeec_reboot(0, EC_REBOOT_COLD, 0); + if (CONFIG(BOARD_GOOGLE_TROGDOR)) + google_chromeec_reboot(0, EC_REBOOT_COLD, 0); }

Attachments:

attachment.htm (text/html — 6.7 KB)

Show replies by date

Douglas Anderson (Code Review)

21 Nov 21 Nov

9:06 a.m.

Douglas Anderson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/reset.c:

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 24: BOARD_GOOGLE_TROGDOR I would probably go the opposite and say "not bubs". Any other board that is designed is more likely to have an EC so bubs should generally be the exception.

Julius Werner (Code Review)

1:08 p.m.

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 1:

(4 comments)

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/Kconfig:

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 11: select EC_GOOGLE_CHROMEEC if BOARD_GOOGLE_TROGDOR These should all be

if !BOARD_GOOGLE_BUBS

instead. Other boards will follow Trogdor, not Bubs. (At least until we make a Chromebox, then this becomes more complicated.)

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 21: select EC_GOOGLE_CHROMEEC_SWITCHES if BOARD_GOOGLE_TROGDOR I would assume that you get the linker issues Doug mentioned (for things like get_recovery_mode_switch()) when you disable this for Bubs. You'll need to also add a

select VBOOT_NO_BOARD_SUPPORT if BOARD_GOOGLE_BUBS

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 23: select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC if BOARD_GOOGLE_BUBS You shouldn't need this since the depthcharge Kconfig already disables software sync.

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/reset.c:

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 24: BOARD_GOOGLE_TROGDOR

...

I would probably go the opposite and say "not bubs". […]

In this case, we can instead add

select MISSING_BOARD_RESET if BOARD_GOOGLE_BUBS

to the Kconfig, and wrap the Makefile lines compiling this file in an

ifneq($(CONFIG_BOARD_GOOGLE_BUBS),y)

that should be a bit cleaner.

Douglas Anderson (Code Review)

1:14 p.m.

Douglas Anderson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/Kconfig:

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 21: select EC_GOOGLE_CHROMEEC_SWITCHES if BOARD_GOOGLE_TROGDOR

...

I would assume that you get the linker issues Doug mentioned (for things like get_recovery_mode_swit […]

Yeah, this made me compile.

Julius Werner (Code Review)

1:45 p.m.

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 1:

(3 comments)

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/Kconfig:

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 18: select MAINBOARD_HAS_CHROMEOS We'll also need a

select MAINBOARD_HAS_SPI_TPM_CR50 if !BOARD_GOOGLE_BUBS select MAINBOARD_HAS_TPM2 if !BOARD_GOOGLE_BUBS

here to make the TPM work.

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 36: default 0x5 Looks like this needs to be 0x0 for Trogdor now.

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 40: default 0xa And this needs to be 0x8

Julius Werner (Code Review)

1:49 p.m.

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/Kconfig:

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 40: default 0xa

...

And this needs to be 0x8

Sorry: 0x6, not 0x8. I only just now realized that SC7180 has fewer QUPs per WRAP than SDM845 had.

Julius Werner (Code Review)

3:05 p.m.

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 1:

(2 comments)

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/Kconfig:

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 36: default 0x5

...

Looks like this needs to be 0x0 for Trogdor now.

edit: 0x6 (see below)

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 40: default 0xa

...

Sorry: 0x6, not 0x8. I only just now realized that SC7180 has fewer QUPs per WRAP than SDM845 had.

Sorry again, our schematics are basically loose unlabeled sheets of paper flying around the office and if you happen to pick up the wrong one you get outdated info. -.- I have now been informed that the correct EC bus is 0x0 (and TPM is 0x6).

mturney mturney (Code Review)

25 Nov 25 Nov

6:36 p.m.

mturney mturney has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 2:

(7 comments)

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/Kconfig:

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 11: select EC_GOOGLE_CHROMEEC if BOARD_GOOGLE_TROGDOR

...

These should all be […]

Done

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 18: select MAINBOARD_HAS_CHROMEOS

...

We'll also need a […]

Done

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 21: select EC_GOOGLE_CHROMEEC_SWITCHES if BOARD_GOOGLE_TROGDOR

...

Yeah, this made me compile.

Done

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 23: select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC if BOARD_GOOGLE_BUBS

...

You shouldn't need this since the depthcharge Kconfig already disables software sync.

Done

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 36: default 0x5

...

edit: 0x6 (see below)

Done

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 40: default 0xa

...

Sorry again, our schematics are basically loose unlabeled sheets of paper flying around the office a […]

Done

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/reset.c:

https://review.coreboot.org/c/coreboot/+/37069/1/src/mainboard/google/trogdo... PS1, Line 24: BOARD_GOOGLE_TROGDOR

...

In this case, we can instead add […]

Done

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 2 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Douglas Anderson dianders@chromium.org Gerrit-CC: Julius Werner jwerner@chromium.org Gerrit-Comment-Date: Tue, 26 Nov 2019 02:36:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Julius Werner jwerner@chromium.org Comment-In-Reply-To: Douglas Anderson dianders@chromium.org Gerrit-MessageType: comment

mturney mturney (Code Review)

6:46 p.m.

Hello build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37069

to look at the new patch set (#3).

Change subject: trogdor: add support for Bubs variant ......................................................................

trogdor: add support for Bubs variant

Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Signed-off-by: T Michael Turney mturney@codeaurora.org --- A payloads/libpayload/configs/config.bubs M src/mainboard/google/trogdor/Kconfig M src/mainboard/google/trogdor/Kconfig.name M src/mainboard/google/trogdor/Makefile.inc 4 files changed, 31 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/37069/3

Julius Werner (Code Review)

26 Nov 26 Nov

2:25 p.m.

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 4: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/37069/4/src/mainboard/google/trogdo... File src/mainboard/google/trogdor/Kconfig.name:

https://review.coreboot.org/c/coreboot/+/37069/4/src/mainboard/google/trogdo... PS4, Line 10: Jenkins seems to think this is one empty line too many.

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 4 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Douglas Anderson dianders@chromium.org Gerrit-Comment-Date: Tue, 26 Nov 2019 22:25:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

mturney mturney (Code Review)

7 Feb 7 Feb

10:47 a.m.

Hello Julius Werner, Ravi kumar, build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37069

to look at the new patch set (#23).

Change subject: trogdor: add support for Bubs variant ......................................................................

trogdor: add support for Bubs variant

Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Signed-off-by: T Michael Turney mturney@codeaurora.org --- A payloads/libpayload/configs/config.bubs M src/mainboard/google/trogdor/Kconfig M src/mainboard/google/trogdor/Kconfig.name M src/mainboard/google/trogdor/Makefile.inc 4 files changed, 30 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/37069/23

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 23 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Ravi kumar rbokka@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Doug Anderson dianders@chromium.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Julius Werner (Code Review)

2 Mar 2 Mar

3:11 p.m.

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 28: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 28 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Ravi kumar rbokka@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Doug Anderson dianders@chromium.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Mon, 02 Mar 2020 23:11:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Ravi kumar (Code Review)

3 Mar 3 Mar

2:29 a.m.

Ravi kumar has uploaded a new patch set (#29) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

trogdor: add support for Bubs variant

Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Signed-off-by: T Michael Turney mturney@codeaurora.org --- A payloads/libpayload/configs/config.bubs M src/mainboard/google/trogdor/Kconfig M src/mainboard/google/trogdor/Kconfig.name M src/mainboard/google/trogdor/Makefile.inc 4 files changed, 30 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/37069/29

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 29 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Ravi kumar rbokka@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Doug Anderson dianders@chromium.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

mturney mturney (Code Review)

6 Mar 6 Mar

1:21 p.m.

Hello Ravi kumar, build bot (Jenkins), Patrick Georgi, Martin Roth, Julius Werner,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37069

to look at the new patch set (#30).

Change subject: trogdor: add support for Bubs variant ......................................................................

trogdor: add support for Bubs variant

Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Signed-off-by: T Michael Turney mturney@codeaurora.org --- A payloads/libpayload/configs/config.bubs M src/mainboard/google/trogdor/Kconfig M src/mainboard/google/trogdor/Kconfig.name M src/mainboard/google/trogdor/Makefile.inc 4 files changed, 30 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/37069/30

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 30 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Ravi kumar rbokka@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Doug Anderson dianders@chromium.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Bob Moragues (Code Review)

14 Apr 14 Apr

8:03 p.m.

Bob Moragues has uploaded a new patch set (#34) to the change originally created by mturney mturney. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

trogdor: add support for Bubs variant

Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Signed-off-by: T Michael Turney mturney@codeaurora.org --- A payloads/libpayload/configs/config.bubs M src/mainboard/google/trogdor/Kconfig M src/mainboard/google/trogdor/Kconfig.name M src/mainboard/google/trogdor/Makefile.inc 4 files changed, 30 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/37069/34

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 34 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Bob Moragues moragues@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Ravi kumar rbokka@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Doug Anderson dianders@chromium.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Bob Moragues (Code Review)

8:08 p.m.

Bob Moragues has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 34: Code-Review+1

Rebased patch.

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 34 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Bob Moragues moragues@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Ravi kumar rbokka@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Doug Anderson dianders@chromium.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Wed, 15 Apr 2020 03:08:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Julius Werner (Code Review)

15 Apr 15 Apr

12:57 p.m.

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 34: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 34 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Bob Moragues moragues@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Ravi kumar rbokka@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Doug Anderson dianders@chromium.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Wed, 15 Apr 2020 19:57:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Julius Werner (Code Review)

12:58 p.m.

Julius Werner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

trogdor: add support for Bubs variant

Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Signed-off-by: T Michael Turney mturney@codeaurora.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/37069 Reviewed-by: Bob Moragues moragues@google.com Reviewed-by: Julius Werner jwerner@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- A payloads/libpayload/configs/config.bubs M src/mainboard/google/trogdor/Kconfig M src/mainboard/google/trogdor/Kconfig.name M src/mainboard/google/trogdor/Makefile.inc 4 files changed, 30 insertions(+), 11 deletions(-)

Approvals: build bot (Jenkins): Verified Julius Werner: Looks good to me, approved Bob Moragues: Looks good to me, but someone else must approve

diff --git a/payloads/libpayload/configs/config.bubs b/payloads/libpayload/configs/config.bubs new file mode 100644 index 0000000..7e162e5 --- /dev/null +++ b/payloads/libpayload/configs/config.bubs @@ -0,0 +1,8 @@ +CONFIG_LP_CHROMEOS=y +CONFIG_LP_ARCH_ARM64=y +CONFIG_LP_TIMER_ARM64_ARCH=y +CONFIG_LP_SERIAL_CONSOLE=y +CONFIG_LP_QUALCOMM_QUPV3_SERIAL_CONSOLE=y +CONFIG_LP_USB=y +CONFIG_LP_USB_EHCI=y +CONFIG_LP_USB_XHCI=y diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig index d1dbfe0..76a89fb 100644 --- a/src/mainboard/google/trogdor/Kconfig +++ b/src/mainboard/google/trogdor/Kconfig @@ -8,20 +8,23 @@ def_bool y select BOARD_ROMSIZE_KB_8192 select COMMON_CBFS_SPI_WRAPPER - select EC_GOOGLE_CHROMEEC - select EC_GOOGLE_CHROMEEC_RTC - select EC_GOOGLE_CHROMEEC_SPI - select RTC + select EC_GOOGLE_CHROMEEC if !BOARD_GOOGLE_BUBS + select EC_GOOGLE_CHROMEEC_RTC if !BOARD_GOOGLE_BUBS + select EC_GOOGLE_CHROMEEC_SPI if !BOARD_GOOGLE_BUBS + select RTC if !BOARD_GOOGLE_BUBS + select MISSING_BOARD_RESET if BOARD_GOOGLE_BUBS select SOC_QUALCOMM_SC7180 select SPI_FLASH select SPI_FLASH_WINBOND select MAINBOARD_HAS_CHROMEOS + select MAINBOARD_HAS_SPI_TPM_CR50 if !BOARD_GOOGLE_BUBS + select MAINBOARD_HAS_TPM2 if !BOARD_GOOGLE_BUBS

config VBOOT - select EC_GOOGLE_CHROMEEC_SWITCHES + select EC_GOOGLE_CHROMEEC_SWITCHES if !BOARD_GOOGLE_BUBS select VBOOT_VBNV_FLASH - select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC - select VBOOT_MOCK_SECDATA + select VBOOT_NO_BOARD_SUPPORT if BOARD_GOOGLE_BUBS + select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_BUBS

config MAINBOARD_DIR string @@ -29,11 +32,11 @@

config DRIVER_TPM_SPI_BUS hex - default 0x5 + default 0x6

config EC_GOOGLE_CHROMEEC_SPI_BUS hex - default 0xa + default 0x0

########################################################## #### Update below when adding a new derivative board. #### @@ -43,5 +46,6 @@ string default "Trogdor" if BOARD_GOOGLE_TROGDOR default "Lazor" if BOARD_GOOGLE_LAZOR + default "Bubs" if BOARD_GOOGLE_BUBS

endif # BOARD_GOOGLE_TROGDOR_COMMON diff --git a/src/mainboard/google/trogdor/Kconfig.name b/src/mainboard/google/trogdor/Kconfig.name index 66636a6..7be1a2d 100644 --- a/src/mainboard/google/trogdor/Kconfig.name +++ b/src/mainboard/google/trogdor/Kconfig.name @@ -1,3 +1,4 @@ +comment "Trogdor"

config BOARD_GOOGLE_TROGDOR bool "Trogdor" @@ -6,3 +7,7 @@ config BOARD_GOOGLE_LAZOR bool "Lazor" select BOARD_GOOGLE_TROGDOR_COMMON + +config BOARD_GOOGLE_BUBS + bool "Bubs" + select BOARD_GOOGLE_TROGDOR_COMMON diff --git a/src/mainboard/google/trogdor/Makefile.inc b/src/mainboard/google/trogdor/Makefile.inc index 5c85351..3586db5 100644 --- a/src/mainboard/google/trogdor/Makefile.inc +++ b/src/mainboard/google/trogdor/Makefile.inc @@ -13,24 +13,26 @@ ##

bootblock-y += memlayout.ld -bootblock-y += reset.c bootblock-y += boardid.c bootblock-y += chromeos.c bootblock-y += bootblock.c

verstage-y += memlayout.ld +ifneq ($(CONFIG_BOARD_GOOGLE_BUBS),y) verstage-y += reset.c +endif verstage-y += boardid.c verstage-y += chromeos.c

romstage-y += memlayout.ld romstage-y += romstage.c -romstage-y += reset.c romstage-y += boardid.c romstage-y += chromeos.c

ramstage-y += memlayout.ld ramstage-y += mainboard.c +ifneq ($(CONFIG_BOARD_GOOGLE_BUBS),y) ramstage-y += reset.c +endif ramstage-y += chromeos.c ramstage-y += boardid.c

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 35 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Bob Moragues moragues@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Ravi kumar rbokka@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: Doug Anderson dianders@chromium.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: merged

9elements QA (Code Review)

1:12 p.m.

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37069 )

Change subject: trogdor: add support for Bubs variant ......................................................................

Patch Set 35:

Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/2356 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2355 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2354

Please note: This test is under development and might not be accurate at all!

-- To view, visit https://review.coreboot.org/c/coreboot/+/37069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d9bc98863c4f33c19e295b642f48c51921ed984 Gerrit-Change-Number: 37069 Gerrit-PatchSet: 35 Gerrit-Owner: mturney mturney mturney@codeaurora.org Gerrit-Reviewer: Bob Moragues moragues@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Ravi kumar rbokka@codeaurora.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Reviewer: mturney mturney mturney@codeaurora.org Gerrit-CC: 9elements QA hardwaretestrobot@gmail.com Gerrit-CC: Doug Anderson dianders@chromium.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Wed, 15 Apr 2020 20:12:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1678

days inactive

1824

days old

coreboot-gerrit@coreboot.org

18 comments

6 participants

tags (0)

participants (6)

9elements QA (Code Review)
Bob Moragues (Code Review)
Douglas Anderson (Code Review)
Julius Werner (Code Review)
mturney mturney (Code Review)
Ravi kumar (Code Review)