[03/11] bsp: merge wdr4300 to ar71xx

Submitted by Tim Niemeyer on June 8, 2016, 4:29 p.m.

Details

Message ID 1465403387-3241-3-git-send-email-tim@tn-x.org
State Superseded, archived
Headers show

Commit Message

Tim Niemeyer June 8, 2016, 4:29 p.m.
Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

 .../root_file_system/etc/network.tl-wdr3500-v1     |  0
 .../root_file_system/etc/network.tl-wdr3600-v1     |  0
 .../root_file_system/etc/network.tl-wdr4300-v1     |  0
 .../root_file_system/etc/network.tl-wdr4310-v1     |  0
 bsp/board_ar71xx.bsp                               |  4 +++
 bsp/board_wdr4300.bsp                              |  9 ------
 bsp/wdr4300/.config                                | 34 ----------------------
 7 files changed, 4 insertions(+), 43 deletions(-)
 rename bsp/{wdr4300 => ar71xx}/root_file_system/etc/network.tl-wdr3500-v1 (100%)
 rename bsp/{wdr4300 => ar71xx}/root_file_system/etc/network.tl-wdr3600-v1 (100%)
 rename bsp/{wdr4300 => ar71xx}/root_file_system/etc/network.tl-wdr4300-v1 (100%)
 rename bsp/{wdr4300 => ar71xx}/root_file_system/etc/network.tl-wdr4310-v1 (100%)
 delete mode 100644 bsp/board_wdr4300.bsp
 delete mode 100644 bsp/wdr4300/.config

Patch hide | download patch | download mbox

diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr3500-v1 b/bsp/ar71xx/root_file_system/etc/network.tl-wdr3500-v1
similarity index 100%
rename from bsp/wdr4300/root_file_system/etc/network.tl-wdr3500-v1
rename to bsp/ar71xx/root_file_system/etc/network.tl-wdr3500-v1
diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr3600-v1 b/bsp/ar71xx/root_file_system/etc/network.tl-wdr3600-v1
similarity index 100%
rename from bsp/wdr4300/root_file_system/etc/network.tl-wdr3600-v1
rename to bsp/ar71xx/root_file_system/etc/network.tl-wdr3600-v1
diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr4300-v1 b/bsp/ar71xx/root_file_system/etc/network.tl-wdr4300-v1
similarity index 100%
rename from bsp/wdr4300/root_file_system/etc/network.tl-wdr4300-v1
rename to bsp/ar71xx/root_file_system/etc/network.tl-wdr4300-v1
diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr4310-v1 b/bsp/ar71xx/root_file_system/etc/network.tl-wdr4310-v1
similarity index 100%
rename from bsp/wdr4300/root_file_system/etc/network.tl-wdr4310-v1
rename to bsp/ar71xx/root_file_system/etc/network.tl-wdr4310-v1
diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp
index cbdac68..f10a7fc 100644
--- a/bsp/board_ar71xx.bsp
+++ b/bsp/board_ar71xx.bsp
@@ -21,4 +21,8 @@  images=("openwrt-ar71xx-generic-cpe210-220-510-520-squashfs-sysupgrade.bin"
         "openwrt-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin"
         "openwrt-ar71xx-generic-tl-mr3020-v1-squashfs-sysupgrade.bin"
         "openwrt-ar71xx-generic-ubnt-bullet-m-squashfs-sysupgrade.bin"
+        "openwrt-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin"
+        "openwrt-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin"
+        "openwrt-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin"
+        "openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin"
         )
