Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump mvdan/sh from 3.8.0 to 3.9.0 in lib/tools/shellfmt.sh #1

Closed
wants to merge 6 commits into from
Closed

Bump mvdan/sh from 3.8.0 to 3.9.0 in lib/tools/shellfmt.sh #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff27ffd
odroidc2: fix reboot
MichaIng May 22, 2024
8994dd3
radxa-zero3: fix U-Boot dtb choice for Armbian kernel builds
MichaIng May 13, 2024
2e1871e
nanopineo: remove LED patch conflicting with upstream
MichaIng May 13, 2024
7793f6d
configs: enable mt7921u USB WiFi drivers for all boards
MichaIng Jun 2, 2024
4110286
meson64: remove U-Boot boot order patch
MichaIng Jul 22, 2024
5a6b849
tools: Bump `SHELLFMT_VERSION` from 3.8.0 to 3.9.0
MichaIng Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/kernel/linux-arm64-wdk2023.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3708,7 +3708,7 @@ CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
# CONFIG_MT7921E is not set
# CONFIG_MT7921S is not set
# CONFIG_MT7921U is not set
CONFIG_MT7921U=m
# CONFIG_MT7996E is not set
# CONFIG_MT7925E is not set
# CONFIG_MT7925U is not set
Expand Down
2 changes: 1 addition & 1 deletion config/kernel/linux-bcm2711-legacy.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3005,7 +3005,7 @@ CONFIG_MT7915E=m
CONFIG_MT7921_COMMON=m
CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MT7921U is not set
CONFIG_MT7921U=m
CONFIG_WLAN_VENDOR_MICROCHIP=y
# CONFIG_WILC1000_SDIO is not set
# CONFIG_WILC1000_SPI is not set
Expand Down
2 changes: 1 addition & 1 deletion config/kernel/linux-k3-current.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2838,7 +2838,7 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
# CONFIG_MT7915E is not set
# CONFIG_MT7921E is not set
# CONFIG_MT7921S is not set
# CONFIG_MT7921U is not set
CONFIG_MT7921U=m
CONFIG_WLAN_VENDOR_MICROCHIP=y
# CONFIG_WILC1000_SDIO is not set
# CONFIG_WILC1000_SPI is not set
Expand Down
2 changes: 1 addition & 1 deletion config/kernel/linux-odroidxu4-current.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2443,7 +2443,7 @@ CONFIG_MT76x2U=m
# CONFIG_MT7663U is not set
# CONFIG_MT7663S is not set
# CONFIG_MT7921S is not set
# CONFIG_MT7921U is not set
CONFIG_MT7921U=m
CONFIG_WLAN_VENDOR_MICROCHIP=y
# CONFIG_WILC1000_SDIO is not set
# CONFIG_WILC1000_SPI is not set
Expand Down
2 changes: 1 addition & 1 deletion config/kernel/linux-phytium-embedded-current.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3036,7 +3036,7 @@ CONFIG_MT792x_LIB=m
CONFIG_MT7921_COMMON=m
CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MT7921U is not set
CONFIG_MT7921U=m
# CONFIG_MT7996E is not set
CONFIG_WLAN_VENDOR_MICROCHIP=y
# CONFIG_WILC1000_SDIO is not set
Expand Down
2 changes: 1 addition & 1 deletion config/kernel/linux-rk35xx-vendor.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3031,7 +3031,7 @@ CONFIG_MT7915E=m
CONFIG_MT7921_COMMON=m
CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MT7921U is not set
CONFIG_MT7921U=m
CONFIG_WLAN_VENDOR_MICROCHIP=y
CONFIG_WILC1000=m
CONFIG_WILC1000_SDIO=m
Expand Down
2 changes: 1 addition & 1 deletion config/kernel/linux-tqma-current.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3008,7 +3008,7 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
# CONFIG_MT7915E is not set
# CONFIG_MT7921E is not set
# CONFIG_MT7921S is not set
# CONFIG_MT7921U is not set
CONFIG_MT7921U=m
# CONFIG_MT7996E is not set
CONFIG_WLAN_VENDOR_MICROCHIP=y
# CONFIG_WILC1000_SDIO is not set
Expand Down
2 changes: 1 addition & 1 deletion lib/tools/shellfmt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# This file is a part of the Armbian Build Framework
# https://github.com/armbian/build/

SHELLFMT_VERSION=${SHELLFMT_VERSION:-3.8.0} # https://github.com/mvdan/sh/releases/
SHELLFMT_VERSION=${SHELLFMT_VERSION:-3.9.0} # https://github.com/mvdan/sh/releases/

SRC="$(
cd "$(dirname "$0")/../.."
Expand Down
13 changes: 13 additions & 0 deletions patch/kernel/archive/meson64-6.10/board-odroidc2-fix-reboot.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index e6d2de7..662b4be 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -102,7 +102,7 @@
/*
* signal name from schematics: TF_3V3N_1V8_EN
*/
- gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
gpios-states = <0>;

