build.config*: remove duplication to only change what is strictly needed

Change-Id: I96aed0b84271e43edae43f35c84ced3179daa496 Signed-off-by: Thierry Strudel <tstrudel@google.com>
2018-04-13 12:34:00 -07:00
parent 17edc8383d
commit 3aca733244
11 changed files with 57 additions and 237 deletions
--- a/build.config
+++ b/build.config
@@ -1,28 +1,3 @@
-ARCH=arm64
-BRANCH=android-msm-bluecross-4.9
-CC=clang
-CLANG_TRIPLE=aarch64-linux-gnu-
-CROSS_COMPILE=aarch64-linux-android-
-CROSS_COMPILE_ARM32=arm-linux-androideabi-
-DEFCONFIG=b1c1_defconfig
-EXTRA_CMDS=''
 KERNEL_DIR=private/msm-google
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
 POST_DEFCONFIG_CMDS="check_defconfig"
-CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-4393122/bin/
-LD_LIBRARY_PATH=${ROOT_DIR}/prebuilts-master/clang/host/linux-x86/clang-4393122/lib64:$LD_LIBRARY_PATH
-LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
-LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
-DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
-LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
-FILES="
-arch/arm64/boot/dtbo.img
-arch/arm64/boot/Image.lz4-dtb
-vmlinux
-System.map
-.config
-"
-EXT_MODULES="
-private/msm-google-modules/wlan/qcacld-3.0
-"
-IN_KERNEL_MODULES=1
--- a/build.config.common
+++ b/build.config.common
@@ -0,0 +1,25 @@
+ARCH=arm64
+BRANCH=android-msm-bluecross-4.9
+CROSS_COMPILE=aarch64-linux-android-
+CROSS_COMPILE_ARM32=arm-linux-androideabi-
+DEFCONFIG=b1c1_defconfig
+EXTRA_CMDS=''
+CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-4393122/bin/
+LD_LIBRARY_PATH=${ROOT_DIR}/prebuilts-master/clang/host/linux-x86/clang-4393122/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
+LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
+LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
+DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
+LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
+FILES="
+arch/arm64/boot/dtbo.img
+arch/arm64/boot/Image.lz4-dtb
+vmlinux
+System.map
+.config
+"
+EXT_MODULES="
+private/msm-google-modules/wlan/qcacld-3.0
+"
+IN_KERNEL_MODULES=1
--- a/build.config.common.clang
+++ b/build.config.common.clang
@@ -0,0 +1,3 @@
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+CC=clang
+CLANG_TRIPLE=aarch64-linux-gnu-
--- a/build.config.debug_api
+++ b/build.config.debug_api
@@ -1,3 +1,7 @@
+KERNEL_DIR=private/msm-google
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+KCFLAGS='-fno-tree-vrp'
+POST_DEFCONFIG_CMDS="update_debug_config"
 function update_debug_config() {
    ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
         -e CONFIG_DMA_API_DEBUG \
@@ -8,7 +12,6 @@ function update_debug_config() {
         -e CONFIG_DEBUG_PI_LIST \
         -e CONFIG_DEBUG_NOTIFIERS \
         -e CONFIG_DEBUG_CREDENTIALS \
-         -d CONFIG_KERNEL_LZ4 \
         -d LTO \
         -d LTO_CLANG \
         -d CFI \
@@ -17,28 +20,3 @@ function update_debug_config() {
    (cd ${OUT_DIR} && \
     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
 }
-
-ARCH=arm64
-BRANCH=android-msm-bluecross-4.9
-CROSS_COMPILE=aarch64-linux-android-
-CROSS_COMPILE_ARM32=arm-linux-androideabi-
-DEFCONFIG=b1c1_defconfig
-EXTRA_CMDS=''
-KERNEL_DIR=private/msm-google
-POST_DEFCONFIG_CMDS="update_debug_config"
-LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
-LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
-DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
-LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
-FILES="
-arch/arm64/boot/dtbo.img
-arch/arm64/boot/Image.gz-dtb
-vmlinux
-System.map
-"
-EXT_MODULES="
-private/msm-google-modules/wlan/qcacld-3.0
-"
-IN_KERNEL_MODULES=1
-KCFLAGS='-fno-tree-vrp'
--- a/build.config.debug_hang
+++ b/build.config.debug_hang
@@ -1,3 +1,7 @@
+KERNEL_DIR=private/msm-google
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+KCFLAGS='-fno-tree-vrp'
+POST_DEFCONFIG_CMDS="update_debug_config"
 function update_debug_config() {
    ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
         -e CONFIG_LOCKUP_DETECTOR \
@@ -9,7 +13,6 @@ function update_debug_config() {
         -e CONFIG_WQ_WATCHDOG \
         -e CONFIG_PANIC_ON_RT_THROTTLING \
         -e CONFIG_RCU_EQS_DEBUG \
-         -d CONFIG_KERNEL_LZ4 \
         -d LTO \
         -d LTO_CLANG \
         -d CFI \
@@ -18,28 +21,3 @@ function update_debug_config() {
    (cd ${OUT_DIR} && \
     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
 }
-
-ARCH=arm64
-BRANCH=android-msm-bluecross-4.9
-CROSS_COMPILE=aarch64-linux-android-
-CROSS_COMPILE_ARM32=arm-linux-androideabi-
-DEFCONFIG=b1c1_defconfig
-EXTRA_CMDS=''
-KERNEL_DIR=private/msm-google
-POST_DEFCONFIG_CMDS="update_debug_config"
-LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
-LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
-DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
-LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
-FILES="
-arch/arm64/boot/dtbo.img
-arch/arm64/boot/Image.gz-dtb
-vmlinux
-System.map
-"
-EXT_MODULES="
-private/msm-google-modules/wlan/qcacld-3.0
-"
-IN_KERNEL_MODULES=1
-KCFLAGS='-fno-tree-vrp'
--- a/build.config.debug_locking
+++ b/build.config.debug_locking
@@ -1,3 +1,7 @@
+KERNEL_DIR=private/msm-google
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+KCFLAGS='-fno-tree-vrp'
+POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
 function update_debug_config() {
    ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
         -e CONFIG_DEBUG_RT_MUTEXES \
@@ -6,7 +10,6 @@ function update_debug_config() {
         -e CONFIG_DEBUG_MUTEXES \
         -e CONFIG_DEBUG_PREEMPT \
         -e CONFIG_DEBUG_ATOMIC_SLEEP \
-         -d CONFIG_KERNEL_LZ4 \
         -d LTO \
         -d LTO_CLANG \
         -d CFI \
@@ -15,28 +18,3 @@ function update_debug_config() {
    (cd ${OUT_DIR} && \
     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
 }
-
-ARCH=arm64
-BRANCH=android-msm-bluecross-4.9
-CROSS_COMPILE=aarch64-linux-android-
-CROSS_COMPILE_ARM32=arm-linux-androideabi-
-DEFCONFIG=b1c1_defconfig
-EXTRA_CMDS=''
-KERNEL_DIR=private/msm-google
-POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
-LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
-LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
-DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
-LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
-FILES="
-arch/arm64/boot/dtbo.img
-arch/arm64/boot/Image.gz-dtb
-vmlinux
-System.map
-"
-EXT_MODULES="
-private/msm-google-modules/wlan/qcacld-3.0
-"
-IN_KERNEL_MODULES=1
-KCFLAGS='-fno-tree-vrp'
--- a/build.config.debug_memory
+++ b/build.config.debug_memory
@@ -1,3 +1,6 @@
+KERNEL_DIR=private/msm-google
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
+POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
 function update_debug_config() {
    ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
         -e CONFIG_DEBUG_OBJECTS \
@@ -12,7 +15,6 @@ function update_debug_config() {
         -e CONFIG_DEBUG_MEMORY_INIT \
         -e CONFIG_DEBUG_STACK_USAGE \
         -e CONFIG_DEBUG_PAGEALLOC \
-         -d CONFIG_KERNEL_LZ4 \
         -d LTO \
         -d LTO_CLANG \
         -d CFI \
@@ -21,28 +23,3 @@ function update_debug_config() {
    (cd ${OUT_DIR} && \
     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
 }
-
-ARCH=arm64
-BRANCH=android-msm-bluecross-4.9
-CROSS_COMPILE=aarch64-linux-android-
-CROSS_COMPILE_ARM32=arm-linux-androideabi-
-DEFCONFIG=b1c1_defconfig
-EXTRA_CMDS=''
-KERNEL_DIR=private/msm-google
-POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
-LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
-LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
-DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
-LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
-FILES="
-arch/arm64/boot/dtbo.img
-arch/arm64/boot/Image.gz-dtb
-vmlinux
-System.map
-"
-EXT_MODULES="
-private/msm-google-modules/wlan/qcacld-3.0
-"
-IN_KERNEL_MODULES=1
-KCFLAGS='-fno-tree-vrp'
--- a/build.config.gcc
+++ b/build.config.gcc
@@ -1,3 +1,7 @@
+KERNEL_DIR=private/msm-google
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+KCFLAGS='-fno-tree-vrp'
+POST_DEFCONFIG_CMDS="check_defconfig && update_gcc_config"
 function update_gcc_config() {
  # Disable clang-specific options
  ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
@@ -8,27 +12,3 @@ function update_gcc_config() {
  (cd ${OUT_DIR} && \
    make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
 }
-ARCH=arm64
-BRANCH=android-msm-bluecross-4.9
-CROSS_COMPILE=aarch64-linux-android-
-CROSS_COMPILE_ARM32=arm-linux-androideabi-
-DEFCONFIG=b1c1_defconfig
-EXTRA_CMDS=''
-KERNEL_DIR=private/msm-google
-POST_DEFCONFIG_CMDS="check_defconfig && update_gcc_config"
-LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
-LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
-DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
-LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
-FILES="
-arch/arm64/boot/dtbo.img
-arch/arm64/boot/Image.lz4-dtb
-vmlinux
-System.map
-"
-EXT_MODULES="
-private/msm-google-modules/wlan/qcacld-3.0
-"
-IN_KERNEL_MODULES=1
-KCFLAGS='-fno-tree-vrp'
--- a/build.config.kasan
+++ b/build.config.kasan
@@ -1,3 +1,6 @@
+KERNEL_DIR=private/msm-google
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
+POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config"
 function update_kasan_config() {
    ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
         -e CONFIG_KASAN \
@@ -17,32 +20,3 @@ function update_kasan_config() {
    (cd ${OUT_DIR} && \
     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
 }
-
-ARCH=arm64
-BRANCH=android-msm-bluecross-4.9
-CC=clang
-CLANG_TRIPLE=aarch64-linux-gnu-
-CROSS_COMPILE=aarch64-linux-android-
-CROSS_COMPILE_ARM32=arm-linux-androideabi-
-DEFCONFIG=b1c1_defconfig
-EXTRA_CMDS=''
-KERNEL_DIR=private/msm-google
-POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config"
-CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-4393122/bin/
-LD_LIBRARY_PATH=${ROOT_DIR}/prebuilts-master/clang/host/linux-x86/clang-4393122/lib64:$LD_LIBRARY_PATH
-LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
-LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
-DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
-LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
-FILES="
-arch/arm64/boot/dtbo.img
-arch/arm64/boot/Image.lz4-dtb
-vmlinux
-System.map
-.config
-"
-EXT_MODULES="
-private/msm-google-modules/wlan/qcacld-3.0
-"
-IN_KERNEL_MODULES=1
--- a/build.config.no-cfi
+++ b/build.config.no-cfi
@@ -1,3 +1,6 @@
+KERNEL_DIR=private/msm-google
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
+POST_DEFCONFIG_CMDS="check_defconfig && update_nocfi_config"
 function update_nocfi_config() {
  # Disable clang-specific options
  ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
@@ -8,30 +11,3 @@ function update_nocfi_config() {
  (cd ${OUT_DIR} && \
    make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
 }
-ARCH=arm64
-BRANCH=android-msm-bluecross-4.9
-CC=clang
-CLANG_TRIPLE=aarch64-linux-gnu-
-CROSS_COMPILE=aarch64-linux-android-
-CROSS_COMPILE_ARM32=arm-linux-androideabi-
-DEFCONFIG=b1c1_defconfig
-EXTRA_CMDS=''
-KERNEL_DIR=private/msm-google
-POST_DEFCONFIG_CMDS="check_defconfig && update_nocfi_config"
-CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-4393122/bin/
-LD_LIBRARY_PATH=${ROOT_DIR}/prebuilts-master/clang/host/linux-x86/clang-4393122/lib64:$LD_LIBRARY_PATH
-LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
-LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
-DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
-LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
-FILES="
-arch/arm64/boot/dtbo.img
-arch/arm64/boot/Image.lz4-dtb
-vmlinux
-System.map
-"
-EXT_MODULES="
-private/msm-google-modules/wlan/qcacld-3.0
-"
-IN_KERNEL_MODULES=1
--- a/build.config.safestack
+++ b/build.config.safestack
@@ -1,3 +1,6 @@
+KERNEL_DIR=private/msm-google
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
+POST_DEFCONFIG_CMDS="check_defconfig && update_safestack_config"
 function update_safestack_config() {
  ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
    -e SAFESTACK \
@@ -5,30 +8,3 @@ function update_safestack_config() {
  (cd ${OUT_DIR} && \
    make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
 }
-ARCH=arm64
-BRANCH=android-msm-bluecross-4.9
-CC=clang
-CLANG_TRIPLE=aarch64-linux-gnu-
-CROSS_COMPILE=aarch64-linux-android-
-CROSS_COMPILE_ARM32=arm-linux-androideabi-
-DEFCONFIG=b1c1_defconfig
-EXTRA_CMDS=''
-KERNEL_DIR=private/msm-google
-POST_DEFCONFIG_CMDS="check_defconfig && update_safestack_config"
-CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-4579689/bin/
-LD_LIBRARY_PATH=${ROOT_DIR}/prebuilts-master/clang/host/linux-x86/clang-4579689/lib64:$LD_LIBRARY_PATH
-LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
-LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
-DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
-LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
-FILES="
-arch/arm64/boot/dtbo.img
-arch/arm64/boot/Image.lz4-dtb
-vmlinux
-System.map
-"
-EXT_MODULES="
-private/msm-google-modules/wlan/qcacld-3.0
-"
-IN_KERNEL_MODULES=1