merge ti: RobertCNelson/ti-linux-kernel@3f5abc5...03066ae

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
thess · Dec 10, 2015 · ce60ffa · ce60ffa
1 parent 86b24dc
commit ce60ffa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/patches/ti_omap2plus_defconfig b/patches/ti_omap2plus_defconfig
@@ -1187,6 +1187,7 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 # CONFIG_BT_ATH3K is not set
+CONFIG_BT_WILINK=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
@@ -1487,7 +1488,7 @@ CONFIG_EEPROM_93CX6=y
 #
 # Texas Instruments shared transport line discipline
 #
-# CONFIG_TI_ST is not set
+CONFIG_TI_ST=m
 # CONFIG_SENSORS_LIS3_SPI is not set
 CONFIG_SENSORS_LIS3_I2C=m
 

diff --git a/version.sh b/version.sh
@@ -24,7 +24,7 @@ toolchain="gcc_linaro_gnueabihf_4_9"
 #Kernel/Build
 KERNEL_REL=4.1
 KERNEL_TAG=${KERNEL_REL}.13
-BUILD=${build_prefix}-r35
+BUILD=${build_prefix}-r35.1
 kernel_rt=".12-rt13"
 
 #v4.X-rcX + upto SHA
@@ -37,7 +37,7 @@ BRANCH="ti-linux-${branch_prefix}4.1.y"
 DISTRO=cross
 DEBARCH=armhf
 
-ti_git_old_release="3df2123ade3f619c4f4d8d817b5185d5295a62c6"
-        ti_git_pre="d4855d1af636950461e5fe9d69752b3cefca75c5"
-       ti_git_post="3f5abc5c36e07a7e32be5e1490d18550c5928297"
+ti_git_old_release="3f5abc5c36e07a7e32be5e1490d18550c5928297"
+        ti_git_pre="3f5abc5c36e07a7e32be5e1490d18550c5928297"
+       ti_git_post="03066ae73fc380e3ea9da8cba63591a135b33b71"
 #