From 29d126b5c13a8581cbc0961523eb3fd60320111d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 12 Jan 2018 01:42:11 +0100
Subject: [PATCH] ar71xx/generic: add generic- prefix to vendor-specific image
 Makefile snippets

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 target/linux/ar71xx/image/Makefile                        | 8 ++++----
 .../{legacy-devices.mk => generic-legacy-devices.mk}      | 0
 target/linux/ar71xx/image/{senao.mk => generic-senao.mk}  | 0
 .../linux/ar71xx/image/{tp-link.mk => generic-tp-link.mk} | 0
 target/linux/ar71xx/image/{ubnt.mk => generic-ubnt.mk}    | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename target/linux/ar71xx/image/{legacy-devices.mk => generic-legacy-devices.mk} (100%)
 rename target/linux/ar71xx/image/{senao.mk => generic-senao.mk} (100%)
 rename target/linux/ar71xx/image/{tp-link.mk => generic-tp-link.mk} (100%)
 rename target/linux/ar71xx/image/{ubnt.mk => generic-ubnt.mk} (100%)

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 6c70babc56ec..e14271df53d8 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -13,11 +13,11 @@ KERNEL_LOADADDR = 0x80060000
 DEVICE_VARS += BOARDNAME CMDLINE CONSOLE IMAGE_SIZE LOADER_TYPE
 
 ifeq ($(SUBTARGET),generic)
-include ./tp-link.mk
-include ./ubnt.mk
 include ./generic.mk
-include ./legacy-devices.mk
-include ./senao.mk
+include ./generic-legacy-devices.mk
+include ./generic-senao.mk
+include ./generic-tp-link.mk
+include ./generic-ubnt.mk
 endif
 ifeq ($(SUBTARGET),nand)
 include ./nand.mk
diff --git a/target/linux/ar71xx/image/legacy-devices.mk b/target/linux/ar71xx/image/generic-legacy-devices.mk
similarity index 100%
rename from target/linux/ar71xx/image/legacy-devices.mk
rename to target/linux/ar71xx/image/generic-legacy-devices.mk
diff --git a/target/linux/ar71xx/image/senao.mk b/target/linux/ar71xx/image/generic-senao.mk
similarity index 100%
rename from target/linux/ar71xx/image/senao.mk
rename to target/linux/ar71xx/image/generic-senao.mk
diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk
similarity index 100%
rename from target/linux/ar71xx/image/tp-link.mk
rename to target/linux/ar71xx/image/generic-tp-link.mk
diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/generic-ubnt.mk
similarity index 100%
rename from target/linux/ar71xx/image/ubnt.mk
rename to target/linux/ar71xx/image/generic-ubnt.mk
-- 
2.30.2