From: David Bauer <mail@david-bauer.net>
Date: Mon, 18 May 2020 19:10:40 +0000 (+0200)
Subject: mpc85xx: rename generic subtarget to p1010
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=564f87ef5bea16d5d1d8a9a80e8de77429159f26;p=oweals%2Fopenwrt.git

mpc85xx: rename generic subtarget to p1010

The mpc85xx-generic subtarget supports the QorIQ SoCs of the p1010
family. Rename the subtarget to reflect this affiliation as it's the
case with the other mpc85xx subtargets.

Signed-off-by: David Bauer <mail@david-bauer.net>
---

diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 4bb4d8812d..2ffdfeddcd 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/target/linux/mpc85xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=mpc85xx
 BOARDNAME:=Freescale MPC85xx
 CPU_TYPE:=8540
 FEATURES:=squashfs ramdisk
-SUBTARGETS:=generic p1020 p2020
+SUBTARGETS:=p1010 p1020 p2020
 
 KERNEL_PATCHVER:=5.4
 
diff --git a/target/linux/mpc85xx/generic/config-default b/target/linux/mpc85xx/generic/config-default
deleted file mode 100644
index e25d51aeb1..0000000000
--- a/target/linux/mpc85xx/generic/config-default
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_FSL_CORENET_CF is not set
-CONFIG_MTD_NAND_FSL_IFC=y
-CONFIG_MTD_SPLIT_FIRMWARE=y
-CONFIG_MTD_SPLIT_TPLINK_FW=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_BEB_LIMIT=20
-CONFIG_MTD_UBI_BLOCK=y
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_REALTEK_PHY=y
-CONFIG_RED_15W_REV1=y
-CONFIG_TL_WDR4900_V1=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
diff --git a/target/linux/mpc85xx/generic/profiles/00-default.mk b/target/linux/mpc85xx/generic/profiles/00-default.mk
deleted file mode 100644
index 67507ace8a..0000000000
--- a/target/linux/mpc85xx/generic/profiles/00-default.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Default
-  NAME:=Default Profile
-  PRIORITY:=1
-endef
-
-define Profile/Default/Description
-	Default package set compatible with most MPC85xx boards.
-endef
-
-$(eval $(call Profile,Default))
diff --git a/target/linux/mpc85xx/generic/target.mk b/target/linux/mpc85xx/generic/target.mk
deleted file mode 100644
index f826fe4d15..0000000000
--- a/target/linux/mpc85xx/generic/target.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-BOARDNAME:=Generic
-FEATURES+=nand
-KERNELNAME:=simpleImage.tl-wdr4900-v1
-
-define Target/Description
-	Build firmware images for generic MPC85xx based boards.
-endef
-
diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile
index 40002c13c4..225f871699 100644
--- a/target/linux/mpc85xx/image/Makefile
+++ b/target/linux/mpc85xx/image/Makefile
@@ -21,7 +21,7 @@ define Device/Default
   SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
 endef
 
-ifeq ($(SUBTARGET),generic)
+ifeq ($(SUBTARGET),p1010)
 
 define Device/tplink_tl-wdr4900-v1
   DEVICE_VENDOR := TP-Link
diff --git a/target/linux/mpc85xx/p1010/config-default b/target/linux/mpc85xx/p1010/config-default
new file mode 100644
index 0000000000..e25d51aeb1
--- /dev/null
+++ b/target/linux/mpc85xx/p1010/config-default
@@ -0,0 +1,18 @@
+# CONFIG_FSL_CORENET_CF is not set
+CONFIG_MTD_NAND_FSL_IFC=y
+CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_TPLINK_FW=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_BLOCK=y
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_REALTEK_PHY=y
+CONFIG_RED_15W_REV1=y
+CONFIG_TL_WDR4900_V1=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
diff --git a/target/linux/mpc85xx/p1010/profiles/00-default.mk b/target/linux/mpc85xx/p1010/profiles/00-default.mk
new file mode 100644
index 0000000000..5356aaa939
--- /dev/null
+++ b/target/linux/mpc85xx/p1010/profiles/00-default.mk
@@ -0,0 +1,15 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Default
+  NAME:=Default Profile
+  PRIORITY:=1
+endef
+
+define Profile/Default/Description
+	Default package set compatible with most P1010 boards.
+endef
+
+$(eval $(call Profile,Default))
diff --git a/target/linux/mpc85xx/p1010/target.mk b/target/linux/mpc85xx/p1010/target.mk
new file mode 100644
index 0000000000..12ed78ace1
--- /dev/null
+++ b/target/linux/mpc85xx/p1010/target.mk
@@ -0,0 +1,8 @@
+BOARDNAME:=P1010
+FEATURES+=nand
+KERNELNAME:=simpleImage.tl-wdr4900-v1
+
+define Target/Description
+	Build firmware images for P1010 based boards.
+endef
+