huitui

root/package/base-files/files/sbin/sysupgrade

@@ -0,0 +1,391 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/functions/system.sh
+. /usr/share/libubox/jshn.sh
+
+# initialize defaults
+export MTD_ARGS=""
+export MTD_CONFIG_ARGS=""
+export INTERACTIVE=0
+export VERBOSE=1
+export SAVE_CONFIG=1
+export SAVE_OVERLAY=0
+export SAVE_OVERLAY_PATH=
+export SAVE_PARTITIONS=1
+export SAVE_INSTALLED_PKGS=0
+export SKIP_UNCHANGED=0
+export CONF_IMAGE=
+export CONF_BACKUP_LIST=0
+export CONF_BACKUP=
+export CONF_RESTORE=
+export NEED_IMAGE=
+export HELP=0
+export FORCE=0
+export TEST=0
+export UMOUNT_ETCBACKUP_DIR=0
+
+# parse options
+while [ -n "$1" ]; do
+	case "$1" in
+		-i) export INTERACTIVE=1;;
+		-v) export VERBOSE="$(($VERBOSE + 1))";;
+		-q) export VERBOSE="$(($VERBOSE - 1))";;
+		-n) export SAVE_CONFIG=0;;
+		-c) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/etc;;
+		-o) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/;;
+		-p) export SAVE_PARTITIONS=0;;
+		-k) export SAVE_INSTALLED_PKGS=1;;
+		-u) export SKIP_UNCHANGED=1;;
+		-b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;;
+		-r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
+		-l|--list-backup) export CONF_BACKUP_LIST=1;;
+		-f) export CONF_IMAGE="$2"; shift;;
+		-F|--force) export FORCE=1;;
+		-T|--test) export TEST=1;;
+		-h|--help) export HELP=1; break;;
+		-*)
+			echo "Invalid option: $1" >&2
+			exit 1
+		;;
+		*) break;;
+	esac
+	shift;
+done
+
+export CONFFILES=/tmp/sysupgrade.conffiles
+export CONF_TAR=/tmp/sysupgrade.tgz
+export ETCBACKUP_DIR=/etc/backup
+export INSTALLED_PACKAGES=${ETCBACKUP_DIR}/installed_packages.txt
+
+IMAGE="$1"
+
+[ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && {
+	cat <<EOF
+Usage: $0 [<upgrade-option>...] <image file or URL>
+       $0 [-q] [-i] [-c] [-u] [-o] [-k] <backup-command> <file>
+
+upgrade-option:
+	-f <config>  restore configuration from .tar.gz (file or url)
+	-i           interactive mode
+	-c           attempt to preserve all changed files in /etc/
+	-o           attempt to preserve all changed files in /, except those
+	             from packages but including changed confs.
+	-u           skip from backup files that are equal to those in /rom
+	-n           do not save configuration over reflash
+	-p           do not attempt to restore the partition table after flash.
+	-k           include in backup a list of current installed packages at
+	             $INSTALLED_PACKAGES
+	-T | --test
+	             Verify image and config .tar.gz but do not actually flash.
+	-F | --force
+	             Flash image even if image checks fail, this is dangerous!
+	-q           less verbose
+	-v           more verbose
+	-h | --help  display this help
+
+backup-command:
+	-b | --create-backup <file>
+	             create .tar.gz of files specified in sysupgrade.conf
+	             then exit. Does not flash an image. If file is '-',
+	             i.e. stdout, verbosity is set to 0 (i.e. quiet).
+	-r | --restore-backup <file>
+	             restore a .tar.gz created with sysupgrade -b
+	             then exit. Does not flash an image. If file is '-',
+	             the archive is read from stdin.
+	-l | --list-backup
+	             list the files that would be backed up when calling
+	             sysupgrade -b. Does not create a backup file.
+
+EOF
+	exit 1
+}
+
+[ -n "$IMAGE" -a -n "$NEED_IMAGE" ] && {
+	cat <<-EOF
+		-b|--create-backup and -r|--restore-backup do not perform a firmware upgrade.
+		Do not specify both -b|-r and a firmware image.
+	EOF
+	exit 1
+}
+
+# prevent messages from clobbering the tarball when using stdout
+[ "$CONF_BACKUP" = "-" ] && export VERBOSE=0
+
+missing_lines() {
+    local file1 file2 line
+    file1="$1"
+    file2="$2"
+    oIFS="$IFS"
+    IFS=":"
+    while read line; do
+	set -- $line
+	grep -q "^$1:" "$file2" || echo "$*"
+    done < "$file1"
+    IFS="$oIFS"
+}
+
+list_conffiles() {
+	awk '
+		BEGIN { conffiles = 0 }
+		/^Conffiles:/ { conffiles = 1; next }
+		!/^ / { conffiles = 0; next }
+		conffiles == 1 { print }
+	' /usr/lib/opkg/status
+}
+
+list_changed_conffiles() {
+	# Cannot handle spaces in filenames - but opkg cannot either...
+	list_conffiles | while read file csum; do
+		[ -r "$file" ] || continue
+
+		echo "${csum}  ${file}" | busybox sha256sum -sc - || echo "$file"
+	done
+}
+
+add_conffiles() {
+	local file="$1"
+	( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
+		/etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
+		\( -type f -o -type l \) $find_filter 2>/dev/null;
+	  list_changed_conffiles ) | sort -u > "$file"
+	return 0
+}
+
+add_overlayfiles() {
+	local file="$1"
+
+	local packagesfiles=$1.packagesfiles
+	touch "$packagesfiles"
+
+	if [ "$SAVE_OVERLAY_PATH" = / ]; then
+		local conffiles=$1.conffiles
+		local keepfiles=$1.keepfiles
+
+		list_conffiles | cut -f2 -d ' ' | sort -u > "$conffiles"
+
+		# backup files from /etc/sysupgrade.conf and /lib/upgrade/keep.d, but
+		# ignore those aready controlled by opkg conffiles
+		find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
+			/etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
+			\( -type f -o -type l \) 2>/dev/null | sort -u |
+			grep -h -v -x -F -f $conffiles > "$keepfiles"
+
+		# backup conffiles, but only those changed if '-u'
+		[ $SKIP_UNCHANGED = 1 ] &&
+			list_changed_conffiles | sort -u > "$conffiles"
+
+		# do not backup files from packages, except those listed
+		# in conffiles and keep.d
+		{
+			find /usr/lib/opkg/info -type f -name "*.list" -exec cat {} \;
+			find /usr/lib/opkg/info -type f -name "*.control" -exec sed \
+				-ne '/^Alternatives/{s/^Alternatives: //;s/, /\n/g;p}' {} \; |
+				cut -f2 -d:
+		} |  grep -v -x -F -f $conffiles |
+		     grep -v -x -F -f $keepfiles | sort -u > "$packagesfiles"
+		rm -f "$keepfiles" "$conffiles"
+	fi
+
+	# busybox grep bug when file is empty
+	[ -s "$packagesfiles" ] || echo > $packagesfiles
+
+	( cd /overlay/upper/; find .$SAVE_OVERLAY_PATH \( -type f -o -type l \) $find_filter | sed \
+		-e 's,^\.,,' \
+		-e '\,^/etc/board.json$,d' \
+		-e '\,/[^/]*-opkg$,d' \
+		-e '\,^/etc/urandom.seed$,d' \
+		-e "\,^$INSTALLED_PACKAGES$,d" \
+		-e '\,^/usr/lib/opkg/.*,d' \
+	) | grep -v -x -F -f $packagesfiles > "$file"
+
+	rm -f "$packagesfiles"
+
+	return 0
+}
+
+if [ $SAVE_OVERLAY = 1 ]; then
+	[ ! -d /overlay/upper/etc ] && {
+		echo "Cannot find '/overlay/upper/etc', required for '-c'" >&2
+		exit 1
+	}
+	sysupgrade_init_conffiles="add_overlayfiles"
+else
+	sysupgrade_init_conffiles="add_conffiles"
+fi
+
+find_filter=""
+if [ $SKIP_UNCHANGED = 1 ]; then
+	[ ! -d /rom/ ] && {
+		echo "'/rom/' is required by '-u'"
+		exit 1
+	}
+	find_filter='( ( -exec test -e /rom/{} ; -exec cmp -s /{} /rom/{} ; ) -o -print )'
+fi
+
+include /lib/upgrade
+
+do_save_conffiles() {
+	local conf_tar="$1"
+
+	[ -z "$(rootfs_type)" ] && {
+		echo "Cannot save config while running from ramdisk." >&2
+		ask_bool 0 "Abort" && exit
+		rm -f "$conf_tar"
+		return 0
+	}
+	run_hooks "$CONFFILES" $sysupgrade_init_conffiles
+	ask_bool 0 "Edit config file list" && vi "$CONFFILES"
+
+	if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then
+		echo "${INSTALLED_PACKAGES}" >> "$CONFFILES"
+		mkdir -p "$ETCBACKUP_DIR"
+		# Avoid touching filesystem on each backup
+		RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)"
+		mkdir -p "$RAMFS/upper" "$RAMFS/work"
+		mount -t overlay overlay -o lowerdir=$ETCBACKUP_DIR,upperdir=$RAMFS/upper,workdir=$RAMFS/work $ETCBACKUP_DIR &&
+			UMOUNT_ETCBACKUP_DIR=1 || {
+				echo "Cannot mount '$ETCBACKUP_DIR' as tmpfs to avoid touching disk while saving the list of installed packages." >&2
+				ask_bool 0 "Abort" && exit
+			}
+
+		# Format: pkg-name<TAB>{rom,overlay,unkown}
+		# rom is used for pkgs in /rom, even if updated later
+		find /usr/lib/opkg/info -name "*.control" \( \
+			\( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \
+			\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
+			\( -exec echo {} unknown \; \) \
+			\) | sed -e 's,.*/,,;s/\.control /\t/' > ${INSTALLED_PACKAGES}
+	fi
+
+	v "Saving config files..."
+	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
+	tar c${TAR_V}zf "$conf_tar" -T "$CONFFILES" 2>/dev/null
+	if [ "$?" -ne 0 ]; then
+		echo "Failed to create the configuration backup."
+		rm -f "$conf_tar"
+		exit 1
+	fi
+
+	[ "$UMOUNT_ETCBACKUP_DIR" -eq 1 ] && {
+		umount "$ETCBACKUP_DIR"
+		rm -rf "$RAMFS"
+	}
+	rm -f "$CONFFILES"
+}
+
+if [ $CONF_BACKUP_LIST -eq 1 ]; then
+	run_hooks "$CONFFILES" $sysupgrade_init_conffiles
+	[ "$SAVE_INSTALLED_PKGS" -eq 1 ] && echo ${INSTALLED_PACKAGES} >> "$CONFFILES"
+	cat "$CONFFILES"
+	rm -f "$CONFFILES"
+	exit 0
+fi
+
+if [ -n "$CONF_BACKUP" ]; then
+	do_save_conffiles "$CONF_BACKUP"
+	exit $?
+fi
+
+if [ -n "$CONF_RESTORE" ]; then
+	if [ "$CONF_RESTORE" != "-" ] && [ ! -f "$CONF_RESTORE" ]; then
+		echo "Backup archive '$CONF_RESTORE' not found." >&2
+		exit 1
+	fi
+
+	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
+	cp /etc/passwd /etc/group /etc/shadow /tmp
+	tar -C / -x${TAR_V}zf "$CONF_RESTORE"
+	missing_lines /tmp/passwd /etc/passwd >> /etc/passwd
+	missing_lines /tmp/group /etc/group >> /etc/group
+	missing_lines /tmp/shadow /etc/shadow >> /etc/shadow
+	rm /tmp/passwd /tmp/group /tmp/shadow
+	exit $?
+fi
+
+type platform_check_image >/dev/null 2>/dev/null || {
+	echo "Firmware upgrade is not implemented for this platform." >&2
+	exit 1
+}
+
+case "$IMAGE" in
+	http://*|\
+	https://*)
+		wget -O/tmp/sysupgrade.img "$IMAGE" || exit 1
+		IMAGE=/tmp/sysupgrade.img
+		;;
+esac
+
+IMAGE="$(readlink -f "$IMAGE")"
+
+case "$IMAGE" in
+	'')
+		echo "Image file not found." >&2
+		exit 1
+		;;
+	/tmp/*)	;;
+	*)
+		v "Image not in /tmp, copying..."
+		cp -f "$IMAGE" /tmp/sysupgrade.img
+		IMAGE=/tmp/sysupgrade.img
+		;;
+esac
+
+json_load "$(/usr/libexec/validate_firmware_image "$IMAGE")" || {
+	echo "Failed to check image"
+	exit 1
+}
+json_get_var valid "valid"
+[ "$valid" -eq 0 ] && {
+	if [ $FORCE -eq 1 ]; then
+		echo "Image check failed but --force given - will update anyway!" >&2
+	else
+		echo "Image check failed." >&2
+		exit 1
+	fi
+}
+
+if [ -n "$CONF_IMAGE" ]; then
+	case "$(get_magic_word $CONF_IMAGE cat)" in
+		# .gz files
+		1f8b) ;;
+		*)
+			echo "Invalid config file. Please use only .tar.gz files" >&2
+			exit 1
+		;;
+	esac
+	get_image "$CONF_IMAGE" "cat" > "$CONF_TAR"
+	export SAVE_CONFIG=1
+elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
+	[ $TEST -eq 1 ] || do_save_conffiles "$CONF_TAR"
+	export SAVE_CONFIG=1
+else
+	[ $TEST -eq 1 ] || rm -f "$CONF_TAR"
+	export SAVE_CONFIG=0
+fi
+
+if [ $TEST -eq 1 ]; then
+	exit 0
+fi
+
+install_bin /sbin/upgraded
+v "Commencing upgrade. Closing all shell sessions."
+
+COMMAND='/lib/upgrade/do_stage2'
+
+if [ -n "$FAILSAFE" ]; then
+	printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade
+	lock -u /tmp/.failsafe
+else
+	json_init
+	json_add_string prefix "$RAM_ROOT"
+	json_add_string path "$IMAGE"
+	[ $FORCE -eq 1 ] && json_add_boolean force 1
+	[ $SAVE_CONFIG -eq 1 ] && json_add_string backup "$CONF_TAR"
+	json_add_string command "$COMMAND"
+	json_add_object options
+	json_add_int save_partitions "$SAVE_PARTITIONS"
+	json_close_object
+
+	ubus call system sysupgrade "$(json_dump)"
+fi

root/package/firmware/ipq-wifi/Makefile

@@ -37,9 +37,15 @@ ALLWIFIBOARDS:= \
 	ezviz_cs-w3-wd1200g-eup \
 	glinet_gl-s1300 \
 	linksys_ea8300 \
+<<<<<<< HEAD
   pangu_l1000 \
 	p2w_r619ac \
 	mobipromo_cm520-79f \
+=======
+	p2w_r619ac \
+	mobipromo_cm520-79f \
+	pangu_l1000 \
+>>>>>>> parent of 602cd0b... fixomr
 	qxwlan_e2600ac
 
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))

root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch

@@ -57,11 +57,22 @@ diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
 index 2033bb8683033..90ccc71231c1a 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
+<<<<<<< HEAD
 @@ -1874,6 +1874,7 @@ struct xhci_hcd {
+=======
+@@ -1874,7 +1874,8 @@ struct xhci_hcd {
+>>>>>>> parent of 602cd0b... fixomr
  #define XHCI_RESET_PLL_ON_DISCONNECT	BIT_ULL(34)
  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35)
  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(36)
 +#define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(37)
+<<<<<<< HEAD
  
  	unsigned int		num_active_eps;
  	unsigned int		limit_active_eps;
+=======
+ #define XHCI_DISABLE_SPARSE	BIT_ULL(38)
+ 
+ 	unsigned int		num_active_eps;
+ 	unsigned int		limit_active_eps;
+>>>>>>> parent of 602cd0b... fixomr

root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch

@@ -3288,6 +3288,7 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
  	 * the ACK carries the same options again (see RFC1122 4.2.3.8)
  	 */
 @@ -387,15 +421,15 @@
