summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2016-06-21 02:05:09 +0000
committerDenys Dmytriyenko <denys@ti.com>2016-06-20 16:56:24 -0400
commit09715125ddfaa131ff64465cab5035e5a3452eda (patch)
treeefc7ba50bc2d7d596cd2c13983766074d22b38da
parent57c2c15749f87d74cfa62682e86b9e73f6272f21 (diff)
downloadmeta-ti-09715125ddfaa131ff64465cab5035e5a3452eda.tar.gz
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>
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.4/defconfig2
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.4/dra7xx/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.4/k2g-evm/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.4/keystone/defconfig2
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.4/ti33x/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.4/ti43x/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-rt-4.4/defconfig2
-rw-r--r--recipes-kernel/linux/linux-ti-staging-rt-4.4/dra7xx/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-rt-4.4/k2g-evm/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-rt-4.4/keystone/defconfig2
-rw-r--r--recipes-kernel/linux/linux-ti-staging-rt-4.4/ti33x/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-rt-4.4/ti43x/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-rt_4.4.bb2
-rw-r--r--recipes-kernel/linux/linux-ti-staging-systest-4.4/defconfig2
-rw-r--r--recipes-kernel/linux/linux-ti-staging-systest-4.4/dra7xx/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-systest-4.4/k2g-evm/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-systest-4.4/keystone/defconfig2
-rw-r--r--recipes-kernel/linux/linux-ti-staging-systest-4.4/ti33x/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging-systest-4.4/ti43x/defconfig1
-rw-r--r--recipes-kernel/linux/linux-ti-staging_4.4.bb15
-rw-r--r--recipes-kernel/linux/setup-defconfig.inc66
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:"
6 6
7BRANCH = "ti-rt-linux-4.4.y" 7BRANCH = "ti-rt-linux-4.4.y"
8 8
9SRCREV = "8c26434b1cf4e1c3011c7a9925aeb2bec735db6a" 9SRCREV = "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"
63KERNEL_DEVICETREE_k2g-evm = "keystone-k2g-evm.dtb" 63KERNEL_DEVICETREE_k2g-evm = "keystone-k2g-evm.dtb"
64KERNEL_DEVICETREE_k2l-evm = "keystone-k2l-evm.dtb" 64KERNEL_DEVICETREE_k2l-evm = "keystone-k2l-evm.dtb"
65 65
66KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
67
68COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3|omap4|keystone" 66COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3|omap4|keystone"
69 67
70S = "${WORKDIR}/git" 68S = "${WORKDIR}/git"
71 69
72BRANCH = "ti-lsk-linux-4.4.y" 70BRANCH = "ti-lsk-linux-4.4.y"
73 71
74SRCREV = "51452e46647ed57ae83e6a95e1a4d700260e6bf0" 72SRCREV = "26c74f51ccb2e7c63bf10defcef646f2cb4a3ea4"
75PV = "4.4.12+git${SRCPV}" 73PV = "4.4.13+git${SRCPV}"
76 74
77# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild 75# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
78MACHINE_KERNEL_PR_append = "a" 76MACHINE_KERNEL_PR_append = "a"
79PR = "${MACHINE_KERNEL_PR}" 77PR = "${MACHINE_KERNEL_PR}"
80 78
81KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
82
83KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${KERNEL_CONFIG_DIR}/am33xx_only.cfg"
84KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${KERNEL_CONFIG_DIR}/am43xx_only.cfg"
85KERNEL_CONFIG_FRAGMENTS_append_dra7xx = " ${KERNEL_CONFIG_DIR}/dra7_only.cfg"
86KERNEL_CONFIG_FRAGMENTS_append_k2g-evm = " ${KERNEL_CONFIG_DIR}/k2g_only.cfg"
87
88MULTI_CONFIG_BASE_SUFFIX = ""
89
90KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" 79KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
91KERNEL_GIT_PROTOCOL = "git" 80KERNEL_GIT_PROTOCOL = "git"
92SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ 81SRC_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() {
24 echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion 24 echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
25 echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion 25 echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
26 26
27 # First, check if pointing to a combined config with config fragments 27 # Zero, when using "tisdk" configs, pass control to defconfig_builder
28 config=`cat ${B}/.config | grep use-combined-config | cut -d= -f2` 28 config=`cat ${B}/.config | grep use-tisdk-config | cut -d= -f2`
29 if [ -n "$config" ] 29 if [ -n "$config" ]
30 then 30 then
31 cp ${S}/$config ${B}/.config 31 ${S}/ti_config_fragments/defconfig_builder.sh -w ${S} -t $config
32 fi 32 oe_runmake -C ${S} O=${B} "$config"_defconfig
33 else
34 # First, check if pointing to a combined config with config fragments
35 config=`cat ${B}/.config | grep use-combined-config | cut -d= -f2`
36 if [ -n "$config" ]
37 then
38 cp ${S}/$config ${B}/.config
39 fi
33 40
34 # Second, extract any config fragments listed in the defconfig 41 # Second, extract any config fragments listed in the defconfig
35 config=`cat ${B}/.config | grep config-fragment | cut -d= -f2` 42 config=`cat ${B}/.config | grep config-fragment | cut -d= -f2`
36 if [ -n "$config" ] 43 if [ -n "$config" ]
37 then 44 then
38 configfrags="" 45 configfrags=""
39 for f in $config 46 for f in $config
40 do 47 do
41 # Check if the config fragment is available 48 # Check if the config fragment is available
42 if [ ! -e "${S}/$f" ] 49 if [ ! -e "${S}/$f" ]
43 then 50 then
44 echo "Could not find kernel config fragment $f" 51 echo "Could not find kernel config fragment $f"
45 exit 1 52 exit 1
46 else 53 else
47 # Sanitize config fragment files to be relative to sources 54 # Sanitize config fragment files to be relative to sources
48 configfrags="$configfrags ${S}/$f" 55 configfrags="$configfrags ${S}/$f"
49 fi 56 fi
50 done 57 done
51 fi 58 fi
52 59
53 # Third, check if pointing to a known in kernel defconfig 60 # Third, check if pointing to a known in kernel defconfig
54 config=`cat ${B}/.config | grep use-kernel-config | cut -d= -f2` 61 config=`cat ${B}/.config | grep use-kernel-config | cut -d= -f2`
55 if [ -n "$config" ] 62 if [ -n "$config" ]
56 then 63 then
57 oe_runmake -C ${S} O=${B} $config 64 oe_runmake -C ${S} O=${B} $config
58 else 65 else
59 yes '' | oe_runmake -C ${S} O=${B} oldconfig 66 yes '' | oe_runmake -C ${S} O=${B} oldconfig
67 fi
60 fi 68 fi
61 69
62 # Fourth, handle config fragments specified in the recipe 70 # Fourth, handle config fragments specified in the recipe