diff options
Diffstat (limited to 'src/soc/intel/broadwell/include/soc')
-rw-r--r-- | src/soc/intel/broadwell/include/soc/device_nvs.h | 4 | ||||
-rw-r--r-- | src/soc/intel/broadwell/include/soc/nvs.h | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/soc/intel/broadwell/include/soc/device_nvs.h b/src/soc/intel/broadwell/include/soc/device_nvs.h index 2b784557cd..27304b573d 100644 --- a/src/soc/intel/broadwell/include/soc/device_nvs.h +++ b/src/soc/intel/broadwell/include/soc/device_nvs.h @@ -15,10 +15,10 @@ #define SIO_NVS_SDIO 7 #define SIO_NVS_ADSP 8 -typedef struct { +struct __packed device_nvs { u8 enable[9]; u32 bar0[9]; u32 bar1[9]; -} __packed device_nvs_t; +}; #endif diff --git a/src/soc/intel/broadwell/include/soc/nvs.h b/src/soc/intel/broadwell/include/soc/nvs.h index 1b6a231651..70f26e8ef1 100644 --- a/src/soc/intel/broadwell/include/soc/nvs.h +++ b/src/soc/intel/broadwell/include/soc/nvs.h @@ -4,7 +4,6 @@ #define _BROADWELL_NVS_H_ #include <stdint.h> -#include <soc/device_nvs.h> struct __packed global_nvs { /* Miscellaneous */ @@ -35,15 +34,6 @@ struct __packed global_nvs { u32 cbmc; /* 0x1c - 0x1f - coreboot Memory Console */ u64 pm1i; /* 0x20 - 0x27 - PM1 wake status bit */ u64 gpei; /* 0x28 - 0x2f - GPE wake status bit */ - u8 unused1[132]; /* 0x30 - 0xb3 - unused */ - - u8 unused2[76]; - - /* ChromeOS specific (0x100 - 0xfff) */ - u8 chromeos_reserve[0xf00]; - - /* Device specific (0x1000) */ - device_nvs_t dev; }; #endif |