ipq806x: add support for GL.iNet GL-B1300

[openwrt/openwrt.git] / target / linux / ipq806x / image / Makefile

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index db6c94c0acd98f64e1f54db4c24e9fa2581658ea..c2d72556552f6478191c730b3462974c44153dc9 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -3,26 +3,6 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-UBIFS_OPTS = -m 2048 -e 124KiB -c 4096 -U -F
-
-define Image/Prepare
-       $(CP) $(LINUX_DIR)/vmlinux $(KDIR)/vmlinux-unstripped.elf
-endef
-
-define Image/BuildKernel
-       $(CP) $(KDIR)/vmlinux-unstripped.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
-endef
-
-define Image/Build/squashfs
-       cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-raw
-       $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-endef
-
-define Image/Build
-       $(call Image/Build/$(1),$(1))
-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1)-root.img bs=2k conv=sync
-endef
-
 define Device/Default
        PROFILES := Default
        KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
@@ -31,6 +11,7 @@ define Device/Default
        KERNEL_LOADADDR = 0x42208000
        SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
        IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
+       IMAGE/sysupgrade.bin/squashfs :=
 endef
 
 define Device/LegacyImage
@@ -59,8 +40,6 @@ define Device/UbiFit
 endef
 
 define Device/DniImage
-       PROFILES += $$(DEVICE_NAME)
-       FILESYSTEMS := squashfs
        KERNEL_SUFFIX := -uImage
        KERNEL = kernel-bin | append-dtb | uImage none
        KERNEL_NAME := zImage
@@ -74,8 +53,6 @@ endef
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 
 define Device/TpSafeImage
-       PROFILES += $$(DEVICE_NAME)
-       FILESYSTEMS := squashfs
        KERNEL_SUFFIX := -uImage
        KERNEL = kernel-bin | append-dtb | uImage none
        KERNEL_NAME := zImage
@@ -87,8 +64,6 @@ endef
 DEVICE_VARS += TPLINK_BOARD_ID
 
 define Device/ZyXELImage
-       PROFILES += $$(DEVICE_NAME)
-       FILESYSTEMS := squashfs
        KERNEL_SUFFIX := -uImage
        KERNEL = kernel-bin | append-dtb | uImage none | pad-to $${KERNEL_SIZE}
        KERNEL_NAME := zImage
@@ -109,7 +84,7 @@ define Device/avm_fritzbox-4040
        IMAGE_SIZE := 29753344
        IMAGES = sysupgrade.bin
        IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
-       DEVICE_PACKAGES := kmod-usb-phy-qcom-ipq4019 ipq-wifi-fritz4040 fritz-tffs fritz-caldata u-boot-fritz4040
+       DEVICE_PACKAGES := ipq-wifi-avm_fritzbox-4040 fritz-tffs fritz-caldata u-boot-fritz4040
 endef
 TARGET_DEVICES += avm_fritzbox-4040
 
@@ -119,9 +94,7 @@ define Device/linksys_ea8500
        PAGESIZE := 2048
        BLOCKSIZE := 128k
        KERNEL_SIZE := 3072k
-       FILESYSTEMS := squashfs
        KERNEL = kernel-bin | append-dtb | uImage none | append-uImage-fakeroot-hdr
-       PROFILES += $$(DEVICE_NAME)
        BOARD_NAME := ea8500
        SUPPORTED_DEVICES += ea8500
        UBINIZE_OPTS := -E 5
@@ -192,9 +165,23 @@ define Device/netgear_r7800
 endef
 TARGET_DEVICES += netgear_r7800
 
+define Device/glinet_gl-b1300
+       DEVICE_TITLE := GL.iNet GL-B1300
+       BOARD_NAME := gl-b1300
+       DEVICE_DTS := qcom-ipq4019-gl-b1300
+       KERNEL_LOADADDR := 0x80208000
+       KERNEL_INSTALL := 1
+       KERNEL_SIZE := 4096k
+       IMAGE_SIZE := 26624k
+       $(call Device/FitImage)
+       IMAGES := sysupgrade.bin
+       IMAGE/sysupgrade.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
+       DEVICE_PACKAGES := ipq-wifi-glinet_gl-b1300
+endef
+TARGET_DEVICES += glinet_gl-b1300
+
 define Device/openmesh_a42
        $(call Device/FitImageLzma)
-       FILESYSTEMS := squashfs
        DEVICE_DTS := qcom-ipq4019-a42
        KERNEL_LOADADDR := 0x80208000
        BLOCKSIZE := 64k
@@ -203,14 +190,13 @@ define Device/openmesh_a42
        KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE)
        IMAGE_SIZE := 15616k
        IMAGES = factory.bin sysupgrade.bin
-       IMAGE/factory.bin/squashfs := append-rootfs | pad-rootfs | openmesh-image ce_type=A42
+       IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A42
        IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
-       DEVICE_PACKAGES := ath10k-firmware-qca4019 uboot-envtools ipq-wifi-openmesh_a42
+       DEVICE_PACKAGES := ath10k-firmware-qca4019 uboot-envtools
 endef
 TARGET_DEVICES += openmesh_a42
 
 define Device/qcom_ap-dk01.1-c1
-       PROFILES += $$(DEVICE_NAME)
        DEVICE_TITLE := QCA AP-DK01.1-C1
        BOARD_NAME := ap-dk01.1-c1
        DEVICE_DTS := qcom-ipq4019-ap.dk01.1-c1
@@ -218,7 +204,6 @@ define Device/qcom_ap-dk01.1-c1
        KERNEL_INSTALL := 1
        KERNEL_SIZE := 4096k
        IMAGE_SIZE := 26624k
-       FILESYSTEMS := squashfs
        $(call Device/FitImage)
        IMAGES := sysupgrade.bin
        IMAGE/sysupgrade.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
@@ -291,8 +276,6 @@ endef
 TARGET_DEVICES += tplink_c2600
 
 define Device/tplink_vr2600v
-       PROFILES += $$(DEVICE_NAME)
-       FILESYSTEMS := squashfs
        KERNEL_SUFFIX := -uImage
        KERNEL = kernel-bin | append-dtb | uImage none
        KERNEL_NAME := zImage