Paul Fagerburg has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45175 )
Change subject: src/mb/google/hatch: remove "sushi" variant. ......................................................................
src/mb/google/hatch: remove "sushi" variant.
Sushi is not a real product, just a test of the new_variant program. The effort to keep it up-to-date with the rest of Hatch is no longer worth it. Remove the variant.
Signed-off-by: Paul Fagerburg pfagerburg@chromium.org Change-Id: I2b0036f3cbdea4bfaed1274ab87a20d24c75de57 --- M src/mainboard/google/hatch/Kconfig M src/mainboard/google/hatch/Kconfig.name D src/mainboard/google/hatch/variants/sushi/Makefile.inc D src/mainboard/google/hatch/variants/sushi/include/variant/acpi/dptf.asl D src/mainboard/google/hatch/variants/sushi/include/variant/ec.h D src/mainboard/google/hatch/variants/sushi/include/variant/gpio.h D src/mainboard/google/hatch/variants/sushi/overridetree.cb 7 files changed, 0 insertions(+), 41 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/45175/1
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 782bed9..e4e343b 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -140,7 +140,6 @@ default "Nightfury" if BOARD_GOOGLE_NIGHTFURY default "Puff" if BOARD_GOOGLE_PUFF default "Stryke" if BOARD_GOOGLE_STRYKE - default "Sushi" if BOARD_GOOGLE_SUSHI default "Wyvern" if BOARD_GOOGLE_WYVERN default "Dooly" if BOARD_GOOGLE_DOOLY
@@ -174,7 +173,6 @@ default "nightfury" if BOARD_GOOGLE_NIGHTFURY default "puff" if BOARD_GOOGLE_PUFF default "stryke" if BOARD_GOOGLE_STRYKE - default "sushi" if BOARD_GOOGLE_SUSHI default "wyvern" if BOARD_GOOGLE_WYVERN default "dooly" if BOARD_GOOGLE_DOOLY
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name index f4fe50e..69bb28a 100644 --- a/src/mainboard/google/hatch/Kconfig.name +++ b/src/mainboard/google/hatch/Kconfig.name @@ -90,10 +90,6 @@ bool "-> Stryke" select BOARD_GOOGLE_BASEBOARD_HATCH
-config BOARD_GOOGLE_SUSHI - bool "-> Sushi" - select BOARD_GOOGLE_BASEBOARD_HATCH - config BOARD_GOOGLE_WYVERN bool "-> Wyvern" select BOARD_GOOGLE_BASEBOARD_PUFF diff --git a/src/mainboard/google/hatch/variants/sushi/Makefile.inc b/src/mainboard/google/hatch/variants/sushi/Makefile.inc deleted file mode 100644 index a115aa9..0000000 --- a/src/mainboard/google/hatch/variants/sushi/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = diff --git a/src/mainboard/google/hatch/variants/sushi/include/variant/acpi/dptf.asl b/src/mainboard/google/hatch/variants/sushi/include/variant/acpi/dptf.asl deleted file mode 100644 index fd3b5cf..0000000 --- a/src/mainboard/google/hatch/variants/sushi/include/variant/acpi/dptf.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <baseboard/acpi/dptf.asl> diff --git a/src/mainboard/google/hatch/variants/sushi/include/variant/ec.h b/src/mainboard/google/hatch/variants/sushi/include/variant/ec.h deleted file mode 100644 index ce6fbfe..0000000 --- a/src/mainboard/google/hatch/variants/sushi/include/variant/ec.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef VARIANT_EC_H -#define VARIANT_EC_H - -#include <baseboard/ec.h> - -#endif diff --git a/src/mainboard/google/hatch/variants/sushi/include/variant/gpio.h b/src/mainboard/google/hatch/variants/sushi/include/variant/gpio.h deleted file mode 100644 index d08b33b..0000000 --- a/src/mainboard/google/hatch/variants/sushi/include/variant/gpio.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef VARIANT_GPIO_H -#define VARIANT_GPIO_H - -#include <baseboard/gpio.h> - -/* Memory configuration board straps */ -/* Copied from baseboard and may need to change for the new variant. */ -#define GPIO_MEM_CONFIG_0 GPP_F20 -#define GPIO_MEM_CONFIG_1 GPP_F21 -#define GPIO_MEM_CONFIG_2 GPP_F11 -#define GPIO_MEM_CONFIG_3 GPP_F22 - -#endif diff --git a/src/mainboard/google/hatch/variants/sushi/overridetree.cb b/src/mainboard/google/hatch/variants/sushi/overridetree.cb deleted file mode 100644 index abbcaaa..0000000 --- a/src/mainboard/google/hatch/variants/sushi/overridetree.cb +++ /dev/null @@ -1,6 +0,0 @@ -chip soc/intel/cannonlake - - device domain 0 on - end - -end
Hello Patrick Georgi, Martin Roth, Angel Pons,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45175
to look at the new patch set (#2).
Change subject: src/mb/google/hatch: remove "sushi" variant. ......................................................................
src/mb/google/hatch: remove "sushi" variant.
Sushi is not a real product, just a test of the new_variant program. The effort to keep it up-to-date with the rest of Hatch is no longer worth it. Remove the variant.
BUG=b:168030592 TEST=build bot is successful, hatch-cq builds successfully
Signed-off-by: Paul Fagerburg pfagerburg@chromium.org Change-Id: I2b0036f3cbdea4bfaed1274ab87a20d24c75de57 --- M src/mainboard/google/hatch/Kconfig M src/mainboard/google/hatch/Kconfig.name D src/mainboard/google/hatch/variants/sushi/Makefile.inc D src/mainboard/google/hatch/variants/sushi/include/variant/acpi/dptf.asl D src/mainboard/google/hatch/variants/sushi/include/variant/ec.h D src/mainboard/google/hatch/variants/sushi/include/variant/gpio.h D src/mainboard/google/hatch/variants/sushi/overridetree.cb 7 files changed, 0 insertions(+), 41 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/45175/2
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45175 )
Change subject: src/mb/google/hatch: remove "sushi" variant. ......................................................................
Patch Set 2: Code-Review+2
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45175 )
Change subject: src/mb/google/hatch: remove "sushi" variant. ......................................................................
Patch Set 2: Code-Review+2
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45175 )
Change subject: src/mb/google/hatch: remove "sushi" variant. ......................................................................
Patch Set 2: Code-Review+2
Paul Fagerburg has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45175 )
Change subject: src/mb/google/hatch: remove "sushi" variant. ......................................................................
src/mb/google/hatch: remove "sushi" variant.
Sushi is not a real product, just a test of the new_variant program. The effort to keep it up-to-date with the rest of Hatch is no longer worth it. Remove the variant.
BUG=b:168030592 TEST=build bot is successful, hatch-cq builds successfully
Signed-off-by: Paul Fagerburg pfagerburg@chromium.org Change-Id: I2b0036f3cbdea4bfaed1274ab87a20d24c75de57 Reviewed-on: https://review.coreboot.org/c/coreboot/+/45175 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Martin Roth martinroth@google.com Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Tim Wawrzynczak twawrzynczak@chromium.org --- M src/mainboard/google/hatch/Kconfig M src/mainboard/google/hatch/Kconfig.name D src/mainboard/google/hatch/variants/sushi/Makefile.inc D src/mainboard/google/hatch/variants/sushi/include/variant/acpi/dptf.asl D src/mainboard/google/hatch/variants/sushi/include/variant/ec.h D src/mainboard/google/hatch/variants/sushi/include/variant/gpio.h D src/mainboard/google/hatch/variants/sushi/overridetree.cb 7 files changed, 0 insertions(+), 41 deletions(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved Aaron Durbin: Looks good to me, approved Tim Wawrzynczak: Looks good to me, approved
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 782bed9..e4e343b 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -140,7 +140,6 @@ default "Nightfury" if BOARD_GOOGLE_NIGHTFURY default "Puff" if BOARD_GOOGLE_PUFF default "Stryke" if BOARD_GOOGLE_STRYKE - default "Sushi" if BOARD_GOOGLE_SUSHI default "Wyvern" if BOARD_GOOGLE_WYVERN default "Dooly" if BOARD_GOOGLE_DOOLY
@@ -174,7 +173,6 @@ default "nightfury" if BOARD_GOOGLE_NIGHTFURY default "puff" if BOARD_GOOGLE_PUFF default "stryke" if BOARD_GOOGLE_STRYKE - default "sushi" if BOARD_GOOGLE_SUSHI default "wyvern" if BOARD_GOOGLE_WYVERN default "dooly" if BOARD_GOOGLE_DOOLY
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name index f4fe50e..69bb28a 100644 --- a/src/mainboard/google/hatch/Kconfig.name +++ b/src/mainboard/google/hatch/Kconfig.name @@ -90,10 +90,6 @@ bool "-> Stryke" select BOARD_GOOGLE_BASEBOARD_HATCH
-config BOARD_GOOGLE_SUSHI - bool "-> Sushi" - select BOARD_GOOGLE_BASEBOARD_HATCH - config BOARD_GOOGLE_WYVERN bool "-> Wyvern" select BOARD_GOOGLE_BASEBOARD_PUFF diff --git a/src/mainboard/google/hatch/variants/sushi/Makefile.inc b/src/mainboard/google/hatch/variants/sushi/Makefile.inc deleted file mode 100644 index a115aa9..0000000 --- a/src/mainboard/google/hatch/variants/sushi/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = diff --git a/src/mainboard/google/hatch/variants/sushi/include/variant/acpi/dptf.asl b/src/mainboard/google/hatch/variants/sushi/include/variant/acpi/dptf.asl deleted file mode 100644 index fd3b5cf..0000000 --- a/src/mainboard/google/hatch/variants/sushi/include/variant/acpi/dptf.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <baseboard/acpi/dptf.asl> diff --git a/src/mainboard/google/hatch/variants/sushi/include/variant/ec.h b/src/mainboard/google/hatch/variants/sushi/include/variant/ec.h deleted file mode 100644 index ce6fbfe..0000000 --- a/src/mainboard/google/hatch/variants/sushi/include/variant/ec.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef VARIANT_EC_H -#define VARIANT_EC_H - -#include <baseboard/ec.h> - -#endif diff --git a/src/mainboard/google/hatch/variants/sushi/include/variant/gpio.h b/src/mainboard/google/hatch/variants/sushi/include/variant/gpio.h deleted file mode 100644 index d08b33b..0000000 --- a/src/mainboard/google/hatch/variants/sushi/include/variant/gpio.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef VARIANT_GPIO_H -#define VARIANT_GPIO_H - -#include <baseboard/gpio.h> - -/* Memory configuration board straps */ -/* Copied from baseboard and may need to change for the new variant. */ -#define GPIO_MEM_CONFIG_0 GPP_F20 -#define GPIO_MEM_CONFIG_1 GPP_F21 -#define GPIO_MEM_CONFIG_2 GPP_F11 -#define GPIO_MEM_CONFIG_3 GPP_F22 - -#endif diff --git a/src/mainboard/google/hatch/variants/sushi/overridetree.cb b/src/mainboard/google/hatch/variants/sushi/overridetree.cb deleted file mode 100644 index abbcaaa..0000000 --- a/src/mainboard/google/hatch/variants/sushi/overridetree.cb +++ /dev/null @@ -1,6 +0,0 @@ -chip soc/intel/cannonlake - - device domain 0 on - end - -end
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45175 )
Change subject: src/mb/google/hatch: remove "sushi" variant. ......................................................................
Patch Set 3:
a bit late, but +2 and thank you!
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45175 )
Change subject: src/mb/google/hatch: remove "sushi" variant. ......................................................................
Patch Set 3: Code-Review+2