Skip to content

Commit d3544d3

Browse files
authored
Merge pull request #6 from FarmBot/zero_2
v1.18.1
2 parents a45a953 + 91657ac commit d3544d3

10 files changed

+95
-34
lines changed

.circleci/config.yml

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,31 @@
11
exec: &exec
22
name: build-tools/nerves-system-br
3-
version: 1.17.4
4-
elixir: 1.12.3-otp-24
3+
version: 1.18.3
4+
elixir: 1.13.2-otp-24
55

66
version: 2.1
77

88
orbs:
9-
build-tools: nerves-project/build-tools@0.1.5
9+
build-tools: nerves-project/build-tools@0.2.2
1010

1111
workflows:
1212
version: 2
1313
build_test_deploy:
1414
jobs:
15+
- build-tools/get-br-dependencies:
16+
exec:
17+
<<: *exec
18+
context: org-global
19+
filters:
20+
tags:
21+
only: /.*/
1522
- build-tools/build-system:
1623
exec:
1724
<<: *exec
1825
resource-class: large
1926
context: org-global
27+
requires:
28+
- build-tools/get-br-dependencies
2029
filters:
2130
tags:
2231
only: /.*/

CHANGELOG.md

+34
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,40 @@ follows:
1212
releases, and Linux kernel updates. They're also made to fix bugs and add
1313
features to the build infrastructure.
1414

