From 1c3744d46727e095b0ce43af25bb52519fb36ecc Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sun, 8 Dec 2019 00:40:09 +0800
Subject: [PATCH] target: ramips: update

---
 .../ramips/base-files/etc/board.d/02_network      | 10 ----------
 .../linux/ramips/base-files/etc/init.d/bootcount  | 13 -------------
 target/linux/ramips/dts/MIWIFI-NANO.dts           | 15 ---------------
 target/linux/ramips/image/mt7620.mk               |  8 --------
 target/linux/ramips/image/mt76x8.mk               |  4 ----
 5 files changed, 50 deletions(-)

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 1d536f78b0..7f0dbbe003 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -540,10 +540,7 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_binary factory 57350)
 		;;
 	gl-mt300n-v2|\
-<<<<<<< HEAD
 	miwifi-mini|\
-=======
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 	whr-g300n)
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		;;
@@ -581,13 +578,6 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_binary Factory 0xe000)
 		;;
 	xiaomi,miwifi-r3|\
-<<<<<<< HEAD
-=======
-	miwifi-mini)
-		wan_mac=$(cat /sys/class/net/eth0/address)
-		lan_mac=$(macaddr_setbit_la "$wan_mac")
-		;;
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 	k2p)
 		lan_mac=$(mtd_get_mac_binary factory 0xe000)
 		wan_mac=$(mtd_get_mac_binary factory 0xe006)
diff --git a/target/linux/ramips/base-files/etc/init.d/bootcount b/target/linux/ramips/base-files/etc/init.d/bootcount
index f77788310f..e086e055e6 100755
--- a/target/linux/ramips/base-files/etc/init.d/bootcount
+++ b/target/linux/ramips/base-files/etc/init.d/bootcount
@@ -1,5 +1,4 @@
 #!/bin/sh /etc/rc.common
-<<<<<<< HEAD
 START=99
 boot() {
 	case $(board_name) in
@@ -10,16 +9,4 @@ boot() {
 		fw_setenv flag_boot_success 1
 		;;
 	esac
-=======
-
-START=99
-
-start() {
-	. /lib/functions.sh
-
-	local board=$(board_name)
-	if [ $board = "sk-wb8" ]; then
-		fw_setenv bootcount 0
-	fi
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 }
diff --git a/target/linux/ramips/dts/MIWIFI-NANO.dts b/target/linux/ramips/dts/MIWIFI-NANO.dts
index b1b098ceae..4740942ca8 100644
--- a/target/linux/ramips/dts/MIWIFI-NANO.dts
+++ b/target/linux/ramips/dts/MIWIFI-NANO.dts
@@ -57,17 +57,12 @@
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
-<<<<<<< HEAD
 			ralink,group = "gpio", "refclk", "wdt", "wled_an";
-=======
-			ralink,group = "refclk", "wled_an", "gpio";
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 			ralink,function = "gpio";
 		};
 	};
 };
 
-<<<<<<< HEAD
 &ehci {
 	status = "disabled";
 };
@@ -76,8 +71,6 @@
 	status = "disabled";
 };
 
-=======
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 &wmac {
 	status = "okay";
 	ralink,mtd-eeprom = <&factory 0x4>;
@@ -93,11 +86,7 @@
 	m25p80@0 {
 		compatible = "jedec,spi-nor";
 		reg = <0>;
-<<<<<<< HEAD
 		spi-max-frequency = <40000000>;
-=======
-		spi-max-frequency = <10000000>;
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 		m25p,chunked-io = <32>;
 
 		partitions {
@@ -108,10 +97,6 @@
 			partition@0 {
 				label = "u-boot";
 				reg = <0x0 0x30000>;
-<<<<<<< HEAD
-=======
-				read-only;
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 			};
 
 			partition@30000 {
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 2332c19452..6a528be76c 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -283,12 +283,8 @@ define Device/u25awf-h1
   DTS := U25AWF-H1
   IMAGE_SIZE := 16064k
   DEVICE_TITLE := Kimax U25AWF-H1
-<<<<<<< HEAD
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-storage kmod-scsi-core \
   		     kmod-fs-ext4 kmod-fs-vfat block-mount
-=======
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 endef
 TARGET_DEVICES += u25awf-h1
 
@@ -336,12 +332,8 @@ define Device/kimax_u35wf
   DTS := U35WF
   IMAGE_SIZE := 16064k
   DEVICE_TITLE := Kimax U35WF
-<<<<<<< HEAD
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-storage kmod-scsi-core \
   		     kmod-fs-ext4 kmod-fs-vfat block-mount
-=======
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 endef
 TARGET_DEVICES += kimax_u35wf
 
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index 769ac711b1..7cfe1606b0 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -97,11 +97,7 @@ define Device/miwifi-nano
   DTS := MIWIFI-NANO
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_TITLE := Xiaomi MiWiFi Nano
-<<<<<<< HEAD
   DEVICE_PACKAGES := uboot-envtools
-=======
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
->>>>>>> parent of 5d51ba13... ramips: delete MTK 762x support
 endef
 TARGET_DEVICES += miwifi-nano