+<<<<<<< HEAD
  	/* Try to redo what tcp_v4_send_synack did. */
  	req->rsk_window_clamp = tp->window_clamp ? :dst_metric(&rt->dst, RTAX_WINDOW);
  
@@ -3296,6 +3297,16 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
 -				  ireq->wscale_ok, &rcv_wscale,
 -				  dst_metric(&rt->dst, RTAX_INITRWND));
 +	tp->ops->select_initial_window(sk, tcp_full_space(sk), req->mss,
+=======
+ 	    (req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))
+ 		req->rsk_window_clamp = full_space;
+ 
+-	tcp_select_initial_window(sk, full_space, req->mss,
+-				  &req->rsk_rcv_wnd, &req->rsk_window_clamp,
+-				  ireq->wscale_ok, &rcv_wscale,
+-				  dst_metric(&rt->dst, RTAX_INITRWND));
++	tp->ops->select_initial_window(sk, full_space, req->mss,
+>>>>>>> parent of 602cd0b... fixomr
 +				       &req->rsk_rcv_wnd, &req->rsk_window_clamp,
 +				       ireq->wscale_ok, &rcv_wscale,
 +				       dst_metric(&rt->dst, RTAX_INITRWND));
@@ -4028,6 +4039,7 @@ diff -aurN linux-5.4.64/net/ipv4/tcp.c linux-5.4.64.mptcp/net/ipv4/tcp.c
  #ifdef CONFIG_MMU
  	case TCP_ZEROCOPY_RECEIVE: {
  		struct tcp_zerocopy_receive zc;
+<<<<<<< HEAD
 @@ -3862,7 +4143,9 @@
  	if (sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV)
  		TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
@@ -4038,6 +4050,8 @@ diff -aurN linux-5.4.64/net/ipv4/tcp.c linux-5.4.64.mptcp/net/ipv4/tcp.c
  	tcp_clear_xmit_timers(sk);
  	if (req)
  		reqsk_fastopen_remove(sk, req, false);
+=======
+>>>>>>> parent of 602cd0b... fixomr
 @@ -3878,6 +4161,8 @@
  
  int tcp_abort(struct sock *sk, int err)
@@ -4592,12 +4606,22 @@ diff -aurN linux-5.4.64/net/ipv4/tcp_input.c linux-5.4.64.mptcp/net/ipv4/tcp_inp
  {
  	int eaten;
  	struct sk_buff *tail = skb_peek_tail(&sk->sk_receive_queue);
+<<<<<<< HEAD
 @@ -4774,7 +4838,7 @@
  	int avail = tp->rcv_nxt - tp->copied_seq;
  
  	if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) &&
 -	    !sock_flag(sk, SOCK_DONE))
 +	    !sock_flag(sk, SOCK_DONE) && !mptcp(tp))
