aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2020-03-30 09:49:46 -0500
committerDan Murphy <dmurphy@ti.com>2020-03-30 09:49:46 -0500
commit60872a63357a05168382e987d1d466f1ae8c8dac (patch)
treeebc143e8ae5f6dc658f7d8aa5daa1b3920249cab
parentb6822767e55a60ae074eaac9d6a3831502a0de24 (diff)
downloadlinux-dt-60872a63357a05168382e987d1d466f1ae8c8dac.tar.gz
system_test: build: Add in tree defconfig build options
Signed-off-by: Dan Murphy <dmurphy@ti.com>
-rw-r--r--system_test/base_build_recipe6
-rwxr-xr-xsystem_test/build_system_test.sh16
2 files changed, 16 insertions, 6 deletions
diff --git a/system_test/base_build_recipe b/system_test/base_build_recipe
index 852ccd5..565b711 100644
--- a/system_test/base_build_recipe
+++ b/system_test/base_build_recipe
@@ -1,9 +1,13 @@
+arch: arm testsuite: multi_v7_defconfig defconfig: multi_v7_defconfig patch_dir: none overlay_dir: none
+arch: arm testsuite: keystone_defconfig defconfig: keystone_defconfig patch_dir: none overlay_dir: none
+arch: arm testsuite: omap2_plus_defconfig defconfig: omap2_plus_defconfig patch_dir: none overlay_dir: none
+arch: arm testsuite: davinci_all_defconfig defconfig: davinci_all_defconfig patch_dir: none overlay_dir: none
+arch: arm64 testsuite: v8_defconfig defconfig: defconfig patch_dir: none overlay_dir: none
arch: arm testsuite: ti_sdk_am3x_release defconfig: ti_sdk_am3x_release patch_dir: none overlay_dir: none
arch: arm testsuite: ti_sdk_am4x_release defconfig: ti_sdk_am4x_release patch_dir: none overlay_dir: none
arch: arm testsuite: ti_sdk_dra7x_release defconfig: ti_sdk_dra7x_release patch_dir: none overlay_dir: none
arch: arm testsuite: ti_sdk_omap2_release defconfig: ti_sdk_omap2_release patch_dir: none dt_overlay: none
arch: arm testsuite: ti_sdk_k2g_release defconfig: ti_sdk_k2g_release patch_dir: none dt_overlay: none
-arch: arm testsuite: ti_sdk_k2g_release defconfig: ti_sdk_k2g_release patch_dir: none dt_overlay: none
arch: arm testsuite: ti_sdk_keystone_release defconfig: ti_sdk_keystone_release patch_dir: none dt_overlay: none
arch: arm testsuite: ti_sdk_omapl138_release defconfig: ti_sdk_omapl138_release patch_dir: none dt_overlay: none
arch: arm64 testsuite: ti_sdk_arm64_release defconfig: ti_sdk_arm64_release patch_dir: none dt_overlay: none
diff --git a/system_test/build_system_test.sh b/system_test/build_system_test.sh
index 099cce4..7ce8693 100755
--- a/system_test/build_system_test.sh
+++ b/system_test/build_system_test.sh
@@ -214,7 +214,6 @@ if [ -z ${DEFCONFIG_BASE} ]; then
exit 1
fi
-DEFCONFIG=${DEFCONFIG_BASE}"_defconfig"
KERNEL_OUT=${BASE_OUTPUT_DIR}"/"${TESTSUITE}"/kernel_out"
if [ ${ARCH} = "arm64" ]; then
@@ -235,15 +234,22 @@ fi
check_for_compiler
-build_defconfig
-
-copy_defconfig_to_kernel
+IN_TREE_DEFCONFIG=$(grep -c "defconfig" <<< ${DEFCONFIG_BASE})
+if [ ${IN_TREE_DEFCONFIG} -eq 0 ]; then
+ DEFCONFIG=${DEFCONFIG_BASE}"_defconfig"
+ build_defconfig
+ copy_defconfig_to_kernel
+else
+ DEFCONFIG=${DEFCONFIG_BASE}
+fi
set_working_directory
cross_make ARCH=${ARCH} O=${KERNEL_OUT} ${DEFCONFIG}
-remove_defconfig_from_kernel
+if [ ${IN_TREE_DEFCONFIG} -eq 0 ]; then
+ remove_defconfig_from_kernel
+fi
build_the_kernel