Merge pull request #9 from nerves-project/br-bump

Buildroot Bump 2016.11.1

.travis.yml

@@ -15,14 +15,6 @@ addons:
     - bc
     - libssl-dev
 
-notifications:
-  webhooks:
-    urls:
-      - $GITTER_WEBHOOK_URL
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: always     # options: [always|never|change] default: always
-
 # Cache downloaded files between builds
 cache:
     directories:
@@ -48,6 +40,9 @@ script:
   - mix deps.get
   - mix archive.install https://github.com/nerves-project/archives/raw/master/nerves_bootstrap.ez --force
   - mix compile
+  # Testing should be moved to locally execute mix test.
+  #  This will centralize the test suite for systems to the nerves package
+  #  Removing these for now
   # - export NERVES_SYSTEM=$NERVES_PACKAGE/_build/dev/nerves/system
   # - export NERVES_TOOLCHAIN=$NERVES_PACKAGE/_build/dev/nerves/toolchain
   # - git clone https://github.com/nerves-project/nerves-examples
@@ -62,7 +57,6 @@ before_deploy:
     - make system
     - cd $NERVES_PACKAGE
     - $NERVES_PACKAGE/deps/nerves_system_br/scripts/ci-deploy.sh
-
 deploy:
   # Deploy tagged releases to GitHub
   - provider: releases

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 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.1
 
 * Bug Fixes

README.md

@@ -11,7 +11,7 @@ This is the base Nerves System configuration for the Raspberry Pi 3 Model B.
 | CPU                  | 1.2 GHz quad-core ARMv8         |
 | Memory               | 1 GB DRAM                       |
 | Storage              | MicroSD                         |