+=======
+@@ -4774,8 +4838,8 @@
+ 	int avail = tp->rcv_nxt - tp->copied_seq;
+ 
+ 	if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) &&
+-	    !sock_flag(sk, SOCK_DONE) &&
++	    !sock_flag(sk, SOCK_DONE) && !mptcp(tp) &&
+ 	    tcp_receive_window(tp) > inet_csk(sk)->icsk_ack.rcv_mss)
+>>>>>>> parent of 602cd0b... fixomr
  		return;
  
  	sk->sk_data_ready(sk);
@@ -6714,6 +6738,7 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
  		goto out_free;
  
 @@ -241,15 +259,15 @@
+<<<<<<< HEAD
  	}
  
  	req->rsk_window_clamp = tp->window_clamp ? :dst_metric(dst, RTAX_WINDOW);
@@ -6722,6 +6747,16 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
 -				  ireq->wscale_ok, &rcv_wscale,
 -				  dst_metric(dst, RTAX_INITRWND));
 +	tp->ops->select_initial_window(sk, tcp_full_space(sk), req->mss,
+=======
+ 	    (req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))
+ 		req->rsk_window_clamp = full_space;
+ 
+-	tcp_select_initial_window(sk, full_space, req->mss,
+-				  &req->rsk_rcv_wnd, &req->rsk_window_clamp,
+-				  ireq->wscale_ok, &rcv_wscale,
+-				  dst_metric(dst, RTAX_INITRWND));
++	tp->ops->select_initial_window(sk, full_space, req->mss,
+>>>>>>> parent of 602cd0b... fixomr
 +				       &req->rsk_rcv_wnd, &req->rsk_window_clamp,
 +				       ireq->wscale_ok, &rcv_wscale,
 +				       dst_metric(dst, RTAX_INITRWND));
