Merge back from ikuai-xb1
This commit is contained in:
Justin Liu
@@ -1,7 +1,7 @@
|
||||
Index: target/linux/ramips/base-files/etc/diag.sh
|
||||
===================================================================
|
||||
--- target/linux/ramips/base-files/etc/diag.sh (revision 43770)
|
||||
+++ target/linux/ramips/base-files/etc/diag.sh (working copy)
|
||||
--- target/linux/ramips/base-files/etc/diag.sh.orig 2014-09-21 16:32:37.000000000 +0800
|
||||
+++ target/linux/ramips/base-files/etc/diag.sh 2018-12-19 12:40:43.910978057 +0800
|
||||
@@ -54,6 +54,15 @@
|
||||
fonera20n)
|
||||
status_led="fonera20n:green:power"
|
||||
@@ -20,8 +20,8 @@ Index: target/linux/ramips/base-files/etc/diag.sh
|
||||
;;
|
||||
Index: target/linux/ramips/base-files/etc/uci-defaults/01_leds
|
||||
===================================================================
|
||||
--- target/linux/ramips/base-files/etc/uci-defaults/01_leds (revision 43770)
|
||||
+++ target/linux/ramips/base-files/etc/uci-defaults/01_leds (working copy)
|
||||
--- target/linux/ramips/base-files/etc/uci-defaults/01_leds.orig 2014-09-21 16:32:37.000000000 +0800
|
||||
+++ target/linux/ramips/base-files/etc/uci-defaults/01_leds 2018-12-19 12:40:43.910978057 +0800
|
||||
@@ -106,6 +106,24 @@
|
||||
set_usb_led "fonera20n:orange:usb"
|
||||
set_wifi_led "fonera20n:orange:wifi"
|
||||
@@ -48,8 +48,9 @@ Index: target/linux/ramips/base-files/etc/uci-defaults/01_leds
|
||||
set_wifi_led "rt2800pci-phy0::radio"
|
||||
;;
|
||||
Index: target/linux/ramips/base-files/etc/uci-defaults/02_network
|
||||
--- target/linux/ramips/base-files/etc/uci-defaults/02_network
|
||||
+++ target/linux/ramips/base-files/etc/uci-defaults/02_network
|
||||
===================================================================
|
||||
--- target/linux/ramips/base-files/etc/uci-defaults/02_network.orig 2014-09-21 16:32:37.000000000 +0800
|
||||
+++ target/linux/ramips/base-files/etc/uci-defaults/02_network 2018-12-19 12:45:44.938893829 +0800
|
||||
@@ -184,6 +184,7 @@ ramips_setup_interfaces()
|
||||
ucidef_add_switch_vlan "switch0" "2" "4 6t"
|
||||
;;
|
||||
@@ -73,8 +74,8 @@ Index: target/linux/ramips/base-files/etc/uci-defaults/02_network
|
||||
lan_mac=$(macaddr_setbit_la "$lan_mac")
|
||||
Index: target/linux/ramips/base-files/lib/ramips.sh
|
||||
===================================================================
|
||||
--- target/linux/ramips/base-files/lib/ramips.sh (revision 43770)
|
||||
+++ target/linux/ramips/base-files/lib/ramips.sh (working copy)
|
||||
--- target/linux/ramips/base-files/lib/ramips.sh.orig 2014-09-21 16:32:37.000000000 +0800
|
||||
+++ target/linux/ramips/base-files/lib/ramips.sh 2018-12-19 12:40:43.910978057 +0800
|
||||
@@ -160,6 +160,15 @@
|
||||
*"HAME MPR-A2")
|
||||
name="mpr-a2"
|
||||
@@ -93,8 +94,8 @@ Index: target/linux/ramips/base-files/lib/ramips.sh
|
||||
;;
|
||||
Index: target/linux/ramips/base-files/lib/upgrade/platform.sh
|
||||
===================================================================
|
||||
--- target/linux/ramips/base-files/lib/upgrade/platform.sh (revision 43770)
|
||||
+++ target/linux/ramips/base-files/lib/upgrade/platform.sh (working copy)
|
||||
--- target/linux/ramips/base-files/lib/upgrade/platform.sh.orig 2014-09-21 16:32:37.000000000 +0800
|
||||
+++ target/linux/ramips/base-files/lib/upgrade/platform.sh 2018-12-19 12:40:43.910978057 +0800
|
||||
@@ -51,6 +51,7 @@
|
||||
freestation5 | \
|
||||
hw550-3g | \
|
||||
@@ -105,8 +106,8 @@ Index: target/linux/ramips/base-files/lib/upgrade/platform.sh
|
||||
m3 | \
|
||||
Index: target/linux/ramips/dts/HC5661.dts
|
||||
===================================================================
|
||||
--- target/linux/ramips/dts/HC5661.dts (revision 0)
|
||||
+++ target/linux/ramips/dts/HC5661.dts (revision 0)
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ target/linux/ramips/dts/HC5661.dts 2018-12-19 12:40:43.910978057 +0800
|
||||
@@ -0,0 +1,32 @@
|
||||
+/dts-v1/;
|
||||
+
|
||||
@@ -142,8 +143,8 @@ Index: target/linux/ramips/dts/HC5661.dts
|
||||
+};
|
||||
Index: target/linux/ramips/dts/HC5761.dts
|
||||
===================================================================
|
||||
--- target/linux/ramips/dts/HC5761.dts (revision 0)
|
||||
+++ target/linux/ramips/dts/HC5761.dts (revision 0)
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ target/linux/ramips/dts/HC5761.dts 2018-12-19 12:40:43.910978057 +0800
|
||||
@@ -0,0 +1,32 @@
|
||||
+/dts-v1/;
|
||||
+
|
||||
@@ -179,8 +180,8 @@ Index: target/linux/ramips/dts/HC5761.dts
|
||||
+};
|
||||
Index: target/linux/ramips/dts/HC5861.dts
|
||||
===================================================================
|
||||
--- target/linux/ramips/dts/HC5861.dts (revision 0)
|
||||
+++ target/linux/ramips/dts/HC5861.dts (revision 0)
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ target/linux/ramips/dts/HC5861.dts 2018-12-19 12:40:43.910978057 +0800
|
||||
@@ -0,0 +1,92 @@
|
||||
+/dts-v1/;
|
||||
+
|
||||
@@ -276,8 +277,8 @@ Index: target/linux/ramips/dts/HC5861.dts
|
||||
+};
|
||||
Index: target/linux/ramips/dts/HC5XXX.dtsi
|
||||
===================================================================
|
||||
--- target/linux/ramips/dts/HC5XXX.dtsi (revision 0)
|
||||
+++ target/linux/ramips/dts/HC5XXX.dtsi (revision 0)
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ target/linux/ramips/dts/HC5XXX.dtsi 2018-12-19 12:40:43.910978057 +0800
|
||||
@@ -0,0 +1,141 @@
|
||||
+/include/ "mt7620a.dtsi"
|
||||
+
|
||||
@@ -422,8 +423,8 @@ Index: target/linux/ramips/dts/HC5XXX.dtsi
|
||||
+};
|
||||
Index: target/linux/ramips/image/Makefile
|
||||
===================================================================
|
||||
--- target/linux/ramips/image/Makefile (revision 43770)
|
||||
+++ target/linux/ramips/image/Makefile (working copy)
|
||||
--- target/linux/ramips/image/Makefile.orig 2014-09-21 16:32:37.000000000 +0800
|
||||
+++ target/linux/ramips/image/Makefile 2018-12-19 12:40:43.914978129 +0800
|
||||
@@ -724,6 +724,9 @@
|
||||
na930_mtd_size=20971520
|
||||
Image/Build/Profile/NA930=$(call BuildFirmware/CustomFlash/$(1),$(1),na930,NA930,$(na930_mtd_size))
|
||||
@@ -446,8 +447,8 @@ Index: target/linux/ramips/image/Makefile
|
||||
endef
|
||||
Index: target/linux/ramips/mt7620a/profiles/hiwifi.mk
|
||||
===================================================================
|
||||
--- target/linux/ramips/mt7620a/profiles/hiwifi.mk (revision 0)
|
||||
+++ target/linux/ramips/mt7620a/profiles/hiwifi.mk (revision 0)
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ target/linux/ramips/mt7620a/profiles/hiwifi.mk 2018-12-19 12:40:43.914978129 +0800
|
||||
@@ -0,0 +1,47 @@
|
||||
+#
|
||||
+# Copyright (C) 2015 OpenWrt.org
|
||||
|
||||
Reference in New Issue
Block a user