Bump RPi kernel to 4.4.43

nerves-project · Jan 27, 2017 · 637b115 · 637b115
1 parent 83e2c11
commit 637b115
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## v0.10.0
 
   * New features
+    * Upgraded the Linux kernel to 4.4.43. This also removes the
+      call to mkknlimg which is no longer needed.
     * Bump toolchain to use gcc 5.3 (previously using gcc 4.9.3)
 
 ## v0.9.0

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This is the base Nerves System configuration for the Raspberry Pi 2 Model B.
 | CPU                  | 900 MHz quad-core ARM Cortex-A7 |
 | Memory               | 1 GB DRAM                       |
 | Storage              | MicroSD                         |
-| Linux kernel         | 4.4 w/ Raspberry Pi patches     |
+| Linux kernel         | 4.4.43 w/ Raspberry Pi patches  |
 | IEx terminal         | HDMI and USB keyboard (can be changed to UART)   |
 | GPIO, I2C, SPI       | Yes - Elixir ALE                |
 | ADC                  | No                              |

diff --git a/fwup.conf b/fwup.conf
@@ -74,9 +74,7 @@ file-resource cmdline.txt {
     host-path = "${NERVES_SYSTEM}/images/cmdline.txt"
 }
 file-resource zImage {
-    # All Nerves configs use the DT kernel, but if you don't want it, remove
-    # the .mkknlimg part of the next line.
-    host-path = "${NERVES_SYSTEM}/images/zImage.mkknlimg"
+    host-path = "${NERVES_SYSTEM}/images/zImage"
 }
 file-resource bcm2709-rpi-2-b.dtb {
     host-path = "${NERVES_SYSTEM}/images/bcm2709-rpi-2-b.dtb"

diff --git a/nerves_defconfig b/nerves_defconfig
@@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-createfs.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="26f3b72a9c049be10e6af196252283e1f6ab9d1f"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1ebe8d4a4c96cd6a90805c74233a468854960f67"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-4.4.defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

diff --git a/post-createfs.sh b/post-createfs.sh
@@ -4,9 +4,5 @@ set -e
 
 FWUP_CONFIG=$NERVES_DEFCONFIG_DIR/fwup.conf
 
-# Mark the Raspberry Pi kernel image as using device tree
-$HOST_DIR/usr/bin/mkknlimg \
-    $BINARIES_DIR/zImage $BINARIES_DIR/zImage.mkknlimg
-
 # Run the common post-image processing for nerves
 $BR2_EXTERNAL_NERVES_PATH/board/nerves-common/post-createfs.sh $TARGET_DIR $FWUP_CONFIG