[coreboot-gerrit] [XS] Change in coreboot[main]: libpayload: Include commonlib/helpers.h in libpayload.h for GPL builds

[Yu-Ping Wu (Code Review)]

Yu-Ping Wu has submitted this change. ( https://review.coreboot.org/c/coreboot/+/81289?usp=email )

Change subject: libpayload: Include commonlib/helpers.h in libpayload.h for GPL builds
......................................................................

libpayload: Include commonlib/helpers.h in libpayload.h for GPL builds

This patch makes the GPL-restricted commonlib helpers available in
libpayload when CONFIG_LP_GPL is selected, as a convenience to GPL
payloads that use them a lot.

Cq-Depend: chromium:5375721
Change-Id: I844c6e700c4c0d557f97da94fa3aa2e868edd756
Signed-off-by: Julius Werner 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81289
Tested-by: build bot (Jenkins) 
Reviewed-by: Yu-Ping Wu 
---
M payloads/libpayload/include/libpayload.h
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Yu-Ping Wu: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index c6d2fc6..09bd4be 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -45,9 +45,13 @@
 #include <stdbool.h>
 #include <libpayload-config.h>
 #include <cbgfx.h>
+#if CONFIG(LP_GPL)
+#include <commonlib/helpers.h>
+#else
+#include <commonlib/bsd/helpers.h>
+#endif
 #include <commonlib/bsd/elog.h>
 #include <commonlib/bsd/fmap_serialized.h>
-#include <commonlib/bsd/helpers.h>
 #include <commonlib/bsd/ipchksum.h>
 #include <commonlib/bsd/mem_chip_info.h>
 #include <ctype.h>