mediatek: move mt7623 support into a 32bit subtarget

this is in preparation for adding the new 64bit mt7622 support.

Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/target/linux/mediatek/32/profiles/default.mk b/target/linux/mediatek/32/profiles/default.mk
new file mode 100644 (file)
index 0000000..2ef570b
--- /dev/null
+++ b/target/linux/mediatek/32/profiles/default.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Default
+       NAME:=Default Profile (minimum package set)
+endef
+
+define Profile/Default/Description
+       Default package set compatible with most boards.
+endef
+$(eval $(call Profile,Default))

diff --git a/target/linux/mediatek/32/target.mk b/target/linux/mediatek/32/target.mk
new file mode 100644 (file)
index 0000000..0a444c2
--- /dev/null
+++ b/target/linux/mediatek/32/target.mk
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+
+SUBTARGET:=32
+BOARDNAME:=32bit
+CPU_TYPE:=cortex-a7
+CPU_SUBTYPE:=neon-vfpv4
+
+define Target/Description
+       Build firmware images for MediaTek 32bit ARM based boards.
+endef
+

diff --git a/target/linux/mediatek/Makefile b/target/linux/mediatek/Makefile
index f1836939a39ca2dcbbdaa0185fac6a2a60d88ccb..4ebac09a6e96bdd58d1e4d3ee848d7b226b97555 100644 (file)
--- a/target/linux/mediatek/Makefile
+++ b/target/linux/mediatek/Makefile
@@ -5,9 +5,8 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=mediatek
 BOARDNAME:=MediaTek Ralink ARM
+SUBTARGETS:=32
 FEATURES:=squashfs nand ubifs
-CPU_TYPE:=cortex-a7
-CPU_SUBTYPE:=neon-vfpv4
 MAINTAINER:=John Crispin <john@phrozen.org>
 
 KERNEL_PATCHVER:=4.9

diff --git a/target/linux/mediatek/image/32.mk b/target/linux/mediatek/image/32.mk
new file mode 100644 (file)
index 0000000..574bf93
--- /dev/null
+++ b/target/linux/mediatek/image/32.mk
@@ -0,0 +1,43 @@
+define Image/BuilduImage
+       $(CP) $(KDIR)/zImage$(2) $(KDIR)/zImage-$(1)$(2)
+       cat $(LINUX_DIR)/arch/arm/boot/dts/mt7623-$1.dtb >> $(KDIR)/zImage-$(1)$(2)
+       mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)'  -d $(KDIR)/zImage-$(1)$(2) $(KDIR)/uImage-$(1)$(2)
+endef
+
+define Image/Build/SysupgradeCombined
+       $(call Image/BuilduImage,$1)
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+       $(call Image/BuilduImage,$1,-initramfs)
+       $(CP) $(KDIR)/uImage-$(1)-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-$(1)-initramfs
+endif
+       mkdir -p "$(KDIR_TMP)/sysupgrade-$(3)/"
+       echo "BOARD=$(3)" > "$(KDIR_TMP)/sysupgrade-$(3)/CONTROL"
+       $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(3)/root"
+       $(CP) "$(KDIR)/uImage-$(1)" "$(KDIR_TMP)/sysupgrade-$(3)/kernel"
+       (cd "$(KDIR_TMP)"; $(TAR) cvf \
+               "$(BIN_DIR)/$(IMG_PREFIX)-$(3)-sysupgrade.tar" sysupgrade-$(3) \
+                       $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
+       )
+endef
+
+COMPAT_EMMC:=mediatek,mt7623-rfb-emmc
+COMPAT_NAND:=mediatek,mt7623-rfb-nand
+COMPAT_NAND_EPHY:=mediatek,mt7623-rfb-nand-ephy
+
+define Image/Build/squashfs
+       $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+       $(CP) $(KDIR)/root.squashfs $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs
+
+       $(call Image/Build/SysupgradeCombined,eMMC,squashfs,$$(COMPAT_EMMC))
+
+       $(call Image/BuilduImage,NAND)
+       $(call Image/BuilduImage,NAND-ePHY)
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+       $(call Image/BuilduImage,NAND,-initramfs)
+       $(call Image/BuilduImage,NAND-ePHY,-initramfs)
+       $(CP) $(KDIR)/uImage-NAND-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-NAND-initramfs
+       $(CP) $(KDIR)/uImage-NAND-ePHY-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-NAND-ePHY-initramfs
+endif
+       $(call Image/Build/SysupgradeNAND,NAND,$(1),$(KDIR)/uImage-NAND,$$(COMPAT_NAND))
+       $(call Image/Build/SysupgradeNAND,NAND-ePHY,$(1),$(KDIR)/uImage-NAND-ePHY,$$(COMPAT_NAND_EPHY))
+endef

