kirkwood: move ubi/ubifs options to the image makefile

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index d38ee715554273b4b8d760a64560849de6d8e473..3cc199f7ce069a4f682865c2fddd5c985de21f0b 100644 (file)
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -170,33 +170,69 @@ define Image/Build/ubi
  endif
 endef
 
+DOCKSTAR_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+DOCKSTAR_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
+GOFLEXHOME_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+GOFLEXHOME_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
+GOFLEXNET_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+GOFLEXNET_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Template/Generic=$(call Image/BuildKernel/Template)
 Image/InstallKernel/Template/Generic=$(call Image/InstallKernel/Template)
 
+IB62X0_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+IB62X0_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0)
 Image/InstallKernel/Template/IB62X0=$(call Image/InstallKernel/Template,ib62x0)
 
+ICONNECT_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+ICONNECT_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Template/ICONNECT=$(call Image/BuildKernel/Template,iconnect)
 Image/InstallKernel/Template/ICONNECT=$(call Image/InstallKernel/Template,iconnect)
 
+IOMEGA_IX2_200_UBIFS_OPTS:="-m 512 -e 15872 -c 2048"
+IOMEGA_IX2_200_UBI_OPTS:="-m 512 -p 16384 -s 256"
+
 Image/BuildKernel/Template/IOMEGA_IX2_200=$(call Image/BuildKernel/Template,iomega_ix2_200)
 Image/InstallKernel/Template/IOMEGA_IX2_200=$(call Image/InstallKernel/Template,iomega_ix2_200)
 
+NSA310S_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+NSA310S_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Template/NSA310S=$(call Image/BuildKernel/Template,nsa310s)
 Image/InstallKernel/Template/NSA310S=$(call Image/InstallKernel/Template,nsa310s)
 
+POGOE02_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+POGOE02_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Template/POGOE02=$(call Image/BuildKernel/Template,pogo_e02)
 Image/InstallKernel/Template/POGOE02=$(call Image/InstallKernel/Template,pogo_e02)
 
+SHEEVAPLUG_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+SHEEVAPLUG_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Template/SHEEVAPLUG=$(call Image/BuildKernel/Template,sheevaplug)
 Image/InstallKernel/Template/SHEEVAPLUG=$(call Image/InstallKernel/Template,sheevaplug)
 
+SHEEVAPLUGSATA_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+SHEEVAPLUGSATA_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Template/SHEEVAPLUGSATA=$(call Image/BuildKernel/Template,sheevaplug-esata)
 Image/InstallKernel/Template/SHEEVAPLUGSATA=$(call Image/InstallKernel/Template,sheevaplug-esata)
 
+GuruplugServerPlus_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+GuruplugServerPlus_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Template/GuruplugServerPlus=$(call Image/BuildKernel/Template,guruplug-server-plus)
 Image/InstallKernel/Template/GuruplugServerPlus=$(call Image/InstallKernel/Template,guruplug-server-plus)
 
+Topkick1281P2_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+Topkick1281P2_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Template/Topkick1281P2=$(call Image/BuildKernel/Template,topkick)
 Image/InstallKernel/Template/Topkick1281P2=$(call Image/InstallKernel/Template,topkick)
 

diff --git a/target/linux/kirkwood/profiles/110-nas.mk b/target/linux/kirkwood/profiles/110-nas.mk
index bf97437871e66faae3564e141623a98f8329da9b..614dc4d7543b2b6de377c6585936202a4c26b0d8 100644 (file)
--- a/target/linux/kirkwood/profiles/110-nas.mk
+++ b/target/linux/kirkwood/profiles/110-nas.mk
@@ -15,9 +15,6 @@ define Profile/DOCKSTAR/Description
  Package set compatible with Seagate FreeAgent Dockstar board.
 endef
 
-DOCKSTAR_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-DOCKSTAR_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,DOCKSTAR))
 
 define Profile/GOFLEXHOME
@@ -32,9 +29,6 @@ define Profile/GOFLEXHOME/Description
  Package set compatible with Seagate GoFlexHome
 endef
 
-GOFLEXHOME_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-GOFLEXHOME_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,GOFLEXHOME))
 
 define Profile/GOFLEXNET
@@ -48,9 +42,6 @@ define Profile/GOFLEXNET/Description
  Package set compatible with Seagate GoFlexNet
 endef
 
-GOFLEXNET_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-GOFLEXNET_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,GOFLEXNET))
 
 define Profile/IB62X0
@@ -64,9 +55,6 @@ define Profile/IB62X0/Description
  Package set compatible with RaidSonic ICY BOX IB-NAS62x0 board.
 endef
 
-IB62X0_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-IB62X0_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,IB62X0))
 
 define Profile/ICONNECT
@@ -79,9 +67,6 @@ define Profile/ICONNECT/Description
  Package set compatible with Iomega Iconnect board.
 endef
 
-ICONNECT_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-ICONNECT_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,ICONNECT))
 
 define Profile/IOMEGA_IX2_200
@@ -95,9 +80,6 @@ define Profile/IOMEGA_IX2_200/Description
  Package set compatible with Iomega StorCenter ix2-200 board.
 endef
 
-IOMEGA_IX2_200_UBIFS_OPTS:="-m 512 -e 15872 -c 2048"
-IOMEGA_IX2_200_UBI_OPTS:="-m 512 -p 16384 -s 256"
-
 $(eval $(call Profile,IOMEGA_IX2_200))
 
 define Profile/NSA310S
@@ -111,9 +93,6 @@ define Profile/NSA310S/Description
  Package set compatible with ZyXEL NSA310S board.
 endef
 
-NSA310S_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-NSA310S_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,NSA310S))
 
 define Profile/POGOE02
@@ -126,7 +105,4 @@ define Profile/POGOE02/Description
  Package set compatible with Cloud Engines Pogoplug E02 board.
 endef
 
-POGOE02_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-POGOE02_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,POGOE02))

diff --git a/target/linux/kirkwood/profiles/120-plug.mk b/target/linux/kirkwood/profiles/120-plug.mk
index 3f92f89b23ff01073fbd9525797afe68e4961788..0512aff4503135c2a642107011f11b795ecbcc77 100644 (file)
--- a/target/linux/kirkwood/profiles/120-plug.mk
+++ b/target/linux/kirkwood/profiles/120-plug.mk
@@ -17,9 +17,6 @@ define Profile/SHEEVAPLUG/Description
  Package set compatible with Globalscale Technologies SheevaPlug board.
 endef
 
-SHEEVAPLUG_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-SHEEVAPLUG_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,SHEEVAPLUG))
 
 define Profile/SHEEVAPLUGSATA
@@ -34,9 +31,6 @@ define Profile/SHEEVAPLUGSATA/Description
  Package set compatible with Globalscale Technologies eSATA SheevaPlug board.
 endef
 
-SHEEVAPLUGSATA_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-SHEEVAPLUGSATA_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,SHEEVAPLUGSATA))
 
 define Profile/GuruplugServerPlus
@@ -53,9 +47,6 @@ define Profile/GuruplugServerPlus/Description
  Package set compatible with Globalscale Technologies Guruplug Server Plus board.
 endef
 
-GuruplugServerPlus_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-GuruplugServerPlus_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,GuruplugServerPlus))
 
 define Profile/Topkick1281P2
@@ -70,7 +61,4 @@ define Profile/Topkick1281P2/Description
  Package set compatible with Univeral Scientific Industrial Co. Topkick-1281P2 board.
 endef
 
-Topkick1281P2_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-Topkick1281P2_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,Topkick1281P2))