X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fwigyori.git;a=blobdiff_plain;f=target%2Flinux%2Flayerscape%2Fimage%2FMakefile;h=fc76ddd2ef745fcf37342b5d12644a1cae27f305;hp=bb94ff863f9dc8dd9b920b3baffc37dcd0049f7c;hb=9aa196e0f260986991dc8ea65a219f81aed0197e;hpb=4162a7eba629bd93ddacfbfbb1c1402ded8a56b0

diff --git a/target/linux/layerscape/image/Makefile b/target/linux/layerscape/image/Makefile
index bb94ff863f..fc76ddd2ef 100644
--- a/target/linux/layerscape/image/Makefile
+++ b/target/linux/layerscape/image/Makefile
@@ -9,15 +9,35 @@ include $(INCLUDE_DIR)/image.mk
 
 define Build/append-ls-rcw
 	rm -f $@
-	dd if=$(KDIR)/$(1)-rcw.bin >> $@
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-rcw.bin >> $@
 endef
 
 define Build/append-ls-uboot
-	dd if=$(KDIR)/$(1)-$(SUBTARGET)-uboot.bin >> $@
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-$(SUBTARGET)-uboot.bin >> $@
+endef
+
+define Build/append-ls-ppa
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-ppa.itb >> $@
 endef
 
 define Build/append-ls-fman
-	dd if=$(KDIR)/$(1)-fman.bin >> $@
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-fman.bin >> $@
+endef
+
+define Build/append-ls-mc
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-mc.itb >> $@
+endef
+
+define Build/append-ls-ppfe
+	dd if=$(STAGING_DIR_IMAGE)/pfe.itb >> $@
+endef
+
+define Build/append-ls-dpl
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-dpl.dtb >> $@
+endef
+
+define Build/append-ls-dpc
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-dpc.dtb >> $@
 endef
 
 define Build/append-ls-dtb
@@ -25,23 +45,20 @@ define Build/append-ls-dtb
 	dd if=$(DTS_DIR)/$(1).dtb >> $@
 endef
 
-define Build/append-ls-rootfs-ext4
-	$(STAGING_DIR_HOST)/bin/make_ext4fs -l $(word 2,$(1)) -b 4096 -i 6000 -m 0 -J $(KDIR)/$(word 1,$(1))-$(word 2,$(1)).root.ext4 $(TARGET_DIR)
-	dd if=$(KDIR)/$(word 1,$(1))-$(word 2,$(1)).root.ext4 >> $@
-endef
-
 define Device/Default
   PROFILES = Default
   FILESYSTEMS := squashfs
-  KERNEL := kernel-bin | gzip | uImage gzip
   DEVICE_DTS :=
   IMAGES = firmware.bin
 
-ifeq ($(SUBTARGET),64b)
+ifeq ($(SUBTARGET),armv8_64b)
+  KERNEL := kernel-bin | gzip | uImage gzip
   KERNEL_LOADADDR = 0x80080000
   KERNEL_ENTRY_POINT = 0x80080000
 endif
-ifeq ($(SUBTARGET),32b)
+ifeq ($(SUBTARGET),armv8_32b)
+  KERNEL := kernel-bin | uImage none
+  KERNEL_NAME := zImage
   KERNEL_LOADADDR = 0x80008000
   KERNEL_ENTRY_POINT = 0x80008000
 endif
@@ -49,32 +66,120 @@ endef
 
 define Device/ls1043ardb
   DEVICE_TITLE := ls1043ardb-$(SUBTARGET)