@@ -23659,4 +23694,8 @@ diff -aurN linux-5.4.64/tools/include/uapi/linux/bpf.h linux-5.4.64.mptcp/tools/
 +	BPF_TCP_RST_WAIT,
  
  	BPF_TCP_MAX_STATES	/* Leave at the end! */
+<<<<<<< HEAD
  };
+=======
+ };
+>>>>>>> parent of 602cd0b... fixomr

root/target/linux/mediatek/mt7623/config-4.19

@@ -1,8 +1,12 @@
 # CONFIG_AIO is not set
 CONFIG_ALIGNMENT_TRAP=y
+<<<<<<< HEAD
 # CONFIG_ARCH_AXXIA is not set
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+=======
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
@@ -10,7 +14,10 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+<<<<<<< HEAD
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@@ -37,16 +44,24 @@ CONFIG_ARM=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+<<<<<<< HEAD
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set
+=======
+# CONFIG_ARM_ATAG_DTB_COMPAT is not set
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_ARM_CPU_SUSPEND=y
 # CONFIG_ARM_CPU_TOPOLOGY is not set
 CONFIG_ARM_GIC=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
+<<<<<<< HEAD
 CONFIG_ARM_LPAE=y
+=======
+# CONFIG_ARM_LPAE is not set
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_ARM_MEDIATEK_CPUFREQ=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
@@ -55,17 +70,25 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VIRT_EXT=y
+<<<<<<< HEAD
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_ATAGS=y
 CONFIG_AUTO_ZRELADDR=y
 # CONFIG_BCM84881_PHY is not set
 CONFIG_BLK_MQ_PCI=y
