From b3c2bf54981664d9b1b160433c015ede10e2b31e Mon Sep 17 00:00:00 2001 From: Prakruthi Deepak Heragu Date: Tue, 21 Jan 2020 11:48:16 -0800 Subject: [PATCH 1/2] scripts: gki: Add LD to make args to enable CFI/LTO Include LD also as a make argument to enable CFI to satisfy the ld.lld requirement in order to enable CONFIG_LD_IS_LLD. Change-Id: I1ffa90fd88cbd2e953137380186e30cfd4e12b16 Signed-off-by: Prakruthi Deepak Heragu --- scripts/gki/fragment_menuconfig.sh | 1 + scripts/gki/generate_defconfig.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/gki/fragment_menuconfig.sh b/scripts/gki/fragment_menuconfig.sh index fc40e238e3be..2bfd9e9d64fe 100755 --- a/scripts/gki/fragment_menuconfig.sh +++ b/scripts/gki/fragment_menuconfig.sh @@ -32,6 +32,7 @@ KERN_MAKE_ARGS="ARCH=$ARCH \ HOSTCC=$HOSTCC \ HOSTLD=$HOSTLD \ HOSTAR=$HOSTAR \ + LD=$LD \ " # Allyes fragment temporarily created on GKI config fragment diff --git a/scripts/gki/generate_defconfig.sh b/scripts/gki/generate_defconfig.sh index 21cda67402b0..2d71a37374b7 100755 --- a/scripts/gki/generate_defconfig.sh +++ b/scripts/gki/generate_defconfig.sh @@ -32,6 +32,7 @@ KERN_MAKE_ARGS="ARCH=$ARCH \ HOSTCC=$HOSTCC \ HOSTLD=$HOSTLD \ HOSTAR=$HOSTAR \ + LD=$LD \ " # Allyes fragment temporarily created on GKI config fragment From d935788fb2f90c5c85686f1d570c5853e65be346 Mon Sep 17 00:00:00 2001 From: Prakruthi Deepak Heragu Date: Thu, 23 Jan 2020 16:16:46 -0800 Subject: [PATCH 2/2] arm64: defconfig: Enable CFI_PERMISSIVE flag Enable this flag so that kernel doesn't panic if there is a CFI error. Change-Id: I4de6076639aa0db19a4fcc36d94048a0c3651917 Signed-off-by: Prakruthi Deepak Heragu --- arch/arm64/configs/vendor/lahaina_GKI.config | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config index a9dd2732c165..c6a4ca98b531 100644 --- a/arch/arm64/configs/vendor/lahaina_GKI.config +++ b/arch/arm64/configs/vendor/lahaina_GKI.config @@ -107,6 +107,7 @@ CONFIG_MSM_CDSP_LOADER=m CONFIG_UIO_MSM_SHAREDMEM=m CONFIG_QCOM_SOCINFO=m CONFIG_BTFM_SLIM=m +CONFIG_CFI_PERMISSIVE=y # CONFIG_SND_SOC_WCD9335 is not set # CONFIG_SLIM_QCOM_CTRL is not set # CONFIG_SLIM_QCOM_NGD_CTRL is not set