ipq806x: fix R7500 kernel generation

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

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index dad6ee365ed2514ea51f101d98d9d162514c0062..c59e6d446e00d09ec66db9d1240d9a8ff20cbc35 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -10,6 +10,12 @@ KERNEL_LOADADDR := 0x42208000
 
 define Image/Prepare
        $(CP) $(LINUX_DIR)/vmlinux $(KDIR)/$(IMG_PREFIX)-vmlinux.elf
+       mkimage -A arm -O linux -T filesystem -C none \
+               -a $(KERNEL_LOADADDR) -e $(KERNEL_LOADADDR) \
+               -n 'ARM OpenWrt fakeroot' \
+               -s $(KDIR_TMP)/root.dummy-uImage.tmp
+       echo -ne '\xff' > $(KDIR_TMP)/root.dummy
+       cat $(KDIR_TMP)/root.dummy $(KDIR_TMP)/root.dummy-uImage.tmp > $(KDIR)/root.dummy
 endef
 
 define Image/BuildKernel
@@ -17,6 +23,7 @@ define Image/BuildKernel
 endef
 
 define Image/Build/squashfs
+       cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-raw
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef
 
@@ -29,44 +36,89 @@ define Build/append-dtb
        cat $(DTS_DIR)/$(DEVICE_DTS).dtb >> $@
 endef
 
+define Build/append-file
+       cat $(1) >> $@
+endef
+
 define Device/Default
        PROFILES := Default
        KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
        DEVICE_DTS :=
        KERNEL_PREFIX := $$(IMAGE_PREFIX)
        IMAGES :=
+       KERNEL_IN_UBI :=
 endef
-DEVICE_VARS += DEVICE_DTS
+DEVICE_VARS += DEVICE_DTS KERNEL_IN_UBI
 
 define Device/LegacyImage
        KERNEL_SUFFIX := -uImage
        KERNEL = kernel-bin | append-dtb | uImage none
        KERNEL_NAME := zImage
-       KERNEL_INSTALL := 1
 endef
 
 define Device/FitImage
        KERNEL_SUFFIX := -fit-uImage.itb
        KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb
        KERNEL_NAME := Image
-       KERNEL_INSTALL := 1
 endef
 
+define Device/UbiFit
+       KERNEL_IN_UBI := 1
+       IMAGES := nand-factory.ubi nand-sysupgrade.tar
+       IMAGE/nand-factory.ubi := append-ubi
+       IMAGE/nand-sysupgrade.tar := sysupgrade-nand
+endef
+
+define Device/DniImage
+       PROFILES += $$(DEVICE_NAME)
+       FILESYSTEMS := squashfs
+       KERNEL_SUFFIX := -uImage
+       KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none
+       KERNEL = kernel-bin | append-dtb | pad-to $$$$(($$(KERNEL_SIZE)-2*64-1)) | uImage none | append-file $(KDIR)/root.dummy
+       KERNEL_NAME := zImage
+       NETGEAR_BOARD_ID :=
+       NETGEAR_HW_ID :=
+       BOARD_NAME :=
+       IMAGES := factory.img sysupgrade.tar
+       IMAGE/factory.img := append-kernel | append-ubi | netgear-dni
+       IMAGE/sysupgrade.tar = sysupgrade-nand
+endef
+DEVICE_VARS += KERNEL_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_BLOCK_SIZE DEVICE_PAGE_SIZE BOARD_NAME
+
 define Device/AP148
        $(call Device/FitImage)
+       $(call Device/UbiFit)
        DEVICE_DTS := qcom-ipq8064-ap148
+       BLOCKSIZE := 128KiB
+       PAGESIZE := 2048
 endef
 
 define Device/AP148-legacy
        $(call Device/LegacyImage)
+       $(call Device/UbiFit)
        DEVICE_DTS := qcom-ipq8064-ap148
+       BLOCKSIZE := 128KiB
+       PAGESIZE := 2048
+       BOARD_NAME := AP148
 endef
 
 define Device/DB149
        $(call Device/FitImage)
        DEVICE_DTS := qcom-ipq8064-db149
+       KERNEL_INSTALL := 1
+endef
+
+define Device/R7500
+       $(call Device/DniImage)
+       DEVICE_DTS := qcom-ipq8064-r7500
+       KERNEL_SIZE := 2097152
+       NETGEAR_BOARD_ID := R7500
+       NETGEAR_HW_ID := 29764841+0+128+256+3x3+4x4
+       BLOCKSIZE := 128KiB
+       PAGESIZE := 2048
+       BOARD_NAME := r7500
 endef
 
-TARGET_DEVICES += AP148 AP148-legacy DB149
+TARGET_DEVICES += AP148 AP148-legacy DB149 R7500
 
 $(eval $(call BuildImage))