+<<<<<<< HEAD
+=======
+CONFIG_BOUNCE=y
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_CLEANCACHE=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
+<<<<<<< HEAD
 CONFIG_CLZ_TAB=y
 CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 vmalloc=256M"
 CONFIG_CMDLINE_EXTEND=y
@@ -76,14 +99,29 @@ CONFIG_COMMON_CLK_MT2701_AUDSYS=y
 CONFIG_COMMON_CLK_MT2701_BDPSYS=y
 CONFIG_COMMON_CLK_MT2701_ETHSYS=y
 CONFIG_COMMON_CLK_MT2701_G3DSYS=y
+=======
+CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 rootfstype=squashfs,jffs2"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_MEDIATEK=y
+CONFIG_COMMON_CLK_MT2701=y
+# CONFIG_COMMON_CLK_MT2701_AUDSYS is not set
+CONFIG_COMMON_CLK_MT2701_BDPSYS=y
+CONFIG_COMMON_CLK_MT2701_ETHSYS=y
+# CONFIG_COMMON_CLK_MT2701_G3DSYS is not set
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_COMMON_CLK_MT2701_HIFSYS=y
 CONFIG_COMMON_CLK_MT2701_IMGSYS=y
 CONFIG_COMMON_CLK_MT2701_MMSYS=y
 CONFIG_COMMON_CLK_MT2701_VDECSYS=y
 # CONFIG_COMMON_CLK_MT7622 is not set
