Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/27804 )
Change subject: mb/google/poppy/variants/rammus: change build directory to rammus
......................................................................
mb/google/poppy/variants/rammus: change build directory to rammus
Move the build board directory from poppy to rammus.
BUG=b:111579386
BRANCH=Master
TEST=Build pass
Change-Id: I3a9fc2bbfe7261661f0c5c073baff0ff1434d09f
Signed-off-by: Zhuohao Lee <zhuohao(a)chromium.org>
Reviewed-on: https://review.coreboot.org/27804
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Furquan Shaikh <furquan(a)google.com>
---
M src/mainboard/google/poppy/Kconfig
M src/mainboard/google/poppy/Kconfig.name
A src/mainboard/google/poppy/variants/rammus/Makefile.inc
A src/mainboard/google/poppy/variants/rammus/include/variant/acpi/dptf.asl
A src/mainboard/google/poppy/variants/rammus/include/variant/ec.h
A src/mainboard/google/poppy/variants/rammus/include/variant/gpio.h
6 files changed, 131 insertions(+), 2 deletions(-)
Approvals:
build bot (Jenkins): Verified
Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 06501f7..9a75d9c 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -129,7 +129,7 @@
default "nami" if BOARD_GOOGLE_NAMI
default "nautilus" if BOARD_GOOGLE_NAUTILUS
default "nocturne" if BOARD_GOOGLE_NOCTURNE
- default "poppy" if BOARD_GOOGLE_RAMMUS
+ default "rammus" if BOARD_GOOGLE_RAMMUS
default "soraka" if BOARD_GOOGLE_SORAKA
# Select this option to enable camera ACPI support on the variant.
@@ -183,6 +183,11 @@
select VARIANT_HAS_CAMERA_ACPI
select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+config VARIANT_SPECIFIC_OPTIONS_RAMMUS
+ def_bool n
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select MAINBOARD_HAS_SPI_TPM_CR50
+
config VARIANT_SPECIFIC_OPTIONS_SORAKA
def_bool n
select DRIVERS_I2C_MAX98927
diff --git a/src/mainboard/google/poppy/Kconfig.name b/src/mainboard/google/poppy/Kconfig.name
index 67f1870..c33d7fb 100644
--- a/src/mainboard/google/poppy/Kconfig.name
+++ b/src/mainboard/google/poppy/Kconfig.name
@@ -28,7 +28,7 @@
config BOARD_GOOGLE_RAMMUS
bool "-> Rammus"
select BOARD_GOOGLE_BASEBOARD_POPPY
- select VARIANT_SPECIFIC_OPTIONS_POPPY
+ select VARIANT_SPECIFIC_OPTIONS_RAMMUS
config BOARD_GOOGLE_SORAKA
bool "-> Soraka"
diff --git a/src/mainboard/google/poppy/variants/rammus/Makefile.inc b/src/mainboard/google/poppy/variants/rammus/Makefile.inc
new file mode 100644
index 0000000..f24f8a7
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/rammus/Makefile.inc
@@ -0,0 +1 @@
+SPD_SOURCES = empty # 0b0000
diff --git a/src/mainboard/google/poppy/variants/rammus/include/variant/acpi/dptf.asl b/src/mainboard/google/poppy/variants/rammus/include/variant/acpi/dptf.asl
new file mode 100644
index 0000000..a9afa73
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/rammus/include/variant/acpi/dptf.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <baseboard/acpi/dptf.asl>
diff --git a/src/mainboard/google/poppy/variants/rammus/include/variant/ec.h b/src/mainboard/google/poppy/variants/rammus/include/variant/ec.h
new file mode 100644
index 0000000..b22fccb
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/rammus/include/variant/ec.h
@@ -0,0 +1,86 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __MAINBOARD_EC_H__
+#define __MAINBOARD_EC_H__
+
+#include <ec/ec.h>
+#include <ec/google/chromeec/ec_commands.h>
+
+#include <variant/gpio.h>
+
+#define MAINBOARD_EC_SCI_EVENTS \
+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_LOW) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_CRITICAL) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_STATUS) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP))
+
+#define MAINBOARD_EC_SMI_EVENTS \
+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED))
+
+/* EC can wake from S5 with lid or power button */
+#define MAINBOARD_EC_S5_WAKE_EVENTS \
+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
+
+/*
+ * EC can wake from S3 with lid or power button or key press or
+ * mode change event.
+ */
+#define MAINBOARD_EC_S3_WAKE_EVENTS \
+ (MAINBOARD_EC_S5_WAKE_EVENTS |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED))
+
+#define MAINBOARD_EC_S0IX_WAKE_EVENTS (MAINBOARD_EC_S3_WAKE_EVENTS)
+
+/* Log EC wake events plus EC shutdown events */
+#define MAINBOARD_EC_LOG_EVENTS \
+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_SHUTDOWN) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
+
+/*
+ * ACPI related definitions for ASL code.
+ */
+
+/* Enable EC backed PD MCU device in ACPI */
+#define EC_ENABLE_PD_MCU_DEVICE
+
+/* Enable LID switch and provide wake pin for EC */
+#define EC_ENABLE_LID_SWITCH
+#define EC_ENABLE_WAKE_PIN GPE_EC_WAKE
+
+/* Enable Tablet switch */
+#define EC_ENABLE_TABLET_EVENT
+#define EC_ENABLE_TBMC_DEVICE
+
+#define SIO_EC_MEMMAP_ENABLE /* EC Memory Map Resources */
+#define SIO_EC_HOST_ENABLE /* EC Host Interface Resources */
+#define SIO_EC_ENABLE_PS2K /* Enable PS/2 Keyboard */
+
+/* Enable EC backed Keyboard Backlight in ACPI */
+#define EC_ENABLE_KEYBOARD_BACKLIGHT
+
+#endif /* __MAINBOARD_EC_H__ */
diff --git a/src/mainboard/google/poppy/variants/rammus/include/variant/gpio.h b/src/mainboard/google/poppy/variants/rammus/include/variant/gpio.h
new file mode 100644
index 0000000..cd34cf0
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/rammus/include/variant/gpio.h
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __MAINBOARD_GPIO_H__
+#define __MAINBOARD_GPIO_H__
+
+#include <baseboard/gpio.h>
+
+#endif /* __MAINBOARD_GPIO_H__ */
--
To view, visit https://review.coreboot.org/27804
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a9fc2bbfe7261661f0c5c073baff0ff1434d09f
Gerrit-Change-Number: 27804
Gerrit-PatchSet: 2
Gerrit-Owner: Zhuohao Lee <zhuohao(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Martin Kepplinger has uploaded this change for review. ( https://review.coreboot.org/27864
Change subject: [WIP] 3rdparty/blobs: Bump for new microcode update for Intel model 306ax
......................................................................
[WIP] 3rdparty/blobs: Bump for new microcode update for Intel model 306ax
Change-Id: Ib892b5eabb34204dcd3a6ff627374c8214286a2a
---
M 3rdparty/blobs
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/27864/1
diff --git a/3rdparty/blobs b/3rdparty/blobs
index 372012e..0414580 160000
--- a/3rdparty/blobs
+++ b/3rdparty/blobs
@@ -1 +1 @@
-Subproject commit 372012e8e1d0d01f3e77ff73b118665b41ff68b6
+Subproject commit 0414580b638d5d4497b6885589de56c331072879
--
To view, visit https://review.coreboot.org/27864
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib892b5eabb34204dcd3a6ff627374c8214286a2a
Gerrit-Change-Number: 27864
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Kepplinger <martink(a)posteo.de>
Michał Żygowski has abandoned this change. ( https://review.coreboot.org/27825 )
Change subject: mainboard/pcengines: select ADD_SEABIOS_SERCON_PORT_FILE
......................................................................
Abandoned
Due to gerrit errors, the change has been duplicated (27824)
--
To view, visit https://review.coreboot.org/27825
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: abandon
Gerrit-Change-Id: I9e65dd1e28859028c8c46f28a5442de8c59d4893
Gerrit-Change-Number: 27825
Gerrit-PatchSet: 1
Gerrit-Owner: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Felix Held has posted comments on this change. ( https://review.coreboot.org/27852 )
Change subject: [WIP]Documentation: Add basic flashing tutorial for Lenovo
......................................................................
Patch Set 1:
> > > (1 comment)
> > >
> > > IIRC the reverse current protection diode isn't populated in at
> > > least some models; IIRC it's replaced with a 0 ohm resistor
> >
> > Do you know which models that are ?
> > On T500 / T410 there's no such diode assembled, maybe it only
> > applies to older models ?
>
> I can have a look later, but I think the x230 doesn't have a
> reverse current protection diode, but a 0 ohm resistor instead.
I had a look at the X230 mainboard I have here and there the reverse current protection diode wasn't populated, but the 0 ohm resistor that is in parallel to the diode
--
To view, visit https://review.coreboot.org/27852
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia833e27f4e7d89ee32be9bed21a0c021839facec
Gerrit-Change-Number: 27852
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Mon, 06 Aug 2018 00:30:30 +0000
Gerrit-HasComments: No
Gerrit-HasLabels: No
Felix Held has posted comments on this change. ( https://review.coreboot.org/27852 )
Change subject: [WIP]Documentation: Add basic flashing tutorial for Lenovo
......................................................................
Patch Set 1:
> > (1 comment)
> >
> > IIRC the reverse current protection diode isn't populated in at
> > least some models; IIRC it's replaced with a 0 ohm resistor
>
> Do you know which models that are ?
> On T500 / T410 there's no such diode assembled, maybe it only
> applies to older models ?
I can have a look later, but I think the x230 doesn't have a reverse current protection diode, but a 0 ohm resistor instead.
--
To view, visit https://review.coreboot.org/27852
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia833e27f4e7d89ee32be9bed21a0c021839facec
Gerrit-Change-Number: 27852
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Sun, 05 Aug 2018 13:46:41 +0000
Gerrit-HasComments: No
Gerrit-HasLabels: No
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/27852 )
Change subject: [WIP]Documentation: Add basic flashing tutorial for Lenovo
......................................................................
Patch Set 1:
> (1 comment)
>
> IIRC the reverse current protection diode isn't populated in at
> least some models; IIRC it's replaced with a 0 ohm resistor
Do you know which models that are ?
On T500 / T410 there's no such diode assembled, maybe it only applies to older models ?
--
To view, visit https://review.coreboot.org/27852
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia833e27f4e7d89ee32be9bed21a0c021839facec
Gerrit-Change-Number: 27852
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Sun, 05 Aug 2018 07:38:42 +0000
Gerrit-HasComments: No
Gerrit-HasLabels: No