[coreboot-gerrit] Change in coreboot[master]: Define BL31_SOURCE in Makefile.inc and include it for headers

[Paul Kocialkowski (Code Review)]

Paul Kocialkowski has uploaded a new change for review. ( https://review.coreboot.org/19136 )

Change subject: Define BL31_SOURCE in Makefile.inc and include it for headers
......................................................................

Define BL31_SOURCE in Makefile.inc and include it for headers

As BL31_SOURCE may be overridden, the specified source path should be
included for headers search instead of relying on the global 3rdparty
include.

Thus, also remove the arm-trusted-firmware prefix in rk3399 soc code.

Change-Id: I148fa21a77cbb21f2b3b434e3d047a4577c991bb
Signed-off-by: Paul Kocialkowski <contact at paulk.fr>
---
M Makefile.inc
M src/arch/arm64/Makefile.inc
M src/soc/rockchip/rk3399/include/soc/bl31_plat_params.h
3 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/19136/1

diff --git a/Makefile.inc b/Makefile.inc
index 573d927..c792886 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -353,6 +353,8 @@
 CPPFLAGS_common += -Isrc/device/oprom/include
 VBOOT_SOURCE ?= 3rdparty/vboot
 CPPFLAGS_common += -I$(VBOOT_SOURCE)/firmware/include
+BL31_SOURCE ?= 3rdparty/arm-trusted-firmware
+CPPFLAGS_common += -I$(BL31_SOURCE)
 CPPFLAGS_common += -include $(src)/include/kconfig.h
 CPPFLAGS_common += -I3rdparty
 
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index ad3941b..fe33996 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -138,7 +138,6 @@
 
 ifeq ($(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE),y)
 
-BL31_SOURCE := $(top)/3rdparty/arm-trusted-firmware
 BL31_BUILD := $(abspath $(obj)/3rdparty/arm-trusted-firmware)
 BL31_TARGET := $(BL31_BUILD)/bl31/bl31.elf
 
diff --git a/src/soc/rockchip/rk3399/include/soc/bl31_plat_params.h b/src/soc/rockchip/rk3399/include/soc/bl31_plat_params.h
index c73d687..7af7f7b 100644
--- a/src/soc/rockchip/rk3399/include/soc/bl31_plat_params.h
+++ b/src/soc/rockchip/rk3399/include/soc/bl31_plat_params.h
@@ -17,7 +17,7 @@
 #ifndef __BL31_PLAT_PARAMS_H__
 #define __BL31_PLAT_PARAMS_H__
 
-#include <arm-trusted-firmware/plat/rockchip/common/include/plat_params.h>
+#include <plat/rockchip/common/include/plat_params.h>
 
 void register_bl31_param(struct bl31_plat_param *param);
 

-- 
To view, visit https://review.coreboot.org/19136
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I148fa21a77cbb21f2b3b434e3d047a4577c991bb
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Paul Kocialkowski <contact at paulk.fr>