+<<<<<<< HEAD
 CONFIG_COMMON_CLK_MT7629=y
 # CONFIG_COMMON_CLK_MT7629_ETHSYS is not set
 # CONFIG_COMMON_CLK_MT7629_HIFSYS is not set
+=======
+# CONFIG_COMMON_CLK_MT7629 is not set
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_COMMON_CLK_MT8135 is not set
 # CONFIG_COMMON_CLK_MT8173 is not set
 CONFIG_COREDUMP=y
@@ -118,7 +156,10 @@ CONFIG_CPU_SPECTRE=y
 CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_V7=y
+<<<<<<< HEAD
 CONFIG_CRASH_CORE=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_CRC16=y
 # CONFIG_CRC32_SARWATE is not set
 CONFIG_CRC32_SLICEBY8=y
@@ -126,18 +167,29 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
+<<<<<<< HEAD
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_AKCIPHER2=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_DEFLATE=y
+<<<<<<< HEAD
+=======
+CONFIG_CRYPTO_DEV_MEDIATEK=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HMAC=y
+<<<<<<< HEAD
+=======
+CONFIG_CRYPTO_HW=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_MANAGER=y
@@ -147,7 +199,10 @@ CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
+<<<<<<< HEAD
 CONFIG_CRYPTO_RSA=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
@@ -172,7 +227,11 @@ CONFIG_DEBUG_UART_PHYS=0x11004000
 CONFIG_DEBUG_UART_VIRT=0xf1004000
 CONFIG_DEBUG_UNCOMPRESS=y
 # CONFIG_DEBUG_USER is not set
+<<<<<<< HEAD
 CONFIG_DEFAULT_NETLINK=y
