Skip to content

Commit 4d83606

Browse files
ehsan6shaehsan6sha
authored
Merge pull request #22 from functionland/v24.11
V24.11 - updated kernel to v6
2 parents 8b7bbeb + 9737f4f commit 4d83606

File tree

6 files changed

+271
-128
lines changed

6 files changed

+271
-128
lines changed

‎build_image.sh

Lines changed: 81 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
66
BUILD_PATH=$DIR/build
77
ARMBIAN_PATH=$BUILD_PATH/armbian-build
88
ARMBIAN_IMAGE_PATH=$ARMBIAN_PATH/output/images
9+
BOOTLOADER_IMAGE_PATH=$ARMBIAN_PATH/cache/sources/u-boot-worktree/u-boot-rockchip64/next-dev-v2024.03/
910
########################################################
1011
Main() {
1112

1213
# read all variable from config file
1314
source $DIR/config
1415

15-
if [ -d $BUILD_PATH ]; then
16-
rm -rf "$BUILD_PATH"
17-
fi
16+
# if [ -d $BUILD_PATH ]; then
17+
# rm -rf "$BUILD_PATH"
18+
# fi
1819
mkdir -p $BUILD_PATH
1920

2021
#download armbian src
@@ -56,10 +57,10 @@ ArmbianSrcInit()
5657

5758
sudo apt-get -y -qq install git
5859

59-
#get armbian-biuld
60-
if [ -d $ARMBIAN_PATH ]; then
61-
rm -rf "$ARMBIAN_PATH"
62-
fi
60+
#get armbian-build
61+
# if [ -d $ARMBIAN_PATH ]; then
62+
# rm -rf "$ARMBIAN_PATH"
63+
# fi
6364

6465
echo "clone armbian-build branch $ARMBIAN_REPO_BRANCH"
6566
git clone --depth=1 --branch=$ARMBIAN_BRANCH https://github.com/armbian/build $ARMBIAN_PATH
@@ -145,6 +146,9 @@ ArmbianCompileDesktop()
145146
CreateUsbFlashUpdate()
146147
{
147148
echo "Create USB Flash Update files"
149+
150+
echo "copy bootloader to output folder"
151+
cp $BOOTLOADER_IMAGE_PATH/rkspi_loader.img $BUILD_PATH/flash.img
148152

149153
echo "Split update file to 1GB parts"
150154
split -d -a 1 -b 1G $ARMBIAN_IMAGE_PATH/*.img $BUILD_PATH/update.img. --verbose
@@ -158,8 +162,9 @@ CreateUsbFlashUpdate()
158162
echo "usb update starting"
159163
echo "******************************************"
160164
161-
setenv load_addr "0x9000000"
162-
setenv load_size "0x40000000"
165+
setenv load_addr0 "0x09000000"
166+
setenv load_addr1 "0x0B000000"
167+
setenv load_size "0x40000000"
163168
164169
setenv load_addr_part_0 "0x0000000"
165170
setenv load_addr_part_1 "0x0200000"
@@ -185,38 +190,87 @@ CreateUsbFlashUpdate()
185190
usb reset
186191
usb dev 0
187192
193+
mtd_blk dev 2
194+
188195
mmc list
189196
mmc dev
190197
198+
fatload usb 0:1 \${load_addr0} flash.img
199+
echo "usb: flash image size: \${filesize} bytes"
200+
201+
setexpr file_size_blk \${filesize} / 0x200
202+
echo "mtd: flash image block size: \${file_size_blk}"
203+
204+
mtd_blk read \${load_addr1} 0 \${file_size_blk}
205+
206+
setexpr cmp_size \${filesize} / 4
207+
echo "cmp: cmp size: \${cmp_size}"
208+
209+
echo "cmp: compare usb flash.img with mtd content"
210+
cmp \${load_addr0} \${load_addr1} \${cmp_size}
211+
212+
if test \$? -eq 0 ; then
213+
echo "******************************************"
214+
echo "usb: flash already updated"
215+
echo "******************************************"
216+
else
217+
if test -e usb 0:1 flash.img ; then
218+
echo "******************************************"
219+
echo "usb: there is flash update file"
220+
221+
#turn on red led
222+
gpio clear gpio211
223+
224+
#turn off blue led
225+
gpio set gpio212
226+
227+
echo "mtd: wait for copy flash image to Nor Flash"
228+
mtd_blk write \${load_addr0} 0 \${file_size_blk}
229+
echo "mtd: copy completed"
230+
231+
rkimgtest mtd 2
232+
233+
echo " "
234+
echo "please remove USB"
235+
echo ""
236+
echo "******************************************"
237+
else
238+
echo "******************************************"
239+
echo "usb: there is no flash update file"
240+
echo "******************************************"
241+
fi
242+
fi
243+
244+
echo "update rootfs"
245+
191246
if test -e usb 0:1 update.img.0 ; then
192247
echo "******************************************"
193248
echo "usb: there is update file"
194249
195250
#turn on red led
196251
gpio clear gpio211
252+
gpio clear gpio411
197253
198254
#turn off blue led
199255
gpio set gpio212
200-
256+
gpio set gpio412
201257
EOF
202258

203-
#for (( i=0; i<$fileCnt; i++ ))
204-
#do
205259
i=0
206260
while [ "$i" -lt $fileCnt ]; do
207261
cat >> $BUILD_PATH/boot.cmd <<- EOF
208262
209263
size usb 0:1 update.img.$i
210-
echo "usb: part $i image size: \${filesize} bytes"
264+
echo "usb: part $i image size: \${filesize} bytes"
211265
echo "usb: wait for copy part $i image to DDR"
212-
fatload usb 0:1 \${load_addr} update.img.$i
213-
echo "usb: part $i copy complete"
266+
fatload usb 0:1 \${load_addr0} update.img.$i
267+
echo "usb: part $i copy complete"
214268
setexpr file_size_blk \${filesize} / 0x200
215-
echo "emmc: part $i image block size: \${file_size_blk}"
269+
echo "emmc: part $i image block size: \${file_size_blk}"
216270
echo "emmc: wait for copy part $i image to eMMC"
217-
mmc write \${load_addr} \${load_addr_part_$i} \${file_size_blk}
271+
mmc write \${load_addr0} \${load_addr_part_$i} \${file_size_blk}
218272
echo "emmc: part $i copy completed"
219-
273+
220274
EOF
221275
i=$(( i + 1 ))
222276
done
@@ -233,14 +287,18 @@ CreateUsbFlashUpdate()
233287
234288
#turn off red led
235289
gpio set gpio211
290+
gpio set gpio411
236291
237292
#turn on blue led
238-
gpio clear gpio212
293+
gpio clear gpio212
294+
gpio clear gpio412
239295
240-
while true ; do ;
241-
gpio set gpio212 &&
296+
while true ; do ;
297+
gpio set gpio212 &&
298+
gpio set gpio412 &&
242299
usb reset &&
243-
gpio clear gpio212 &&
300+
gpio clear gpio212 &&
301+
gpio clear gpio412 &&
244302
usb reset &&
245303
; done;
246304
@@ -256,7 +314,7 @@ CreateUsbFlashUpdate()
256314
echo "zip all update file to $BUILD_PATH/update.zip"
257315
cd $BUILD_PATH
258316
sudo rm -f update.zip
259-
zip -s 1900m -r update.zip update.img.* boot.scr
317+
zip -s 1900m -r update.zip update.img.* boot.scr flash.img
260318

261319
} #CreateUsbFlashUpdate
262320
########################################################

‎config

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
ARMBIAN_BRANCH="main"
1+
ARMBIAN_BRANCH="v24.11"
22

33
ARMBIAN_ROOT_PASSWORD="fxblox"
44
ARMBIAN_USER_NAME="pi"
55
ARMBIAN_USER_PASSWORD="fxblox"
6-
7-
8-

‎userpatches/customize-image.sh

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,11 @@ fxBloxCustomScript()
5656
# read all variable from config file
5757
source /tmp/overlay/config
5858

59-
#fix blutooth frimware loading error
60-
echo "fix blutooth"
61-
ln -s /lib/firmware/rtl8852bu_config /lib/firmware/rtl_bt/rtl8852bu_config.bin
62-
ln -s /lib/firmware/rtl8852bu_fw /lib/firmware/rtl_bt/rtl8852bu_fw.bin
63-
6459
fxBloxCustomScriptService;
6560

6661
InstallpythonPackages;
6762

6863
InstallDocker;
69-
#InstallDockerOffline;
7064

7165
InstallFulaOTA;
7266

@@ -76,6 +70,8 @@ fxBloxCustomScriptService()
7670
{
7771
echo "install fxBlox Custom Script Service"
7872

73+
74+
# disable armbian autoconfig
7975
rm /root/.not_logged_in_yet
8076

8177
mkdir -p /usr/bin/fula/
@@ -91,19 +87,19 @@ fxBloxCustomScriptService()
9187
cat > /etc/systemd/system/fxBlox_custom_script_service.service <<- EOF
9288
[Unit]
9389
Description=fxBlox custom script service
94-
After=multi-user.target network.target
90+
After=default.target
9591
ConditionPathExists=/root/.fxBlox_custom_script_service
9692
9793
[Service]
98-
Type=oneshot
94+
Type=simple
9995
User=root
10096
Group=root
10197
ExecStart=/bin/bash /usr/bin/fxBlox_custom_script_service.sh
10298
RemainAfterExit=yes
10399
TimeoutStartSec=infinity
104100
105101
[Install]
106-
WantedBy=multi-user.target
102+
WantedBy=default.target
107103
EOF
108104
systemctl --no-reload enable fxBlox_custom_script_service.service
109105

@@ -132,7 +128,7 @@ InstallDocker()
132128

133129
#Add Docker's official GPG key:
134130
for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do apt-get remove $pkg; done
135-
#apt-get update
131+
136132
# Add Docker's official GPG key:
137133
apt-get update
138134
apt-get install ca-certificates curl
@@ -156,31 +152,14 @@ InstallDocker()
156152
ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
157153
} # InstallDocker
158154

159-
InstallDockerOffline()
160-
{
161-
echo "installing docker"
162-
apt install /tmp/overlay/docker/*.deb
163-
164-
#Install Docker Compose 1.29.2
165-
echo "Docker Compose"
166-
cp /tmp/overlay/docker/docker-compose /usr/local/bin/docker-compose
167-
chmod +x /usr/local/bin/docker-compose
168-
ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
169-
170-
} # InstallDockerOffline
171-
172155
InstallFulaOTA()
173156
{
174157
echo "Install Fula OTA"
175158

176159
mkdir -p /home/$ARMBIAN_USER_NAME
177160
#chown -R $ARMBIAN_USER_NAME:$ARMBIAN_USER_NAME /home/$ARMBIAN_USER_NAME
178161

179-
git clone -b main https://github.com/functionland/fula-ota /home/$ARMBIAN_USER_NAME/fula-ota
180-
181-
#copy offline docker
182-
#mkdir -p /usr/bin/fula/
183-
#cp /tmp/overlay/offline_docker/* /usr/bin/fula/
162+
git clone --depth=1 -b main https://github.com/functionland/fula-ota /home/$ARMBIAN_USER_NAME/fula-ota
184163

185164
cd /home/$ARMBIAN_USER_NAME/fula-ota/docker/fxsupport/linux
186165
bash ./fula.sh install chroot

‎userpatches/kernel/rk35xx-vendor-6.1/0002-fxblox-rk1-disablr-sleep.patch

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
From 56375772f28425030f0d98ac2e5bc4316f611916 Mon Sep 17 00:00:00 2001
2+
From: mahdichi <[email protected]>
3+
Date: Mon, 11 Nov 2024 20:30:41 +0330
4+
Subject: [PATCH 2/2] fxblox-rk1-disablr-sleep
5+
6+
---
7+
.../boot/dts/rockchip/rk3588-fxblox-rk1.dts | 32 +++++++++----------
8+
1 file changed, 16 insertions(+), 16 deletions(-)
9+
10+
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts b/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts
11+
index 7b09635a0..b676d014a 100644
12+
--- a/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts
13+
+++ b/arch/arm64/boot/dts/rockchip/rk3588-fxblox-rk1.dts
14+
@@ -1178,22 +1178,22 @@ loader@0 {
15+
};
16+
};
17+
18+
-&rockchip_suspend {
19+
- compatible = "rockchip,pm-rk3588";
20+
- status = "okay";
21+
- rockchip,sleep-debug-en = <1>;
22+
- rockchip,sleep-mode-config = <
23+
- (0
24+
- | RKPM_SLP_ARMOFF_DDRPD
25+
- )
26+
- >;
27+
- rockchip,wakeup-config = <
28+
- (0
29+
- | RKPM_GPIO_WKUP_EN
30+
- | RKPM_USB_WKUP_EN
31+
- )
32+
- >;
33+
-};
34+
+// &rockchip_suspend {
35+
+// compatible = "rockchip,pm-rk3588";
36+
+// status = "okay";
37+
+// rockchip,sleep-debug-en = <1>;
38+
+// rockchip,sleep-mode-config = <
39+
+// (0
40+
+// | RKPM_SLP_ARMOFF_DDRPD
41+
+// )
42+
+// >;
43+
+// rockchip,wakeup-config = <
44+
+// (0
45+
+// | RKPM_GPIO_WKUP_EN
46+
+// | RKPM_USB_WKUP_EN
47+
+// )
48+
+// >;
49+
+// };
50+
51+
&avdd_0v75_s0 {
52+
regulator-state-mem {
53+
--
54+
2.34.1
55+

0 commit comments

Comments
 (0)