Skip to content

Commit b950684

Browse files
amclainamclain
authored
Merge pull request #31 from redwirelabs/update-mchip2024.04-otp27
Update to Microchip 2024.04 and OTP 27
2 parents d26a704 + b4f00e8 commit b950684

11 files changed

+104
-113
lines changed

‎.circleci/config.yml

Lines changed: 3 additions & 3 deletions
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.23.0
4-
elixir: 1.14.5-otp-26
3+
version: 1.28.2
4+
elixir: 1.17.2-otp-27
55

66
version: 2.1
77

88
orbs:
9-
build-tools: nerves-project/build-tools@0.2.3
9+
build-tools: nerves-project/build-tools@0.3.0
1010

1111
workflows:
1212
version: 2

‎.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
elixir 1.16.2-otp-26
2-
erlang 26.2.5
1+
elixir 1.17.2-otp-27
2+
erlang 27.0.1

‎README.md

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -33,47 +33,6 @@ If you need custom modifications to this system for your device, clone this
3333
repository and update as described in [Making custom
3434
systems](https://hexdocs.pm/nerves/systems.html#customizing-your-own-nerves-system)
3535

36-
# GPIO
37-
38-
The WLSOM1 exposes four banks of GPIO: `A`, `B`, `C`, `D`. The physical GPIO
39-
pins are numbered logically in sequence from `PA0` (`gpio0`) to
40-
`PD31` (`gpio127`) when exposed via sysfs or [`Circuits.GPIO`](https://hex.pm/packages/circuits_gpio).
41-
42-
| Pin | GPIO | | Pin | GPIO | | Pin | GPIO | | Pin | GPIO |
43-
| --- | ---- | - | --- | ---- | - | --- | ---- | - | --- | ---- |
44-
| PA0 | 0 | | PB0 | 32 | | PC0 | 64 | | PD0 | 96 |
45-
| PA1 | 1 | | PB1 | 33 | | PC1 | 65 | | PD1 | 97 |
46-
| PA2 | 2 | | PB2 | 34 | | PC2 | 66 | | PD2 | 98 |
47-
| PA3 | 3 | | PB3 | 35 | | PC3 | 67 | | PD3 | 99 |
48-
| PA4 | 4 | | PB4 | 36 | | PC4 | 68 | | PD4 | 100 |
49-
| PA5 | 5 | | PB5 | 37 | | PC5 | 69 | | PD5 | 101 |
50-
| PA6 | 6 | | PB6 | 38 | | PC6 | 70 | | PD6 | 102 |
51-
| PA7 | 7 | | PB7 | 39 | | PC7 | 71 | | PD7 | 103 |
52-
| PA8 | 8 | | PB8 | 40 | | PC8 | 72 | | PD8 | 104 |
53-
| PA9 | 9 | | PB9 | 41 | | PC9 | 73 | | PD9 | 105 |
54-
| PA10 | 10 | | PB10 | 42 | | PC10 | 74 | | PD10 | 106 |
55-
| PA11 | 11 | | PB11 | 43 | | PC11 | 75 | | PD11 | 107 |
56-
| PA12 | 12 | | PB12 | 44 | | PC12 | 76 | | PD12 | 108 |
57-
| PA13 | 13 | | PB13 | 45 | | PC13 | 77 | | PD13 | 109 |
58-
| PA14 | 14 | | PB14 | 46 | | PC14 | 78 | | PD14 | 110 |
59-
| PA15 | 15 | | PB15 | 47 | | PC15 | 79 | | PD15 | 111 |
60-
| PA16 | 16 | | PB16 | 48 | | PC16 | 80 | | PD16 | 112 |
61-
| PA17 | 17 | | PB17 | 49 | | PC17 | 81 | | PD17 | 113 |
62-
| PA18 | 18 | | PB18 | 50 | | PC18 | 82 | | PD18 | 114 |
63-
| PA19 | 19 | | PB19 | 51 | | PC19 | 83 | | PD19 | 115 |
64-
| PA20 | 20 | | PB20 | 52 | | PC20 | 84 | | PD20 | 116 |
65-
| PA21 | 21 | | PB21 | 53 | | PC21 | 85 | | PD21 | 117 |
66-
| PA22 | 22 | | PB22 | 54 | | PC22 | 86 | | PD22 | 118 |
67-
| PA23 | 23 | | PB23 | 55 | | PC23 | 87 | | PD23 | 119 |
68-
| PA24 | 24 | | PB24 | 56 | | PC24 | 88 | | PD24 | 120 |
69-
| PA25 | 25 | | PB25 | 57 | | PC25 | 89 | | PD25 | 121 |
70-
| PA26 | 26 | | PB26 | 58 | | PC26 | 90 | | PD26 | 122 |
71-
| PA27 | 27 | | PB27 | 59 | | PC27 | 91 | | PD27 | 123 |
72-
| PA28 | 28 | | PB28 | 60 | | PC28 | 92 | | PD28 | 124 |
73-
| PA29 | 29 | | PB29 | 61 | | PC29 | 93 | | PD29 | 125 |
74-
| PA30 | 30 | | PB30 | 62 | | PC30 | 94 | | PD30 | 126 |
75-
| PA31 | 31 | | PB31 | 63 | | PC31 | 95 | | PD31 | 127 |
76-
7736
# UART
7837

7938
| Header | Device |

‎fwup.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ file-resource rootfs.img {
2424
}
2525

2626
mbr mbr {
27-
bootstrap-code-host-path = "${NERVES_SDK_IMAGES}/sama5d2-sdcardboot-uboot-4.0.8.bin"
27+
bootstrap-code-host-path = "${NERVES_SDK_IMAGES}/sama5d2-sdcardboot-uboot-4.0.9.bin"
2828
partition 0 {
2929
block-offset = ${BOOT_PART_OFFSET}
3030
block-count = ${BOOT_PART_COUNT}

‎linux/0001-Update-gpio-names.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎linux/0002-squashfs-provide-backing_dev_info-in-order-to-disabl.patch renamed to ‎linux/0001-squashfs-provide-backing_dev_info-in-order-to-disabl.patch

File renamed without changes.

‎linux/0002-change-rgb-led-to-gpio.patch

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
From bff8543d0b8bea5c13fc4cfb935afbb7e927f0e9 Mon Sep 17 00:00:00 2001
2+
From: Alex McLain <[email protected]>
3+
Date: Sun, 25 Aug 2024 22:31:51 -0700
4+
Subject: [PATCH] Change RGB LED to GPIO instead of sysfs leds
5+
6+
---
7+
.../dts/microchip/at91-sama5d27_wlsom1_ek.dts | 48 ++++++++++---------
8+
1 file changed, 26 insertions(+), 22 deletions(-)
9+
10+
diff --git a/arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts b/arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts
11+
index 15239834d..98d4da968 100644
12+
--- a/arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts
13+
+++ b/arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts
14+
@@ -40,28 +40,32 @@ button-1 {
15+
};
16+
};
17+
18+
- leds {
19+
- compatible = "gpio-leds";
20+
- pinctrl-names = "default";
21+
- pinctrl-0 = <&pinctrl_led_gpio_default>;
22+
- status = "okay";
23+
-
24+
- led-red {
25+
- label = "red";
26+
- gpios = <&pioA PIN_PA6 GPIO_ACTIVE_HIGH>;
27+
- };
28+
-
29+
- led-green {
30+
- label = "green";
31+
- gpios = <&pioA PIN_PA7 GPIO_ACTIVE_HIGH>;
32+
- };
33+
-
34+
- led-blue {
35+
- label = "blue";
36+
- gpios = <&pioA PIN_PA8 GPIO_ACTIVE_HIGH>;
37+
- linux,default-trigger = "heartbeat";
38+
- };
39+
- };
40+
+ // nerves_system_sama5d27_wlsom1_ek
41+
+ // Freeing up the RGB LED for application use by Circuits.GPIO.
42+
+ // Remove 0002-change-rgb-led-to-gpio.patch to use sysfs leds.
43+
+ //
44+
+ // leds {
45+
+ // compatible = "gpio-leds";
46+
+ // pinctrl-names = "default";
47+
+ // pinctrl-0 = <&pinctrl_led_gpio_default>;
48+
+ // status = "okay";
49+
+
50+
+ // led-red {
51+
+ // label = "red";
52+
+ // gpios = <&pioA PIN_PA6 GPIO_ACTIVE_HIGH>;
53+
+ // };
54+
+
55+
+ // led-green {
56+
+ // label = "green";
57+
+ // gpios = <&pioA PIN_PA7 GPIO_ACTIVE_HIGH>;
58+
+ // };
59+
+
60+
+ // led-blue {
61+
+ // label = "blue";
62+
+ // gpios = <&pioA PIN_PA8 GPIO_ACTIVE_HIGH>;
63+
+ // linux,default-trigger = "heartbeat";
64+
+ // };
65+
+ // };
66+
};
67+
68+
&adc {
69+
--
70+
2.25.1
71+

‎linux/linux-6.1.defconfig renamed to ‎linux/linux-6.6.defconfig

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
# CONFIG_LOCALVERSION_AUTO is not set
2-
# CONFIG_SWAP is not set
32
CONFIG_SYSVIPC=y
43
CONFIG_NO_HZ_IDLE=y
54
CONFIG_HIGH_RES_TIMERS=y
65
CONFIG_LOG_BUF_SHIFT=14
76
CONFIG_CGROUPS=y
8-
CONFIG_NAMESPACES=y
97
CONFIG_BLK_DEV_INITRD=y
10-
CONFIG_EMBEDDED=y
11-
CONFIG_SLAB=y
8+
CONFIG_KEXEC=y
129
CONFIG_ARCH_AT91=y
1310
CONFIG_SOC_SAMA5D2=y
1411
CONFIG_SOC_SAMA5D3=y
1512
CONFIG_SOC_SAMA5D4=y
1613
CONFIG_UACCESS_WITH_MEMCPY=y
1714
CONFIG_ARM_APPENDED_DTB=y
1815
CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
19-
CONFIG_KEXEC=y
2016
CONFIG_VFP=y
2117
CONFIG_NEON=y
2218
CONFIG_KERNEL_MODE_NEON=y
@@ -27,6 +23,8 @@ CONFIG_MODULE_FORCE_LOAD=y
2723
CONFIG_MODULE_UNLOAD=y
2824
CONFIG_MODULE_FORCE_UNLOAD=y
2925
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
26+
# CONFIG_SWAP is not set
27+
CONFIG_CMA=y
3028
CONFIG_NET=y
3129
CONFIG_PACKET=y
3230
CONFIG_UNIX=y
@@ -40,9 +38,10 @@ CONFIG_IP_PNP_BOOTP=y
4038
CONFIG_IP_PNP_RARP=y
4139
# CONFIG_INET_DIAG is not set
4240
CONFIG_IPV6_SIT_6RD=y
41+
CONFIG_NETFILTER=y
42+
CONFIG_IP_NF_IPTABLES=y
43+
CONFIG_IP_NF_FILTER=y
4344
CONFIG_CAN=y
44-
CONFIG_CAN_AT91=y
45-
CONFIG_CAN_M_CAN=y
4645
CONFIG_BT=y
4746
CONFIG_CFG80211=y
4847
CONFIG_MAC80211=y
@@ -85,6 +84,8 @@ CONFIG_MACB=y
8584
CONFIG_WIZNET_W5100=m
8685
CONFIG_WIZNET_W5100_SPI=m
8786
CONFIG_MICREL_PHY=y
87+
CONFIG_CAN_AT91=y
88+
CONFIG_CAN_M_CAN=y
8889
CONFIG_LIBERTAS_THINFIRM=m
8990
CONFIG_LIBERTAS_THINFIRM_USB=m
9091
CONFIG_MWIFIEX=m
@@ -119,7 +120,6 @@ CONFIG_SPI=y
119120
CONFIG_SPI_ATMEL=y
120121
CONFIG_SPI_GPIO=y
121122
CONFIG_SPI_SPIDEV=y
122-
CONFIG_GPIO_SYSFS=y
123123
CONFIG_POWER_RESET=y
124124
CONFIG_POWER_SUPPLY=y
125125
CONFIG_BATTERY_ACT8945A=y
@@ -136,15 +136,12 @@ CONFIG_REGULATOR_ACT8865=y
136136
CONFIG_REGULATOR_ACT8945A=y
137137
CONFIG_REGULATOR_PWM=m
138138
CONFIG_MEDIA_SUPPORT=y
139-
CONFIG_V4L_PLATFORM_DRIVERS=y
140-
CONFIG_VIDEO_ATMEL_ISI=y
141139
CONFIG_DRM=y
142140
CONFIG_DRM_ATMEL_HLCDC=y
143141
CONFIG_DRM_PANEL_SIMPLE=y
144142
CONFIG_LCD_CLASS_DEVICE=y
145143
CONFIG_BACKLIGHT_CLASS_DEVICE=y
146144
CONFIG_BACKLIGHT_PWM=y
147-
CONFIG_FRAMEBUFFER_CONSOLE=y
148145
CONFIG_SOUND=y
149146
CONFIG_SND=y
150147
CONFIG_SND_SOC=y
@@ -180,16 +177,12 @@ CONFIG_LEDS_GPIO=y
180177
CONFIG_LEDS_PWM=y
181178
CONFIG_LEDS_TRIGGER_TIMER=y
182179
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
183-
CONFIG_LEDS_TRIGGER_GPIO=y
184180
CONFIG_RTC_CLASS=y
185181
CONFIG_RTC_DRV_AT91RM9200=y
186182
CONFIG_DMADEVICES=y
187183
CONFIG_AT_HDMAC=y
188184
CONFIG_AT_XDMAC=y
189185
CONFIG_STAGING=y
190-
CONFIG_FB_TFT=m
191-
CONFIG_FB_TFT_HX8357D=m
192-
CONFIG_FB_TFT_ILI9341=m
193186
# CONFIG_IOMMU_SUPPORT is not set
194187
CONFIG_IIO=y
195188
CONFIG_AT91_ADC=y
@@ -223,12 +216,10 @@ CONFIG_CRYPTO_DEV_ATMEL_TDES=y
223216
CONFIG_CRYPTO_DEV_ATMEL_SHA=y
224217
CONFIG_CRC_ITU_T=y
225218
CONFIG_CRC7=y
219+
CONFIG_DMA_CMA=y
226220
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=3
227221
CONFIG_CONSOLE_LOGLEVEL_QUIET=3
228222
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=3
229223
CONFIG_STRIP_ASM_SYMS=y
230224
CONFIG_DEBUG_FS=y
231-
CONFIG_DEBUG_MEMORY_INIT=y
232-
# CONFIG_SCHED_DEBUG is not set
233-
# CONFIG_FTRACE is not set
234225
CONFIG_DEBUG_USER=y

‎mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ defmodule NervesSystemSAMA5D27WLSOM1EK.MixProject do
5050
defp deps do
5151
[
5252
{:nerves, "~> 1.5.4 or >= 1.6.0", runtime: false},
53-
{:nerves_system_br, "1.27.2", runtime: false},
53+
{:nerves_system_br, "1.28.2", runtime: false},
5454
{:nerves_toolchain_armv7_nerves_linux_gnueabihf, "~> 13.2.0", runtime: false},
5555
{:nerves_system_linter, "~> 0.4", runtime: false},
5656
{:ex_doc, "~> 0.29", only: [:dev, :test], runtime: false}

‎mix.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
%{
2-
"castore": {:hex, :castore, "1.0.7", "b651241514e5f6956028147fe6637f7ac13802537e895a724f90bf3e36ddd1dd", [:mix], [], "hexpm", "da7785a4b0d2a021cd1292a60875a784b6caef71e76bf4917bdee1f390455cf5"},
3-
"earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
4-
"elixir_make": {:hex, :elixir_make, "0.8.3", "d38d7ee1578d722d89b4d452a3e36bcfdc644c618f0d063b874661876e708683", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.0", [hex: :certifi, repo: "hexpm", optional: true]}], "hexpm", "5c99a18571a756d4af7a4d89ca75c28ac899e6103af6f223982f09ce44942cc9"},
5-
"ex_doc": {:hex, :ex_doc, "0.32.1", "21e40f939515373bcdc9cffe65f3b3543f05015ac6c3d01d991874129d173420", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "5142c9db521f106d61ff33250f779807ed2a88620e472ac95dc7d59c380113da"},
6-
"jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
7-
"makeup": {:hex, :makeup, "1.1.1", "fa0bc768698053b2b3869fa8a62616501ff9d11a562f3ce39580d60860c3a55e", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"},
2+
"castore": {:hex, :castore, "1.0.8", "dedcf20ea746694647f883590b82d9e96014057aff1d44d03ec90f36a5c0dc6e", [:mix], [], "hexpm", "0b2b66d2ee742cb1d9cb8c8be3b43c3a70ee8651f37b75a8b982e036752983f1"},
3+
"earmark_parser": {:hex, :earmark_parser, "1.4.41", "ab34711c9dc6212dda44fcd20ecb87ac3f3fce6f0ca2f28d4a00e4154f8cd599", [:mix], [], "hexpm", "a81a04c7e34b6617c2792e291b5a2e57ab316365c2644ddc553bb9ed863ebefa"},
4+
"elixir_make": {:hex, :elixir_make, "0.8.4", "4960a03ce79081dee8fe119d80ad372c4e7badb84c493cc75983f9d3bc8bde0f", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.0", [hex: :certifi, repo: "hexpm", optional: true]}], "hexpm", "6e7f1d619b5f61dfabd0a20aa268e575572b542ac31723293a4c1a567d5ef040"},
5+
"ex_doc": {:hex, :ex_doc, "0.34.2", "13eedf3844ccdce25cfd837b99bea9ad92c4e511233199440488d217c92571e8", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "5ce5f16b41208a50106afed3de6a2ed34f4acfd65715b82a0b84b49d995f95c1"},
6+
"jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
7+
"makeup": {:hex, :makeup, "1.1.2", "9ba8837913bdf757787e71c1581c21f9d2455f4dd04cfca785c70bbfff1a76a3", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cce1566b81fbcbd21eca8ffe808f33b221f9eee2cbc7a1706fc3da9ff18e6cac"},
88
"makeup_elixir": {:hex, :makeup_elixir, "0.16.2", "627e84b8e8bf22e60a2579dad15067c755531fea049ae26ef1020cad58fe9578", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "41193978704763f6bbe6cc2758b84909e62984c7752b3784bd3c218bb341706b"},
9-
"makeup_erlang": {:hex, :makeup_erlang, "0.1.5", "e0ff5a7c708dda34311f7522a8758e23bfcd7d8d8068dc312b5eb41c6fd76eba", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "94d2e986428585a21516d7d7149781480013c56e30c6a233534bedf38867a59a"},
10-
"nerves": {:hex, :nerves, "1.10.5", "9c4296a5fd9c48858a92b17ae52cfcf1bc9acfefdc2da5c10ec79e4c139ecaec", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [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: false]}], "hexpm", "a1309b6c56e2797f7514e89afc61b7c06803f359e94b00ac006bef4e611d95e9"},
11-
"nerves_system_br": {:hex, :nerves_system_br, "1.27.2", "b7845bbbfaed3e2d3f7e638a84c82edfb4dffa4447b7727ce01839781e97a291", [:mix], [], "hexpm", "92d1589a7e88673e0906e12051272e07b06d868c5bc606e19566dc3729fd84df"},
9+
"makeup_erlang": {:hex, :makeup_erlang, "1.0.1", "c7f58c120b2b5aa5fd80d540a89fdf866ed42f1f3994e4fe189abebeab610839", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "8a89a1eeccc2d798d6ea15496a6e4870b75e014d1af514b1b71fa33134f57814"},
10+
"nerves": {:hex, :nerves, "1.11.1", "bd31dc8bd8212478a87702c06b5475482dd65d1c3395930f16279d488624ab84", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [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: false]}], "hexpm", "18e815823bb110b0c82a667bcf8711653dfa94237422df79013aba8ba831dd2c"},
11+
"nerves_system_br": {:hex, :nerves_system_br, "1.28.2", "52ce9e71914674450c1d9e10fa594daa02bbb66f3c2706c32c6e939632b15b08", [:mix], [], "hexpm", "9717aec80eb12ac409e44ff7fdc91f24c7fbe918f41a6be379c88f60fde45a04"},
1212
"nerves_system_linter": {:hex, :nerves_system_linter, "0.4.0", "81e9a6f5018fe5fb67d7b43a04dca36156f62b55b5554eb2fa3964d3889d09cd", [:mix], [], "hexpm", "b5bd8480ce7a6317f4601ff41fd2f594bdf76aff0bdf6dcfac571c3fa1ec5f82"},
1313
"nerves_toolchain_armv7_nerves_linux_gnueabihf": {:hex, :nerves_toolchain_armv7_nerves_linux_gnueabihf, "13.2.0", "48305b5ba2ec41d2f9bfd0997d6bb6e8a9f5358146baa58fc64887bfe2d38ccd", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.10.0", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm", "7a43b14eb4ec90f36acf36a42ce42c1d69c280b90eea7ab9965e00db3ee6cbf7"},
1414
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.10.0", "c6b35377a0b7a93633a8673a788f1580fe1fa06083374b0e4df36da65828d2ef", [:mix], [{:nerves, "~> 1.0", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm", "e4ae1a2b84de3502ecac195765819be0ce2834eb276553163a7c03133f1760f1"},

‎nerves_defconfig

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
88
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
99
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v13.2.0/nerves_toolchain_armv7_nerves_linux_gnueabihf-linux_${shell uname -m}-13.2.0-BE3EA83.tar.xz"
1010
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv7-nerves-linux-gnueabihf"
11+
BR2_TOOLCHAIN_EXTERNAL_GCC_13=y
1112
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
1213
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
1314
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
@@ -25,12 +26,12 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-build.sh ${BR2_EXTERN
2526
BR2_ROOTFS_POST_IMAGE_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-createfs.sh"
2627
BR2_LINUX_KERNEL=y
2728
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
28-
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2023.10)/linux4microchip-2023.10.tar.gz"
29+
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2024.04)/linux4microchip-2024.04.tar.gz"
2930
BR2_LINUX_KERNEL_PATCH="${NERVES_DEFCONFIG_DIR}/linux"
3031
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
31-
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux/linux-6.1.defconfig"
32+
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/linux/linux-6.6.defconfig"
3233
BR2_LINUX_KERNEL_DTS_SUPPORT=y
33-
BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_wlsom1_ek"
34+
BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/at91-sama5d27_wlsom1_ek"
3435
BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
3536
BR2_LINUX_KERNEL_INSTALL_TARGET=y
3637
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/busybox-1.22.config"
@@ -47,15 +48,13 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y
4748
BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y
4849
# BR2_TARGET_ROOTFS_TAR is not set
4950
BR2_TARGET_AT91BOOTSTRAP3=y
50-
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
51-
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
52-
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v4.0.8"
51+
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y
52+
BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.9)/v4.0.9.tar.gz"
5353
BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_wlsom1_eksd_uboot"
5454
BR2_TARGET_UBOOT=y
5555
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
56-
BR2_TARGET_UBOOT_CUSTOM_GIT=y
57-
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4microchip/u-boot-mchp.git"
58-
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4microchip-2023.10"
56+
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
57+
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip-2024.04)/linux4microchip-2024.04.tar.gz"
5958
BR2_TARGET_UBOOT_PATCH="${NERVES_DEFCONFIG_DIR}/uboot"
6059
BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
6160
BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="${NERVES_DEFCONFIG_DIR}/uboot/uboot.defconfig"

0 commit comments

Comments
 (0)