-| Linux kernel         | 4.1 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                              |
@@ -29,7 +29,7 @@ If [available in Hex](https://hex.pm/docs/publish), the package can be installed
   1. Add nerves_system_rpi3 to your list of dependencies in `mix.exs`:
 
         def deps do
-          [{:nerves_system_rpi3, "~> 0.6.1"}]
+          [{:nerves_system_rpi3, "~> 0.10.0"}]
         end
 
   2. Ensure nerves_system_rpi3 is started before your application:

VERSION

@@ -1 +1 @@
-0.9.1
+0.10.0

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 bcm2710-rpi-3-b.dtb {
     host-path = "${NERVES_SYSTEM}/images/bcm2710-rpi-3-b.dtb"

linux-4.4.defconfig

@@ -109,7 +109,7 @@ CONFIG_USB_NET_SMSC95XX=y
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_NET_CDC_SUBSET is not set
 # CONFIG_USB_NET_ZAURUS is not set
-CONFIG_BRCMFMAC=y
+CONFIG_BRCMFMAC=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_KEYBOARD is not set

mix.exs

@@ -8,7 +8,7 @@ defmodule NervesSystemRpi3.Mixfile do
   def project do
     [app: :nerves_system_rpi3,
      version: @version,
-     elixir: "~> 1.2",
+     elixir: "~> 1.3",
      compilers: Mix.compilers ++ [:nerves_package],
      description: description(),
      package: package(),
@@ -22,8 +22,9 @@ defmodule NervesSystemRpi3.Mixfile do
 
   defp deps do
     [{:nerves, "~> 0.4.0"},
-     {:nerves_system_br, "~> 0.8.1"},
-     {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.8.0"}]
+     {:nerves_system_br, "~> 0.9.2"},
+     #{:nerves_system_br, github: "nerves-project/nerves_system_br", branch: "rpi-updates"},
+     {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.9.0"}]
   end
 
   defp description do

mix.lock

@@ -1,5 +1,5 @@
-%{"distillery": {:hex, :distillery, "1.0.0", "a866a72bf2a3a5f078f5a249017ed951acda88a760d200512f91f585d74db1ec", [:mix], []},
-  "nerves": {:hex, :nerves, "0.4.4", "6574a710d653c14a37e3383d02419f5a9ad2e65b2de9ad524f4eae2015d8aee6", [:mix], [{:distillery, "~> 1.0.0", [hex: :distillery, optional: false]}]},
-  "nerves_system_br": {:hex, :nerves_system_br, "0.8.2", "f9917e75b54fb3eadbd67c2123ac1406d0a7fdef24f1960e3577c759d0a6fbc7", [:mix], []},
-  "nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.8.0", "873f8d6f74413c14eda3462b397a88f043a6c3bd65f56ff57db4e2e1eaf48994", [:mix], [{:nerves, "~> 0.4.0", [hex: :nerves, optional: false]}, {:nerves_toolchain_ctng, "~> 0.8.0", [hex: :nerves_toolchain_ctng, optional: false]}]},
+%{"distillery": {:hex, :distillery, "1.1.0", "e9943bd29557e9c252a051d8ac4b47e597cd9bf2a74332b8628eab4954eb51d7", [:mix], []},
+  "nerves": {:hex, :nerves, "0.4.6", "2026851cfbf67fd797e6a9f304498bb2d04f39f2d17d6e77ed82fab361178eae", [:mix], [{:distillery, "~> 1.0", [hex: :distillery, optional: false]}]},
+  "nerves_system_br": {:hex, :nerves_system_br, "0.9.2", "81bde162f46cfc5a84f08ed34f5a1c8ede4c1d5a8d89f5658afc05388fe4ff69", [:mix], []},
+  "nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.9.0", "5a1bca8c46776ad24c358ab58800ed470f91a3e294ac6eb8ffda0041954781e1", [:mix], [{:nerves, "~> 0.4.0", [hex: :nerves, optional: false]}, {:nerves_toolchain_ctng, "~> 0.8.0", [hex: :nerves_toolchain_ctng, optional: false]}]},
   "nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "0.8.0", "6dff7ed51e1711c5f4da3d559bc528a8265e3dd950dda95f4d6832aed9dbe320", [:mix], []}}

nerves.exs

@@ -19,6 +19,7 @@ config pkg, :nerves_env,
     defconfig: "nerves_defconfig",
   ],
   checksum: [
+    "nerves_defconfig",
     "rootfs-additions",
     "linux-4.4.defconfig",
     "fwup.conf",

nerves_defconfig

@@ -4,9 +4,9 @@ BR2_ARM_FPU_NEON_VFPV4=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
 BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.8.0/nerves_toolchain_arm_unknown_linux_gnueabihf-0.8.0.linux-x86_64.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.9.0/nerves_toolchain_arm_unknown_linux_gnueabihf-0.9.0.linux-x86_64.tar.xz"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-unknown-linux-gnueabihf"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
+BR2_TOOLCHAIN_EXTERNAL_GCC_5=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
@@ -17,19 +17,19 @@ BR2_INIT_NONE=y
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ENABLE_LOCALE_WHITELIST="locale-archive"
 BR2_GENERATE_LOCALE="en_US.UTF-8"
-BR2_ROOTFS_OVERLAY="${NERVES_SYSTEM}/board/nerves-common/rootfs-additions ${NERVES_DEFCONFIG_DIR}/rootfs-additions"
-BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL}/board/nerves-common/post-build.sh"
+BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/rootfs-additions ${NERVES_DEFCONFIG_DIR}/rootfs-additions"
+BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/post-build.sh"
 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
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"
 BR2_LINUX_KERNEL_EXT_KERNEL_WIRELESS_REGDB=y
-BR2_PACKAGE_BUSYBOX_CONFIG="${NERVES_SYSTEM}/board/nerves-common/busybox-1.22.config"
+BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/busybox-1.22.config"
 BR2_PACKAGE_E2FSPROGS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set

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/board/nerves-common/post-createfs.sh $TARGET_DIR $FWUP_CONFIG
+$BR2_EXTERNAL_NERVES_PATH/board/nerves-common/post-createfs.sh $TARGET_DIR $FWUP_CONFIG