15+
## v1.18.1
16+
17+
* Updated dependencies
18+
* [nerves_system_br v1.18.3](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.18.3)
19+
20+
* Changes
21+
* The `cpufreq` directories are available again. This was a regression that
22+
would break code that manually adjusted the CPU frequency.
23+
* Programs that use OpenMP will run now. The OpenMP shared library
24+
(`libgomp.so`) was supplied by the toolchain, but not copied.
25+
26+
## v1.18.0
27+
28+
This release updates to Buildroot 2021.11 and OTP 24.2. If you have made a
29+
custom system, please review the `nerves_system_br` [release
30+
notes](https://github.com/nerves-project/nerves_system_br/blob/v1.18.2/CHANGELOG.md#v1180)
31+
since Buildroot 2021.11 changed some Raspberry Pi firmware options.
32+
33+
* Updated dependencies
34+
* [nerves_system_br v1.18.2](https://github.com/nerves-project/nerves_system_br/releases/tag/v1.18.2)
35+
* [Buildroot 2021.11](http://lists.busybox.net/pipermail/buildroot/2021-December/629911.html)
36+
* [Erlang/OTP 24.2](https://erlang.org/download/OTP-24.2.README)
37+
* [Raspberry Pi WiFi firmware](https://github.com/RPi-Distro/firmware-nonfree/blob/bullseye/debian/changelog)
38+
* Linux 5.10.88 with Raspberry Pi patches
39+
* GCC 10.3
40+
41+
* Improvements
42+
* Support for the `dl.nerves-project.org` backup site. Due to a GitHub outage
43+
in November, there was a 2 day period of failing builds since some packages
44+
could not be downloaded. We implemented the backup site to prevent this in
45+
the future. This update is in the `nerves_defconfig`.
46+
* Use new build ORB on CircleCI. This ORB will shorten build times to fit in
47+
CircleCI's new free tier limits. Please update if building your own systems.
48+
1549
## v1.17.4
1650

1751
* Updated dependencies

MAINTENANCE.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
# Maintaining This Repo
22

33
```bash
4-
git clone [email protected]:Farmbot-Labs/nerves_system_farmbot_rpi3.git
5-
cd nerves_system_farmbot_rpi3
4+
git clone [email protected]:Farmbot/farmbot_system_rpi3.git
5+
cd farmbot_system_rpi3
66
git remote add upstream [email protected]:Nerves-Project/nerves_system_rpi3.git
77
git fetch --all
88
git merge v<new upstream release>
99
git push origin main
1010
cd ..
1111
git clone [email protected]:Nerves-Project/nerves_system_br -b v<latest release>
12-
make system # this will take a while.
12+
./nerves_system_br/create-build.sh ./farmbot_system_rpi3/nerves_defconfig BUILD_RPI3
13+
cd BUILD_RPI3
14+
make system # this will take a while. dependencies may need to be installed/upgraded
15+
cd ..
1316
# create github release.
1417
# upload system artifact.
15-
cd nerves_system_farmbot_rpi3
18+
cd farmbot_system_rpi3
1619
mix hex.publish package
1720
```

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.17.4-farmbot.1
1+
1.18.1-farmbot.1

fwup.conf

+8-2
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ file-resource bootcode.bin {
9797
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/bootcode.bin"
9898
}
9999
file-resource fixup.dat {
100-
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/fixup.dat"
100+
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/fixup_x.dat"
101101
}
102102
file-resource start.elf {
103-
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/start.elf"
103+
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/start_x.elf"
104104
}
105105
file-resource config.txt {
106106
host-path = "${NERVES_SYSTEM}/images/config.txt"
@@ -126,6 +126,9 @@ file-resource rpi-backlight.dtbo {
126126
file-resource bcm2710-rpi-cm3.dtb {
127127
host-path = "${NERVES_SYSTEM}/images/bcm2710-rpi-cm3.dtb"
128128
}
129+
file-resource bcm2710-rpi-zero-2-w.dtb {
130+
host-path = "${NERVES_SYSTEM}/images/bcm2710-rpi-zero-2-w.dtb"
131+
}
129132
file-resource w1-gpio-pullup.dtbo {
130133
host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/w1-gpio-pullup.dtbo"
131134
}
@@ -236,6 +239,7 @@ task complete {
236239
on-resource rpi-ft5406.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-ft5406.dtbo") }
237240
on-resource rpi-backlight.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
238241
on-resource bcm2710-rpi-cm3.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-cm3.dtb") }
242+
on-resource bcm2710-rpi-zero-2-w.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-zero-2-w.dtb") }
239243
on-resource w1-gpio-pullup.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/w1-gpio-pullup.dtbo") }
240244
on-resource miniuart-bt.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/miniuart-bt.dtbo") }
241245
on-resource ramoops.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/ramoops.dtbo") }
@@ -302,6 +306,7 @@ task upgrade.a {
302306
on-resource rpi-ft5406.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-ft5406.dtbo") }
303307
on-resource rpi-backlight.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
304308
on-resource bcm2710-rpi-cm3.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-cm3.dtb") }
309+
on-resource bcm2710-rpi-zero-2-w.dtb { fat_write(${BOOT_A_PART_OFFSET}, "bcm2710-rpi-zero-2-w.dtb") }
305310
on-resource w1-gpio-pullup.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/w1-gpio-pullup.dtbo") }
306311
on-resource miniuart-bt.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/miniuart-bt.dtbo") }
307312
on-resource ramoops.dtbo { fat_write(${BOOT_A_PART_OFFSET}, "overlays/ramoops.dtbo") }
@@ -375,6 +380,7 @@ task upgrade.b {
375380
on-resource rpi-ft5406.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/rpi-ft5406.dtbo") }
376381
on-resource rpi-backlight.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/rpi-backlight.dtbo") }
377382
on-resource bcm2710-rpi-cm3.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2710-rpi-cm3.dtb") }
383+
on-resource bcm2710-rpi-zero-2-w.dtb { fat_write(${BOOT_B_PART_OFFSET}, "bcm2710-rpi-zero-2-w.dtb") }
378384
on-resource w1-gpio-pullup.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/w1-gpio-pullup.dtbo") }
379385
on-resource miniuart-bt.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/miniuart-bt.dtbo") }
380386
on-resource ramoops.dtbo { fat_write(${BOOT_B_PART_OFFSET}, "overlays/ramoops.dtbo") }

linux-5.10.defconfig

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
4141
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
4242
CONFIG_CPU_FREQ_GOV_USERSPACE=y
4343
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
44+
CONFIG_CPUFREQ_DT=y
45+
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
4446
CONFIG_VFP=y
4547
CONFIG_NEON=y
4648
CONFIG_KERNEL_MODE_NEON=y

mix.exs

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ defmodule FarmbotSystemRpi3.Mixfile do
6464
defp deps do
6565
[
6666
{:nerves, "~> 1.5.4 or ~> 1.6.0 or ~> 1.7.4", runtime: false},
67-
{:nerves_system_br, "1.17.4", runtime: false},
68-
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 1.4.3", runtime: false},
67+
{:nerves_system_br, "1.18.3", runtime: false},
68+
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 1.5.0", runtime: false},
6969
{:nerves_system_linter, "~> 0.4", only: [:dev, :test], runtime: false},
7070
{:ex_doc, "~> 0.22", only: :docs, runtime: false}
7171
]
@@ -90,7 +90,7 @@ defmodule FarmbotSystemRpi3.Mixfile do
9090
defp package do
9191
[
9292
files: package_files(),
93-
licenses: ["Apache 2.0"],
93+
licenses: ["Apache-2.0"],
9494
links: %{"GitHub" => @source_url}
9595
]
9696
end

mix.lock

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
%{
2-
"earmark_parser": {:hex, :earmark_parser, "1.4.17", "6f3c7e94170377ba45241d394389e800fb15adc5de51d0a3cd52ae766aafd63f", [:mix], [], "hexpm", "f93ac89c9feca61c165b264b5837bf82344d13bebc634cd575cb711e2e342023"},
2+
"castore": {:hex, :castore, "0.1.14", "3f6d7c7c1574c402fef29559d3f1a7389ba3524bc6a090a5e9e6abc3af65dcca", [:mix], [], "hexpm", "b34af542eadb727e6c8b37fdf73e18b2e02eb483a4ea0b52fd500bc23f052b7b"},
3+
"earmark_parser": {:hex, :earmark_parser, "1.4.19", "de0d033d5ff9fc396a24eadc2fcf2afa3d120841eb3f1004d138cbf9273210e8", [:mix], [], "hexpm", "527ab6630b5c75c3a3960b75844c314ec305c76d9899bb30f71cb85952a9dc45"},
34
"elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
4-
"ex_doc": {:hex, :ex_doc, "0.26.0", "1922164bac0b18b02f84d6f69cab1b93bc3e870e2ad18d5dacb50a9e06b542a3", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2775d66e494a9a48355db7867478ffd997864c61c65a47d31c4949459281c78d"},
5+
"ex_doc": {:hex, :ex_doc, "0.27.3", "d09ed7ab590b71123959d9017f6715b54a448d76b43cf909eb0b2e5a78a977b2", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "ee60b329d08195039bfeb25231a208749be4f2274eae42ce38f9be0538a2f2e6"},
56
"makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
67
"makeup_elixir": {:hex, :makeup_elixir, "0.15.2", "dc72dfe17eb240552857465cc00cce390960d9a0c055c4ccd38b70629227e97c", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "fd23ae48d09b32eff49d4ced2b43c9f086d402ee4fd4fcb2d7fad97fa8823e75"},
78
"makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
8-
"nerves": {:hex, :nerves, "1.7.12", "7fbe49c14c9f17efdb8213cb86ebf6b186437cfbbf10a9c6ab132bc61eb2ec27", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "43806d6c310959ebdff4e6998a5c330782d1a4bed1267950f4a7ebe9edad3344"},
9-
"nerves_system_br": {:hex, :nerves_system_br, "1.17.4", "5583f4104f76253c742748ca5e21f54ad9e112abe9270e1ad78d56bebaabd011", [:mix], [], "hexpm", "69a3d3e96b70f0201c17993bc4a95a1c776fb45f6fcac89be8b4297272b7a8aa"},
9+
"nerves": {:hex, :nerves, "1.7.13", "3a3c4aedd0d7204748c2e7f4d0acac9bfb8c022d2e489d5018cea5be733d2525", [:make, :mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "906a67bbe35970a0a09cff32b137fa8db8f661a672a7b853115af0f9eba9a321"},
10+
"nerves_system_br": {:hex, :nerves_system_br, "1.18.3", "24e374ee3a98f3ebe4d012b536656f4a2d36302ad205a845ca2fa3c9a04bdc19", [:mix], [], "hexpm", "4c19b5c6b0653eb2c890e0a991a22afcf4ef0c407b4e689b61b792ac77dc8e08"},
1011
"nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
11-
"nerves_toolchain_armv7_nerves_linux_gnueabihf": {:hex, :nerves_toolchain_armv7_nerves_linux_gnueabihf, "1.4.3", "ff5b8fed2a71daea7ac07a5a0a6ecec7a4985d2a617a89ab073591d441d9cda4", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.8.4", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "ffefca61b7282a5a10032e61b6dab6758d24eee732c5d8c16fe6aada52dd099a"},
12-
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.8.4", "2f6b4153e3904502d117f9d957c12eaafd490e1d2bdf20a85328ada46a1350da", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "6194be9b1364fdc1db6b2a0e98fa8dcb94fe1af373dcf8149298d62ce9b1b369"},
12+
"nerves_toolchain_armv7_nerves_linux_gnueabihf": {:hex, :nerves_toolchain_armv7_nerves_linux_gnueabihf, "1.5.0", "51be4f07c4922add6cd342ac1f13c3110a425c33af4d45533d246012b8fd0878", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.8.5", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "3b569f34b71892adae706640638cb9677f687ec941647b8f871479da79468b1a"},
13+
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.8.5", "f2dfd6e3b5f85889561b9f00c71510eea87c3d05760d20780285deb3c29ca212", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "2f65b1866f034054f3d61ee672b6d02f4de1d0b40bef74f49527b98ab46a39fc"},
1314
"nimble_parsec": {:hex, :nimble_parsec, "1.2.0", "b44d75e2a6542dcb6acf5d71c32c74ca88960421b6874777f79153bbbbd7dccc", [:mix], [], "hexpm", "52b2871a7515a5ac49b00f214e4165a40724cf99798d8e4a65e4fd64ebd002c1"},
1415
}

nerves_defconfig

+11-6
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@ BR2_arm=y
22
BR2_cortex_a53=y
33
BR2_ARM_FPU_NEON_VFPV4=y
44
BR2_TAR_OPTIONS="--no-same-owner"
5+
BR2_BACKUP_SITE="http://dl.nerves-project.org"
56
BR2_ENABLE_DEBUG=y
67
BR2_OPTIMIZE_2=y
78
BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches"
89
BR2_REPRODUCIBLE=y
910
BR2_TOOLCHAIN_EXTERNAL=y
1011
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
1112
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
12-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.4.3/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_x86_64-1.4.3-C532A43.tar.xz"
13+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v1.5.0/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_x86_64-1.5.0-6FC75CA.tar.xz"
1314
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv7-nerves-linux-gnueabihf"
1415
BR2_TOOLCHAIN_EXTERNAL_GCC_10=y
1516
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
1617
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
1718
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
1819
BR2_TOOLCHAIN_EXTERNAL_CXX=y
20+
BR2_TOOLCHAIN_EXTERNAL_OPENMP=y
1921
BR2_ROOTFS_SKELETON_CUSTOM=y
2022
BR2_ROOTFS_SKELETON_CUSTOM_PATH="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/skeleton"
2123
BR2_INIT_NONE=y
@@ -27,15 +29,17 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/rootfs_overl
2729
BR2_ROOTFS_POST_BUILD_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-build.sh ${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/post-build.sh"
2830
BR2_ROOTFS_POST_IMAGE_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-createfs.sh"
2931
BR2_LINUX_KERNEL=y
30-
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
31-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,1.20211007)/linux-raspberrypi-kernel_1.20211007.tar.gz"
32+
BR2_LINUX_KERNEL_CUSTOM_GIT=y
33+
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
34+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="606d1fc3bc97a8be1d21e143ca88f3ba085ddef1"
3235
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3336
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux-5.10.defconfig"
3437
BR2_LINUX_KERNEL_XZ=y
3538
BR2_LINUX_KERNEL_DTS_SUPPORT=y
36-
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3 bcm2710-rpi-3-b-plus"
39+
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3 bcm2710-rpi-3-b-plus bcm2710-rpi-zero-2-w"
3740
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${NERVES_DEFCONFIG_DIR}/ramoops.dts"
3841
BR2_LINUX_KERNEL_EXT_CUSTOMLOGO=y
42+
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
3943
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/busybox.config"
4044
BR2_PACKAGE_ALSA_UTILS=y
4145
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
@@ -55,8 +59,9 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
5559
BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
5660
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
5761
BR2_PACKAGE_RPI_FIRMWARE=y
58-
BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20211007"
59-
BR2_PACKAGE_RPI_FIRMWARE_X=y
62+
BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="536baf33ae9007d027bffc8f42cb603664ecb5c4"
63+
BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
64+
BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
6065
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
6166
BR2_PACKAGE_AVRDUDE=y
6267
BR2_PACKAGE_PIGPIO=y

0 commit comments

Comments
 (0)