diff --git a/target/linux/mediatek/image/Makefile b/target/linux/mediatek/image/Makefile
index d515a04d5b4e5a5b60e0474faff305b537aae329..6721259b208e9033aa06e24c6421fbb43b9e9eac 100644 (file)
--- a/target/linux/mediatek/image/Makefile
+++ b/target/linux/mediatek/image/Makefile
@@ -1,51 +1,7 @@
-# Copyright (c) 2014 The Linux Foundation. All rights reserved.
-#
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-define Image/BuilduImage
-       $(CP) $(KDIR)/zImage$(2) $(KDIR)/zImage-$(1)$(2)
-       cat $(LINUX_DIR)/arch/arm/boot/dts/mt7623-$1.dtb >> $(KDIR)/zImage-$(1)$(2)
-       mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)'  -d $(KDIR)/zImage-$(1)$(2) $(KDIR)/uImage-$(1)$(2)
-endef
-
-define Image/Build/SysupgradeCombined
-       $(call Image/BuilduImage,$1)
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-       $(call Image/BuilduImage,$1,-initramfs)
-       $(CP) $(KDIR)/uImage-$(1)-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-$(1)-initramfs
-endif
-       mkdir -p "$(KDIR_TMP)/sysupgrade-$(3)/"
-       echo "BOARD=$(3)" > "$(KDIR_TMP)/sysupgrade-$(3)/CONTROL"
-       $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(3)/root"
-       $(CP) "$(KDIR)/uImage-$(1)" "$(KDIR_TMP)/sysupgrade-$(3)/kernel"
-       (cd "$(KDIR_TMP)"; $(TAR) cvf \
-               "$(BIN_DIR)/$(IMG_PREFIX)-$(3)-sysupgrade.tar" sysupgrade-$(3) \
-                       $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
-       )
-endef
-
-COMPAT_EMMC:=mediatek,mt7623-rfb-emmc
-COMPAT_NAND:=mediatek,mt7623-rfb-nand
-COMPAT_NAND_EPHY:=mediatek,mt7623-rfb-nand-ephy
-
-define Image/Build/squashfs
-       $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-       $(CP) $(KDIR)/root.squashfs $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs
-
-       $(call Image/Build/SysupgradeCombined,eMMC,squashfs,$$(COMPAT_EMMC))
-
-       $(call Image/BuilduImage,NAND)
-       $(call Image/BuilduImage,NAND-ePHY)
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-       $(call Image/BuilduImage,NAND,-initramfs)
-       $(call Image/BuilduImage,NAND-ePHY,-initramfs)
-       $(CP) $(KDIR)/uImage-NAND-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-NAND-initramfs
-       $(CP) $(KDIR)/uImage-NAND-ePHY-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-NAND-ePHY-initramfs
-endif
-       $(call Image/Build/SysupgradeNAND,NAND,$(1),$(KDIR)/uImage-NAND,$$(COMPAT_NAND))
-       $(call Image/Build/SysupgradeNAND,NAND-ePHY,$(1),$(KDIR)/uImage-NAND-ePHY,$$(COMPAT_NAND_EPHY))
-endef
+include $(SUBTARGET).mk
 
 define Image/Build
        $(call Image/Build/$(1),$(1))

diff --git a/target/linux/mediatek/profiles/default.mk b/target/linux/mediatek/profiles/default.mk
deleted file mode 100644 (file)
index 2ef570b..0000000
--- a/target/linux/mediatek/profiles/default.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Default
-       NAME:=Default Profile (minimum package set)
-endef
-
-define Profile/Default/Description
-       Default package set compatible with most boards.
-endef
-$(eval $(call Profile,Default))