diff --git a/bsp/board_wdr4300.bsp b/bsp/board_wdr4300.bsp
deleted file mode 100644
index aea2c2c..0000000
--- a/bsp/board_wdr4300.bsp
+++ /dev/null
@@ -1,9 +0,0 @@ 
-machine=wdr4300
-chipset=ar71xx
-target=$builddir/$machine
-images=(
-        "openwrt-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin"
-        "openwrt-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin"
-        "openwrt-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin"
-        "openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin"
-       )
diff --git a/bsp/wdr4300/.config b/bsp/wdr4300/.config
deleted file mode 100644
index a827ffb..0000000
--- a/bsp/wdr4300/.config
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# Generated using "./buildscript config openwrt".
-# Do no edit manually
-#
-CONFIG_TARGET_ar71xx=y
-CONFIG_TARGET_ar71xx_generic=y
-CONFIG_TARGET_ar71xx_generic_TLWDR4300=y
-CONFIG_BUSYBOX_CUSTOM=y
-# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
-# CONFIG_BUSYBOX_CONFIG_CROND is not set
-# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
-CONFIG_BUSYBOX_CONFIG_SHA256SUM=y
-CONFIG_CLEAN_IPKG=y
-# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
-# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
-# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
-# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
-# CONFIG_PACKAGE_ALFRED_VIS is not set
-# CONFIG_PACKAGE_dnsmasq is not set
-# CONFIG_PACKAGE_firewall is not set
-CONFIG_PACKAGE_gpioctl-sysfs=y
-CONFIG_PACKAGE_kmod-ifb=y
-# CONFIG_PACKAGE_kmod-ipt-nat is not set
-CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
-CONFIG_PACKAGE_kmod-ledtrig-netdev=y
-# CONFIG_PACKAGE_kmod-lib-crc-ccitt is not set
-# CONFIG_PACKAGE_kmod-ppp is not set
-CONFIG_PACKAGE_kmod-sched-connmark=y
-CONFIG_PACKAGE_libugpio=y
-# CONFIG_PACKAGE_odhcpd is not set
-# CONFIG_PACKAGE_opkg is not set
-# CONFIG_PACKAGE_ppp is not set
-CONFIG_PACKAGE_qos-scripts=y
-CONFIG_PACKAGE_tc=y

Comments

Jan Kraus June 9, 2016, 11:26 a.m.
Hi Tim,

aufgrund mangelnder Hardware kann ichs nicht testen. 
Wenn der vorausgehende Patch drin ist, sollte dieser hier auch passen:
Reviewed-by: Jan Kraus <mayosemmel@gmail.com>

Grüße Jan 

