Skip to content

Commit e56d59e

Browse files
RickCarlinoRickCarlino
committed
v1.14.0-farmbot.1 - Merge upstream changes
2 parents d17115f + 79541eb commit e56d59e

15 files changed

+113
-122
lines changed

‎.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
exec: &exec
22
name: build-tools/nerves-system-br
3-
version: 1.13.2
4-
elixir: 1.10.4-otp-23
3+
version: 1.14.4
4+
elixir: 1.11.3-otp-23
55

66
version: 2.1
77

88
orbs:
9-
build-tools: nerves-project/[email protected].2
9+
build-tools: nerves-project/[email protected].4
1010

1111
workflows:
1212
version: 2

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This is the base Nerves System configuration for the Raspberry Pi 3 Model B.
1313
| CPU | 1.2 GHz quad-core Cortex-A53 (ARMv8) |
1414
| Memory | 1 GB DRAM |
1515
| Storage | MicroSD |
16-
| Linux kernel | 4.19 w/ Raspberry Pi patches |
16+
| Linux kernel | 5.4 w/ Raspberry Pi patches |
1717
| IEx terminal | HDMI and USB keyboard (can be changed to UART) |
1818
| GPIO, I2C, SPI | Yes - [Elixir Circuits](https://github.com/elixir-circuits) |
1919
| ADC | No |
@@ -22,7 +22,7 @@ This is the base Nerves System configuration for the Raspberry Pi 3 Model B.
2222
| Display | HDMI or 7" RPi Touchscreen |
2323
| Camera | Yes - via rpi-userland |
2424
| Ethernet | Yes |
25-
| WiFi | Yes - Nerves.Network |
25+
| WiFi | Yes - [VintageNet](https://hex.pm/packages/vintage_net) |
2626
| Bluetooth | Watch [Harald](https://github.com/verypossible/harald) |
2727
| Audio | HDMI/Stereo out |
2828

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.13.0-farmbot.1
1+
1.14.0-farmbot.1

‎cmdline.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# NOTES:
2-
# 1. serial0 is magically replaced to the right thing by the RPi bootloader.
3-
# /dev/serial0 won't exist unless you make it, so don't expected it in
4-
# userland.
5-
# 2. If not using HDMI, remove console=tty1 and consoleblank=0
6-
vt.global_cursor_default=0 console=tty1 console=serial0,115200 fbcon=scrollback:1024k root=/dev/mmcblk0p2 rootwait consoleblank=0
1+
# OLD CMDLINE:
2+
# vt.global_cursor_default=0 console=tty1 console=serial0,115200 fbcon=scrollback:1024k root=/dev/mmcblk0p2 rootwait consoleblank=0
3+
# NEW CMDLINE
4+
console=tty1 console=serial0,115200 fbcon=scrollback:1024k root=/dev/mmcblk0p2 rootwait consoleblank=0 quiet

‎config.txt

+5
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,9 @@ dtoverlay=ramoops
4343

4444
# Enable the UART (/dev/ttyAMA0) on the RPi3.
4545
enable_uart=1
46+
47+
# Our dtoverlay (old):
4648
dtoverlay=pi3-disable-bt
49+
50+
# Upstream dtoverlay (new):
51+
dtoverlay=miniuart-bt

‎fwup.conf

+6-6
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ file-resource bcm2710-rpi-cm3.dtb {
129129
file-resource w1-gpio-pullup.dtbo {
130130
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/w1-gpio-pullup.dtbo"
131131
}
132-
file-resource pi3-disable-bt.dtbo {
133-
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/pi3-disable-bt.dtbo"
132+
file-resource miniuart-bt.dtbo {
133+
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/miniuart-bt.dtbo"
134134
}
135135
file-resource ramoops.dtbo {
136136
host-path = "${NERVES_SYSTEM}/images/ramoops.dtb"
@@ -237,7 +237,7 @@ task complete {
237237
on-resource rpi-backlight.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
238238
on-resource bcm2710-rpi-cm3.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-cm3.dtb") }
239239
on-resource w1-gpio-pullup.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/w1-gpio-pullup.dtbo") }
240-
on-resource pi3-disable-bt.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/pi3-disable-bt.dtbo") }
240+
on-resource miniuart-bt.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/miniuart-bt.dtbo") }
241241
on-resource ramoops.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/ramoops.dtbo") }
242242

243243
on-resource rootfs.img {
@@ -303,7 +303,7 @@ task upgrade.a {
303303
on-resource rpi-backlight.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
304304
on-resource bcm2710-rpi-cm3.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-cm3.dtb") }
305305
on-resource w1-gpio-pullup.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/w1-gpio-pullup.dtbo") }
306-
on-resource pi3-disable-bt.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/pi3-disable-bt.dtbo") }
306+
on-resource miniuart-bt.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/miniuart-bt.dtbo") }
307307
on-resource ramoops.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/ramoops.dtbo") }
308308
on-resource rootfs.img {
309309
delta-source-raw-offset=${ROOTFS_B_PART_OFFSET}
@@ -376,7 +376,7 @@ task upgrade.b {
376376
on-resource rpi-backlight.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
377377
on-resource bcm2710-rpi-cm3.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2710-rpi-cm3.dtb") }
378378
on-resource w1-gpio-pullup.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/w1-gpio-pullup.dtbo") }
379-
on-resource pi3-disable-bt.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/pi3-disable-bt.dtbo") }
379+
on-resource miniuart-bt.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/miniuart-bt.dtbo") }
380380
on-resource ramoops.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/ramoops.dtbo") }
381381
on-resource rootfs.img {
382382
delta-source-raw-offset=${ROOTFS_A_PART_OFFSET}
@@ -420,4 +420,4 @@ task upgrade.wrongplatform {
420420
on-init {
421421
error("Expecting platform=${NERVES_FW_PLATFORM} and architecture=${NERVES_FW_ARCHITECTURE}")
422422
}
423-
}
423+
}

‎linux-4.19.defconfig renamed to ‎linux-5.4.defconfig

+8-12
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ CONFIG_BLK_DEV_THROTTLING=y
5959
CONFIG_BLK_WBT=y
6060
CONFIG_PARTITION_ADVANCED=y
6161
# CONFIG_EFI_PARTITION is not set
62-
# CONFIG_IOSCHED_DEADLINE is not set
63-
CONFIG_CFQ_GROUP_IOSCHED=y
6462
# CONFIG_MQ_IOSCHED_DEADLINE is not set
6563
# CONFIG_MQ_IOSCHED_KYBER is not set
6664
CONFIG_CLEANCACHE=y
@@ -70,6 +68,7 @@ CONFIG_NET=y
7068
CONFIG_PACKET=y
7169
CONFIG_UNIX=y
7270
CONFIG_INET=y
71+
CONFIG_IP_MULTICAST=y
7372
CONFIG_IP_ADVANCED_ROUTER=y
7473
CONFIG_IP_MULTIPLE_TABLES=y
7574
CONFIG_IP_ROUTE_VERBOSE=y
@@ -81,9 +80,6 @@ CONFIG_TCP_CONG_ADVANCED=y
8180
# CONFIG_TCP_CONG_BIC is not set
8281
# CONFIG_TCP_CONG_WESTWOOD is not set
8382
# CONFIG_TCP_CONG_HTCP is not set
84-
# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
85-
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
86-
# CONFIG_INET6_XFRM_MODE_BEET is not set
8783
# CONFIG_IPV6_SIT is not set
8884
CONFIG_NETFILTER=y
8985
CONFIG_NF_CONNTRACK=m
@@ -145,8 +141,6 @@ CONFIG_MAC80211_MESH=y
145141
CONFIG_RFKILL=y
146142
CONFIG_DEVTMPFS=y
147143
CONFIG_DEVTMPFS_MOUNT=y
148-
CONFIG_DMA_CMA=y
149-
CONFIG_CMA_SIZE_MBYTES=5
150144
CONFIG_CONNECTOR=m
151145
CONFIG_OF_CONFIGFS=y
152146
CONFIG_BLK_DEV_LOOP=y
@@ -227,8 +221,7 @@ CONFIG_INPUT_EVDEV=y
227221
CONFIG_INPUT_JOYSTICK=y
228222
CONFIG_JOYSTICK_RPISENSE=m
229223
CONFIG_INPUT_TOUCHSCREEN=y
230-
CONFIG_TOUCHSCREEN_RPI_FT5406=m
231-
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
224+
CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
232225
CONFIG_INPUT_MISC=y
233226
CONFIG_INPUT_AD714X=m
234227
# CONFIG_SERIO is not set
@@ -290,13 +283,13 @@ CONFIG_DRM=m
290283
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
291284
CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
292285
CONFIG_DRM_VC4=m
293-
CONFIG_DRM_TINYDRM=m
294286
CONFIG_TINYDRM_REPAPER=m
295287
CONFIG_FB=y
296288
CONFIG_FB_BCM2708=y
297289
CONFIG_FB_RPISENSE=m
298-
CONFIG_BACKLIGHT_LCD_SUPPORT=y
299-
CONFIG_BACKLIGHT_RPI=m
290+
CONFIG_BACKLIGHT_CLASS_DEVICE=m
291+
# CONFIG_BACKLIGHT_GENERIC is not set
292+
CONFIG_BACKLIGHT_GPIO=m
300293
CONFIG_FRAMEBUFFER_CONSOLE=y
301294
CONFIG_LOGO=y
302295
# CONFIG_LOGO_LINUX_MONO is not set
@@ -348,6 +341,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y
348341
CONFIG_LEDS_TRIGGER_CAMERA=y
349342
CONFIG_LEDS_TRIGGER_INPUT=y
350343
CONFIG_LEDS_TRIGGER_PANIC=y
344+
CONFIG_LEDS_TRIGGER_PATTERN=y
351345
CONFIG_RTC_CLASS=y
352346
# CONFIG_RTC_HCTOSYS is not set
353347
CONFIG_DMADEVICES=y
@@ -390,5 +384,7 @@ CONFIG_CRYPTO_GCM=y
390384
CONFIG_CRYPTO_CMAC=y
391385
CONFIG_CRYPTO_ARC4=y
392386
# CONFIG_CRYPTO_HW is not set
387+
CONFIG_DMA_CMA=y
388+
CONFIG_CMA_SIZE_MBYTES=5
393389
CONFIG_PRINTK_TIME=y
394390
CONFIG_PANIC_TIMEOUT=10

‎linux/0001-brcmfmac-add-a-note-to-commonly-reported-error.patch

-25
This file was deleted.

‎mix.exs

+16-8
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,24 @@ defmodule FarmbotSystemRpi3.Mixfile do
4848
platform_config: [
4949
defconfig: "nerves_defconfig"
5050
],
51+
# The :env key is an optional experimental feature for adding environment
52+
# variables to the crosscompile environment. These are intended for
53+
# llvm-based tooling that may need more precise processor information.
54+
env: [
55+
{"TARGET_ARCH", "arm"},
56+
{"TARGET_CPU", "cortex_a53"},
57+
{"TARGET_OS", "linux"},
58+
{"TARGET_ABI", "gnueabihf"}
59+
],
5160
checksum: package_files()
5261
]
5362
end
5463

5564
defp deps do
5665
[
57-
{:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.0", runtime: false},
58-
{:nerves_system_br, "1.13.2", runtime: false},
59-
{:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 1.3.0", runtime: false},
66+
{:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.4", runtime: false},
67+
{:nerves_system_br, "1.14.4", runtime: false},
68+
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 1.4.0", runtime: false},
6069
{:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
6170
{:ex_doc, "~> 0.22", only: :docs, runtime: false}
6271
]
@@ -96,7 +105,7 @@ defmodule FarmbotSystemRpi3.Mixfile do
96105
"fwup-revert.conf",
97106
"fwup.conf",
98107
"LICENSE",
99-
"linux-4.19.defconfig",
108+
"linux-5.4.defconfig",
100109
"mix.exs",
101110
"nerves_defconfig",
102111
"post-build.sh",
@@ -113,10 +122,9 @@ defmodule FarmbotSystemRpi3.Mixfile do
113122
end
114123

115124
defp build_runner_opts() do
116-
if primary_site = System.get_env("BR2_PRIMARY_SITE") do
117-
[make_args: ["BR2_PRIMARY_SITE=#{primary_site}"]]
118-
else
119-
[]
125+
case System.get_env("BR2_PRIMARY_SITE") do
126+
nil -> []
127+
primary_site -> [make_args: ["BR2_PRIMARY_SITE=#{primary_site}"]]
120128
end
121129
end
122130

‎mix.lock

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
%{
2-
"earmark": {:hex, :earmark, "1.4.9", "837e4c1c5302b3135e9955f2bbf52c6c52e950c383983942b68b03909356c0d9", [:mix], [{:earmark_parser, ">= 1.4.9", [hex: :earmark_parser, repo: "hexpm", optional: false]}], "hexpm", "0d72df7d13a3dc8422882bed5263fdec5a773f56f7baeb02379361cb9e5b0d8e"},
3-
"earmark_parser": {:hex, :earmark_parser, "1.4.10", "6603d7a603b9c18d3d20db69921527f82ef09990885ed7525003c7fe7dc86c56", [:mix], [], "hexpm", "8e2d5370b732385db2c9b22215c3f59c84ac7dda7ed7e544d7c459496ae519c0"},
4-
"elixir_make": {:hex, :elixir_make, "0.6.1", "8faa29a5597faba999aeeb72bbb9c91694ef8068f0131192fb199f98d32994ef", [:mix], [], "hexpm", "35d33270680f8d839a4003c3e9f43afb595310a592405a00afc12de4c7f55a18"},
5-
"ex_doc": {:hex, :ex_doc, "0.22.6", "0fb1e09a3e8b69af0ae94c8b4e4df36995d8c88d5ec7dbd35617929144b62c00", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "1e0aceda15faf71f1b0983165e6e7313be628a460e22a031e32913b98edbd638"},
2+
"earmark_parser": {:hex, :earmark_parser, "1.4.12", "b245e875ec0a311a342320da0551da407d9d2b65d98f7a9597ae078615af3449", [:mix], [], "hexpm", "711e2cc4d64abb7d566d43f54b78f7dc129308a63bc103fbd88550d2174b3160"},
3+
"elixir_make": {:hex, :elixir_make, "0.6.2", "7dffacd77dec4c37b39af867cedaabb0b59f6a871f89722c25b28fcd4bd70530", [:mix], [], "hexpm", "03e49eadda22526a7e5279d53321d1cced6552f344ba4e03e619063de75348d9"},
4+
"ex_doc": {:hex, :ex_doc, "0.23.0", "a069bc9b0bf8efe323ecde8c0d62afc13d308b1fa3d228b65bca5cf8703a529d", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "f5e2c4702468b2fd11b10d39416ddadd2fcdd173ba2a0285ebd92c39827a5a16"},
65
"makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
7-
"makeup_elixir": {:hex, :makeup_elixir, "0.15.0", "98312c9f0d3730fde4049985a1105da5155bfe5c11e47bdc7406d88e01e4219b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "75ffa34ab1056b7e24844c90bfc62aaf6f3a37a15faa76b07bc5eba27e4a8b4a"},
8-
"nerves": {:hex, :nerves, "1.6.5", "9bcdf358ba1451da3e0fee9454f075ae800b44688cc52ec4f08f64c43683b880", [:make, :mix], [{:distillery, "~> 2.1", [hex: :distillery, repo: "hexpm", optional: true]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "80805fbc634b510ff77df1033d9268e6056c13ee813b2203691adb621a2adc09"},
9-
"nerves_system_br": {:hex, :nerves_system_br, "1.13.2", "8cc4a53de3a54e605a4d5d88512eb851be05010fc31deea1bb940cfad3e1f0b2", [:mix], [], "hexpm", "37f41000289eaa6b3b80a81d5612aa28b433bf27cd695db0200e83ddedadd671"},
6+
"makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"},
7+
"nerves": {:hex, :nerves, "1.7.4", "6dc9c9c79baf9af540e34638e2fd964700f68f8dcece7cad26048c3a89ef6788", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ac99ab1aa27ace81fd6d49e311697e8027b5c34b00728523e0721a8e2f4414eb"},
8+
"nerves_system_br": {:hex, :nerves_system_br, "1.14.4", "cfab33432035f4ad92202a53d9067a02034d02144f7b33419e2636ef8feb4c3a", [:mix], [], "hexpm", "c04df862d040b9233a4c45e9f58633c70b70a43baf9c68eb983e41819eb95911"},
109
"nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
11-
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "1.3.2", "c1adf1c067f46810a678946506f379b8d1694b154fcbc77b1de5fda97494fbfc", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.7.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "0200515efb0ddd6a2318234c7084f7cdb8691fbb83c47def527558b4921f3a3a"},
12-
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.7.2", "0683dff3b81483879a57e14d8e020314a4d1ecc6ee91952c1d7d9f1f528924a4", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "5d44f279705119defac7f28a70edb0273f92b38bc8ae668db4f271cd91f6eaee"},
10+
"nerves_toolchain_armv7_nerves_linux_gnueabihf": {:hex, :nerves_toolchain_armv7_nerves_linux_gnueabihf, "1.4.1", "bd3e3ae08727294c01456f0c6fa55ee11c67ed001bda71e817d3e5f960efd074", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.8.1", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "fdf4cd7b30d7d4aa49ee997c9bfc5fc4a34951850d18be41d854bf3889a0c749"},
11+
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.8.2", "66163f4fb90aa40cabae5700e516fdf40708d260334c4674514413d7cb585dbb", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "9734237608269d2d649cc67ebb7bcb605bb122259a7cea17dadcf8204f467638"},
1312
"nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"},
1413
}

‎nerves_defconfig

+10-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ BR2_cortex_a53=y
33
BR2_ARM_FPU_NEON_VFPV4=y
44
BR2_TAR_OPTIONS="--no-same-owner"
55
BR2_OPTIMIZE_2=y
6+
BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches"
7+
BR2_REPRODUCIBLE=y
68
BR2_TOOLCHAIN_EXTERNAL=y
79
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
810
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
9-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.3.2/nerves_toolchain_arm_unknown_linux_gnueabihf-linux_x86_64-1.3.2-E31F29C.tar.xz"
10-
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-unknown-linux-gnueabihf"
11-
BR2_TOOLCHAIN_EXTERNAL_GCC_9=y
12-
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
11+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.4.0/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_x86_64-1.4.0-CE0FCC7.tar.xz"
12+
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv7-nerves-linux-gnueabihf"
13+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y
1314
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
15+
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
1416
BR2_TOOLCHAIN_EXTERNAL_CXX=y
1517
BR2_ROOTFS_SKELETON_CUSTOM=y
1618
BR2_ROOTFS_SKELETON_CUSTOM_PATH="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/skeleton"
@@ -23,10 +25,9 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-build.sh ${BR2_EXTERN
2325
BR2_ROOTFS_POST_IMAGE_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-createfs.sh"
2426
BR2_LINUX_KERNEL=y
2527
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
26-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20200601-1)/linux-raspberrypi-kernel_1.20200601-1.tar.gz"
27-
BR2_LINUX_KERNEL_PATCH="${NERVES_DEFCONFIG_DIR}/linux"
28+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20200902-1)/linux-raspberrypi-kernel_1.20200902-1.tar.gz"
2829
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
29-
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-4.19.defconfig"
30+
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-5.4.defconfig"
3031
BR2_LINUX_KERNEL_XZ=y
3132
BR2_LINUX_KERNEL_DTS_SUPPORT=y
3233
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3 bcm2710-rpi-3-b-plus"
@@ -50,7 +51,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
5051
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
5152
BR2_PACKAGE_LINUX_FIRMWARE=y
5253
BR2_PACKAGE_RPI_FIRMWARE=y
53-
BR2_PACKAGE_RPI_FIRMWARE_KERNEL_4_19=y
54+
BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20200902"
5455
BR2_PACKAGE_RPI_FIRMWARE_X=y
5556
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
5657
BR2_PACKAGE_AVRDUDE=y
@@ -101,3 +102,4 @@ BR2_NERVES_ADDITIONAL_IMAGE_FILES="${NERVES_DEFCONFIG_DIR}/fwup.conf ${NERVES_DE
101102
BR2_PACKAGE_NBTTY=y
102103
BR2_PACKAGE_NERVES_CONFIG=y
103104
BR2_PACKAGE_LSUSB=y
105+
BR2_PACKAGE_RPI_DISTRO_FIRMWARE_NONFREE=y

‎ramoops.dts

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
/dts-v1/;
22
/plugin/;
33

4-
/ {
4+
/{
55
compatible = "brcm,bcm2835";
66

77
fragment@0 {
8-
target-path = "/";
8+
target = <&rmem>;
99
__overlay__ {
10-
reserved-memory {
11-
#address-cells = <1>;
12-
#size-cells = <1>;
13-
ranges;
10+
/* See arch/arm/boot/dts/bcm283x.dtsi for rmem definition. */
11+
#address-cells = <1>;
12+
#size-cells = <1>;
13+
ranges;
1414

15-
ramoops: ramoops@0f000000 {
16-
compatible = "ramoops";
17-
reg = <0x0b000000 0x100000>; /* 1 MB */
18-
ecc-size = <16>;
19-
record-size = <0x20000>; /* 128kB */
20-
console-size = <0x20000>;
21-
ftrace-size = <0>;
22-
pmsg-size = <0x20000>;
23-
};
15+
ramoops: ramoops@b000000 {
16+
compatible = "ramoops";
17+
reg = <0x0b000000 0x100000>; /* 1 MB */
18+
ecc-size = <16>;
19+
record-size = <0x20000>; /* 128kB */
20+
console-size = <0x20000>;
21+
ftrace-size = <0>;
22+
pmsg-size = <0x20000>;
2423
};
2524
};
2625
};

0 commit comments

Comments
 (0)