summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2020-11-02 20:47:22 +0800
committerYongQin Liu <yongqin.liu@linaro.org>2020-11-02 13:03:15 +0000
commitd5dffd076ec64892ecf96fcc9b1bef445d145b32 (patch)
tree504f3a477ff9c99ab51633e7184e5023b5807bfc
parentc7846c1e5d86d304f54e9b7109296267b912a339 (diff)
hikey/hikey960 configs: remove variant of HIKEY_KERNEL_DIRandroid-hikey-linaro-4.14-pmwg-20210818-180105-d5dffd076ec6
and use KERNEL_DIR when necessary Test: boot test with hikey/hikey960 aosp-master-throttled-copped#6922500 builds Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: Icf760b10ff1b9043ddce438f9673b7d2145e9ab9
-rw-r--r--build.config.hikey7
-rw-r--r--build.config.hikey9607
2 files changed, 4 insertions, 10 deletions
diff --git a/build.config.hikey b/build.config.hikey
index b9e6a95149a8..5a837921c9be 100644
--- a/build.config.hikey
+++ b/build.config.hikey
@@ -1,9 +1,6 @@
-HIKEY_KERNEL_DIR=hikey-linaro
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
-. ${ROOT_DIR}/${HIKEY_KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/${HIKEY_KERNEL_DIR}/build.config.aarch64
-
-KERNEL_DIR=${HIKEY_KERNEL_DIR}
BRANCH=android-hikey-linaro-4.14
DEFCONFIG=hikey_defconfig
diff --git a/build.config.hikey960 b/build.config.hikey960
index 2fd1859cb9dc..3d5ed95b11b9 100644
--- a/build.config.hikey960
+++ b/build.config.hikey960
@@ -1,9 +1,6 @@
-HIKEY_KERNEL_DIR=hikey-linaro
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
-. ${ROOT_DIR}/${HIKEY_KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/${HIKEY_KERNEL_DIR}/build.config.aarch64
-
-KERNEL_DIR=${HIKEY_KERNEL_DIR}
BRANCH=android-hikey-linaro-4.14
DEFCONFIG=hikey960_defconfig