Skip to content

Commit d1e9c90

Browse files
committed
OrangePi 3 LTS: Use extlinux and remove aw859a-wifi.service
For "reasons" extlinux provides a more stable boot. Remove aw859a-wifi.service: The service modprobes sprdwl_ng later in the boot process. Which is not required. Just enabling it in modules-load.d will suffice. I believe the reasoning for this service was to prevent a crash which occurs if sprdwl_ng loads before cpufreq_dt. To prevent the crash we will set in the defconfig CONFIG_CPUFREQ_DT=y. Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
1 parent 1890d7f commit d1e9c90

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

config/boards/orangepi3-lts.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ BOARD_NAME="Orange Pi 3 LTS"
33
BOARD_VENDOR="xunlong"
44
BOARDFAMILY="sun50iw6"
55
BOARD_MAINTAINER="pyavitz"
6-
BOOT_FDT_FILE="sun50i-h6-orangepi-3-lts.dtb"
6+
BOOT_FDT_FILE="allwinner/sun50i-h6-orangepi-3-lts.dtb"
77
BOOTCONFIG="orangepi_3_lts_defconfig"
88
BOOT_LOGO="desktop"
9-
MODULES_BLACKLIST="sunxi_addr" # Still loads but later in the boot process
109
CRUSTCONFIG="orangepi_3_lts_defconfig"
1110
KERNEL_TARGET="current,edge"
1211
KERNEL_TEST_TARGET="current"
1312
PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
13+
SRC_EXTLINUX="yes"
14+
SRC_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=1"
1415

1516
function post_family_config__use_orangepi3lts_uboot() {
1617
case $BRANCH in
@@ -50,14 +51,14 @@ function post_family_tweaks_bsp__uwe5622_wireless() {
5051
[Install]
5152
WantedBy=multi-user.target
5253
EOT
53-
cp -f "$SRC/packages/bsp/sunxi/aw859a-wifi.service" "${destination}"/etc/systemd/system/
5454
mkdir -p "${destination}"/etc/modules-load.d
5555
# Add needed wireless modules
5656
cat > "${destination}"/etc/modules-load.d/uwe5622-wireless.conf <<- EOT
5757
hci_uart
5858
bnep
5959
rfcomm
6060
sprdbt_tty
61+
sprdwl_ng
6162
EOT
6263
fi
6364
}
@@ -66,7 +67,6 @@ function post_family_tweaks_bsp__uwe5622_wireless() {
6667
function post_family_tweaks__enable_uwe5622_wireless_services() {
6768
display_alert "$BOARD" "Enabling UWE5622 Wireless Services" "info"
6869
chroot_sdcard systemctl --no-reload enable sprd-bluetooth.service
69-
chroot_sdcard systemctl --no-reload enable aw859a-wifi.service
7070
}
7171

7272
function post_family_config__opi3lts_set_asoundstate_file() {

0 commit comments

Comments
 (0)