ANDROID: hikey960: Fix up HiKey960 build with symbol strict mode

After commit 205d5f733f ("ANDROID: GKI: Enable symbol trimming
and strict mode"), HiKey960 stopped booting properly.

Will McVicker suggested we add a new symbol list:
  android/abi_gki_aarch64_hikey960

So this patch does this. However, we also ran into an issue with
one of the configs we had enabled needing filp_open() which is
no longer allowed. So this patch also disables
CONFIG_NVME_TARGET (which wasn't really necessary) to avoid
this.

Fixes: 205d5f733f ("ANDROID: GKI: Enable symbol trimming and strict mode")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I3b7a862805f134f1dfa49e2a0c2e47ee5bb3b83a
This commit is contained in:
John Stultz
2021-09-21 22:53:57 +00:00
committed by Steve Muckle
parent 86e1e41c5d
commit 58b97c86ee
4 changed files with 1273 additions and 1 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,6 @@ CONFIG_CPUFREQ_DT=m
CONFIG_RFKILL_GPIO=m
CONFIG_CONNECTOR=m
CONFIG_BLK_DEV_NVME=m
CONFIG_NVME_TARGET=m
CONFIG_HISI_HIKEY_USB=m
CONFIG_WLAN_VENDOR_TI=y
CONFIG_WL18XX=m

View File

@@ -14,6 +14,7 @@ android/abi_gki_aarch64_fips140
android/abi_gki_aarch64_generic
android/abi_gki_aarch64_virtual_device
android/abi_gki_aarch64_db845c
android/abi_gki_aarch64_hikey960
"
FILES="${FILES}

View File

@@ -20,4 +20,5 @@ arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dtb
vmlinux
System.map
"
KMI_SYMBOL_LIST=android/abi_gki_aarch64_hikey960
GKI_MODULES_LIST=android/gki_aarch64_modules