From 9020803f1d17314db0931c50ef25d2bd15542817 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sun, 28 Jun 2020 17:13:32 +0200 Subject: [PATCH] Update kernel configs due to logo support, adjust patches Now always create logo, but enable only on request, where defined (Pinebook, Teres, ...) --- config/bootenv/cubox.txt | 1 + config/bootenv/rk322x.txt | 1 + config/bootenv/rockchip.txt | 1 + config/bootenv/s5p6818.txt | 1 + config/bootenv/sunxi.txt | 2 +- config/bootenv/udoo.txt | 1 + config/kernel/linux-rockchip-current.config | 5 +++-- config/kernel/linux-rockchip-dev.config | 22 ++++++++++++++++++- config/kernel/linux-rockchip64-current.config | 1 + config/kernel/linux-rockchip64-dev.config | 1 + config/kernel/linux-sunxi-dev.config | 4 +++- lib/distributions.sh | 3 ++- lib/general.sh | 9 ++++---- ...verse-do-not-use-bulk-on-EP3-and-EP4.patch | 6 ++--- ...verse-do-not-use-bulk-on-EP3-and-EP4.patch | 6 ++--- 15 files changed, 48 insertions(+), 16 deletions(-) diff --git a/config/bootenv/cubox.txt b/config/bootenv/cubox.txt index b9bafac335..8ef917299f 100644 --- a/config/bootenv/cubox.txt +++ b/config/bootenv/cubox.txt @@ -1 +1,2 @@ verbosity=1 +bootlogo=false diff --git a/config/bootenv/rk322x.txt b/config/bootenv/rk322x.txt index 4ad0e401c7..8657cc4d01 100644 --- a/config/bootenv/rk322x.txt +++ b/config/bootenv/rk322x.txt @@ -1,2 +1,3 @@ verbosity=1 extraargs=coherent_pool=2M +bootlogo=false diff --git a/config/bootenv/rockchip.txt b/config/bootenv/rockchip.txt index b9bafac335..8ef917299f 100644 --- a/config/bootenv/rockchip.txt +++ b/config/bootenv/rockchip.txt @@ -1 +1,2 @@ verbosity=1 +bootlogo=false diff --git a/config/bootenv/s5p6818.txt b/config/bootenv/s5p6818.txt index af16115c05..918acb77b5 100644 --- a/config/bootenv/s5p6818.txt +++ b/config/bootenv/s5p6818.txt @@ -1,2 +1,3 @@ verbosity=1 console=both +bootlogo=false diff --git a/config/bootenv/sunxi.txt b/config/bootenv/sunxi.txt index 552f25f077..42db4f151b 100644 --- a/config/bootenv/sunxi.txt +++ b/config/bootenv/sunxi.txt @@ -1,4 +1,4 @@ verbosity=1 -logo=disabled +bootlogo=false console=both disp_mode=1920x1080p60 diff --git a/config/bootenv/udoo.txt b/config/bootenv/udoo.txt index b9bafac335..8ef917299f 100644 --- a/config/bootenv/udoo.txt +++ b/config/bootenv/udoo.txt @@ -1 +1,2 @@ verbosity=1 +bootlogo=false diff --git a/config/kernel/linux-rockchip-current.config b/config/kernel/linux-rockchip-current.config index 30d3958681..61b96bfbf4 100644 --- a/config/kernel/linux-rockchip-current.config +++ b/config/kernel/linux-rockchip-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.38 Kernel Configuration +# Linux/arm 5.4.49 Kernel Configuration # # @@ -12,7 +12,6 @@ CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_INLINE=y -CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -2327,6 +2326,7 @@ CONFIG_WLAN_VENDOR_TI=y # CONFIG_WL12XX is not set # CONFIG_WL18XX is not set # CONFIG_WLCORE is not set +CONFIG_RTL8723DU=m CONFIG_RTL8723DS=m CONFIG_RTL8822BU=m CONFIG_RTL8188EU=m @@ -4289,6 +4289,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +CONFIG_BOOTSPLASH=y # end of Console display driver support CONFIG_LOGO=y diff --git a/config/kernel/linux-rockchip-dev.config b/config/kernel/linux-rockchip-dev.config index f3fc7664ea..dec6968780 100644 --- a/config/kernel/linux-rockchip-dev.config +++ b/config/kernel/linux-rockchip-dev.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.7.2 Kernel Configuration +# Linux/arm 5.7.6 Kernel Configuration # # @@ -2322,6 +2322,7 @@ CONFIG_WLAN_VENDOR_TI=y # CONFIG_WL12XX is not set # CONFIG_WL18XX is not set # CONFIG_WLCORE is not set +CONFIG_RTL8723DU=m CONFIG_RTL8723DS=m CONFIG_RTL8822BU=m CONFIG_RTL8188EU=m @@ -4326,6 +4327,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +CONFIG_BOOTSPLASH=y # end of Console display driver support CONFIG_LOGO=y @@ -6378,6 +6380,24 @@ CONFIG_PSTORE_RAM=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # CONFIG_EROFS_FS is not set +CONFIG_AUFS_FS=m +CONFIG_AUFS_BRANCH_MAX_127=y +# CONFIG_AUFS_BRANCH_MAX_511 is not set +# CONFIG_AUFS_BRANCH_MAX_1023 is not set +# CONFIG_AUFS_BRANCH_MAX_32767 is not set +CONFIG_AUFS_SBILIST=y +# CONFIG_AUFS_HNOTIFY is not set +# CONFIG_AUFS_EXPORT is not set +# CONFIG_AUFS_XATTR is not set +# CONFIG_AUFS_FHSM is not set +# CONFIG_AUFS_RDU is not set +# CONFIG_AUFS_DIRREN is not set +# CONFIG_AUFS_SHWH is not set +# CONFIG_AUFS_BR_RAMFS is not set +# CONFIG_AUFS_BR_FUSE is not set +CONFIG_AUFS_BR_HFSPLUS=y +CONFIG_AUFS_BDEV_LOOP=y +# CONFIG_AUFS_DEBUG is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V2=y diff --git a/config/kernel/linux-rockchip64-current.config b/config/kernel/linux-rockchip64-current.config index d83594746d..30ea373b7d 100644 --- a/config/kernel/linux-rockchip64-current.config +++ b/config/kernel/linux-rockchip64-current.config @@ -5358,6 +5358,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +CONFIG_BOOTSPLASH=y # end of Console display driver support CONFIG_LOGO=y diff --git a/config/kernel/linux-rockchip64-dev.config b/config/kernel/linux-rockchip64-dev.config index cd7fa66b47..3c84a35605 100644 --- a/config/kernel/linux-rockchip64-dev.config +++ b/config/kernel/linux-rockchip64-dev.config @@ -5457,6 +5457,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +CONFIG_BOOTSPLASH=y # end of Console display driver support CONFIG_LOGO=y diff --git a/config/kernel/linux-sunxi-dev.config b/config/kernel/linux-sunxi-dev.config index 14f5a1efc4..69f370bfa4 100644 --- a/config/kernel/linux-sunxi-dev.config +++ b/config/kernel/linux-sunxi-dev.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.7.5 Kernel Configuration +# Linux/arm 5.7.6 Kernel Configuration # # @@ -2578,6 +2578,7 @@ CONFIG_WLAN_VENDOR_TI=y # CONFIG_WL12XX is not set # CONFIG_WL18XX is not set # CONFIG_WLCORE is not set +CONFIG_RTL8723DU=m CONFIG_RTL8723DS=m CONFIG_RTL8822BU=m CONFIG_RTL8188EU=m @@ -4608,6 +4609,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +CONFIG_BOOTSPLASH=y # end of Console display driver support CONFIG_LOGO=y diff --git a/lib/distributions.sh b/lib/distributions.sh index 617cb88d32..5f7415704e 100644 --- a/lib/distributions.sh +++ b/lib/distributions.sh @@ -426,7 +426,8 @@ install_common() # nsswitch settings for sane DNS behavior: remove resolve, assure libnss-myhostname support sed "s/hosts\:.*/hosts: files mymachines dns myhostname/g" -i "${SDCARD}"/etc/nsswitch.conf - [[ $BOOT_LOGO == yes || $BOOT_LOGO == desktop && $BUILD_DESKTOP == yes ]] && boot_logo + # build logo in any case + boot_logo } diff --git a/lib/general.sh b/lib/general.sh index b1f95f1ef7..6a952b8d7c 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -590,10 +590,11 @@ display_alert "Building kernel splash logo" "$RELEASE" "info" --blob "${SDCARD}"/tmp/throbber73.rgb \ --blob "${SDCARD}"/tmp/throbber74.rgb \ "${SDCARD}"/lib/firmware/bootsplash.armbian >/dev/null 2>&1 - [[ -f "${SDCARD}"/boot/armbianEnv.txt ]] && grep -q '^bootlogo' "${SDCARD}"/boot/armbianEnv.txt && \ - sed -i 's/^bootlogo.*/bootlogo=true/' "${SDCARD}"/boot/armbianEnv.txt || echo 'bootlogo=true' >> "${SDCARD}"/boot/armbianEnv.txt - [[ -f "${SDCARD}"/boot/boot.ini ]] && sed -i 's/^setenv bootlogo.*/setenv bootlogo "true"/' "${SDCARD}"/boot/boot.ini - + if [[ $BOOT_LOGO == yes || $BOOT_LOGO == desktop && $BUILD_DESKTOP == yes ]]; then + [[ -f "${SDCARD}"/boot/armbianEnv.txt ]] && grep -q '^bootlogo' "${SDCARD}"/boot/armbianEnv.txt && \ + sed -i 's/^bootlogo.*/bootlogo=true/' "${SDCARD}"/boot/armbianEnv.txt || echo 'bootlogo=true' >> "${SDCARD}"/boot/armbianEnv.txt + [[ -f "${SDCARD}"/boot/boot.ini ]] && sed -i 's/^setenv bootlogo.*/setenv bootlogo "true"/' "${SDCARD}"/boot/boot.ini + fi # enable additional services chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload enable bootsplash-ask-password-console.path >/dev/null 2>&1" chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload enable bootsplash-hide-when-booted.service >/dev/null 2>&1" diff --git a/patch/kernel/rockchip-current/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch b/patch/kernel/rockchip-current/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch index 551c18cc50..a559997993 100644 --- a/patch/kernel/rockchip-current/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch +++ b/patch/kernel/rockchip-current/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch @@ -43,8 +43,8 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath resubmit: @@ -909,11 +909,11 @@ - goto err_skb; - } + rx_buf->hif_dev = hif_dev; + rx_buf->skb = skb; + usb_fill_bulk_urb(urb, hif_dev->udev, + usb_rcvbulkpipe(hif_dev->udev, @@ -53,7 +53,7 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath USB_REG_IN_PIPE), skb->data, MAX_REG_IN_BUF_SIZE, + ath9k_hif_usb_reg_in_cb, skb); -- ath9k_hif_usb_reg_in_cb, skb, 1); +- ath9k_hif_usb_reg_in_cb, rx_buf, 1); /* Anchor URB */ usb_anchor_urb(urb, &hif_dev->reg_in_submitted); diff --git a/patch/kernel/rockchip-dev/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch b/patch/kernel/rockchip-dev/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch index 551c18cc50..a559997993 100644 --- a/patch/kernel/rockchip-dev/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch +++ b/patch/kernel/rockchip-dev/2007-drivers-wifi-ath9k-reverse-do-not-use-bulk-on-EP3-and-EP4.patch @@ -43,8 +43,8 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath resubmit: @@ -909,11 +909,11 @@ - goto err_skb; - } + rx_buf->hif_dev = hif_dev; + rx_buf->skb = skb; + usb_fill_bulk_urb(urb, hif_dev->udev, + usb_rcvbulkpipe(hif_dev->udev, @@ -53,7 +53,7 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath USB_REG_IN_PIPE), skb->data, MAX_REG_IN_BUF_SIZE, + ath9k_hif_usb_reg_in_cb, skb); -- ath9k_hif_usb_reg_in_cb, skb, 1); +- ath9k_hif_usb_reg_in_cb, rx_buf, 1); /* Anchor URB */ usb_anchor_urb(urb, &hif_dev->reg_in_submitted);