summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/brya/Kconfig5
-rw-r--r--src/mainboard/google/brya/Kconfig.name4
-rw-r--r--src/mainboard/google/brya/variants/joxer/include/variant/ec.h8
-rw-r--r--src/mainboard/google/brya/variants/joxer/include/variant/gpio.h8
-rw-r--r--src/mainboard/google/brya/variants/joxer/memory/Makefile.inc5
-rw-r--r--src/mainboard/google/brya/variants/joxer/memory/dram_id.generated.txt1
-rw-r--r--src/mainboard/google/brya/variants/joxer/memory/mem_parts_used.txt11
-rw-r--r--src/mainboard/google/brya/variants/joxer/overridetree.cb6
8 files changed, 47 insertions, 1 deletions
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 3983a301ff..71479f44fd 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -140,6 +140,7 @@ config DRIVER_TPM_I2C_BUS
default 0x1 if BOARD_GOOGLE_MITHRAX
default 0x1 if BOARD_GOOGLE_KULDAX
default 0x3 if BOARD_GOOGLE_SKOLAS4ES
+ default 0x0 if BOARD_GOOGLE_JOXER
config DRIVER_TPM_I2C_ADDR
hex
@@ -200,6 +201,7 @@ config MAINBOARD_PART_NUMBER
default "Mithrax" if BOARD_GOOGLE_MITHRAX
default "Kuldax" if BOARD_GOOGLE_KULDAX
default "Skolas4ES" if BOARD_GOOGLE_SKOLAS4ES
+ default "Joxer" if BOARD_GOOGLE_JOXER
config VARIANT_DIR
default "brya0" if BOARD_GOOGLE_BRYA0
@@ -233,6 +235,7 @@ config VARIANT_DIR
default "mithrax" if BOARD_GOOGLE_MITHRAX
default "kuldax" if BOARD_GOOGLE_KULDAX
default "skolas4es" if BOARD_GOOGLE_SKOLAS4ES
+ default "joxer" if BOARD_GOOGLE_JOXER
config VBOOT
select VBOOT_EARLY_EC_SYNC if !BOARD_GOOGLE_BASEBOARD_NISSA
@@ -263,7 +266,7 @@ config USE_PM_ACPI_TIMER
choice
prompt "Cache as RAM (CAR) setup configuration to use"
- default USE_ADL_NEM if BOARD_GOOGLE_BRYA4ES || BOARD_GOOGLE_PRIMUS4ES || BOARD_GOOGLE_GIMBLE4ES || BOARD_GOOGLE_REDRIX4ES || BOARD_GOOGLE_TAEKO4ES || BOARD_GOOGLE_ANAHERA4ES || BOARD_GOOGLE_TANIKS || BOARD_GOOGLE_NIVVIKS || BOARD_GOOGLE_NEREID || BOARD_GOOGLE_CRAASK || BOARD_GOOGLE_SKOLAS4ES
+ default USE_ADL_NEM if BOARD_GOOGLE_BRYA4ES || BOARD_GOOGLE_PRIMUS4ES || BOARD_GOOGLE_GIMBLE4ES || BOARD_GOOGLE_REDRIX4ES || BOARD_GOOGLE_TAEKO4ES || BOARD_GOOGLE_ANAHERA4ES || BOARD_GOOGLE_TANIKS || BOARD_GOOGLE_NIVVIKS || BOARD_GOOGLE_NEREID || BOARD_GOOGLE_CRAASK || BOARD_GOOGLE_SKOLAS4ES || BOARD_GOOGLE_JOXER
default USE_ADL_ENEM
config USE_ADL_ENEM
diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name
index 015269791c..d5cb33e0c3 100644
--- a/src/mainboard/google/brya/Kconfig.name
+++ b/src/mainboard/google/brya/Kconfig.name
@@ -240,3 +240,7 @@ config BOARD_GOOGLE_MITHRAX
config BOARD_GOOGLE_KULDAX
bool "-> Kuldax"
select BOARD_GOOGLE_BASEBOARD_BRASK
+
+config BOARD_GOOGLE_JOXER
+ bool "-> Joxer"
+ select BOARD_GOOGLE_BASEBOARD_NISSA
diff --git a/src/mainboard/google/brya/variants/joxer/include/variant/ec.h b/src/mainboard/google/brya/variants/joxer/include/variant/ec.h
new file mode 100644
index 0000000000..7a2a6ff8b7
--- /dev/null
+++ b/src/mainboard/google/brya/variants/joxer/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/joxer/include/variant/gpio.h b/src/mainboard/google/brya/variants/joxer/include/variant/gpio.h
new file mode 100644
index 0000000000..c4fe342621
--- /dev/null
+++ b/src/mainboard/google/brya/variants/joxer/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/joxer/memory/Makefile.inc b/src/mainboard/google/brya/variants/joxer/memory/Makefile.inc
new file mode 100644
index 0000000000..eace2e443e
--- /dev/null
+++ b/src/mainboard/google/brya/variants/joxer/memory/Makefile.inc
@@ -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/joxer/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/joxer/memory/dram_id.generated.txt
new file mode 100644
index 0000000000..fa247902ee
--- /dev/null
+++ b/src/mainboard/google/brya/variants/joxer/memory/dram_id.generated.txt
@@ -0,0 +1 @@
+DRAM Part Name ID to assign
diff --git a/src/mainboard/google/brya/variants/joxer/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/joxer/memory/mem_parts_used.txt
new file mode 100644
index 0000000000..96211370d9
--- /dev/null
+++ b/src/mainboard/google/brya/variants/joxer/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.inc 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/joxer/overridetree.cb b/src/mainboard/google/brya/variants/joxer/overridetree.cb
new file mode 100644
index 0000000000..4f2c04a57a
--- /dev/null
+++ b/src/mainboard/google/brya/variants/joxer/overridetree.cb
@@ -0,0 +1,6 @@
+chip soc/intel/alderlake
+
+ device domain 0 on
+ end
+
+end