aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-10-23 15:43:26 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-10-23 15:43:26 +0000
commit31639e70b8bbfdf39c9e6caf4f43b0a8d5b30539 (patch)
treeb03a72a3fc3f8108c8ff405604fc1b5a6c22168a /target/linux
parent3080df79e77d509ac76648ee50d362640722a2f0 (diff)
downloadupstream-31639e70b8bbfdf39c9e6caf4f43b0a8d5b30539.tar.gz
upstream-31639e70b8bbfdf39c9e6caf4f43b0a8d5b30539.tar.bz2
upstream-31639e70b8bbfdf39c9e6caf4f43b0a8d5b30539.zip
ar71xx: rename 'nand' subtarget to 'mikrotik'
It is for Mikrotik devices only, rename the subtarget to reflect that. Also fix the wget2nand script to use the new image names. Based on the patch by Stefan Agner: http://patchwork.openwrt.org/patch/4123/ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38509 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/Makefile2
-rwxr-xr-xtarget/linux/ar71xx/base-files/sbin/wget2nand4
-rw-r--r--target/linux/ar71xx/mikrotik/config-default (renamed from target/linux/ar71xx/nand/config-default)0
-rw-r--r--target/linux/ar71xx/mikrotik/profiles/01-minimal.mk (renamed from target/linux/ar71xx/nand/profiles/01-minimal.mk)0
-rw-r--r--target/linux/ar71xx/mikrotik/profiles/02-ath5k.mk (renamed from target/linux/ar71xx/nand/profiles/02-ath5k.mk)0
-rw-r--r--target/linux/ar71xx/mikrotik/target.mk (renamed from target/linux/ar71xx/nand/target.mk)0
6 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 019e3cb13db..a59a124d1d1 100644
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=ar71xx
BOARDNAME:=Atheros AR7xxx/AR9xxx
FEATURES:=squashfs targz mips16
CPU_TYPE=34kc
-SUBTARGETS:=generic nand
+SUBTARGETS:=generic mikrotik
LINUX_VERSION:=3.10.17
diff --git a/target/linux/ar71xx/base-files/sbin/wget2nand b/target/linux/ar71xx/base-files/sbin/wget2nand
index f80eecd2192..8175a9e2a1a 100755
--- a/target/linux/ar71xx/base-files/sbin/wget2nand
+++ b/target/linux/ar71xx/base-files/sbin/wget2nand
@@ -27,8 +27,8 @@ url=$1
exit 1
}
-url_kernel=$url/openwrt-ar71xx-nand-vmlinux-lzma.elf
-url_rootfs=$url/openwrt-ar71xx-nand-rootfs.tar.gz
+url_kernel=$url/openwrt-ar71xx-mikrotik-vmlinux-lzma.elf
+url_rootfs=$url/openwrt-ar71xx-mikrotik-rootfs.tar.gz
mtd_kernel="$(find_mtd_part 'kernel')"
mtd_rootfs="$(find_mtd_part 'rootfs')"
diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/mikrotik/config-default
index efa562c66ee..efa562c66ee 100644
--- a/target/linux/ar71xx/nand/config-default
+++ b/target/linux/ar71xx/mikrotik/config-default
diff --git a/target/linux/ar71xx/nand/profiles/01-minimal.mk b/target/linux/ar71xx/mikrotik/profiles/01-minimal.mk
index 3651c88ab2d..3651c88ab2d 100644
--- a/target/linux/ar71xx/nand/profiles/01-minimal.mk
+++ b/target/linux/ar71xx/mikrotik/profiles/01-minimal.mk
diff --git a/target/linux/ar71xx/nand/profiles/02-ath5k.mk b/target/linux/ar71xx/mikrotik/profiles/02-ath5k.mk
index a291ff68aeb..a291ff68aeb 100644
--- a/target/linux/ar71xx/nand/profiles/02-ath5k.mk
+++ b/target/linux/ar71xx/mikrotik/profiles/02-ath5k.mk
diff --git a/target/linux/ar71xx/nand/target.mk b/target/linux/ar71xx/mikrotik/target.mk
index 45d2624cd4b..45d2624cd4b 100644
--- a/target/linux/ar71xx/nand/target.mk
+++ b/target/linux/ar71xx/mikrotik/target.mk