states = <3300000 0>,
13 changes: 13 additions & 0 deletions patch/kernel/archive/meson64-6.6/board-odroidc2-fix-reboot.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index e6d2de7..662b4be 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -102,7 +102,7 @@
/*
* signal name from schematics: TF_3V3N_1V8_EN
*/
- gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
gpios-states = <0>;

states = <3300000 0>,
22 changes: 1 addition & 21 deletions ...nel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i
index df71fab3c..032849663 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
@@ -49,6 +49,63 @@ / {
@@ -49,6 +49,43 @@ / {
aliases {
ethernet0 = &emac;
};
+
+ /* Warning: sunxi-5.18:
+ * The leds node is present in the sun8i-h3-nanopi.dtsi file
+ * You will have to fix this situation yourself
+ */
+ leds {
+ compatible = "gpio-leds";
+
+ pwr {
+ label = "nanopi:red:pwr";
+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
+ linux,default-trigger = "default-on";
+ };
+
+ status {
+ label = "nanopi:green:status";
+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
+ vdd_cpux: gpio-regulator {
+ compatible = "regulator-gpio";
+ pinctrl-names = "default";
Expand Down
22 changes: 1 addition & 21 deletions ...nel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot
index df71fab3cf4e..032849663443 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts
+++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts
@@ -49,6 +49,63 @@ / {
@@ -49,6 +49,43 @@ / {
aliases {
ethernet0 = &emac;
};
+
+ /* Warning: sunxi-5.18:
+ * The leds node is present in the sun8i-h3-nanopi.dtsi file
+ * You will have to fix this situation yourself
+ */
+ leds {
+ compatible = "gpio-leds";
+
+ pwr {
+ label = "nanopi:red:pwr";
+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
+ linux,default-trigger = "default-on";
+ };
+
+ status {
+ label = "nanopi:green:status";
+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
+ vdd_cpux: gpio-regulator {
+ compatible = "regulator-gpio";
+ pinctrl-names = "default";
Expand Down
22 changes: 1 addition & 21 deletions ...nel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot
index df71fab3cf4e..032849663443 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts
+++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts
@@ -49,6 +49,63 @@ / {
@@ -49,6 +49,43 @@ / {
aliases {
ethernet0 = &emac;
};
+
+ /* Warning: sunxi-5.18:
+ * The leds node is present in the sun8i-h3-nanopi.dtsi file
+ * You will have to fix this situation yourself
+ */
+ leds {
+ compatible = "gpio-leds";
+
+ pwr {
+ label = "nanopi:red:pwr";
+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
+ linux,default-trigger = "default-on";
+ };
+
+ status {
+ label = "nanopi:green:status";
+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
+ vdd_cpux: gpio-regulator {
+ compatible = "regulator-gpio";
+ pinctrl-names = "default";
Expand Down
19 changes: 19 additions & 0 deletions patch/u-boot/u-boot-radxa-latest/board_radxa-zero3-fix-dtb-choice.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/board/rockchip/evb_rk3568/evb_rk3568.c b/board/rockchip/evb_rk3568/evb_rk3568.c
index 43b8de4..72a419b 100644
--- a/board/rockchip/evb_rk3568/evb_rk3568.c
+++ b/board/rockchip/evb_rk3568/evb_rk3568.c
@@ -24,10 +24,10 @@ struct variant_def {

#ifdef CONFIG_ID_EEPROM
static struct variant_def variants[] = {
- {"radxa,zero3", 230, 270, 0, -1, "rockchip/rk3566-radxa-zero-3w-aic8800ds2.dtb"},
- {"radxa,zero3", 400, 450, 0, -1, "rockchip/rk3566-radxa-zero-3e.dtb"},
- {"radxa,zero3", 451, 510, 0, -1, "rockchip/rk3566-radxa-zero-3w-ap6212.dtb"},
- {"radxa,rock-3c", 300, 360, 0, -1, "rockchip/rk3566-rock-3c-aic8800ds2.dtb"},
+ {"radxa,zero3", 230, 270, 0, -1, "rockchip/rk3566-radxa-zero3.dtb"},
+ {"radxa,zero3", 400, 450, 0, -1, "rockchip/rk3566-radxa-zero3.dtb"},
+ {"radxa,zero3", 451, 510, 0, -1, "rockchip/rk3566-radxa-zero3-ap6212.dtb"},
+ {"radxa,rock-3c", 300, 360, 0, -1, "rockchip/rk3566-rock-3c.dtb"},
};

static void set_fdtfile(void)
33 changes: 0 additions & 33 deletions patch/u-boot/v2022.10/meson64-boot-usb-nvme-scsi-first.patch
View file
Open in desktop

This file was deleted.