Am Mittwoch, den 08.06.2016, 18:29 +0200 schrieb Tim Niemeyer:
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> ---
> 
>  .../root_file_system/etc/network.tl-wdr3500-v1     |  0
>  .../root_file_system/etc/network.tl-wdr3600-v1     |  0
>  .../root_file_system/etc/network.tl-wdr4300-v1     |  0
>  .../root_file_system/etc/network.tl-wdr4310-v1     |  0
>  bsp/board_ar71xx.bsp                               |  4 +++
>  bsp/board_wdr4300.bsp                              |  9 ------
>  bsp/wdr4300/.config                                | 34 ----------------------
>  7 files changed, 4 insertions(+), 43 deletions(-)
>  rename bsp/{wdr4300 => ar71xx}/root_file_system/etc/network.tl-wdr3500-v1 (100%)
>  rename bsp/{wdr4300 => ar71xx}/root_file_system/etc/network.tl-wdr3600-v1 (100%)
>  rename bsp/{wdr4300 => ar71xx}/root_file_system/etc/network.tl-wdr4300-v1 (100%)
>  rename bsp/{wdr4300 => ar71xx}/root_file_system/etc/network.tl-wdr4310-v1 (100%)
>  delete mode 100644 bsp/board_wdr4300.bsp
>  delete mode 100644 bsp/wdr4300/.config
> 
> diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr3500-v1 b/bsp/ar71xx/root_file_system/etc/network.tl-wdr3500-v1
> similarity index 100%
> rename from bsp/wdr4300/root_file_system/etc/network.tl-wdr3500-v1
> rename to bsp/ar71xx/root_file_system/etc/network.tl-wdr3500-v1
> diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr3600-v1 b/bsp/ar71xx/root_file_system/etc/network.tl-wdr3600-v1
> similarity index 100%
> rename from bsp/wdr4300/root_file_system/etc/network.tl-wdr3600-v1
> rename to bsp/ar71xx/root_file_system/etc/network.tl-wdr3600-v1
> diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr4300-v1 b/bsp/ar71xx/root_file_system/etc/network.tl-wdr4300-v1
> similarity index 100%
> rename from bsp/wdr4300/root_file_system/etc/network.tl-wdr4300-v1
> rename to bsp/ar71xx/root_file_system/etc/network.tl-wdr4300-v1
> diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr4310-v1 b/bsp/ar71xx/root_file_system/etc/network.tl-wdr4310-v1
> similarity index 100%
> rename from bsp/wdr4300/root_file_system/etc/network.tl-wdr4310-v1
> rename to bsp/ar71xx/root_file_system/etc/network.tl-wdr4310-v1
> diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp
> index cbdac68..f10a7fc 100644
> --- a/bsp/board_ar71xx.bsp
> +++ b/bsp/board_ar71xx.bsp
> @@ -21,4 +21,8 @@ images=("openwrt-ar71xx-generic-cpe210-220-510-520-squashfs-sysupgrade.bin"
>          "openwrt-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin"
>          "openwrt-ar71xx-generic-tl-mr3020-v1-squashfs-sysupgrade.bin"
>          "openwrt-ar71xx-generic-ubnt-bullet-m-squashfs-sysupgrade.bin"
> +        "openwrt-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin"
> +        "openwrt-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin"
> +        "openwrt-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin"
> +        "openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin"
>          )
> diff --git a/bsp/board_wdr4300.bsp b/bsp/board_wdr4300.bsp
> deleted file mode 100644
> index aea2c2c..0000000
> --- a/bsp/board_wdr4300.bsp
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -machine=wdr4300
> -chipset=ar71xx
> -target=$builddir/$machine
> -images=(
> -        "openwrt-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin"
> -        "openwrt-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin"
> -        "openwrt-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin"
> -        "openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin"
> -       )
> diff --git a/bsp/wdr4300/.config b/bsp/wdr4300/.config
> deleted file mode 100644
> index a827ffb..0000000
> --- a/bsp/wdr4300/.config
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -# Generated using "./buildscript config openwrt".
> -# Do no edit manually
> -#
> -CONFIG_TARGET_ar71xx=y
> -CONFIG_TARGET_ar71xx_generic=y
> -CONFIG_TARGET_ar71xx_generic_TLWDR4300=y
> -CONFIG_BUSYBOX_CUSTOM=y
> -# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
> -# CONFIG_BUSYBOX_CONFIG_CROND is not set
> -# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
> -# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
> -CONFIG_BUSYBOX_CONFIG_SHA256SUM=y
> -CONFIG_CLEAN_IPKG=y
> -# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
> -# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
> -# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
> -# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
> -# CONFIG_PACKAGE_ALFRED_VIS is not set
> -# CONFIG_PACKAGE_dnsmasq is not set
> -# CONFIG_PACKAGE_firewall is not set
> -CONFIG_PACKAGE_gpioctl-sysfs=y
> -CONFIG_PACKAGE_kmod-ifb=y
> -# CONFIG_PACKAGE_kmod-ipt-nat is not set
> -CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
> -CONFIG_PACKAGE_kmod-ledtrig-netdev=y
> -# CONFIG_PACKAGE_kmod-lib-crc-ccitt is not set
> -# CONFIG_PACKAGE_kmod-ppp is not set
> -CONFIG_PACKAGE_kmod-sched-connmark=y
> -CONFIG_PACKAGE_libugpio=y
> -# CONFIG_PACKAGE_odhcpd is not set
> -# CONFIG_PACKAGE_opkg is not set
> -# CONFIG_PACKAGE_ppp is not set
> -CONFIG_PACKAGE_qos-scripts=y
> -CONFIG_PACKAGE_tc=y
> -- 
> 2.1.4
>