diff options
Diffstat (limited to 'src/vendorcode/google/chromeos/cros_vpd.c')
| -rw-r--r-- | src/vendorcode/google/chromeos/cros_vpd.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/vendorcode/google/chromeos/cros_vpd.c b/src/vendorcode/google/chromeos/cros_vpd.c index 26b01ee7a3..df2b5bf667 100644 --- a/src/vendorcode/google/chromeos/cros_vpd.c +++ b/src/vendorcode/google/chromeos/cros_vpd.c @@ -15,16 +15,6 @@ #include "lib_vpd.h" #include "vpd_tables.h" -/* - * Static variables are available in ramstage (all platforms), and romstage for - * some platforms (ex, ARM, which uses SRAM). - */ -#if defined(__PRE_RAM__) && CONFIG_ARCH_X86 -#define STATIC_VAR -#else -#define STATIC_VAR static -#endif - /* Currently we only support Google VPD 2.0, which has a fixed offset. */ enum { GOOGLE_VPD_2_0_OFFSET = 0x600, @@ -39,10 +29,10 @@ struct vpd_gets_arg { static int cros_vpd_load(uint8_t **vpd_address, int32_t *vpd_size) { - STATIC_VAR int cached = 0; - STATIC_VAR uint8_t *cached_address = NULL; - STATIC_VAR int32_t cached_size = 0; - STATIC_VAR int result = -1; + MAYBE_STATIC int cached = 0; + MAYBE_STATIC uint8_t *cached_address = NULL; + MAYBE_STATIC int32_t cached_size = 0; + MAYBE_STATIC int result = -1; struct google_vpd_info info; int32_t base; |