Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86469?usp=email )
Change subject: mb/google/brya: Set SYSTEM_TYPE_MINIPC for brask baseboard boards
......................................................................
mb/google/brya: Set SYSTEM_TYPE_MINIPC for brask baseboard boards
Brask devices are all Chromeboxes, so select SYSTEM_TYPE_MINIPC to
ensure the SMBIOS enclosure type is set correctly.
Change-Id: I133a26223ad204dfad67e136cf342d2fb2a7205e
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86469
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Subrata Banik <subratabanik(a)google.com>
Reviewed-by: Eric Lai <ericllai(a)google.com>
---
M src/mainboard/google/brya/Kconfig
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Subrata Banik: Looks good to me, approved
Eric Lai: Looks good to me, approved
build bot (Jenkins): Verified
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 9b0d59b..0f1c3c5 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -68,6 +68,7 @@
select RT8168_GET_MAC_FROM_VPD
select RT8168_SET_LED_MODE
select SOC_INTEL_ALDERLAKE_PCH_P
+ select SYSTEM_TYPE_MINIPC
select TPM_GOOGLE_CR50
config BOARD_GOOGLE_BASEBOARD_HADES
--
To view, visit https://review.coreboot.org/c/coreboot/+/86469?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I133a26223ad204dfad67e136cf342d2fb2a7205e
Gerrit-Change-Number: 86469
Gerrit-PatchSet: 2
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Reviewer: Eric Lai <ericllai(a)google.com>
Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86474?usp=email )
(
6 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: mb/trulo/var/uldrenite: Add Fn support and clean up Kconfig order
......................................................................
mb/trulo/var/uldrenite: Add Fn support and clean up Kconfig order
Support Fn key on uldrenite emits a scancode of 94 (0x5e) and order the
Kconfig.
BUG=b:394749952
TEST=fn + top row (F1~F12) keys work fine
Change-Id: I92c1bd200f1849a460943bdb96ab122d464a0f40
Signed-off-by: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86474
Reviewed-by: John Su <john_su(a)compal.corp-partner.google.com>
Reviewed-by: Subrata Banik <subratabanik(a)google.com>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Andy Ebrahiem <ahmet.ebrahiem(a)9elements.com>
Reviewed-by: Eric Lai <ericllai(a)google.com>
---
M src/mainboard/google/brya/Kconfig
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
John Su: Looks good to me, approved
Subrata Banik: Looks good to me, approved
Andy Ebrahiem: Looks good to me, but someone else must approve
Eric Lai: Looks good to me, approved
build bot (Jenkins): Verified
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 31948fbd..2e57055 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -643,12 +643,13 @@
select BOARD_GOOGLE_BASEBOARD_TRULO
select BOARD_ROMSIZE_KB_32768
select CHROMEOS_WIFI_SAR if CHROMEOS
- select SOC_INTEL_TCSS_USE_PDC_PMC_USBC_MUX_CONFIGURATION
+ select DRIVERS_WWAN_FM350GL
+ select ENFORCE_MEM_CHANNEL_DISABLE
select HAVE_PCIE_WWAN
select HAVE_WWAN_POWER_SEQUENCE
- select DRIVERS_WWAN_FM350GL
+ select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
select SOC_INTEL_COMMON_BLOCK_HDA_VERB
- select ENFORCE_MEM_CHANNEL_DISABLE
+ select SOC_INTEL_TCSS_USE_PDC_PMC_USBC_MUX_CONFIGURATION
config BOARD_GOOGLE_VELL
select BOARD_GOOGLE_BASEBOARD_BRYA
--
To view, visit https://review.coreboot.org/c/coreboot/+/86474?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I92c1bd200f1849a460943bdb96ab122d464a0f40
Gerrit-Change-Number: 86474
Gerrit-PatchSet: 8
Gerrit-Owner: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com>
Gerrit-Reviewer: Andy Ebrahiem <ahmet.ebrahiem(a)9elements.com>
Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Reviewer: Eric Lai <ericllai(a)google.com>
Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com>
Gerrit-Reviewer: John Su <john_su(a)compal.corp-partner.google.com>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Jamie Chen <jamie_chen(a)compal.corp-partner.google.com>
Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86454?usp=email )
Change subject: Kconfig: Rework SYSTEM_TYPE_XX to better map to SMBIOS
......................................................................
Kconfig: Rework SYSTEM_TYPE_XX to better map to SMBIOS
Add SYSTEM_TYPE_SERVER and SYSTEM_TYPE_ALL_INE_ONE; rename
SYSTEM_TYPE_BOX to SYSTEM_TYPE_MINIPC. Map these entries to the
analogous SMBIOS enclosure types.
Follow-on patches will have mainboards select these new SYSTEM_TYPE
entries as appropriate.
Change-Id: I2a35101ccc60daf4863568216ef145c9c701140b
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86454
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Subrata Banik <subratabanik(a)google.com>
Reviewed-by: Eric Lai <ericllai(a)google.com>
Reviewed-by: Andy Ebrahiem <ahmet.ebrahiem(a)9elements.com>
---
M src/Kconfig
M src/lib/smbios_defaults.c
M src/mainboard/google/brya/Kconfig
3 files changed, 26 insertions(+), 12 deletions(-)
Approvals:
Eric Lai: Looks good to me, but someone else must approve
build bot (Jenkins): Verified
Andy Ebrahiem: Looks good to me, but someone else must approve
Subrata Banik: Looks good to me, approved
diff --git a/src/Kconfig b/src/Kconfig
index 1d71840..e4c8467 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -652,18 +652,11 @@
# load site-local kconfig to allow user specific defaults and overrides
source "site-local/Kconfig"
-config SYSTEM_TYPE_BOX
- default n
- bool
- help
- For devices like chromebox, mac-mini etc. These devices
- without built-in display and operates on AC supply alone.
-
-config SYSTEM_TYPE_LAPTOP
+config SYSTEM_TYPE_ALL_IN_ONE
default n
bool
-config SYSTEM_TYPE_TABLET
+config SYSTEM_TYPE_CONVERTIBLE
default n
bool
@@ -671,7 +664,22 @@
default n
bool
-config SYSTEM_TYPE_CONVERTIBLE
+config SYSTEM_TYPE_LAPTOP
+ default n
+ bool
+
+config SYSTEM_TYPE_MINIPC
+ default n
+ bool
+ help
+ For devices like chromebox, mac-mini etc. These devices
+ without built-in display and operates on AC supply alone.
+
+config SYSTEM_TYPE_SERVER
+ default n
+ bool
+
+config SYSTEM_TYPE_TABLET
default n
bool
diff --git a/src/lib/smbios_defaults.c b/src/lib/smbios_defaults.c
index 0ad6442..ba6b231 100644
--- a/src/lib/smbios_defaults.c
+++ b/src/lib/smbios_defaults.c
@@ -99,6 +99,12 @@
return SMBIOS_ENCLOSURE_CONVERTIBLE;
else if (CONFIG(SYSTEM_TYPE_DETACHABLE))
return SMBIOS_ENCLOSURE_DETACHABLE;
+ else if (CONFIG(SYSTEM_TYPE_SERVER))
+ return SMBIOS_ENCLOSURE_MAIN_SERVER_CHASSIS;
+ else if (CONFIG(SYSTEM_TYPE_MINIPC))
+ return SMBIOS_ENCLOSURE_MINI_PC;
+ else if (CONFIG(SYSTEM_TYPE_ALL_IN_ONE))
+ return SMBIOS_ENCLOSURE_ALL_IN_ONE;
else
return SMBIOS_ENCLOSURE_DESKTOP;
}
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index fc18f8f..31948fbd 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -97,7 +97,7 @@
select SOC_INTEL_ALDERLAKE_PCH_N
select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW
select SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE
- select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_BOX
+ select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_MINIPC
select TPM_GOOGLE_TI50
select SOC_INTEL_COMMON_MMC_OVERRIDE
@@ -223,7 +223,7 @@
config BOARD_GOOGLE_DIRKS
select BOARD_GOOGLE_BASEBOARD_NISSA
select SOC_INTEL_TWINLAKE
- select SYSTEM_TYPE_BOX
+ select SYSTEM_TYPE_MINIPC
config BOARD_GOOGLE_DOCHI
select BOARD_GOOGLE_BASEBOARD_BRYA
--
To view, visit https://review.coreboot.org/c/coreboot/+/86454?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I2a35101ccc60daf4863568216ef145c9c701140b
Gerrit-Change-Number: 86454
Gerrit-PatchSet: 3
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Andy Ebrahiem <ahmet.ebrahiem(a)9elements.com>
Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Reviewer: Eric Lai <ericllai(a)google.com>
Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86492?usp=email )
Change subject: mb/google/nissa/var/guren: Create empty variant for guren
......................................................................
mb/google/nissa/var/guren: Create empty variant for guren
Create the template files to a new directory named for the guren variant.
BUG=b:397149037
BRANCH=firmware-nissa-15217.B
TEST=None
Change-Id: I23803aaceb122d2b9e3c2215914643593afa1246
Signed-off-by: Brian Hsu <Brian_Hsu(a)pegatron.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86492
Reviewed-by: Subrata Banik <subratabanik(a)google.com>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Eric Lai <ericllai(a)google.com>
---
M src/mainboard/google/brya/Kconfig
M src/mainboard/google/brya/Kconfig.name
A src/mainboard/google/brya/variants/guren/include/variant/ec.h
A src/mainboard/google/brya/variants/guren/include/variant/gpio.h
A src/mainboard/google/brya/variants/guren/memory/Makefile.mk
A src/mainboard/google/brya/variants/guren/memory/dram_id.generated.txt
A src/mainboard/google/brya/variants/guren/memory/mem_parts_used.txt
A src/mainboard/google/brya/variants/guren/overridetree.cb
8 files changed, 49 insertions(+), 0 deletions(-)
Approvals:
Eric Lai: Looks good to me, approved
build bot (Jenkins): Verified
Subrata Banik: Looks good to me, approved
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 213d499..fc18f8f 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -295,6 +295,9 @@
select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
select HAVE_WWAN_POWER_SEQUENCE
+config BOARD_GOOGLE_GUREN
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+
config BOARD_GOOGLE_HADES
select BOARD_GOOGLE_BASEBOARD_HADES
select DRIVERS_GENESYSLOGIC_GL9755
@@ -766,6 +769,7 @@
default 0x1 if BOARD_GOOGLE_GLADIOS
default 0x0 if BOARD_GOOGLE_GLASSWAY
default 0x0 if BOARD_GOOGLE_GOTHRAX
+ default 0x0 if BOARD_GOOGLE_GUREN
default 0x3 if BOARD_GOOGLE_HADES
default 0x0 if BOARD_GOOGLE_JOXER
default 0x1 if BOARD_GOOGLE_KANO
@@ -847,6 +851,7 @@
default 13 if BOARD_GOOGLE_GLADIOS
default 13 if BOARD_GOOGLE_GLASSWAY
default 13 if BOARD_GOOGLE_GOTHRAX
+ default 13 if BOARD_GOOGLE_GUREN
default 20 if BOARD_GOOGLE_HADES # GPE0_DW0_20 (GPP_A20_IRQ)
default 13 if BOARD_GOOGLE_JOXER
default 13 if BOARD_GOOGLE_KANO
@@ -932,6 +937,7 @@
default "Gladios" if BOARD_GOOGLE_GLADIOS
default "Glassway" if BOARD_GOOGLE_GLASSWAY
default "Gothrax" if BOARD_GOOGLE_GOTHRAX
+ default "Guren" if BOARD_GOOGLE_GUREN
default "Hades" if BOARD_GOOGLE_HADES
default "Joxer" if BOARD_GOOGLE_JOXER
default "Kano" if BOARD_GOOGLE_KANO
@@ -1006,6 +1012,7 @@
default "gladios" if BOARD_GOOGLE_GLADIOS
default "glassway" if BOARD_GOOGLE_GLASSWAY
default "gothrax" if BOARD_GOOGLE_GOTHRAX
+ default "guren" if BOARD_GOOGLE_GUREN
default "hades" if BOARD_GOOGLE_HADES
default "joxer" if BOARD_GOOGLE_JOXER
default "kano" if BOARD_GOOGLE_KANO
diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name
index 50bfaef..6007aa2 100644
--- a/src/mainboard/google/brya/Kconfig.name
+++ b/src/mainboard/google/brya/Kconfig.name
@@ -68,6 +68,9 @@
config BOARD_GOOGLE_GOTHRAX
bool "-> Gothrax"
+config BOARD_GOOGLE_GUREN
+ bool "-> Guren"
+
config BOARD_GOOGLE_HADES
bool "-> Hades"
diff --git a/src/mainboard/google/brya/variants/guren/include/variant/ec.h b/src/mainboard/google/brya/variants/guren/include/variant/ec.h
new file mode 100644
index 0000000..7a2a6ff
--- /dev/null
+++ b/src/mainboard/google/brya/variants/guren/include/variant/ec.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __VARIANT_EC_H__
+#define __VARIANT_EC_H__
+
+#include <baseboard/ec.h>
+
+#endif
diff --git a/src/mainboard/google/brya/variants/guren/include/variant/gpio.h b/src/mainboard/google/brya/variants/guren/include/variant/gpio.h
new file mode 100644
index 0000000..c4fe342
--- /dev/null
+++ b/src/mainboard/google/brya/variants/guren/include/variant/gpio.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef VARIANT_GPIO_H
+#define VARIANT_GPIO_H
+
+#include <baseboard/gpio.h>
+
+#endif
diff --git a/src/mainboard/google/brya/variants/guren/memory/Makefile.mk b/src/mainboard/google/brya/variants/guren/memory/Makefile.mk
new file mode 100644
index 0000000..eace2e4
--- /dev/null
+++ b/src/mainboard/google/brya/variants/guren/memory/Makefile.mk
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# This is an auto-generated file. Do not edit!!
+# Add memory parts in mem_parts_used.txt and run spd_tools to regenerate.
+
+SPD_SOURCES = placeholder
diff --git a/src/mainboard/google/brya/variants/guren/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/guren/memory/dram_id.generated.txt
new file mode 100644
index 0000000..fa24790
--- /dev/null
+++ b/src/mainboard/google/brya/variants/guren/memory/dram_id.generated.txt
@@ -0,0 +1 @@
+DRAM Part Name ID to assign
diff --git a/src/mainboard/google/brya/variants/guren/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/guren/memory/mem_parts_used.txt
new file mode 100644
index 0000000..2499005
--- /dev/null
+++ b/src/mainboard/google/brya/variants/guren/memory/mem_parts_used.txt
@@ -0,0 +1,11 @@
+# This is a CSV file containing a list of memory parts used by this variant.
+# One part per line with an optional fixed ID in column 2.
+# Only include a fixed ID if it is required for legacy reasons!
+# Generated IDs are dependent on the order of parts in this file,
+# so new parts must always be added at the end of the file!
+#
+# Generate an updated Makefile.mk and dram_id.generated.txt by running the
+# part_id_gen tool from util/spd_tools.
+# See util/spd_tools/README.md for more details and instructions.
+
+# Part Name
diff --git a/src/mainboard/google/brya/variants/guren/overridetree.cb b/src/mainboard/google/brya/variants/guren/overridetree.cb
new file mode 100644
index 0000000..4f2c04a
--- /dev/null
+++ b/src/mainboard/google/brya/variants/guren/overridetree.cb
@@ -0,0 +1,6 @@
+chip soc/intel/alderlake
+
+ device domain 0 on
+ end
+
+end
--
To view, visit https://review.coreboot.org/c/coreboot/+/86492?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I23803aaceb122d2b9e3c2215914643593afa1246
Gerrit-Change-Number: 86492
Gerrit-PatchSet: 4
Gerrit-Owner: Brian Hsu <brian_hsu(a)pegatron.corp-partner.google.com>
Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Reviewer: Eric Lai <ericllai(a)google.com>
Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Daniel Peng <daniel_peng(a)pegatron.corp-partner.google.com>
Gerrit-CC: David Li <david_li(a)pegatron.corp-partner.google.com>
Gerrit-CC: Samuel Chen <samuel_chen(a)pegatron.corp-partner.google.com>
Gerrit-CC: Wayne3 Wang <wayne3_wang(a)pegatron.corp-partner.google.com>