linux-ti-staging: update to 4.4.13, use new defconfig builder

Convert to using tisdk configs from defconfig_map processed by defconfig_builder.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

21 files changed, 58 insertions, 49 deletions

diff --git a/recipes-kernel/linux/linux-ti-staging-4.4/defconfig b/recipes-kernel/linux/linux-ti-staging-4.4/defconfig
index 990e7f79..d083d182 100644
--- a/recipes-kernel/linux/linux-ti-staging-4.4/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.4/defconfig
@@ -1 +1 @@
-use-combined-config=ti_config_fragments/defconfig_fragment
+use-tisdk-config=ti_sdk_omap2_release
diff --git a/recipes-kernel/linux/linux-ti-staging-4.4/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-4.4/dra7xx/defconfig
new file mode 100644
index 00000000..dcb53bab
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-4.4/dra7xx/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_dra7x_release
diff --git a/recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig b/recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig
new file mode 100644
index 00000000..316b04bb
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_k2g_release
diff --git a/recipes-kernel/linux/linux-ti-staging-4.4/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-4.4/keystone/defconfig
index 470cf114..5a40b93d 100644
--- a/recipes-kernel/linux/linux-ti-staging-4.4/keystone/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-4.4/keystone/defconfig
@@ -1 +1 @@
-use-combined-config=ti_config_fragments/multi_core_defconfig_fragment
+use-tisdk-config=ti_sdk_keystone_release
diff --git a/recipes-kernel/linux/linux-ti-staging-4.4/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-4.4/ti33x/defconfig
new file mode 100644
index 00000000..88f80fa9
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-4.4/ti33x/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_am3x_release
diff --git a/recipes-kernel/linux/linux-ti-staging-4.4/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-4.4/ti43x/defconfig
new file mode 100644
index 00000000..4b9daaf9
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-4.4/ti43x/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_am4x_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.4/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.4/defconfig
index 2091fca5..f0b8bab0 100644
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.4/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.4/defconfig
@@ -1 +1 @@
-use-combined-config=ti_config_fragments/rt_defconfig_fragment
+use-tisdk-config=ti_sdk_omap2_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.4/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.4/dra7xx/defconfig
new file mode 100644
index 00000000..47e3d04a
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.4/dra7xx/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_dra7x_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/defconfig
new file mode 100644
index 00000000..a9c24f2e
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_k2g_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.4/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.4/keystone/defconfig
index 6d287533..fc68085f 100644
--- a/recipes-kernel/linux/linux-ti-staging-rt-4.4/keystone/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.4/keystone/defconfig
@@ -1 +1 @@
-use-combined-config=ti_config_fragments/rt_multi_core_defconfig_fragment
+use-tisdk-config=ti_sdk_keystone_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.4/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.4/ti33x/defconfig
new file mode 100644
index 00000000..0a4fbac2
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.4/ti33x/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_am3x_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.4/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.4/ti43x/defconfig
new file mode 100644
index 00000000..99594c81
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-rt-4.4/ti43x/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_am4x_rt_release
diff --git a/recipes-kernel/linux/linux-ti-staging-rt_4.4.bb b/recipes-kernel/linux/linux-ti-staging-rt_4.4.bb
index 159693b5..03c4ee3b 100644
--- a/recipes-kernel/linux/linux-ti-staging-rt_4.4.bb
+++ b/recipes-kernel/linux/linux-ti-staging-rt_4.4.bb
@@ -6,4 +6,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.4:"
 
 BRANCH = "ti-rt-linux-4.4.y"
 
-SRCREV = "8c26434b1cf4e1c3011c7a9925aeb2bec735db6a"
+SRCREV = "047640ce9624f2d6456e743954761af73527fa91"
diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.4/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.4/defconfig
index cfe4f991..155165db 100644
--- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/defconfig
@@ -1 +1 @@
-use-combined-config=ti_config_fragments/system_test_defconfig_fragment
+use-tisdk-config=ti_sdk_dbg_omap2_release
diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.4/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.4/dra7xx/defconfig
new file mode 100644
index 00000000..9e250caf
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/dra7xx/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_dbg_dra7x_release
diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig
new file mode 100644
index 00000000..32c70e79
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_dbg_k2g_release
diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.4/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.4/keystone/defconfig
index 68cfc252..4ed25d7b 100644
--- a/recipes-kernel/linux/linux-ti-staging-systest-4.4/keystone/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/keystone/defconfig
@@ -1 +1 @@
-use-combined-config=ti_config_fragments/multi_core_system_test_defconfig_fragment
+use-tisdk-config=ti_sdk_dbg_keystone_release
diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti33x/defconfig
new file mode 100644
index 00000000..4deed2c6
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti33x/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_dbg_am3x_release
diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti43x/defconfig
new file mode 100644
index 00000000..46460599
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-systest-4.4/ti43x/defconfig
@@ -0,0 +1 @@
+use-tisdk-config=ti_sdk_dbg_am4x_release
diff --git a/recipes-kernel/linux/linux-ti-staging_4.4.bb b/recipes-kernel/linux/linux-ti-staging_4.4.bb
index a756e4ad..8c1272cc 100644
--- a/recipes-kernel/linux/linux-ti-staging_4.4.bb
+++ b/recipes-kernel/linux/linux-ti-staging_4.4.bb
@@ -63,30 +63,19 @@ KERNEL_DEVICETREE_k2e-evm = "keystone-k2e-evm.dtb"
 KERNEL_DEVICETREE_k2g-evm = "keystone-k2g-evm.dtb"
 KERNEL_DEVICETREE_k2l-evm = "keystone-k2l-evm.dtb"
 
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3|omap4|keystone"
 
 S = "${WORKDIR}/git"
 
 BRANCH = "ti-lsk-linux-4.4.y"
 
