[XS] Change in coreboot[main]: libpayload: Make GPL commonlib includes available to payloads

[Julius Werner (Code Review)]

Julius Werner has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/81287?usp=email )

Change subject: libpayload: Make GPL commonlib includes available to payloads
......................................................................

libpayload: Make GPL commonlib includes available to payloads

CB:77968 made some non-BSD commonlib files part of libpayload when
CONFIG_LP_GPL is set. This patch exports those headers to the payload
(again only when CONFIG_LP_GPL is set) so that payloads can also call
the functions in them directly.

Change-Id: Ifc3e52ee5c3e51520f7b7d44b483bfcb0e8380f8
Signed-off-by: Julius Werner 
---
M payloads/libpayload/Makefile.mk
M payloads/libpayload/bin/lpgcc
2 files changed, 7 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/81287/1

diff --git a/payloads/libpayload/Makefile.mk b/payloads/libpayload/Makefile.mk
index e000868..afaa06d 100644
--- a/payloads/libpayload/Makefile.mk
+++ b/payloads/libpayload/Makefile.mk
@@ -133,6 +133,10 @@
    find include -type f -exec install -m644 {} $(DESTDIR)/libpayload/{} ;
    cd $(coreboottop)/src/commonlib/bsd && find include -type d -exec install -m755 -d $(abspath $(DESTDIR))/libpayload/{} ;
    cd $(coreboottop)/src/commonlib/bsd && find include -type f -exec install -m644 {} $(abspath $(DESTDIR))/libpayload/{} ;
+ifeq ($(CONFIG_LP_GPL),y)
+	cd $(coreboottop)/src/commonlib && find include -type d -exec install -m755 -d $(abspath $(DESTDIR))/libpayload/{} ;
+	cd $(coreboottop)/src/commonlib && find include -type f -exec install -m644 {} $(abspath $(DESTDIR))/libpayload/{} ;
+endif
    install -m 644 $(obj)/libpayload-config.h $(DESTDIR)/libpayload/include
    $(foreach item,$(includes), \
    	install -m 755 -d $(DESTDIR)/libpayload/include/$(call extract_nth,2,$(item)); \
diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc
index 35fa558..bdc1518 100755
--- a/payloads/libpayload/bin/lpgcc
+++ b/payloads/libpayload/bin/lpgcc
@@ -170,6 +170,9 @@

_CFLAGS="$_CFLAGS -include $BASE/../../../src/commonlib/bsd/include/commonlib/bsd/compiler.h"
     _CFLAGS="$_CFLAGS -I$BASE/../../../src/commonlib/bsd/include"
+    if [ "$CONFIG_LP_GPL" = y ]; then
+    _CFLAGS="$_CFLAGS -I$BASE/../../../src/commonlib/include"
+    fi
     _CFLAGS="$_CFLAGS -I$BASE/../../../3rdparty/vboot/firmware/include"
 else
     _CFLAGS="$_CFLAGS -include $BASE/../include/commonlib/bsd/compiler.h"