Re: [OpenWrt-Devel] [PATCH] CC: ar71xx: add support for D-LINK DIR-615 rev. Ix board
Hi,
patch fails to apply to my tree in combination with other backports.
please rebase and resend once i pushed my tree
On 15/07/2015 11:04, Jaehoon You wrote:
> backport of r46248.
>
> Signed-off-by: Jaehoon You
> ---
> target/linux/ar71xx/base-files/etc/diag.sh | 1 +
> .../ar71xx/base-files/etc/uci-defaults/01_leds | 8 ++
> .../ar71xx/base-files/etc/uci-defaults/02_network | 1 +
> target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +
> .../base-files/lib/preinit/05_set_iface_mac_ar71xx | 3 +
> .../ar71xx/base-files/lib/upgrade/platform.sh | 1 +
> target/linux/ar71xx/config-3.18| 1 +
> .../ar71xx/files/arch/mips/ath79/mach-dir-615-i1.c | 133
> +
> target/linux/ar71xx/generic/profiles/d-link.mk | 10 ++
> target/linux/ar71xx/image/Makefile | 9 ++
> .../610-MIPS-ath79-openwrt-machines.patch | 25 +++-
> 11 files changed, 189 insertions(+), 6 deletions(-)
> mode change 100644 => 100755
> target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> create mode 100644
> target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-i1.c
>
> diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
> b/target/linux/ar71xx/base-files/etc/diag.sh
> index 4bdb53d..b1195a3 100644
> --- a/target/linux/ar71xx/base-files/etc/diag.sh
> +++ b/target/linux/ar71xx/base-files/etc/diag.sh
> @@ -57,6 +57,7 @@ get_status_led() {
> dir-505-a1 |\
> dir-600-a1 |\
> dir-615-e1 |\
> + dir-615-i1 |\
> dir-615-e4)
> status_led="d-link:green:power"
> ;;
> diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> index 19814f4..3cafc6f 100644
> --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> @@ -145,6 +145,14 @@ dir-825-b1)
> ucidef_set_led_usbdev "usb" "USB" "d-link:blue:usb" "1-1"
> ;;
>
> +dir-615-i1)
> + ucidef_set_led_default "power" "POWER" "d-link:green:power" "1"
> + ucidef_set_led_default "diag" "DIAG" "d-link:amber:power" "0"
> + ucidef_set_led_default "wps" "WPS" "d-link:blue:wps" "0"
> + ucidef_set_led_netdev "wan" "WAN" "d-link:green:wan" "eth0"
> + ucidef_set_led_wlan "wlan" "WLAN" "d-link:green:wlan" "phy0tpt"
> + ;;
> +
> dir-825-c1)
> ucidef_set_led_usbdev "usb" "USB" "d-link:blue:usb" "1-1"
> ucidef_set_led_wlan "wlan2g" "WLAN 2.4 GHz" "d-link:blue:wlan2g"
> "phy0tpt"
> diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> old mode 100644
> new mode 100755
> index 4fe951e..8cf3b3b
> --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> @@ -213,6 +213,7 @@ tl-wr941nd)
>
> r6100 |\
> smart-300 |\
> +dir-615-i1 |\
> tl-mr3420-v2 |\
> tl-wr841n-v8 |\
> tl-wr842n-v2 |\
> diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> b/target/linux/ar71xx/base-files/lib/ar71xx.sh
> index 8f4bb40..711f2b0 100755
> --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
> @@ -405,6 +405,9 @@ ar71xx_board_detect() {
> *"DIR-615 rev. E4")
> name="dir-615-e4"
> ;;
> + *"DIR-615 rev. I1")
> + name="dir-615-i1"
> + ;;
> *"DIR-825 rev. B1")
> name="dir-825-b1"
> ;;
> diff --git
> a/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
> b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
> index b40dff5..c39169a 100644
> --- a/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
> +++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
> @@ -29,6 +29,9 @@ preinit_set_mac_address() {
> fetch_mac_from_mtd config lan_mac wan_mac
> echo 1 >
> /sys/class/leds/dir-615-c1:green:wancpu/brightness
> ;;
> + dir-615-i1)
> + fetch_mac_from_mtd nvram sys_lan_mac sys_wan_mac
> + ;;
> r6100)
> mac_lan=$(mtd_get_mac_binary caldata 0)
> [ -n "$mac_lan" ] && ifconfig eth1 hw ether "$mac_lan"
> diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> index ade47fb..34ae5a5 100755
> --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> @@ -205,6 +205,7 @@ platform_check_image() {
> dir-615-c1 | \
> dir-615-e1 | \
> dir-615-e4 | \
> + dir-615-i1 | \
> dir-825-c1 | \
> dir-835-a1 | \
> dragino2 | \
> diff --git a/target/linux/ar71xx/config-3.18 b/target/
[OpenWrt-Devel] [PATCH] CC: ar71xx: add support for D-LINK DIR-615 rev. Ix board
backport of r46248.
Signed-off-by: Jaehoon You
---
target/linux/ar71xx/base-files/etc/diag.sh | 1 +
.../ar71xx/base-files/etc/uci-defaults/01_leds | 8 ++
.../ar71xx/base-files/etc/uci-defaults/02_network | 1 +
target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +
.../base-files/lib/preinit/05_set_iface_mac_ar71xx | 3 +
.../ar71xx/base-files/lib/upgrade/platform.sh | 1 +
target/linux/ar71xx/config-3.18| 1 +
.../ar71xx/files/arch/mips/ath79/mach-dir-615-i1.c | 133 +
target/linux/ar71xx/generic/profiles/d-link.mk | 10 ++
target/linux/ar71xx/image/Makefile | 9 ++
.../610-MIPS-ath79-openwrt-machines.patch | 25 +++-
11 files changed, 189 insertions(+), 6 deletions(-)
mode change 100644 => 100755
target/linux/ar71xx/base-files/etc/uci-defaults/02_network
create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-i1.c
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index 4bdb53d..b1195a3 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -57,6 +57,7 @@ get_status_led() {
dir-505-a1 |\
dir-600-a1 |\
dir-615-e1 |\
+ dir-615-i1 |\
dir-615-e4)
status_led="d-link:green:power"
;;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 19814f4..3cafc6f 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -145,6 +145,14 @@ dir-825-b1)
ucidef_set_led_usbdev "usb" "USB" "d-link:blue:usb" "1-1"
;;
+dir-615-i1)
+ ucidef_set_led_default "power" "POWER" "d-link:green:power" "1"
+ ucidef_set_led_default "diag" "DIAG" "d-link:amber:power" "0"
+ ucidef_set_led_default "wps" "WPS" "d-link:blue:wps" "0"
+ ucidef_set_led_netdev "wan" "WAN" "d-link:green:wan" "eth0"
+ ucidef_set_led_wlan "wlan" "WLAN" "d-link:green:wlan" "phy0tpt"
+ ;;
+
dir-825-c1)
ucidef_set_led_usbdev "usb" "USB" "d-link:blue:usb" "1-1"
ucidef_set_led_wlan "wlan2g" "WLAN 2.4 GHz" "d-link:blue:wlan2g"
"phy0tpt"
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
old mode 100644
new mode 100755
index 4fe951e..8cf3b3b
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -213,6 +213,7 @@ tl-wr941nd)
r6100 |\
smart-300 |\
+dir-615-i1 |\
tl-mr3420-v2 |\
tl-wr841n-v8 |\
tl-wr842n-v2 |\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 8f4bb40..711f2b0 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -405,6 +405,9 @@ ar71xx_board_detect() {
*"DIR-615 rev. E4")
name="dir-615-e4"
;;
+ *"DIR-615 rev. I1")
+ name="dir-615-i1"
+ ;;
*"DIR-825 rev. B1")
name="dir-825-b1"
;;
diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
index b40dff5..c39169a 100644
--- a/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
+++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
@@ -29,6 +29,9 @@ preinit_set_mac_address() {
fetch_mac_from_mtd config lan_mac wan_mac
echo 1 >
/sys/class/leds/dir-615-c1:green:wancpu/brightness
;;
+ dir-615-i1)
+ fetch_mac_from_mtd nvram sys_lan_mac sys_wan_mac
+ ;;
r6100)
mac_lan=$(mtd_get_mac_binary caldata 0)
[ -n "$mac_lan" ] && ifconfig eth1 hw ether "$mac_lan"
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index ade47fb..34ae5a5 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -205,6 +205,7 @@ platform_check_image() {
dir-615-c1 | \
dir-615-e1 | \
dir-615-e4 | \
+ dir-615-i1 | \
dir-825-c1 | \
dir-835-a1 | \
dragino2 | \
diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
index 05c98eb..cce377e 100644
--- a/target/linux/ar71xx/config-3.18
+++ b/target/linux/ar71xx/config-3.18
@@ -51,6 +51,7 @@ CONFIG_ATH79_MACH_DHP_1565_A1=y
CONFIG_ATH79_MACH_DIR_505_A1=y
CONFIG_ATH79_MACH_DIR_600_A1=y
CONFIG_ATH79_MACH_DIR_615_C1=y
+CONFIG_ATH79_MACH_DIR_615_I1=y
CONFIG
