Karthik Ramasubramanian has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
mb/google/dedede: Enable ChromeOS
Enable ChromeOS and add associated ACPI configuration.
BUG=b:144768001 TEST=Build Test
Change-Id: Ibb94849a903e4d4364d817de8988a430cd717e4c Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/Makefile.inc A src/mainboard/google/dedede/chromeos.c M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/mainboard.c M src/mainboard/google/dedede/variants/baseboard/gpio.c M src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h 7 files changed, 79 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38281/1
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 21ba001..d824b82 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -2,6 +2,7 @@ def_bool n select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES + select MAINBOARD_HAS_CHROMEOS select SOC_INTEL_JASPERLAKE
if BOARD_GOOGLE_BASEBOARD_DEDEDE @@ -10,6 +11,11 @@ def_bool n select SYSTEM_TYPE_LAPTOP
+config CHROMEOS + bool + default y + select VBOOT_LID_SWITCH + config DEVICETREE string default "variants/baseboard/devicetree.cb" diff --git a/src/mainboard/google/dedede/Makefile.inc b/src/mainboard/google/dedede/Makefile.inc index f214544..5cb209d 100644 --- a/src/mainboard/google/dedede/Makefile.inc +++ b/src/mainboard/google/dedede/Makefile.inc @@ -1,5 +1,11 @@ bootblock-y += bootblock.c +bootblock-$(CONFIG_CHROMEOS) += chromeos.c
+verstage-$(CONFIG_CHROMEOS) += chromeos.c + +romstage-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += mainboard.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c diff --git a/src/mainboard/google/dedede/chromeos.c b/src/mainboard/google/dedede/chromeos.c new file mode 100644 index 0000000..d6daf9f --- /dev/null +++ b/src/mainboard/google/dedede/chromeos.c @@ -0,0 +1,50 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2020 The coreboot project Authors. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include <baseboard/gpio.h> +#include <baseboard/variants.h> +#include <boot/coreboot_tables.h> +#include <gpio.h> +#include <vendorcode/google/chromeos/chromeos.h> + +void fill_lb_gpios(struct lb_gpios *gpios) +{ + struct lb_gpio chromeos_gpios[] = { + {-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"}, + {-1, ACTIVE_HIGH, get_lid_switch(), "lid"}, + {-1, ACTIVE_HIGH, 0, "power"}, + {-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"}, + }; + lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); +} + +int get_lid_switch(void) +{ + /* Lid always open */ + return 1; +} + +int get_recovery_mode_switch(void) +{ + return 0; +} + +int get_write_protect_state(void) +{ + /* No write protect */ + return 0; +} + +void mainboard_chromeos_acpi_generate(void) +{ + const struct cros_gpio *gpios; + size_t num; + + gpios = variant_cros_gpios(&num); + chromeos_acpi_gpio_generate(gpios, num); +} diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl index f9bd032..73c11e9 100644 --- a/src/mainboard/google/dedede/dsdt.asl +++ b/src/mainboard/google/dedede/dsdt.asl @@ -35,6 +35,9 @@ } }
+ /* Chrome OS specific */ + #include <vendorcode/google/chromeos/acpi/chromeos.asl> + /* Chipset specific sleep states */ #include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c index 2b1262e..e22c36a 100644 --- a/src/mainboard/google/dedede/mainboard.c +++ b/src/mainboard/google/dedede/mainboard.c @@ -12,6 +12,7 @@ #include <device/device.h> #include <soc/gpio.h> #include <variant/gpio.h> +#include <vendorcode/google/chromeos/chromeos.h>
static void mainboard_init(void *chip_info) { @@ -31,7 +32,7 @@ static void mainboard_enable(struct device *dev) { dev->ops->write_acpi_tables = mainboard_write_acpi_tables; - dev->ops->acpi_inject_dsdt_generator = NULL; + dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator; }
struct chip_operations mainboard_ops = { diff --git a/src/mainboard/google/dedede/variants/baseboard/gpio.c b/src/mainboard/google/dedede/variants/baseboard/gpio.c index c43e97f..714c2a5 100644 --- a/src/mainboard/google/dedede/variants/baseboard/gpio.c +++ b/src/mainboard/google/dedede/variants/baseboard/gpio.c @@ -9,6 +9,7 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> +#include <vendorcode/google/chromeos/chromeos.h>
/* Pad configuration in ramstage*/ static const struct pad_config gpio_table[] = { @@ -41,4 +42,14 @@ { *num = ARRAY_SIZE(sleep_gpio_table); return sleep_gpio_table; + +} + +static const struct cros_gpio cros_gpios[] = { +}; + +const struct cros_gpio *variant_cros_gpios(size_t *num) +{ + *num = ARRAY_SIZE(cros_gpios); + return cros_gpios; } diff --git a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h index 309b9eb..d7c482c 100644 --- a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h @@ -18,5 +18,6 @@ const struct pad_config *variant_gpio_table(size_t *num); const struct pad_config *variant_early_gpio_table(size_t *num); const struct pad_config *variant_sleep_gpio_table(size_t *num); +const struct cros_gpio *variant_cros_gpios(size_t *num);
#endif /*__BASEBOARD_VARIANTS_H__ */
Hello Justin TerAvest, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38281
to look at the new patch set (#4).
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
mb/google/dedede: Enable ChromeOS
Enable ChromeOS and add associated ACPI configuration.
BUG=b:144768001 TEST=Build Test
Change-Id: Ibb94849a903e4d4364d817de8988a430cd717e4c Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/Makefile.inc A src/mainboard/google/dedede/chromeos.c M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/mainboard.c M src/mainboard/google/dedede/variants/baseboard/gpio.c M src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h 7 files changed, 79 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38281/4
Justin TerAvest has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... File src/mainboard/google/dedede/chromeos.c:
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... PS4, Line 29: return 1; TODO to use ec/google/chromeec/switches.c when ec support is added?
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... File src/mainboard/google/dedede/chromeos.c:
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... PS4, Line 29: return 1;
TODO to use ec/google/chromeec/switches. […]
Actually it can be removed here. I removed it in the EC patch where EC Switches are enabled. I will remove it here.
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... File src/mainboard/google/dedede/variants/baseboard/gpio.c:
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... PS4, Line 51: * __weak
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... File src/mainboard/google/dedede/Kconfig:
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... PS4, Line 15: bool : default y tabs instead of spaces.
Hello Justin TerAvest, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38281
to look at the new patch set (#5).
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
mb/google/dedede: Enable ChromeOS
Enable ChromeOS and add associated ACPI configuration.
BUG=b:144768001 TEST=Build Test
Change-Id: Ibb94849a903e4d4364d817de8988a430cd717e4c Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/Makefile.inc A src/mainboard/google/dedede/chromeos.c M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/mainboard.c M src/mainboard/google/dedede/variants/baseboard/gpio.c M src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h 7 files changed, 79 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38281/5
Hello Justin TerAvest, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38281
to look at the new patch set (#7).
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
mb/google/dedede: Enable ChromeOS
Enable ChromeOS and add associated ACPI configuration.
BUG=b:144768001 TEST=Build Test
Change-Id: Ibb94849a903e4d4364d817de8988a430cd717e4c Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/Makefile.inc A src/mainboard/google/dedede/chromeos.c M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/mainboard.c M src/mainboard/google/dedede/variants/baseboard/gpio.c M src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h 7 files changed, 80 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38281/7
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
Patch Set 7:
(3 comments)
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... File src/mainboard/google/dedede/Kconfig:
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... PS4, Line 15: bool : default y
tabs instead of spaces.
Done
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... File src/mainboard/google/dedede/chromeos.c:
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... PS4, Line 29: return 1;
Actually it can be removed here. I removed it in the EC patch where EC Switches are enabled. […]
Done
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... File src/mainboard/google/dedede/variants/baseboard/gpio.c:
https://review.coreboot.org/c/coreboot/+/38281/4/src/mainboard/google/dedede... PS4, Line 51: *
__weak
Done
Hello Balaji Manigandan, Aamir Bohra, Justin TerAvest, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38281
to look at the new patch set (#8).
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
mb/google/dedede: Enable ChromeOS
Enable ChromeOS and add associated ACPI configuration.
BUG=b:144768001 TEST=Build Test
Change-Id: Ibb94849a903e4d4364d817de8988a430cd717e4c Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/Makefile.inc A src/mainboard/google/dedede/chromeos.c M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/mainboard.c M src/mainboard/google/dedede/variants/baseboard/gpio.c M src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h 7 files changed, 80 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38281/8
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
Patch Set 8:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38281/8/src/mainboard/google/dedede... File src/mainboard/google/dedede/variants/baseboard/gpio.c:
https://review.coreboot.org/c/coreboot/+/38281/8/src/mainboard/google/dedede... PS8, Line 44: blank line not required
Hello Balaji Manigandan, Aamir Bohra, Justin TerAvest, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38281
to look at the new patch set (#9).
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
mb/google/dedede: Enable ChromeOS
Enable ChromeOS and add associated ACPI configuration.
BUG=b:144768001 TEST=Build Test
Change-Id: Ibb94849a903e4d4364d817de8988a430cd717e4c Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/Makefile.inc A src/mainboard/google/dedede/chromeos.c M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/mainboard.c M src/mainboard/google/dedede/variants/baseboard/gpio.c M src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h 7 files changed, 79 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38281/9
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
Patch Set 9:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38281/8/src/mainboard/google/dedede... File src/mainboard/google/dedede/variants/baseboard/gpio.c:
https://review.coreboot.org/c/coreboot/+/38281/8/src/mainboard/google/dedede... PS8, Line 44:
blank line not required
Done
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
Patch Set 10:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38281/10//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38281/10//COMMIT_MSG@9 PS10, Line 9: ChromeOS Chrome OS
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable ChromeOS ......................................................................
Patch Set 10: Code-Review+2
Hello Balaji Manigandan, Aamir Bohra, Justin TerAvest, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38281
to look at the new patch set (#11).
Change subject: mb/google/dedede: Enable building for Chrome OS ......................................................................
mb/google/dedede: Enable building for Chrome OS
Enable building for Chrome OS and add associated ACPI configuration.
BUG=b:144768001 TEST=Build Test
Change-Id: Ibb94849a903e4d4364d817de8988a430cd717e4c Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/Makefile.inc A src/mainboard/google/dedede/chromeos.c M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/mainboard.c M src/mainboard/google/dedede/variants/baseboard/gpio.c M src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h 7 files changed, 79 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38281/11
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable building for Chrome OS ......................................................................
Patch Set 11:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38281/10//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38281/10//COMMIT_MSG@9 PS10, Line 9: ChromeOS
Chrome OS
Done
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable building for Chrome OS ......................................................................
Patch Set 11: Code-Review+2
Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38281 )
Change subject: mb/google/dedede: Enable building for Chrome OS ......................................................................
mb/google/dedede: Enable building for Chrome OS
Enable building for Chrome OS and add associated ACPI configuration.
BUG=b:144768001 TEST=Build Test
Change-Id: Ibb94849a903e4d4364d817de8988a430cd717e4c Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38281 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/Makefile.inc A src/mainboard/google/dedede/chromeos.c M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/mainboard.c M src/mainboard/google/dedede/variants/baseboard/gpio.c M src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h 7 files changed, 79 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 21ba001..cc7aff6 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -2,6 +2,7 @@ def_bool n select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES + select MAINBOARD_HAS_CHROMEOS select SOC_INTEL_JASPERLAKE
if BOARD_GOOGLE_BASEBOARD_DEDEDE @@ -10,6 +11,11 @@ def_bool n select SYSTEM_TYPE_LAPTOP
+config CHROMEOS + bool + default y + select VBOOT_LID_SWITCH + config DEVICETREE string default "variants/baseboard/devicetree.cb" diff --git a/src/mainboard/google/dedede/Makefile.inc b/src/mainboard/google/dedede/Makefile.inc index f214544..5cb209d 100644 --- a/src/mainboard/google/dedede/Makefile.inc +++ b/src/mainboard/google/dedede/Makefile.inc @@ -1,5 +1,11 @@ bootblock-y += bootblock.c +bootblock-$(CONFIG_CHROMEOS) += chromeos.c
+verstage-$(CONFIG_CHROMEOS) += chromeos.c + +romstage-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += mainboard.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c diff --git a/src/mainboard/google/dedede/chromeos.c b/src/mainboard/google/dedede/chromeos.c new file mode 100644 index 0000000..44a8c04 --- /dev/null +++ b/src/mainboard/google/dedede/chromeos.c @@ -0,0 +1,51 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2020 The coreboot project Authors. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include <baseboard/gpio.h> +#include <baseboard/variants.h> +#include <boot/coreboot_tables.h> +#include <gpio.h> +#include <vendorcode/google/chromeos/chromeos.h> + +void fill_lb_gpios(struct lb_gpios *gpios) +{ + struct lb_gpio chromeos_gpios[] = { + {-1, ACTIVE_HIGH, get_write_protect_state(), "write protect"}, + {-1, ACTIVE_HIGH, get_lid_switch(), "lid"}, + {-1, ACTIVE_HIGH, 0, "power"}, + {-1, ACTIVE_HIGH, gfx_get_init_done(), "oprom"}, + }; + lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios)); +} + +int get_lid_switch(void) +{ + /* TODO: use Chrome EC switches when EC support is added */ + return 1; +} + +int get_recovery_mode_switch(void) +{ + /* TODO: use Chrome EC switches when EC support is added */ + return 0; +} + +int get_write_protect_state(void) +{ + /* No write protect */ + return 0; +} + +void mainboard_chromeos_acpi_generate(void) +{ + const struct cros_gpio *gpios; + size_t num; + + gpios = variant_cros_gpios(&num); + chromeos_acpi_gpio_generate(gpios, num); +} diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl index c387fd3..3e278e3 100644 --- a/src/mainboard/google/dedede/dsdt.asl +++ b/src/mainboard/google/dedede/dsdt.asl @@ -35,6 +35,9 @@ } }
+ /* Chrome OS specific */ + #include <vendorcode/google/chromeos/acpi/chromeos.asl> + /* Chipset specific sleep states */ #include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c index b663a43..64bb5ac 100644 --- a/src/mainboard/google/dedede/mainboard.c +++ b/src/mainboard/google/dedede/mainboard.c @@ -9,6 +9,7 @@ #include <arch/acpi.h> #include <baseboard/variants.h> #include <device/device.h> +#include <vendorcode/google/chromeos/chromeos.h>
static void mainboard_init(void *chip_info) { @@ -28,7 +29,7 @@ static void mainboard_enable(struct device *dev) { dev->ops->write_acpi_tables = mainboard_write_acpi_tables; - dev->ops->acpi_inject_dsdt_generator = NULL; + dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator; }
struct chip_operations mainboard_ops = { diff --git a/src/mainboard/google/dedede/variants/baseboard/gpio.c b/src/mainboard/google/dedede/variants/baseboard/gpio.c index 65ac66b..6c95a1d 100644 --- a/src/mainboard/google/dedede/variants/baseboard/gpio.c +++ b/src/mainboard/google/dedede/variants/baseboard/gpio.c @@ -9,6 +9,7 @@ #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <commonlib/helpers.h> +#include <vendorcode/google/chromeos/chromeos.h>
/* Pad configuration in ramstage*/ static const struct pad_config gpio_table[] = { @@ -41,3 +42,12 @@ *num = ARRAY_SIZE(sleep_gpio_table); return sleep_gpio_table; } + +static const struct cros_gpio cros_gpios[] = { +}; + +const struct cros_gpio *__weak variant_cros_gpios(size_t *num) +{ + *num = ARRAY_SIZE(cros_gpios); + return cros_gpios; +} diff --git a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h index 309b9eb..d7c482c 100644 --- a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h @@ -18,5 +18,6 @@ const struct pad_config *variant_gpio_table(size_t *num); const struct pad_config *variant_early_gpio_table(size_t *num); const struct pad_config *variant_sleep_gpio_table(size_t *num); +const struct cros_gpio *variant_cros_gpios(size_t *num);
#endif /*__BASEBOARD_VARIANTS_H__ */
-
Furquan Shaikh (Code Review) -
Justin TerAvest (Code Review)
-
Karthik Ramasubramanian (Code Review)
-
Paul Menzel (Code Review)