Change in coreboot[master]: soc/intel/common/nvs: Don't include CHROMEOS NVS if not used
Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48490 )
Change subject: soc/intel/common/nvs: Don't include CHROMEOS NVS if not used ......................................................................
soc/intel/common/nvs: Don't include CHROMEOS NVS if not used
Don't include the CHROMEOS nvs defines unless building for CHROMEOS. Keep the namespace clean and make sure there isn't any unexpected use.
Change-Id: I9a43678bba20be11cd1b17f595525e792e844e43 Signed-off-by: Marc Jones marcjones@sysproconsulting.com --- M src/soc/intel/common/block/acpi/acpi/globalnvs.asl M src/soc/intel/common/block/include/intelblocks/nvs.h 2 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/48490/1
diff --git a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl index 826e718..c4a7e16 100644 --- a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl +++ b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl @@ -37,7 +37,9 @@ A4GB, 64, // 0x30 - 0x37 Base of above 4GB MMIO Resource A4GS, 64, // 0x38 - 0x3f Length of above 4GB MMIO Resource
+#if CONFIG(CHROMEOS) /* ChromeOS specific */ Offset (0x100), #include <vendorcode/google/chromeos/acpi/gnvs.asl> +#endif } diff --git a/src/soc/intel/common/block/include/intelblocks/nvs.h b/src/soc/intel/common/block/include/intelblocks/nvs.h index cc240c5..d711df5 100644 --- a/src/soc/intel/common/block/include/intelblocks/nvs.h +++ b/src/soc/intel/common/block/include/intelblocks/nvs.h @@ -4,7 +4,10 @@ #define SOC_INTEL_COMMON_BLOCK_NVS_H
#include <commonlib/helpers.h> + +#if CONFIG(CHROMEOS) #include <vendorcode/google/chromeos/gnvs.h> +#endif
struct __packed global_nvs { /* Miscellaneous */ @@ -29,10 +32,14 @@ u64 a4gs; /* 0x38 - 0x3f Length of above 4GB MMIO Resource */ u8 unused[192];
+#if CONFIG(CHROMEOS) /* ChromeOS specific (0x100 - 0xfff) */ chromeos_acpi_t chromeos; +#endif };
+#if CONFIG(CHROMEOS) check_member(global_nvs, chromeos, GNVS_CHROMEOS_ACPI_OFFSET); +#endif
#endif
Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48490 )
Change subject: soc/intel/common/nvs: Don't include CHROMEOS NVS if not used ......................................................................
Patch Set 1:
This patch isn't really needed, but I wanted to check the common NVS and ACPI weren't using any CHROMEOS values.
Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48490 )
Change subject: soc/intel/common/nvs: Don't include CHROMEOS NVS if not used ......................................................................
Patch Set 1:
Well, now we know....
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48490 )
Change subject: soc/intel/common/nvs: Don't include CHROMEOS NVS if not used ......................................................................
Patch Set 1:
The build logs are gone, but I expect this to be doable globally after topic:acpi-gnvs-framework-2 lands.
Marc Jones has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/48490 )
Change subject: soc/intel/common/nvs: Don't include CHROMEOS NVS if not used ......................................................................
Abandoned
No longer needed.
-
Kyösti Mälkki (Code Review) -
Marc Jones (Code Review)