fix rpi3 build. waiting on nerves updates later today for rpi and rpi2

2017-01-30 09:31:34 -08:00 · 2017-01-30 09:31:34 -08:00 · dd0e3454b3
parent 575462c633
commit dd0e3454b3
12 changed files with 33 additions and 95 deletions
--- a/12
+++ b/12
@ -1,7 +1,7 @@
 # THIS FILE WAS GENERATED BY `build_makefile.exs`
-# c03cf14
-# Tue Jan 24 15:45:14 2017 -0800
-# bump-version
+# 575462c
+# Mon Jan 30 08:09:33 2017 -0800
+# added-set_user_env-celery_script

 default: rpi3

@ -49,7 +49,7 @@ firmware-rpi:
 	scripts/build_firmware.sh rpi

 release-rpi: rpi
-	scripts/build_release_images.sh rpi 3.0.2
+	scripts/build_release_images.sh rpi 3.0.3-staging

 ## end rpi portion.
 ## begin rpi3 portion.
@ -77,7 +77,7 @@ firmware-rpi3:
 	scripts/build_firmware.sh rpi3

 release-rpi3: rpi3
-	scripts/build_release_images.sh rpi3 3.0.2
+	scripts/build_release_images.sh rpi3 3.0.3-staging

 ## end rpi3 portion.
 ## begin rpi2 portion.
@ -105,7 +105,7 @@ firmware-rpi2:
 	scripts/build_firmware.sh rpi2

 release-rpi2: rpi2
-	scripts/build_release_images.sh rpi2 3.0.2
+	scripts/build_release_images.sh rpi2 3.0.3-staging

 ## end rpi2 portion.

--- a/apps/farmbot/VERSION
+++ b/apps/farmbot/VERSION
@ -1 +1 @@
-3.0.2
+3.0.3-staging
--- a/apps/nerves_system_rpi2/mix.exs
+++ b/apps/nerves_system_rpi2/mix.exs
@ -20,9 +20,17 @@ defmodule NervesSystemRpi2.Mixfile do
  end

  defp deps do
