Change in coreboot[master]: mb/google/hatch: Fix Puff rom size from 32768 -> 16384 KB

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40897 )

Change subject: mb/google/hatch: Fix Puff rom size from 32768 -> 16384 KB
......................................................................

mb/google/hatch: Fix Puff rom size from 32768 -> 16384 KB

Originally variants make use of a 32MBit chip whereas now they
use a 16MBit spi flash. Allow for the coordination of dealing
with the transition between phases.

BUG=b:153682192
BRANCH=none
TEST=none

Change-Id: Ic336168ea1a0055c30f718f5540209d2cf69d029
Signed-off-by: Edward O'Callaghan 
---
M src/mainboard/google/hatch/Kconfig.name
1 file changed, 26 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/40897/1

diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index 6465854..b7adc8b 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -10,7 +10,7 @@
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
    select BOARD_ROMSIZE_KB_16384

-config BOARD_GOOGLE_DUFFY
+config BOARD_GOOGLE_DUFFY_LEGACY
    bool "-> Duffy"
    select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_32768
@@ -18,6 +18,14 @@
    select SPD_READ_BY_WORD
    select VBOOT_EC_EFS

+config BOARD_GOOGLE_DUFFY
+	bool "-> Duffy"
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_ROMSIZE_KB_16384
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+	select VBOOT_EC_EFS
+
 config BOARD_GOOGLE_HATCH
    bool "->  Hatch"
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
@@ -29,7 +37,7 @@
    select BOARD_ROMSIZE_KB_16384
    select DRIVERS_GFX_GENERIC

-config BOARD_GOOGLE_KAISA
+config BOARD_GOOGLE_KAISA_LEGACY
    bool "-> Kaisa"
    select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_32768
@@ -37,6 +45,14 @@
    select SPD_READ_BY_WORD
    select VBOOT_EC_EFS

+config BOARD_GOOGLE_KAISA
+	bool "-> Kaisa"
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_ROMSIZE_KB_16384
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+	select VBOOT_EC_EFS
+
 config BOARD_GOOGLE_KOHAKU
    bool "->  Kohaku"
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
@@ -72,13 +88,20 @@
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
    select BOARD_ROMSIZE_KB_16384

-config BOARD_GOOGLE_PUFF
+config BOARD_GOOGLE_PUFF_LEGACY
    bool "-> Puff"
    select BOARD_GOOGLE_BASEBOARD_HATCH
    select BOARD_ROMSIZE_KB_32768
    select ROMSTAGE_SPD_SMBUS
    select SPD_READ_BY_WORD

+config BOARD_GOOGLE_PUFF
+	bool "-> Puff"
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_ROMSIZE_KB_16384
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+
 config BOARD_GOOGLE_HELIOS_DISKSWAP
    bool "->  Helios_Diskswap"
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40897 )

Change subject: mb/google/hatch: Fix Puff rom size from 32768 -> 16384 KB
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/40897/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/40897/1//COMMIT_MSG@11 
PS1, Line 11: with the transition between phases.
Please describe the chosen strategy. (Renaming Kconfig boards to _LEGACY?)

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[Edward O'Callaghan (Code Review)]

Hello Sam McNally, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

Originally variants make use of a 32MBit chip whereas now they
use a 16MBit spi flash. Allow for the coordination of dealing
with the transition between phases.

V.2: Leave Puff alone at the moment due to the complexity of
     coordination.

BUG=b:153682192
BRANCH=none
TEST=none

Change-Id: Ic336168ea1a0055c30f718f5540209d2cf69d029
Signed-off-by: Edward O'Callaghan 
---
M src/mainboard/google/hatch/Kconfig.name
1 file changed, 18 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/40897/2

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[Sam McNally (Code Review)]

Sam McNally has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40897 )

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

Patch Set 3:

(1 comment)

This change is ready for review.

https://review.coreboot.org/c/coreboot/+/40897/3/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/Kconfig.name:

