diff --git a/target/linux/ar71xx/generic/config-default b/target/linux/ar71xx/generic/config-default
index d3c8000f6d..5f3adecc22 100644
--- a/target/linux/ar71xx/generic/config-default
+++ b/target/linux/ar71xx/generic/config-default
@@ -82,7 +82,6 @@ CONFIG_ATH79_MACH_EAP300V2=y
 CONFIG_ATH79_MACH_EAP7660D=y
 CONFIG_ATH79_MACH_EL_M150=y
 CONFIG_ATH79_MACH_EL_MINI=y
-CONFIG_ATH79_MACH_ENS202EXT=y
 CONFIG_ATH79_MACH_EPG5000=y
 CONFIG_ATH79_MACH_ESR1750=y
 CONFIG_ATH79_MACH_ESR900=y
@@ -107,7 +106,6 @@ CONFIG_ATH79_MACH_HORNET_UB=y
 CONFIG_ATH79_MACH_JA76PF=y
 CONFIG_ATH79_MACH_JWAP003=y
 CONFIG_ATH79_MACH_JWAP230=y
-CONFIG_ATH79_MACH_KOALA=y
 CONFIG_ATH79_MACH_LAN_TURTLE=y
 CONFIG_ATH79_MACH_LIMA=y
 CONFIG_ATH79_MACH_MC_MAC1200R=y
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index c429eb39d9..804532b55c 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -15,7 +15,6 @@ DEVICE_VARS += BOARDNAME CMDLINE CONSOLE IMAGE_SIZE LOADER_TYPE
 ifeq ($(SUBTARGET),generic)
 include ./generic.mk
 include ./generic-legacy-devices.mk
-include ./generic-senao.mk
 include ./generic-tp-link.mk
 include ./generic-ubnt.mk
 endif
@@ -23,6 +22,7 @@ ifeq ($(SUBTARGET),tiny)
 include ./tiny.mk
 include ./tiny-tp-link.mk
 include ./tiny-legacy-devices.mk
+include ./tiny-senao.mk
 endif
 ifeq ($(SUBTARGET),nand)
 include ./nand.mk
diff --git a/target/linux/ar71xx/image/generic-senao.mk b/target/linux/ar71xx/image/tiny-senao.mk
similarity index 100%
rename from target/linux/ar71xx/image/generic-senao.mk
rename to target/linux/ar71xx/image/tiny-senao.mk
diff --git a/target/linux/ar71xx/tiny/config-default b/target/linux/ar71xx/tiny/config-default
index 78672940b2..2c7b4b71aa 100644
--- a/target/linux/ar71xx/tiny/config-default
+++ b/target/linux/ar71xx/tiny/config-default
@@ -12,7 +12,9 @@ CONFIG_ATH79_MACH_BHR_4GRV2=y
 CONFIG_ATH79_MACH_DIR_600_A1=y
 CONFIG_ATH79_MACH_DIR_615_C1=y
 CONFIG_ATH79_MACH_DIR_615_I1=y
+CONFIG_ATH79_MACH_ENS202EXT=y
 CONFIG_ATH79_MACH_F9K1115V2=y
+CONFIG_ATH79_MACH_KOALA=y
 CONFIG_ATH79_MACH_NBG460N=y
 CONFIG_ATH79_MACH_TEW_632BRP=y
 CONFIG_ATH79_MACH_TEW_712BR=y