-    [{:nerves, "~> 0.4.0"},
-     {:nerves_system_br, "~> 0.8.1"},
+    [{:nerves,  "~> 0.4.0"},
     {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.8.0"}]
+    ++ [find_nerves_system_br()]
+  end
+
+  def find_nerves_system_br do
+    if File.exists?("../nerves_system_br") do
+      {:nerves_system_br, in_umbrella: true}
+    else
+      {:nerves_system_br, "~> 0.8.1"}
+    end
  end

  defp description do
--- a/apps/nerves_system_rpi3/README.md
+++ b/apps/nerves_system_rpi3/README.md
@ -9,7 +9,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                              |
--- a/apps/nerves_system_rpi3/VERSION
+++ b/apps/nerves_system_rpi3/VERSION
@ -1 +1 @@
-0.9.0
+0.10.0
--- a/apps/nerves_system_rpi3/fwup.conf
+++ b/apps/nerves_system_rpi3/fwup.conf
@ -76,7 +76,7 @@ file-resource 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"
--- a/apps/nerves_system_rpi3/mix.exs
+++ b/apps/nerves_system_rpi3/mix.exs
@ -19,7 +19,7 @@ defmodule NervesSystemRpi3.Mixfile do

  defp deps do
    [{:nerves,  "~> 0.4.0"},
-     {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.8.0"}]
+     {:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.9.0"}]
    ++ [find_nerves_system_br()]
  end

@ -27,7 +27,7 @@ defmodule NervesSystemRpi3.Mixfile do
    if File.exists?("../nerves_system_br") do
      {:nerves_system_br, in_umbrella: true}
    else
-      {:nerves_system_br, "~> 0.8.1"}
+      {:nerves_system_br, "~> 0.9.2"}
    end
  end

--- a/apps/nerves_system_rpi3/nerves.exs
+++ b/apps/nerves_system_rpi3/nerves.exs
@ -13,7 +13,7 @@ config pkg, :nerves_env,
  version: version,
  compiler: :nerves_package,
  artifact_url: [
-    "https://github.com/nerves-project/#{pkg}/releases/download/v#{version}/#{pkg}-v#{version}.tar.gz"
+    "https://github.com/FarmBot/farmbot_os/releases/download/v#{version}/farmbot.rootfs-#{pkg}-v#{version}.tar.gz"
    ],
  platform: Nerves.System.BR,
  platform_config: [
--- a/apps/nerves_system_rpi3/nerves_defconfig
+++ b/apps/nerves_system_rpi3/nerves_defconfig
@ -5,9 +5,9 @@ BR2_CCACHE=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
@ -18,19 +18,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_BUSYBOX_CONFIG_FRAGMENT_FILES="${NERVES_DEFCONFIG_DIR}/busybox_defconfig"
 BR2_PACKAGE_E2FSPROGS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
--- a/apps/nerves_system_rpi3/post-createfs.sh
+++ b/apps/nerves_system_rpi3/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
--- a/apps/nerves_system_rpi3/rootfs-additions/lib/firmware/brcm/brcmfmac43430-sdio.txt
+++ b/apps/nerves_system_rpi3/rootfs-additions/lib/firmware/brcm/brcmfmac43430-sdio.txt
@ -1,66 +0,0 @@
-# NVRAM file for BCM943430WLPTH
-# 2.4 GHz, 20 MHz BW mode
-
-# The following parameter values are just placeholders, need to be updated.
-manfid=0x2d0
-prodid=0x0727
-vendid=0x14e4
-devid=0x43e2
-boardtype=0x0727
-boardrev=0x1101
-boardnum=22
-macaddr=00:90:4c:c5:12:38
-sromrev=11
-boardflags=0x00404201
-boardflags3=0x08000000
-xtalfreq=37400
-nocrc=1
-ag0=255
-aa2g=1
-ccode=ALL
-
-pa0itssit=0x20
-extpagain2g=0
-#PA parameters for 2.4GHz, measured at CHIP OUTPUT
-pa2ga0=-168,7161,-820
-AvVmid_c0=0x0,0xc8
-cckpwroffset0=5
-
-# PPR params
-maxp2ga0=84
-txpwrbckof=6
-cckbw202gpo=0
-legofdmbw202gpo=0x66111111
-mcsbw202gpo=0x77711111
-propbw202gpo=0xdd
-
-# OFDM IIR :
-ofdmdigfilttype=18
-ofdmdigfilttypebe=18
-# PAPD mode:
-papdmode=1
-papdvalidtest=1
-pacalidx2g=42
-papdepsoffset=-22
-papdendidx=58
-
-# LTECX flags
-ltecxmux=0
-ltecxpadnum=0x0102
-ltecxfnsel=0x44
-ltecxgcigpio=0x01
-
-il0macaddr=00:90:4c:c5:12:38
-wl0id=0x431b
-
-deadman_to=0xffffffff
-# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG
-muxenab=0x1
-# CLDO PWM voltage settings - 0x4 - 1.1 volt
-#cldo_pwm=0x4
-
-#VCO freq 326.4MHz
-spurconfig=0x3 
-
-edonthd20l=-75
-edoffthd20ul=-80
--- a/mix.lock
+++ b/mix.lock
@ -8,7 +8,7 @@
  "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], []},
  "credo": {:hex, :credo, "0.6.0-rc1", "3db898270ba651aa7d8dc8d844f2827e0111526a01474ab088c7f7f677e83778", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, optional: false]}]},
  "dialyxir": {:hex, :dialyxir, "0.4.3", "a4daeebd0107de10d3bbae2ccb6b8905e69544db1ed5fe9148ad27cd4cb2c0cd", [:mix], []},
-  "distillery": {:hex, :distillery, "1.0.0", "a866a72bf2a3a5f078f5a249017ed951acda88a760d200512f91f585d74db1ec", [:mix], []},
+  "distillery": {:hex, :distillery, "1.1.0", "e9943bd29557e9c252a051d8ac4b47e597cd9bf2a74332b8628eab4954eb51d7", [:mix], []},
  "earmark": {:hex, :earmark, "1.0.3", "89bdbaf2aca8bbb5c97d8b3b55c5dd0cff517ecc78d417e87f1d0982e514557b", [:mix], []},
  "elixir_make": {:hex, :elixir_make, "0.4.0", "992f38fabe705bb45821a728f20914c554b276838433349d4f2341f7a687cddf", [:mix], []},
  "ex_doc": {:hex, :ex_doc, "0.14.5", "c0433c8117e948404d93ca69411dd575ec6be39b47802e81ca8d91017a0cf83c", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
@ -29,7 +29,7 @@
  "mime": {:hex, :mime, "1.0.1", "05c393850524767d13a53627df71beeebb016205eb43bfbd92d14d24ec7a1b51", [:mix], []},
  "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
  "mustache": {:hex, :mustache, "0.0.2", "870fbef411c47d17df06a57b8b3f69e26eb110cba0177c34e273db5d94369d9b", [:mix], []},
-  "nerves": {:hex, :nerves, "0.4.5", "1a82415b7b60fef675a50be85ba8c37b13713d45a47acdded64e6e28ea9309a5", [:mix], [{:distillery, "~> 1.0.0", [hex: :distillery, optional: false]}]},
+  "nerves": {:hex, :nerves, "0.4.6", "2026851cfbf67fd797e6a9f304498bb2d04f39f2d17d6e77ed82fab361178eae", [:mix], [{:distillery, "~> 1.0", [hex: :distillery, optional: false]}]},
  "nerves_firmware": {:git, "https://github.com/nerves-project/nerves_firmware.git", "b783df3867c82dc0abe6770079077a6f922c00a9", []},
  "nerves_firmware_http": {:git, "https://github.com/nerves-project/nerves_firmware_http.git", "cc2cb110b0587a482d454175916dc597d62c4bfa", []},
  "nerves_interim_wifi": {:git, "https://github.com/nerves-project/nerves_interim_wifi.git", "32e848274571e328ebd7155848cc28d020938429", []},
@ -37,7 +37,7 @@
  "nerves_network_interface": {:hex, :nerves_network_interface, "0.3.2", "e7450f7eccd7387ceebee6096a0646bcdc0dd4aa77077e5fa81f6767da9b77af", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}]},
  "nerves_ssdp_server": {:hex, :nerves_ssdp_server, "0.2.1", "2d010552023fc1a724e8cb5c92479a58552976e6f805b6dbf09babd31f923b8f", [:mix], []},
  "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]}]},
+  "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_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "0.8.0", "7e46564ce2b8eca7fed4d50a41a5bb7381d817e6d80d198c22e204758f49ff11", [: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_uart": {:hex, :nerves_uart, "0.1.1", "32e6186b1a1b1d744631126df0b6c4049ddde5b04bc0303de29ab86a2edf60a2", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, optional: false]}]},
 @ -1 +1 @@
 .9.0
 .10.0