+=======
+CONFIG_DEFAULT_MPTCP_PM="fullmesh"
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
@@ -220,7 +279,11 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_GPS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
+<<<<<<< HEAD
 # CONFIG_HARDEN_BRANCH_PREDICTOR is not set
+=======
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -233,7 +296,10 @@ CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
+<<<<<<< HEAD
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_CLK=y
@@ -250,7 +316,10 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+<<<<<<< HEAD
 CONFIG_HAVE_GENERIC_GUP=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
@@ -263,20 +332,32 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_PROC_CPU=y
+<<<<<<< HEAD
 CONFIG_HAVE_RCU_TABLE_FREE=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
 CONFIG_HAVE_SMP=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UID16=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+<<<<<<< HEAD
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_HUGETLBFS is not set
+=======
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+CONFIG_HOTPLUG_CPU=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_HWMON=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_MTK=y
 CONFIG_HZ_FIXED=0
+<<<<<<< HEAD
 CONFIG_HZ_PERIODIC=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
@@ -285,11 +366,15 @@ CONFIG_ICPLUS_PHY=y
 CONFIG_IIO=y
 # CONFIG_IIO_BUFFER is not set
 # CONFIG_IIO_TRIGGER is not set
+<<<<<<< HEAD
 CONFIG_INITRAMFS_COMPRESSION=""
 # CONFIG_INITRAMFS_FORCE is not set
 CONFIG_INITRAMFS_ROOT_GID=1000
 CONFIG_INITRAMFS_ROOT_UID=1000
 CONFIG_INITRAMFS_SOURCE="/openwrt/trunk/build_dir/target-arm_cortex-a7_musl-1.1.14_eabi/root-mediatek /openwrt/trunk/target/linux/generic/image/initramfs-base-files.txt"
+=======
+CONFIG_INITRAMFS_SOURCE=""
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
@@ -301,9 +386,12 @@ CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_KALLSYMS=y
+<<<<<<< HEAD
 CONFIG_KEXEC=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEYS=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_LEDS_MT6323=y
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
@@ -315,7 +403,11 @@ CONFIG_LZO_DECOMPRESS=y
 # CONFIG_MACH_MT6589 is not set
 # CONFIG_MACH_MT6592 is not set
 CONFIG_MACH_MT7623=y
+<<<<<<< HEAD
 CONFIG_MACH_MT7629=y
+=======
+# CONFIG_MACH_MT7629 is not set
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_MACH_MT8127 is not set
 # CONFIG_MACH_MT8135 is not set
 CONFIG_MAGIC_SYSRQ=y
@@ -340,12 +432,15 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_TIFM_SD is not set
 CONFIG_MODULES_USE_ELF_REL=y
+<<<<<<< HEAD
 CONFIG_MPILIB=y
 # CONFIG_MPTCP_BINDER is not set
 # CONFIG_MPTCP_FULLMESH is not set
 # CONFIG_MPTCP_NDIFFPORTS is not set
 # CONFIG_MPTCP_REDUNDANT is not set
 # CONFIG_MPTCP_ROUNDROBIN is not set
+=======
+>>>>>>> parent of 602cd0b... fixomr
 # CONFIG_MT753X_GSW is not set
 CONFIG_MTD_BLOCK2MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
@@ -373,7 +468,11 @@ CONFIG_MTK_EFUSE=y
 CONFIG_MTK_INFRACFG=y
 # CONFIG_MTK_IOMMU is not set
 # CONFIG_MTK_IOMMU_V1 is not set
+<<<<<<< HEAD
 CONFIG_MTK_PLATFORM="mt7623"
+=======
+CONFIG_MTK_PLATFORM=""
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_MTK_PMIC_WRAP=y
 CONFIG_MTK_SCPSYS=y
 CONFIG_MTK_THERMAL=y
@@ -382,7 +481,10 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEON=y
 CONFIG_NET_DSA=y
+<<<<<<< HEAD
 CONFIG_NET_DSA_LEGACY=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_NET_DSA_MT7530=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_FLOW_LIMIT=y
@@ -393,6 +495,12 @@ CONFIG_NET_VENDOR_MEDIATEK=y
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_NLS=y
 CONFIG_NO_BOOTMEM=y
