Merge branch 'master' of github.com:nerves-project/nerves_system_rpi3

Author: connor rigby

.circleci/config.yml

@@ -5,7 +5,7 @@ defaults: &defaults
   environment:
     ENV: CI
     MIX_ENV: test
-    ELIXIR_VERSION: 1.5.1
+    ELIXIR_VERSION: 1.5.2
 
 install_elixir: &install_elixir
   run:
@@ -25,7 +25,7 @@ install_hex_rebar: &install_hex_rebar
 install_nerves_bootstrap: &install_nerves_bootstrap
   run:
     name: Install nerves_bootstrap
-    command: mix archive.install https://github.com/nerves-project/archives/raw/master/nerves_bootstrap.ez --force
+    command: mix archive.install hex nerves_bootstrap --force
 
 version: 2.0
 
@@ -41,12 +41,12 @@ jobs:
           name: Install dependencies
           command: mix deps.get
       - restore_cache:
-          key: nerves/cache
+          key: nerves/cache-{{ .Environment.CIRCLE_PROJECT_USERNAME}}-{{ .Environment.CIRCLE_PROJECT_REPONAME}}
       - run:
           name: Build
           command: mix compile
       - save_cache:
-          key: nerves/cache
+          key: nerves/cache-{{ .Environment.CIRCLE_PROJECT_USERNAME}}-{{ .Environment.CIRCLE_PROJECT_REPONAME}}
           paths:
             - "/nerves/cache"
       - run:
@@ -154,7 +154,7 @@ jobs:
           command: grep -Pazo "(?s)(?<=## ${CIRCLE_TAG})[^#]+" /nerves/deploy/system/CHANGELOG.md > /nerves/deploy/system/RELEASE_NOTES
       - run:
           name: Deploy artifacts to Github
-          command: ./ghr -draft -t $GITHUB_TOKEN -u nerves-project -r $CIRCLE_PROJECT_REPONAME -b "$(cat /nerves/deploy/system/RELEASE_NOTES)" -replace $CIRCLE_TAG /nerves/deploy/system/artifacts
+          command: ./ghr -draft -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -b "$(cat /nerves/deploy/system/RELEASE_NOTES)" -replace $CIRCLE_TAG /nerves/deploy/system/artifacts
 
 workflows:
   version: 2

fwup.conf

@@ -111,6 +111,9 @@ file-resource zImage {
 file-resource bcm2710-rpi-3-b.dtb {
     host-path = "${NERVES_SYSTEM}/images/bcm2710-rpi-3-b.dtb"
 }
+file-resource bcm2710-rpi-cm3.dtb {
+    host-path = "${NERVES_SYSTEM}/images/bcm2710-rpi-cm3.dtb"
+}
 file-resource w1-gpio-pullup.dtbo {
     host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/w1-gpio-pullup.dtbo"
 }
@@ -205,6 +208,7 @@ task complete {
     on-resource fixup.dat { fat_write(${BOOT_A_PART_OFFSET}, "fixup.dat") }
     on-resource zImage { fat_write(${BOOT_A_PART_OFFSET}, "zImage") }
     on-resource bcm2710-rpi-3-b.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-3-b.dtb") }
+    on-resource bcm2710-rpi-cm3.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-cm3.dtb") }
     on-resource w1-gpio-pullup.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/w1-gpio-pullup.dtbo") }
 
     on-resource rootfs.img {
@@ -261,6 +265,7 @@ task upgrade.a {
     on-resource fixup.dat { fat_write(${BOOT_A_PART_OFFSET}, "fixup.dat") }
     on-resource zImage { fat_write(${BOOT_A_PART_OFFSET}, "zImage") }
     on-resource bcm2710-rpi-3-b.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-3-b.dtb") }
+    on-resource bcm2710-rpi-cm3.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-cm3.dtb") }
     on-resource w1-gpio-pullup.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/w1-gpio-pullup.dtbo") }
     on-resource rootfs.img { raw_write(${ROOTFS_A_PART_OFFSET}) }
 
@@ -320,6 +325,7 @@ task upgrade.b {
     on-resource fixup.dat { fat_write(${BOOT_B_PART_OFFSET}, "fixup.dat") }
     on-resource zImage { fat_write(${BOOT_B_PART_OFFSET}, "zImage") }
     on-resource bcm2710-rpi-3-b.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2710-rpi-3-b.dtb") }
+    on-resource bcm2710-rpi-cm3.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2710-rpi-cm3.dtb") }
     on-resource w1-gpio-pullup.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/w1-gpio-pullup.dtbo") }
     on-resource rootfs.img { raw_write(${ROOTFS_B_PART_OFFSET}) }
 

nerves_defconfig

@@ -1,5 +1,5 @@
 BR2_arm=y
-BR2_cortex_a7=y
+BR2_cortex_a53=y
 BR2_ARM_FPU_NEON_VFPV4=y
 BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches"
 BR2_TOOLCHAIN_EXTERNAL=y
@@ -26,7 +26,7 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="04c8e47067d4873c584395e5cb260b4f170a99ea"
 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_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3"
 BR2_LINUX_KERNEL_EXT_KERNEL_WIRELESS_REGDB=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/busybox-1.22.config"
 BR2_PACKAGE_E2FSPROGS=y