From f6780a36ff19b36abcdb5ace903c4ae2272fb574 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Thu, 30 Nov 2017 14:09:06 -0800 Subject: [PATCH] firmware: header tweaks for depthcharge Depthcharge currently includes vboot_nvstorage.h directly, instead of including only the API header files directly. Add 2nvstorage.h to the list of headers which can be requested impolitely. Also fix the definition of ARRAY_SIZE to match exactly what depthcharge and coreboot provide, so that the compiler does not get sad when it's included from both libpayload.h and 2common.h. BUG=chromium:789276 BRANCH=none TEST=make runtests; emerge-reef depthcharge coreboot Change-Id: Idc0390eaf813c3079df1676781e8bf5bc9b46450 Signed-off-by: Randall Spangler Reviewed-on: https://chromium-review.googlesource.com/802176 Reviewed-by: Shelley Chen --- firmware/2lib/include/2common.h | 2 +- firmware/include/vb2_api.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/firmware/2lib/include/2common.h b/firmware/2lib/include/2common.h index fa64c0f3ce..67032c9b32 100644 --- a/firmware/2lib/include/2common.h +++ b/firmware/2lib/include/2common.h @@ -25,7 +25,7 @@ struct vb2_public_key; /* Return the number of elements in an array */ #ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0])) +#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #endif /* Debug output printf() for tests. Otherwise, it's platform-dependent. */ diff --git a/firmware/include/vb2_api.h b/firmware/include/vb2_api.h index 2f63cc1647..d59b6731b7 100644 --- a/firmware/include/vb2_api.h +++ b/firmware/include/vb2_api.h @@ -33,6 +33,7 @@ * TODO: Make cleaner APIs to this stuff. */ #ifdef NEED_VB20_INTERNALS +#include "../2lib/include/2nvstorage.h" #include "../2lib/include/2nvstorage_fields.h" #include "../2lib/include/2struct.h" #include "../lib20/include/vb2_struct.h"