+<<<<<<< HEAD
+=======
+CONFIG_NO_HZ=y
+CONFIG_NO_HZ_COMMON=y
+CONFIG_NO_HZ_IDLE=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_NR_CPUS=4
 CONFIG_NVMEM=y
 CONFIG_OF=y
@@ -420,18 +528,27 @@ CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PCI_V3_SEMI is not set
 CONFIG_PERF_USE_VMALLOC=y
+<<<<<<< HEAD
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PGTABLE_MAPPING=y
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=y
 CONFIG_PHYS_ADDR_T_64BIT=y
+=======
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_PHYLIB=y
+CONFIG_PHYLINK=y
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_PHY_MTK_TPHY=y
 # CONFIG_PHY_MTK_XSPHY is not set
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_MT2701=y
 CONFIG_PINCTRL_MT6397=y
 CONFIG_PINCTRL_MT7623=y
+<<<<<<< HEAD
 CONFIG_PINCTRL_MT7629=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_PINCTRL_MTK=y
 CONFIG_PINCTRL_MTK_MOORE=y
 CONFIG_PLUGIN_HOSTCC="g++"
@@ -500,7 +617,10 @@ CONFIG_SPI_MEM=y
 CONFIG_SPI_MT65XX=y
 # CONFIG_SPI_MTK_SNFI is not set
 CONFIG_SPMI=y
+<<<<<<< HEAD
 # CONFIG_SPS30 is not set
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_SRCU=y
 CONFIG_STREAM_PARSER=y
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -510,7 +630,10 @@ CONFIG_SWCONFIG=y
 CONFIG_SWPHY=y
 CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+<<<<<<< HEAD
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_TASKS_RCU=y
 # CONFIG_TCP_CONG_NANQINLANG is not set
 CONFIG_THERMAL=y
@@ -542,8 +665,11 @@ CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WATCHDOG_CORE=y
+<<<<<<< HEAD
 # CONFIG_WIRELESS is not set
 # CONFIG_WLAN is not set
+=======
+>>>>>>> parent of 602cd0b... fixomr
 CONFIG_XPS=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
@@ -551,5 +677,8 @@ CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
+<<<<<<< HEAD
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
+=======
+>>>>>>> parent of 602cd0b... fixomr

root/target/linux/mediatek/patches-5.4/0998-mt7623-add-missing-pause.patch

@@ -0,0 +1,32 @@
+From 0808ca98e67e914ac48cc8f11910509d3b04379c Mon Sep 17 00:00:00 2001
+From: Frank Wunderlich <frank-w@public-files.de>
+Date: Mon, 7 Sep 2020 09:05:17 +0200
+Subject: [PATCH] arm: dts: mt7623: add missing pause for switchport
+
+commit 36f0a5fc5284838c544218666c63ee8cfa46a9c3 upstream.
+
+port6 of mt7530 switch (= cpu port 0) on bananapi-r2 misses pause option
+which causes rx drops on running iperf.
+
+Fixes: f4ff257cd160 ("arm: dts: mt7623: add support for Bananapi R2 (BPI-R2) board")
+Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20200907070517.51715-1-linux@fw-web.de
+Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+index 2b760f90f38c..5375c6699843 100644
+--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
++++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+@@ -192,6 +192,7 @@
+ 					fixed-link {
+ 						speed = <1000>;
+ 						full-duplex;
++						pause;
+ 					};
+ 				};
+ 			};

root/target/linux/mediatek/patches-5.4/0999-lan-to-wan.patch

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2020-04-19 11:02:56.505715879 +0200
 +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2020-04-19 11:03:53.620780390 +0200
 @@ -196,7 +196,7 @@
@@ -15,12 +16,21 @@
  
 -/* Disabled, is now handled by gmac1 (eth1/wan) via phy-handle!
 +/* Disabled, is now handled by gmac1 (eth1/lan) via phy-handle!
+=======
+--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts.anc	2020-11-16 15:48:00.852410183 +0100
++++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2020-11-16 15:49:23.878965822 +0100
+@@ -210,27 +210,27 @@
+ 
+>>>>>>> parent of 602cd0b... fixomr
  				port@0 {
  					reg = <0>;
 -					label = "wan";
 +					label = "lan";
  				};
+<<<<<<< HEAD
  */
+=======
+>>>>>>> parent of 602cd0b... fixomr
  
  				port@1 {
  					reg = <1>;