Merge pull request #25 from hypriot/upgrade-kernel-to-4.4.15

Upgrade kernel to 4.4.15 and some improvements
hypriot · Jul 25, 2016 · 2c0172b · 2c0172b
2 parents 0f85a8a + 89bf12e
commit 2c0172b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/kernel_configs/rpi1_docker_kernel_config b/kernel_configs/rpi1_docker_kernel_config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.10-hypriotos Kernel Configuration
+# Linux/arm 4.4.15-hypriotos Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -105,7 +105,7 @@ CONFIG_RCU_STALL_COMMON=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_GENERIC_SCHED_CLOCK=y
@@ -1497,7 +1497,7 @@ CONFIG_IFB=m
 # CONFIG_NET_TEAM is not set
 CONFIG_MACVLAN=m
 # CONFIG_MACVTAP is not set
-# CONFIG_IPVLAN is not set
+CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 CONFIG_NETCONSOLE=m

diff --git a/kernel_configs/rpi2_3_docker_kernel_config b/kernel_configs/rpi2_3_docker_kernel_config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.10-hypriotos Kernel Configuration
+# Linux/arm 4.4.15-hypriotos Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -107,7 +107,7 @@ CONFIG_RCU_STALL_COMMON=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
@@ -1655,7 +1655,7 @@ CONFIG_IFB=m
 # CONFIG_NET_TEAM is not set
 CONFIG_MACVLAN=m
 # CONFIG_MACVTAP is not set
-# CONFIG_IPVLAN is not set
+CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 CONFIG_NETCONSOLE=m
@@ -3378,6 +3378,15 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 # CONFIG_DRM_ARMADA is not set
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_FSL_DCU is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 CONFIG_DRM_BRIDGE=y
 
 #

diff --git a/scripts/compile_kernel.sh b/scripts/compile_kernel.sh
@@ -13,7 +13,8 @@ BUILD_ROOT=/var/kernel_build
 BUILD_CACHE=$BUILD_ROOT/cache
 ARM_TOOLS=$BUILD_CACHE/tools
 LINUX_KERNEL=$BUILD_CACHE/linux-kernel
-LINUX_KERNEL_COMMIT=52261e73a34f9ed7f1d049902842895a2c433a50 # Linux 4.4.10
+LINUX_KERNEL_COMMIT=4eda74f2dfcc8875482575c79471bde6766de3ad # Linux 4.4.15
+# LINUX_KERNEL_COMMIT=52261e73a34f9ed7f1d049902842895a2c433a50 # Linux 4.4.10
 # LINUX_KERNEL_COMMIT=36311a9ec4904c080bbdfcefc0f3d609ed508224 # Linux 4.1.8
 # LINUX_KERNEL_COMMIT="59e76bb7e2936acd74938bb385f0884e34b91d72"
 # LINUX_KERNEL_COMMIT=1f58c41a5aba262958c2869263e6fdcaa0aa3c00
@@ -71,7 +72,7 @@ function clone_or_update_repo_for () {
     git pull
   else
     echo "Cloning $repo_path with commit $repo_commit"
-    git clone --depth 200 $repo_url $repo_path
+    git clone --depth 20 $repo_url $repo_path
     if [ ! -z "${repo_commit}" ]; then
       cd $repo_path && git checkout -qf ${repo_commit}
     fi
@@ -111,7 +112,7 @@ create_kernel_for () {
 
   cd $LINUX_KERNEL
 
-  # add kernel branding for hyprOS
+  # add kernel branding for HypriotOS
   sed -i 's/^EXTRAVERSION =.*/EXTRAVERSION = -hypriotos/g' Makefile
 
   # save git commit id of this build