-  DEVICE_PACKAGES += rcw-layerscape-ls1043ardb uboot-layerscape-$(SUBTARGET)-ls1043ardb fman-layerscape-ls1043ardb
-ifeq ($(SUBTARGET),64b)
-  DEVICE_DTS = freescale/fsl-ls1043a-rdb
-endif
-ifeq ($(SUBTARGET),32b)
-  DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1043a-rdb
-endif
-  IMAGE/firmware.bin = append-ls-rcw $(1) | pad-to 1M | append-ls-uboot $(1) | pad-to 3M | \
-  					append-ls-fman $(1) | pad-to 4M | append-ls-dtb $$(DEVICE_DTS) | pad-to 5M | \
-  					append-kernel | pad-to 10M | append-rootfs | pad-rootfs | check-size 67108865
+  DEVICE_PACKAGES +=	rcw-layerscape-ls1043ardb uboot-layerscape-$(SUBTARGET)-ls1043ardb \
+			fman-layerscape-ls1043ardb layerscape-ppa-ls1043ardb
+  DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1043a-rdb-sdk
+  IMAGE/firmware.bin =	append-ls-rcw $(1) | pad-to 1M | \
+			append-ls-uboot $(1) | pad-to 4M | \
+			append-ls-ppa $(1) | pad-to 9M | \
+			append-ls-fman $(1) | pad-to 15M | \
+			append-ls-dtb $$(DEVICE_DTS) | pad-to 16M | \
+			append-kernel | pad-to 32M | \
+			append-rootfs | pad-rootfs | check-size 67108865
 endef
 TARGET_DEVICES += ls1043ardb
 
+define Device/ls1046ardb
+  DEVICE_TITLE := ls1046ardb-$(SUBTARGET)
+  DEVICE_PACKAGES +=	rcw-layerscape-ls1046ardb uboot-layerscape-$(SUBTARGET)-ls1046ardb \
+			fman-layerscape-ls1046ardb layerscape-ppa-ls1046ardb
+  DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk
+  FILESYSTEMS := ubifs
+  UBIFS_OPTS := -m 1 -e 262016 -c 128
+  UBINIZE_OPTS := -E 5
+  BLOCKSIZE := 256KiB
+  PAGESIZE := 1
+  IMAGE/firmware.bin =	append-ls-rcw $(1) | pad-to 1M | \
+			append-ls-uboot $(1) | pad-to 4M | \
+			append-ls-ppa $(1) | pad-to 9M | \
+			append-ls-fman $(1) | pad-to 15M | \
+			append-ls-dtb $$(DEVICE_DTS) | pad-to 16M | \
+			append-kernel | pad-to 32M | \
+			append-ubi | check-size 67108865
+endef
+TARGET_DEVICES += ls1046ardb
+
 define Device/ls1012ardb
   DEVICE_TITLE := ls1012ardb-$(SUBTARGET)
-  DEVICE_PACKAGES += rcw-layerscape-ls1012ardb uboot-layerscape-$(SUBTARGET)-ls1012ardb kmod-ppfe ppfe-ls1012ardb
-ifeq ($(SUBTARGET),64b)
-  DEVICE_DTS = freescale/fsl-ls1012a-rdb
-endif
-ifeq ($(SUBTARGET),32b)
+  DEVICE_PACKAGES +=	rcw-layerscape-ls1012ardb uboot-layerscape-$(SUBTARGET)-ls1012ardb \
+			kmod-ppfe layerscape-ppfe layerscape-ppa-ls1012ardb
   DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1012a-rdb
-endif
-  IMAGE/firmware.bin = append-ls-rcw $(1) | pad-to 1M | append-ls-uboot $(1) | pad-to 3M | \
-  					append-ls-dtb $$(DEVICE_DTS) | pad-to 4M | append-kernel | pad-to 9M | \
-  					append-ls-rootfs-ext4 $(1) 23M | check-size 33554433
+  FILESYSTEMS := ubifs
+  UBIFS_OPTS := -m 1 -e 262016 -c 128
+  UBINIZE_OPTS := -E 5
+  BLOCKSIZE := 256KiB
+  PAGESIZE := 1
+  IMAGE/firmware.bin =	append-ls-rcw $(1) | pad-to 1M | \
+			append-ls-uboot $(1) | pad-to 4M | \
+			append-ls-ppa $(1) | pad-to 10M | \
+			append-ls-ppfe | pad-to 15M | \
+			append-ls-dtb $$(DEVICE_DTS) | pad-to 16M | \
+			append-kernel | pad-to 32M | \
+			append-ubi | check-size 67108865
 endef
 TARGET_DEVICES += ls1012ardb
 
