ar71xx/generic: add generic- prefix to vendor-specific image Makefile snippets

[openwrt/staging/wigyori.git] / target / linux / ar71xx / image / Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 72ae3d59ff779070d8ff31ab2cf515161cdcac16..e14271df53d8515d77da5830f51b870831c8cf0c 100644 (file)
--- 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
@@ -53,7 +53,7 @@ define Device/Default
   PROFILES = Default Minimal $$(DEVICE_PROFILE)
   MTDPARTS :=
   BLOCKSIZE := 64k
-  CONSOLE = ttyS0,115200
+  CONSOLE := ttyS0,115200
   CMDLINE = $$(if $$(BOARDNAME),board=$$(BOARDNAME)) $$(if $$(MTDPARTS),mtdparts=$$(MTDPARTS)) $$(if $$(CONSOLE),console=$$(CONSOLE))
   KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma
   COMPILE :=