From e89b9eb588e85b1938dd24a56afcfe7cfaf8b28d Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 23 Oct 2013 15:43:26 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38509 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/Makefile | 2 +- target/linux/ar71xx/base-files/sbin/wget2nand | 4 ++-- target/linux/ar71xx/{nand => mikrotik}/config-default | 0 target/linux/ar71xx/{nand => mikrotik}/profiles/01-minimal.mk | 0 target/linux/ar71xx/{nand => mikrotik}/profiles/02-ath5k.mk | 0 target/linux/ar71xx/{nand => mikrotik}/target.mk | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename target/linux/ar71xx/{nand => mikrotik}/config-default (100%) rename target/linux/ar71xx/{nand => mikrotik}/profiles/01-minimal.mk (100%) rename target/linux/ar71xx/{nand => mikrotik}/profiles/02-ath5k.mk (100%) rename target/linux/ar71xx/{nand => mikrotik}/target.mk (100%) diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 019e3cb13d..a59a124d1d 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 f80eecd219..8175a9e2a1 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 similarity index 100% rename from target/linux/ar71xx/nand/config-default rename to 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 similarity index 100% rename from target/linux/ar71xx/nand/profiles/01-minimal.mk rename to 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 similarity index 100% rename from target/linux/ar71xx/nand/profiles/02-ath5k.mk rename to target/linux/ar71xx/mikrotik/profiles/02-ath5k.mk diff --git a/target/linux/ar71xx/nand/target.mk b/target/linux/ar71xx/mikrotik/target.mk similarity index 100% rename from target/linux/ar71xx/nand/target.mk rename to target/linux/ar71xx/mikrotik/target.mk -- 2.11.0