From 15212ed11ba931f6910eec5479bc5332c265acd2 Mon Sep 17 00:00:00 2001 From: baiywt Date: Fri, 21 Apr 2023 19:37:33 +0800 Subject: [PATCH] Update for Orange Pi 5 --- configs/orangepi-5-rk3588_defconfig | 71 ++++++++++++++----- include/kernel-5.10 | 2 +- include/kernel.mk | 2 +- package/base-files/files/bin/config_generate | 2 +- .../armv8/base-files/etc/board.d/02_network | 3 + target/linux/rockchip/armv8/config-5.10 | 34 +-------- 6 files changed, 61 insertions(+), 53 deletions(-) diff --git a/configs/orangepi-5-rk3588_defconfig b/configs/orangepi-5-rk3588_defconfig index 9f08360038..4a26df3122 100644 --- a/configs/orangepi-5-rk3588_defconfig +++ b/configs/orangepi-5-rk3588_defconfig @@ -1,31 +1,39 @@ CONFIG_TARGET_rockchip=y CONFIG_TARGET_rockchip_armv8=y CONFIG_TARGET_rockchip_armv8_DEVICE_xunlong_orangepi-5=y +CONFIG_TARGET_KERNEL_PARTSIZE=64 +CONFIG_TARGET_ROOTFS_PARTSIZE=400 # CONFIG_PACKAGE_dnsmasq is not set CONFIG_PACKAGE_dnsmasq-full=y -CONFIG_LUCI_LANG_zh_Hans=y -CONFIG_PACKAGE_luci-app-mwan3=y -CONFIG_PACKAGE_kmod-ipt-nat6=y -CONFIG_PACKAGE_kmod-nf-nat6=y -CONFIG_PACKAGE_kmod-usb-serial-option=y -# CONFIG_PACKAGE_kmod-gpio-button-hotplug is not set -CONFIG_TARGET_KERNEL_PARTSIZE=64 -#CONFIG_TARGET_ROOTFS_PARTSIZE=104 -CONFIG_PACKAGE_usb-modeswitch=y +CONFIG_PACKAGE_iperf3=y +CONFIG_PACKAGE_docker=y +CONFIG_PACKAGE_dockerd=y +CONFIG_PACKAGE_rsync=y +CONFIG_PACKAGE_rsyncd=y +CONFIG_PACKAGE_openssh-sftp-server=y +CONFIG_PACKAGE_iptables-mod-conntrack-extra=y +CONFIG_PACKAGE_iptables-mod-ipopt=y +CONFIG_PACKAGE_iptables-mod-tproxy=y +CONFIG_PACKAGE_zerotier=y CONFIG_PACKAGE_wpa-supplicant=y CONFIG_PACKAGE_uhttpd=y CONFIG_PACKAGE_uhttpd-mod-ubus=y CONFIG_PACKAGE_hostapd=y CONFIG_PACKAGE_hostapd-common=y -CONFIG_PACKAGE_luci-app-ttyd=y -CONFIG_PACKAGE_iw=y -CONFIG_PACKAGE_iwinfo=y -CONFIG_PACKAGE_luci-app-samba4=y -CONFIG_PACKAGE_luci-app-statistics=y -CONFIG_PACKAGE_luci-app-transmission=y -CONFIG_PACKAGE_luci-app-ttyd=y -CONFIG_PACKAGE_kmod-mac80211=y -CONFIG_PACKAGE_kmod-cfg80211=y +CONFIG_PACKAGE_ifstat=y +CONFIG_PACKAGE_iftop=y +CONFIG_PACKAGE_ipset=y +CONFIG_PACKAGE_netperf=y +CONFIG_PACKAGE_squid=y +CONFIG_PACKAGE_tcpdump=y +CONFIG_PACKAGE_speedtest-netperf=y +CONFIG_PACKAGE_htop=y +CONFIG_PACKAGE_libusb-1.0=y +CONFIG_PACKAGE_blkid=y + +CONFIG_LUCI_LANG_zh_Hans=y +CONFIG_PACKAGE_luci-app-dockerman=y +CONFIG_DOCKER_OPTIONAL_FEATURES=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-samba4=y CONFIG_PACKAGE_luci-app-statistics=y @@ -42,6 +50,30 @@ CONFIG_PACKAGE_luci-app-ntpc=y CONFIG_PACKAGE_luci-app-mwan3=y CONFIG_PACKAGE_luci-app-qos=y CONFIG_PACKAGE_luci-app-unbound=y + +CONFIG_PACKAGE_collectd-mod-ping=y +CONFIG_PACKAGE_collectd-mod-thermal=y +CONFIG_PACKAGE_kmod-mt76x0u=y +CONFIG_PACKAGE_kmod-mt7601u=y +CONFIG_PACKAGE_kmod-mt76x2u=y +CONFIG_PACKAGE_kmod-rtl8812au-ct=y +CONFIG_PACKAGE_kmod-rtl8821ae=y +CONFIG_PACKAGE_kmod-rtl8xxxu=y +CONFIG_PACKAGE_kmod-ipt-nat6=y +CONFIG_PACKAGE_kmod-nf-nat6=y +CONFIG_PACKAGE_kmod-usb-serial-option=y +CONFIG_PACKAGE_mt7601u-firmware=y +CONFIG_PACKAGE_rtl8188eu-firmware=y +CONFIG_PACKAGE_rtl8723au-firmware=y +CONFIG_PACKAGE_rtl8723bu-firmware=y +CONFIG_PACKAGE_rtl8821ae-firmware=y +CONFIG_PACKAGE_iw=y +CONFIG_PACKAGE_iwinfo=y +CONFIG_PACKAGE_wpad-wolfssl=y +CONFIG_DRIVER_11AC_SUPPORT=y +CONFIG_DRIVER_11N_SUPPORT=y +CONFIG_PACKAGE_kmod-mac80211=y +CONFIG_PACKAGE_kmod-cfg80211=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_kmod-rtw88=y CONFIG_PACKAGE_rtl8723bu-firmware=y @@ -49,4 +81,5 @@ CONFIG_PACKAGE_rtl8723du-firmware=y CONFIG_PACKAGE_bcmdhd-firmware=y CONFIG_PACKAGE_kmod-rtl8xxxu=y CONFIG_PACKAGE_kmod-bcmdhd=y -CONFIG_PACKAGE_luci=y +CONFIG_PACKAGE_usbutils=y +CONFIG_PACKAGE_usb-modeswitch=y diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 99f7dab32f..212b35bb19 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,5 +1,5 @@ LINUX_VERSION-5.10 = .110 #LINUX_KERNEL_HASH-5.10.110 = c5c3221aa1a8a8de0fdc889cdbc9091e9a970e2199cbcfaf6cd84888a76caff8 KERNEL_GIT_CLONE_URI = https://github.com/orangepi-xunlong/linux-orangepi -KERNEL_GIT_REF = d595b0b29afbcae525580208447b67e59608b619 +KERNEL_GIT_REF = 45d99cf184ab31a30087d0bd2a3c743eb21550d7 KERNEL_GIT_OPT = --depth 1 -b orange-pi-5.10-rk3588-openwrt-v1 diff --git a/include/kernel.mk b/include/kernel.mk index 8f5addbf07..e476d96513 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -67,7 +67,7 @@ else else ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI))$(call qstrip,$(KERNEL_GIT_CLONE_URI)),) LINUX_SITE:=@KERNEL/linux/kernel/v$(word 1,$(subst ., ,$(KERNEL_BASE))).x else - LINUX_UNAME_VERSION:=$(strip $(shell cat $(LINUX_DIR)/include/config/kernel.release 2>/dev/null)) + LINUX_UNAME_VERSION?=$(strip $(shell cat $(LINUX_DIR)/include/config/kernel.release 2>/dev/null)) endif MODULES_SUBDIR:=lib/modules/$(LINUX_UNAME_VERSION) diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index 38362813d1..dbb648d329 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -162,7 +162,7 @@ generate_network() { static) local ipad case "$1" in - lan) ipad=${ipaddr:-"192.168.1.1"} ;; + lan) ipad=${ipaddr:-"192.168.2.1"} ;; *) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;; esac diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network index b0e6479947..b656620718 100644 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network @@ -11,6 +11,9 @@ rockchip_setup_interfaces() friendlyarm,nanopi-r4s) ucidef_set_interfaces_lan_wan 'eth1' 'eth0' ;; + rockchip,rk3588s-orangepi-5) + ucidef_set_interfaces_lan_wan 'eth0' 'eth1' + ;; *) ucidef_set_interface_lan 'eth0' ;; diff --git a/target/linux/rockchip/armv8/config-5.10 b/target/linux/rockchip/armv8/config-5.10 index e1397a9d56..8ccb5ef369 100644 --- a/target/linux/rockchip/armv8/config-5.10 +++ b/target/linux/rockchip/armv8/config-5.10 @@ -284,26 +284,18 @@ CONFIG_CPU_RK3568=y CONFIG_CPU_RK3588=y CONFIG_CPU_RMAP=y CONFIG_CPU_THERMAL=y +CONFIG_CRASH_DUMP=y CONFIG_CRC16=y # CONFIG_CRC32_SARWATE is not set CONFIG_CRC32_SLICEBY8=y -CONFIG_CRC7=y CONFIG_CRC_CCITT=y -CONFIG_CRC_ITU_T=y CONFIG_CRC_T10DIF=y CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_AES_ARM64=y -CONFIG_CRYPTO_AES_ARM64_BS=y CONFIG_CRYPTO_AES_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y -CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y -CONFIG_CRYPTO_ANSI_CPRNG=y -CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y CONFIG_CRYPTO_BLAKE2S=y -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CFB=y -CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y @@ -311,15 +303,8 @@ CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_DEV_ROCKCHIP=y -# CONFIG_CRYPTO_DEV_ROCKCHIP_DEV is not set -CONFIG_CRYPTO_DEV_ROCKCHIP_V1=y -CONFIG_CRYPTO_DEV_ROCKCHIP_V2=y -# CONFIG_CRYPTO_DEV_ROCKCHIP_V3 is not set +# CONFIG_CRYPTO_DEV_ROCKCHIP is not set CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_DRBG_CTR=y -CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y @@ -333,27 +318,13 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_JITTERENTROPY=y # CONFIG_CRYPTO_LIB_BLAKE2S is not set CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y -CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y -CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_LIB_SHA256=y -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA256_ARM64=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_SHA512_ARM64=y -CONFIG_CRYPTO_SHA512_ARM64_CE=y -CONFIG_CRYPTO_SM3=y -CONFIG_CRYPTO_SM4=y -CONFIG_CRYPTO_XTS=y # CONFIG_DAMON is not set CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DCB=y @@ -1121,6 +1092,7 @@ CONFIG_PROBE_EVENTS=y CONFIG_PROC_EVENTS=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_PROC_PID_CPUSET=y +CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y CONFIG_PROXIMITY_DEVICE=y CONFIG_PSTORE=y