V1.28

TheRemote · Sep 28, 2022 · 7c4cd5e · 7c4cd5e
1 parent 3473a60
commit 7c4cd5e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 2,631 deletions.
diff --git a/OrangePiRDA/kernel/arch/arm/configs/i96_linux_defconfig b/OrangePiRDA/kernel/arch/arm/configs/i96_linux_defconfig
@@ -28,7 +28,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-legendary-v1.27"
+CONFIG_LOCALVERSION="-legendary-v1.28"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y

diff --git a/OrangePiRDA/kernel/drivers/net/wireless/rdaw80211/rdawlan/wland_cfg80211.c b/OrangePiRDA/kernel/drivers/net/wireless/rdaw80211/rdawlan/wland_cfg80211.c
@@ -158,12 +158,12 @@ static struct ieee80211_supported_band __wl_band_5ghz_a = {
  */
 static const struct ieee80211_regdomain wland_regdom = {
 	.n_reg_rules = 4,
-	.alpha2 = "00",
+	.alpha2 = "99",
 	.reg_rules = {
 		/*
 		* IEEE 802.11b/g, channels 1..11
 		*/
-		REG_RULE(2412 - 10, 2472 + 10, 40, 10, 30, 0),
+		REG_RULE(2412 - 10, 2472 + 10, 40, 6, 20, 0),
 		/*
 		* IEEE 802.11 channel 14 - Only JP enables this and for 802.11b only
 		*/
@@ -1645,10 +1645,10 @@ static s32 cfg80211_set_tx_power(struct wiphy *wiphy,
 		WLAND_ERR("SET_RADIO error (%d)\n", err);
 #endif
 
-	if (dbm > 30)
-		dbm = 30;
-	if (dbm < 10)
-		dbm = 10;
+	if (dbm > 20)
+		dbm = 20;
+	if (dbm < 6)
+		dbm = 6;
 
 	txpwrmw = (u16) dbm;
 
@@ -1692,10 +1692,10 @@ static s32 cfg80211_get_tx_power(struct wiphy *wiphy,
 	result = (u8) (txpwrdbm & ~TXPWR_OVERRIDE);
 	WLAND_DBG(CFG80211, DEBUG, "result:%d\n", result);
 	*dbm = (s32) wland_qdbm_to_mw(result);
-	if (cfg->conf->tx_power > 30)
-		cfg->conf->tx_power = 30;
-	if (cfg->conf->tx_power < 10)
-		cfg->conf->tx_power = 10;
+	if (cfg->conf->tx_power > 20)
+		cfg->conf->tx_power = 20;
+	if (cfg->conf->tx_power < 6)
+		cfg->conf->tx_power = 6;
 	*dbm = cfg->conf->tx_power;
 	WLAND_DBG(CFG80211, DEBUG, "dbm:%d\n", result);
 done:

diff --git a/OrangePiRDA/scripts/lib/build_image.sh b/OrangePiRDA/scripts/lib/build_image.sh
@@ -5,7 +5,7 @@ build_rk_image() {
 }
 
 build_rda_image() {
-	VER="v1.27"
+	VER="v1.28"
 	IMAGENAME="Legendary_OrangePi_${BOARD}_${OS}_${DISTRO}_${IMAGETYPE}_${VER}"
 	IMAGE="${BUILD}/images/$IMAGENAME.img"
 

diff --git a/OrangePiRDA/scripts/lib/distributions.sh b/OrangePiRDA/scripts/lib/distributions.sh
@@ -269,7 +269,7 @@ EOF
 #!/bin/sh
 
 # Set wireless txpower
-iwconfig wlan0 txpower 30
+iwconfig wlan0 txpower 20
 
 # Trim drives once on startup
 fstrim -v /
@@ -702,7 +702,7 @@ server_setup() {
 		cp "${EXTER}/presets/interfaces" "$DEST/etc/network/interfaces"
 	fi
 	if [ -e "${EXTER}/presets/crda" ]; then
-		cp "${EXTER}/presets/interfaces" "$DEST/etc/default/crda"
+		cp "${EXTER}/presets/crda" "$DEST/etc/default/crda"
 	fi
 	# Preset locales if locales file is present
 	if [ -e "${EXTER}/presets/locales" ]; then

diff --git a/OrangePiRDA/scripts/lib/general.sh b/OrangePiRDA/scripts/lib/general.sh
@@ -145,34 +145,7 @@ modules_update() {
 }
 
 uboot_update() {
-
-	case "${PLATFORM}" in
-	"OrangePiH3" | "OrangePiH6" | "OrangePiH6_Linux4.9")
-		boot0=$BUILD/uboot/boot0_sdcard_"${CHIP}".bin
-		uboot=$BUILD/uboot/u-boot-"${CHIP}".bin
-
-		# Clean TF partition
-		dd bs=1K seek=8 count=1015 if=/dev/zero of="$UBOOT_PATH"
-		# Update uboot
-		dd if=$boot0 of=$UBOOT_PATH conv=notrunc bs=1k seek=8
-		dd if=$uboot of=$UBOOT_PATH conv=notrunc bs=1k seek=16400
-		;;
-	"OrangePiH3_mainline" | "OrangePiH6_mainline")
-		dd if=/dev/zero of=$UBOOT_PATH bs=1k seek=8 count=1015
-		uboot=$BUILD/uboot/u-boot-sunxi-with-spl.bin-${BOARD}
-		dd if=$uboot of=$UBOOT_PATH conv=notrunc bs=1k seek=16400
-		;;
-	"OrangePiRK3399")
-		dd if=$BUILD/uboot/idbloader.img of=$UBOOT_PATH seek=64
-		dd if=$BUILD/uboot/uboot.img of=$UBOOT_PATH seek=24576
-		dd if=$BUILD/uboot/trust.img of=$UBOOT_PATH seek=32768
-		;;
-	"OrangePiRDA")
-		dd bs=512 seek=256 if=${BUILD}/uboot/u-boot.rda of=${UBOOT_PATH} && sync
-		;;
-	"*") ;;
-
-	esac
+	dd bs=512 seek=256 if=${BUILD}/uboot/u-boot.rda of=${UBOOT_PATH} && sync
 
 	sync
 	clear

diff --git a/OrangePiRDA/uboot/kernel/arch/arm/configs/rda8810_defconfig b/OrangePiRDA/uboot/kernel/arch/arm/configs/rda8810_defconfig
@@ -28,7 +28,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-legendary-v1.27"
+CONFIG_LOCALVERSION="-legendary-v1.28"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y