https://review.coreboot.org/c/coreboot/+/40897/3/src/mainboard/google/hatch/... 
PS3, Line 21: config BOARD_GOOGLE_DUFFY
I think these need entries in Kconfig for setting MAINBOARD_PART_NUMBER and VARIANT_DIR.

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40897 )

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

Patch Set 3:

(3 comments)

This change is ready for review.

https://review.coreboot.org/c/coreboot/+/40897/3/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/Kconfig.name:

https://review.coreboot.org/c/coreboot/+/40897/3/src/mainboard/google/hatch/... 
PS3, Line 14: 	bool "-> Duffy"
> You might want to rename this prompt, so that one can tell them apart in menuconfig

Done

https://review.coreboot.org/c/coreboot/+/40897/3/src/mainboard/google/hatch/... 
PS3, Line 21: config BOARD_GOOGLE_DUFFY
> I think these need entries in Kconfig for setting MAINBOARD_PART_NUMBER and VARIANT_DIR.

Done

https://review.coreboot.org/c/coreboot/+/40897/3/src/mainboard/google/hatch/... 
PS3, Line 41: 	bool "-> Kaisa"
> You might want to rename this prompt

Done

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[Edward O'Callaghan (Code Review)]

Hello Sam McNally, Shelley Chen, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

Originally variants make use of a 32MB chip whereas now they
use a 16MB spi flash. Allow for the coordination of dealing
with the transition between phases.

V.2: Leave Puff alone at the moment due to the complexity of
     coordination.

BUG=b:153682192
BRANCH=none
TEST=none

Change-Id: Ic336168ea1a0055c30f718f5540209d2cf69d029
Signed-off-by: Edward O'Callaghan 
---
M src/mainboard/google/hatch/Kconfig
M src/mainboard/google/hatch/Kconfig.name
2 files changed, 22 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/40897/5

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[Sam McNally (Code Review)]

Sam McNally has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40897 )

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

Patch Set 5: Code-Review+2

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40897 )

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

Patch Set 5:

(1 comment)

https://review.coreboot.org/c/coreboot/+/40897/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/40897/3//COMMIT_MSG@9 
PS3, Line 9: 32MBit
> Are you sure you mean megabits here? That would be 4 MiB, which was used around Sandy Bridge times

Done

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[Edward O'Callaghan (Code Review)]

Hello Sam McNally, Shelley Chen, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

Originally variants make use of a 32MB chip whereas now they
use a 16MB SPI flash. Allow for the coordination of dealing
with the transition between phases.

V.2: Leave Puff alone at the moment due to the complexity of
     coordination.

BUG=b:153682192
BRANCH=none
TEST=none

Change-Id: Ic336168ea1a0055c30f718f5540209d2cf69d029
Signed-off-by: Edward O'Callaghan 
---
M src/mainboard/google/hatch/Kconfig
M src/mainboard/google/hatch/Kconfig.name
2 files changed, 22 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/40897/6

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40897 )

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

Patch Set 6:

(2 comments)

https://review.coreboot.org/c/coreboot/+/40897/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/40897/1//COMMIT_MSG@11 
PS1, Line 11: with the transition between phases.
> Please describe the chosen strategy. […]

These boards are intermediates due to some unfortunate circumstances however are mostly irrelevant and will later be removed.

https://review.coreboot.org/c/coreboot/+/40897/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/40897/3//COMMIT_MSG@10 
PS3, Line 10: spi
> SPI

Done

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40897 )

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

Originally variants make use of a 32MB chip whereas now they
use a 16MB SPI flash. Allow for the coordination of dealing
with the transition between phases.

V.2: Leave Puff alone at the moment due to the complexity of
     coordination.

BUG=b:153682192
BRANCH=none
TEST=none

Change-Id: Ic336168ea1a0055c30f718f5540209d2cf69d029
Signed-off-by: Edward O'Callaghan 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40897
Reviewed-by: Sam McNally 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/hatch/Kconfig
M src/mainboard/google/hatch/Kconfig.name
2 files changed, 22 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Sam McNally: Looks good to me, approved

diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 8404eaa..fc4424b 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -106,11 +106,13 @@
    default "Akemi" if BOARD_GOOGLE_AKEMI
    default "Dratini" if BOARD_GOOGLE_DRATINI
    default "Duffy" if BOARD_GOOGLE_DUFFY
+	default "Duffy" if BOARD_GOOGLE_DUFFY_LEGACY
    default "Hatch" if BOARD_GOOGLE_HATCH
    default "Helios" if BOARD_GOOGLE_HELIOS
    default "Helios_Diskswap" if BOARD_GOOGLE_HELIOS_DISKSWAP
    default "Jinlon" if BOARD_GOOGLE_JINLON
    default "Kaisa" if BOARD_GOOGLE_KAISA
+	default "Kaisa" if BOARD_GOOGLE_KAISA_LEGACY
    default "Kindred" if BOARD_GOOGLE_KINDRED
    default "Kohaku" if BOARD_GOOGLE_KOHAKU
    default "Mushu" if BOARD_GOOGLE_MUSHU
@@ -134,11 +136,13 @@
    default "akemi" if BOARD_GOOGLE_AKEMI
    default "dratini" if BOARD_GOOGLE_DRATINI
    default "duffy" if BOARD_GOOGLE_DUFFY
+	default "duffy" if BOARD_GOOGLE_DUFFY_LEGACY
    default "hatch" if BOARD_GOOGLE_HATCH
    default "helios" if BOARD_GOOGLE_HELIOS
    default "helios" if BOARD_GOOGLE_HELIOS_DISKSWAP
    default "jinlon" if BOARD_GOOGLE_JINLON
    default "kaisa" if BOARD_GOOGLE_KAISA
+	default "kaisa" if BOARD_GOOGLE_KAISA_LEGACY
    default "kindred" if BOARD_GOOGLE_KINDRED
    default "kohaku" if BOARD_GOOGLE_KOHAKU
    default "mushu" if BOARD_GOOGLE_MUSHU
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index 6465854..798438f 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -10,10 +10,18 @@
    select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
    select BOARD_ROMSIZE_KB_16384

+config BOARD_GOOGLE_DUFFY_LEGACY
+	bool "-> Duffy Legacy (32MB)"
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_ROMSIZE_KB_32768
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+	select VBOOT_EC_EFS
+
 config BOARD_GOOGLE_DUFFY
    bool "-> Duffy"
    select BOARD_GOOGLE_BASEBOARD_HATCH
-	select BOARD_ROMSIZE_KB_32768
+	select BOARD_ROMSIZE_KB_16384
    select ROMSTAGE_SPD_SMBUS
    select SPD_READ_BY_WORD
    select VBOOT_EC_EFS
@@ -29,10 +37,18 @@
    select BOARD_ROMSIZE_KB_16384
    select DRIVERS_GFX_GENERIC

+config BOARD_GOOGLE_KAISA_LEGACY
+	bool "-> Kaisa Legacy (32MB)"
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_ROMSIZE_KB_32768
+	select ROMSTAGE_SPD_SMBUS
+	select SPD_READ_BY_WORD
+	select VBOOT_EC_EFS
+
 config BOARD_GOOGLE_KAISA
    bool "-> Kaisa"
    select BOARD_GOOGLE_BASEBOARD_HATCH
-	select BOARD_ROMSIZE_KB_32768
+	select BOARD_ROMSIZE_KB_16384
    select ROMSTAGE_SPD_SMBUS
    select SPD_READ_BY_WORD
    select VBOOT_EC_EFS

Change in coreboot[master]: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB

[9elements QA (Code Review)]

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

Change subject: mb/google/hatch: Fix Puff variants rom size from 32768 -> 16384 KB
......................................................................

Patch Set 7:

Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4
Emulation targets:
"QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/3614
"QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/3613
"QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/3612
"QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/3611

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