From: Felix Fietkau <nbd@nbd.name>
Date: Wed, 18 May 2016 13:48:57 +0000 (+0200)
Subject: lantiq: move ubi/ubifs options to the image makefile
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=311faaa1bdd28b67071b5c59ae37c47d5f4ffde1;p=openwrt%2Fstaging%2Fkaloz.git

lantiq: move ubi/ubifs options to the image makefile

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

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index bc74e4f697..5f2956cab5 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -349,6 +349,9 @@ endif
 ifeq ($(CONFIG_TARGET_lantiq_xway),y)
 
 # Danube
+BTHOMEHUBV2B_UBIFS_OPTS:="-m 512 -e 15872 -c 1959"
+BTHOMEHUBV2B_UBI_OPTS:="-m 512 -p 16KiB -s 256"
+
 Image/BuildKernel/Profile/BTHOMEHUBV2B=$(call Image/BuildKernel/Template,BTHOMEHUBV2B)
 Image/Build/Profile/BTHOMEHUBV2B=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV2B)
 
@@ -372,6 +375,9 @@ $(eval $(call lantiqImage,GIGASX76X))
 
 
 # AR9
+BTHOMEHUBV3A_UBIFS_OPTS:="-m 512 -e 15872 -c 1959"
+BTHOMEHUBV3A_UBI_OPTS:="-m 512 -p 16KiB -s 256"
+
 Image/BuildKernel/Profile/BTHOMEHUBV3A=$(call Image/BuildKernel/Template,BTHOMEHUBV3A)
 Image/Build/Profile/BTHOMEHUBV3A=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV3A)
 
@@ -397,20 +403,32 @@ endif
 ifeq ($(CONFIG_TARGET_lantiq_xrx200),y)
 
 # VR9
+P2812HNUF1_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+P2812HNUF1_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Profile/P2812HNUF1=$(call Image/BuildKernel/Template,P2812HNUF1)
 Image/Build/Profile/P2812HNUF1=$(call Image/BuildNAND/$(1),$(1),P2812HNUF1)
 
+P2812HNUF3_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+P2812HNUF3_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Profile/P2812HNUF3=$(call Image/BuildKernel/Template,P2812HNUF3)
 Image/Build/Profile/P2812HNUF3=$(call Image/BuildNAND/$(1),$(1),P2812HNUF3)
 
 $(eval $(call lantiqImage,ARV7519RW22))
 
+BTHOMEHUBV5A_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+BTHOMEHUBV5A_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Profile/BTHOMEHUBV5A=$(call Image/BuildKernel/Template,BTHOMEHUBV5A)
 Image/Build/Profile/BTHOMEHUBV5A=$(call Image/BuildNAND/$(1),$(1),BTHOMEHUBV5A)
 
 $(eval $(call lantiqImage,EASY80920NAND))
 $(eval $(call lantiqImage,EASY80920NOR))
 
+FRITZ3370_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
+FRITZ3370_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
+
 Image/BuildKernel/Profile/FRITZ3370=$(call Image/BuildKernelEVA/Template,FRITZ3370)
 Image/Build/Profile/FRITZ3370=$(call Image/BuildEVA/$(1),$(1),FRITZ3370)
 
diff --git a/target/linux/lantiq/xrx200/profiles/avm.mk b/target/linux/lantiq/xrx200/profiles/avm.mk
index 89909b92e3..35f9a8ea09 100644
--- a/target/linux/lantiq/xrx200/profiles/avm.mk
+++ b/target/linux/lantiq/xrx200/profiles/avm.mk
@@ -3,7 +3,4 @@ define Profile/FRITZ3370
   PACKAGES:=kmod-ath9k wpad-mini kmod-usb-dwc2
 endef
 
-FRITZ3370_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-FRITZ3370_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,FRITZ3370))
diff --git a/target/linux/lantiq/xrx200/profiles/bt.mk b/target/linux/lantiq/xrx200/profiles/bt.mk
index a1083bbb6d..51b6eaee92 100644
--- a/target/linux/lantiq/xrx200/profiles/bt.mk
+++ b/target/linux/lantiq/xrx200/profiles/bt.mk
@@ -3,7 +3,4 @@ define Profile/BTHOMEHUBV5A
   PACKAGES:=kmod-ath9k kmod-ath10k wpad-mini kmod-usb-dwc2
 endef
 
-BTHOMEHUBV5A_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-BTHOMEHUBV5A_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,BTHOMEHUBV5A))
diff --git a/target/linux/lantiq/xrx200/profiles/zyxel.mk b/target/linux/lantiq/xrx200/profiles/zyxel.mk
index f6995f946b..8cb96af4c7 100644
--- a/target/linux/lantiq/xrx200/profiles/zyxel.mk
+++ b/target/linux/lantiq/xrx200/profiles/zyxel.mk
@@ -3,9 +3,6 @@ define Profile/P2812HNUF1
   PACKAGES:=kmod-rt2800-pci wpad-mini kmod-usb-dwc2
 endef
 
-P2812HNUF1_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-P2812HNUF1_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,P2812HNUF1))
 
 define Profile/P2812HNUF3
@@ -13,8 +10,5 @@ define Profile/P2812HNUF3
   PACKAGES:=kmod-rt2800-pci wpad-mini kmod-usb-dwc2
 endef
 
-P2812HNUF3_UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
-P2812HNUF3_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
 $(eval $(call Profile,P2812HNUF3))
 
diff --git a/target/linux/lantiq/xway/profiles/bt.mk b/target/linux/lantiq/xway/profiles/bt.mk
index 656d7f3089..68fefb7c22 100644
--- a/target/linux/lantiq/xway/profiles/bt.mk
+++ b/target/linux/lantiq/xway/profiles/bt.mk
@@ -9,11 +9,6 @@ define Profile/BTHOMEHUBV2B
 	swconfig
 endef
 
-
-BTHOMEHUBV2B_UBIFS_OPTS:="-m 512 -e 15872 -c 1959"
-BTHOMEHUBV2B_UBI_OPTS:="-m 512 -p 16KiB -s 256"
-
-
 $(eval $(call Profile,BTHOMEHUBV2B))
 
 define Profile/BTHOMEHUBV3A
@@ -27,8 +22,4 @@ define Profile/BTHOMEHUBV3A
 	swconfig uboot-envtools
 endef
 
-BTHOMEHUBV3A_UBIFS_OPTS:="-m 512 -e 15872 -c 1959"
-BTHOMEHUBV3A_UBI_OPTS:="-m 512 -p 16KiB -s 256"
-
-
 $(eval $(call Profile,BTHOMEHUBV3A))