update kernel -> 5.17.1 + update build-new-kernel.sh

This commit is contained in:
Christian Zimmermann 2022-04-03 20:14:01 +02:00
parent 94bfae9620
commit 246213fac2
5 changed files with 9549 additions and 8 deletions

19
build-new-kernel.sh Normal file → Executable file
View file

@ -1,37 +1,42 @@
#!/bin/bash
test ${#} -eq 3 || { echo "usage: ${0} <version> <build> <git-token>"; exit 1; }
newver=${1}
nbuild=${2}
token=${3}
newverx=${newver}.${nbuild}
newverx=${newver}-${nbuild}
oldver=$(grep "pkgver" kernel-pkgs/PKGBUILD | head -n1)
oldver=${oldver##*=}
sed -i "s|${oldver}|${newverx}|g;" kernel-pkgs/PKGBUILD
echo "old version: ${oldver}"
echo "new version: ${newver}"
sed -i "s|${oldver}|${newver}|g;" kernel-pkgs/PKGBUILD
rm -rf kernel-pkgs/pkg
cp kernel/config-${oldver} kernel-pkgs/src/linux/.config
cd kernel-pkgs/src/linux
almake distclean
make distclean
git stash
git fetch
git fetch stable-linux
git co v${newver}
git stash apply
git restore scripts/depmod.sh
git diff > ../../../ws/chizeta/how-to-arch-a-banana-pi-r2/kernel/patches/patch-${newverx}
git diff > ../../../ws/chizeta/how-to-arch-a-banana-pi-r2/kernel/patches/patch-${newver}
git reset --hard
githash=$(git rev-parse HEAD)
make olddefconfig
cd -
cp kernel-pkgs/src/linux/.config kernel/linux-${githash}.config
ln -s linux-${githash}.config kernel/config-${newverx}
ln -s linux-${githash}.config kernel/config-${newver}
cd kernel-pkgs
makepkg
curl --header "PRIVATE-TOKEN: ${token}" --upload-file linux-armv7-${newverx}-1-armv7h.pkg.tar.xz "https://git.f3l.de/api/v4/projects/149/packages/generic/linux-banana-r2/${newverx}/linux-armv7-${newverx}-1-armv7h.pkg.tar.xz"
curl --header "PRIVATE-TOKEN: ${token}" --upload-file linux-armv7-headers-${newverx}-1-armv7h.pkg.tar.xz "https://git.f3l.de/api/v4/projects/149/packages/generic/linux-banana-r2/${newverx}/linux-armv7-headers-${newverx}-1-armv7h.pkg.tar.xz"
curl --header "PRIVATE-TOKEN: ${token}" --upload-file linux-armv7-${newverx}-armv7h.pkg.tar.xz "https://git.f3l.de/api/v4/projects/149/packages/generic/linux-banana-r2/${newver}/linux-armv7-${newverx}-armv7h.pkg.tar.xz"
curl --header "PRIVATE-TOKEN: ${token}" --upload-file linux-armv7-headers-${newverx}-armv7h.pkg.tar.xz "https://git.f3l.de/api/v4/projects/149/packages/generic/linux-banana-r2/${newver}/linux-armv7-headers-${newverx}-armv7h.pkg.tar.xz"
cd -

View file

@ -6,7 +6,7 @@ pkgbase=linux-armv7
_srcname=linux
_kernelname=${pkgbase#linux}
_desc="ARMv7 banana-pi-r2"
pkgver=5.16.1
pkgver=5.17.1
pkgrel=1
#rcnver=5.8.5
#rcnrel=armv7-x11

1
kernel/config-5.17.1 Symbolic link
View file

@ -0,0 +1 @@
linux-59db887d13b3a4df2713c2a866fa2767e0dea569.config

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,66 @@
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
index f4848362b3be..d19c77014e89 100644
--- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi
@@ -1090,7 +1090,13 @@ led_pins_a: leds-alt {
pins-leds {
pinmux = <MT7623_PIN_239_EXT_SDIO0_FUNC_GPIO239>,
<MT7623_PIN_240_EXT_XCS_FUNC_GPIO240>,
- <MT7623_PIN_241_EXT_SCK_FUNC_GPIO241>;
+ <MT7623_PIN_241_EXT_SCK_FUNC_GPIO241>,
+ <MT7623_PIN_18_PCM_CLK_FUNC_GPIO18>,
+ <MT7623_PIN_19_PCM_SYNC_FUNC_GPIO19>,
+ <MT7623_PIN_21_PCM_TX_FUNC_GPIO21>,
+ <MT7623_PIN_22_EINT0_FUNC_GPIO22>,
+ <MT7623_PIN_24_EINT2_FUNC_GPIO24>,
+ <MT7623_PIN_25_EINT3_FUNC_GPIO25>;
};
};
diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
index 027c1b0c6a98..c1948bc29427 100644
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
@@ -126,6 +126,42 @@ red {
gpios = <&pio 239 GPIO_ACTIVE_LOW>;
default-state = "off";
};
+
+ cust-0 {
+ label = "bpi-r2:pio:cust0";
+ gpios = <&pio 18 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+
+ cust-1 {
+ label = "bpi-r2:pio:cust1";
+ gpios = <&pio 19 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+
+ cust-2 {
+ label = "bpi-r2:pio:cust2";
+ gpios = <&pio 21 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+
+ cust-3 {
+ label = "bpi-r2:pio:cust3";
+ gpios = <&pio 22 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+
+ cust-4 {
+ label = "bpi-r2:pio:cust4";
+ gpios = <&pio 24 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+
+ cust-5 {
+ label = "bpi-r2:pio:cust5";
+ gpios = <&pio 25 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
};
memory@80000000 {