+define Device/ls1012afrdm
+  DEVICE_TITLE := ls1012afrdm-$(SUBTARGET)
+  DEVICE_PACKAGES +=	rcw-layerscape-ls1012afrdm uboot-layerscape-$(SUBTARGET)-ls1012afrdm \
+			kmod-ppfe layerscape-ppfe layerscape-ppa-ls1012afrdm
+  DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1012a-frdm
+  FILESYSTEMS := ubifs
+  UBIFS_OPTS := -m 1 -e 262016 -c 128
+  UBINIZE_OPTS := -E 5
+  BLOCKSIZE := 256KiB
+  PAGESIZE := 1
+  IMAGE/firmware.bin =	append-ls-rcw $(1) | pad-to 1M | \
+			append-ls-uboot $(1) | pad-to 4M | \
+			append-ls-ppa $(1) | pad-to 10M | \
+			append-ls-ppfe | pad-to 15M | \
+			append-ls-dtb $$(DEVICE_DTS) | pad-to 16M | \
+			append-kernel | pad-to 32M | \
+			append-ubi | check-size 67108865
+endef
+TARGET_DEVICES += ls1012afrdm
+
+ifeq ($(SUBTARGET),armv8_64b)
+define Device/ls1088ardb
+  DEVICE_TITLE := ls1088ardb-$(SUBTARGET)
+  DEVICE_PACKAGES +=	rcw-layerscape-ls1088ardb uboot-layerscape-$(SUBTARGET)-ls1088ardb \
+			layerscape-mc-ls1088ardb layerscape-dpl-ls1088ardb restool \
+			layerscape-ppa-ls1088ardb
+  DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1088a-rdb
+  FILESYSTEMS := ubifs
+  UBIFS_OPTS := -m 1 -e 262016 -c 128
+  UBINIZE_OPTS := -E 5
+  BLOCKSIZE := 256KiB
+  PAGESIZE := 1
+  IMAGE/firmware.bin =	append-ls-rcw $(1) | pad-to 1M | \
+			append-ls-uboot $(1) | pad-to 4M | \
+			append-ls-ppa $(1) | pad-to 10M | \
+			append-ls-mc $(1) | pad-to 13M | \
+			append-ls-dpl $(1) | pad-to 14M | \
+			append-ls-dpc $(1) | pad-to 15M | \
+			append-ls-dtb $$(DEVICE_DTS) | pad-to 16M | \
+			append-kernel | pad-to 32M | \
+			append-ubi | check-size 67108865
+endef
+TARGET_DEVICES += ls1088ardb
+
+define Device/ls2088ardb
+  DEVICE_TITLE := ls2088ardb-$(SUBTARGET)
+  DEVICE_PACKAGES +=	rcw-layerscape-ls2088ardb uboot-layerscape-$(SUBTARGET)-ls2088ardb \
+			layerscape-mc-ls2088ardb layerscape-dpl-ls2088ardb restool \
+			layerscape-ppa-ls2088ardb
+  DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls2088a-rdb
+  IMAGE/firmware.bin =	append-ls-rcw $(1) | pad-to 1M | \
+			append-ls-uboot $(1) | pad-to 4M | \
+			append-ls-ppa $(1) | pad-to 10M | \
+			append-ls-mc $(1) | pad-to 13M | \
+			append-ls-dpl $(1) | pad-to 14M | \
+			append-ls-dpc $(1) | pad-to 15M | \
+			append-ls-dtb $$(DEVICE_DTS) | pad-to 16M | \
+			append-kernel | pad-to 32M | \
+			append-rootfs | pad-rootfs | check-size 67108865
+endef
+TARGET_DEVICES += ls2088ardb
+endif
+
 $(eval $(call BuildImage))