-SRCREV = "51452e46647ed57ae83e6a95e1a4d700260e6bf0"
-PV = "4.4.12+git${SRCPV}"
+SRCREV = "26c74f51ccb2e7c63bf10defcef646f2cb4a3ea4"
+PV = "4.4.13+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR_append = "a"
 PR = "${MACHINE_KERNEL_PR}"
 
-KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
-
-KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${KERNEL_CONFIG_DIR}/am33xx_only.cfg"
-KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${KERNEL_CONFIG_DIR}/am43xx_only.cfg"
-KERNEL_CONFIG_FRAGMENTS_append_dra7xx = " ${KERNEL_CONFIG_DIR}/dra7_only.cfg"
-KERNEL_CONFIG_FRAGMENTS_append_k2g-evm = " ${KERNEL_CONFIG_DIR}/k2g_only.cfg"
-
-MULTI_CONFIG_BASE_SUFFIX = ""
-
 KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
 KERNEL_GIT_PROTOCOL = "git"
 SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
diff --git a/recipes-kernel/linux/setup-defconfig.inc b/recipes-kernel/linux/setup-defconfig.inc
index cfad14b2..7faf7f2b 100644
--- a/recipes-kernel/linux/setup-defconfig.inc
+++ b/recipes-kernel/linux/setup-defconfig.inc
@@ -24,39 +24,47 @@ do_configure() {
     echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
     echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
 
-    # First, check if pointing to a combined config with config fragments
-    config=`cat ${B}/.config | grep use-combined-config | cut -d= -f2`
+    # Zero, when using "tisdk" configs, pass control to defconfig_builder
+    config=`cat ${B}/.config | grep use-tisdk-config | cut -d= -f2`
     if [ -n "$config" ]
     then
-        cp ${S}/$config ${B}/.config
-    fi
+        ${S}/ti_config_fragments/defconfig_builder.sh -w ${S} -t $config
+        oe_runmake -C ${S} O=${B} "$config"_defconfig
+    else
+        # First, check if pointing to a combined config with config fragments
+        config=`cat ${B}/.config | grep use-combined-config | cut -d= -f2`
+        if [ -n "$config" ]
+        then
+            cp ${S}/$config ${B}/.config
+        fi
 
-    # Second, extract any config fragments listed in the defconfig
-    config=`cat ${B}/.config | grep config-fragment | cut -d= -f2`
-    if [ -n "$config" ]
-    then
-        configfrags=""
-        for f in $config
-        do
-            # Check if the config fragment is available
-            if [ ! -e "${S}/$f" ]
-            then
-                echo "Could not find kernel config fragment $f"
-                exit 1
-            else
-                # Sanitize config fragment files to be relative to sources
-                configfrags="$configfrags ${S}/$f"
-            fi
-        done
-    fi
+        # Second, extract any config fragments listed in the defconfig
+        config=`cat ${B}/.config | grep config-fragment | cut -d= -f2`
+        if [ -n "$config" ]
+        then
+            configfrags=""
+            for f in $config
+            do
+                # Check if the config fragment is available
+                if [ ! -e "${S}/$f" ]
+                then
+                    echo "Could not find kernel config fragment $f"
+                    exit 1
+                else
+                    # Sanitize config fragment files to be relative to sources
+                    configfrags="$configfrags ${S}/$f"
+                fi
+            done
+        fi
 
-    # Third, check if pointing to a known in kernel defconfig
-    config=`cat ${B}/.config | grep use-kernel-config | cut -d= -f2`
-    if [ -n "$config" ]
-    then
-        oe_runmake -C ${S} O=${B} $config
-    else
-        yes '' | oe_runmake -C ${S} O=${B} oldconfig
+        # Third, check if pointing to a known in kernel defconfig
+        config=`cat ${B}/.config | grep use-kernel-config | cut -d= -f2`
+        if [ -n "$config" ]
+        then
+            oe_runmake -C ${S} O=${B} $config
+        else
+            yes '' | oe_runmake -C ${S} O=${B} oldconfig
+        fi
     fi
 
     # Fourth, handle config fragments specified in the recipe