layerscape: define ls-append function

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

diff --git a/target/linux/layerscape/image/Makefile b/target/linux/layerscape/image/Makefile
index 5bf094f14c8ee2e266c5fd26b0471caad8662436..27c4eaa926ec7423b31de3082b84f7599366f0f0 100644 (file)
--- a/target/linux/layerscape/image/Makefile
+++ b/target/linux/layerscape/image/Makefile
@@ -9,40 +9,15 @@ include $(INCLUDE_DIR)/image.mk
 
 ITB_BOARDS = traverse-five64
 
-define Build/append-ls-rcw
+define Build/ls-clean
        rm -f $@
-       dd if=$(STAGING_DIR_IMAGE)/$(1)-rcw.bin >> $@
 endef
 
-define Build/append-ls-uboot
-       dd if=$(STAGING_DIR_IMAGE)/$(1)-$(SUBTARGET)-uboot.bin >> $@
+define Build/ls-append
+       dd if=$(STAGING_DIR_IMAGE)/$(1) >> $@
 endef
 
-define Build/append-ls-ppa
-       dd if=$(STAGING_DIR_IMAGE)/$(1)-ppa.itb >> $@
-endef
-
-define Build/append-ls-fman
-       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
+define Build/ls-append-dtb
        $(call Image/BuildDTB,$(DTS_DIR)/$(1).dts,$(DTS_DIR)/$(1).dtb)
        dd if=$(DTS_DIR)/$(1).dtb >> $@
 endef
@@ -79,14 +54,19 @@ endef
 
 define Device/ls1043ardb
   DEVICE_TITLE := ls1043ardb-$(SUBTARGET)
-  DEVICE_PACKAGES +=   layerscape-rcw-ls1043ardb uboot-layerscape-$(SUBTARGET)-ls1043ardb \
-                       layerscape-fman-ls1043ardb layerscape-ppa-ls1043ardb
+  DEVICE_PACKAGES +=   layerscape-rcw-ls1043ardb layerscape-fman-ls1043ardb \
+                       layerscape-ppa-ls1043ardb
+  ifeq ($(SUBTARGET),armv8_32b)
+    DEVICE_PACKAGES += u-boot-ls1043ardb-image
+  endif
   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 | \
+  IMAGE/firmware.bin = ls-clean | \
+                       ls-append $(1)-rcw.bin | pad-to 1M | \
+                       ls-append $(1)-uboot.bin | pad-to 3M | \
+                       ls-append $(1)-uboot-env.bin | pad-to 4M | \
+                       ls-append $(1)-ppa.itb | pad-to 9M | \
+                       ls-append $(1)-fman.bin | pad-to 15M | \
+                       ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
                        append-kernel | pad-to 32M | \
                        append-rootfs | pad-rootfs | check-size 67108865
 endef
@@ -94,19 +74,24 @@ TARGET_DEVICES += ls1043ardb
 
 define Device/ls1046ardb
   DEVICE_TITLE := ls1046ardb-$(SUBTARGET)
-  DEVICE_PACKAGES +=   layerscape-rcw-ls1046ardb uboot-layerscape-$(SUBTARGET)-ls1046ardb \
-                       layerscape-fman-ls1046ardb layerscape-ppa-ls1046ardb
+  DEVICE_PACKAGES +=   layerscape-rcw-ls1046ardb layerscape-fman-ls1046ardb \
+                       layerscape-ppa-ls1046ardb
+  ifeq ($(SUBTARGET),armv8_32b)
+    DEVICE_PACKAGES += u-boot-ls1046ardb-image
+  endif
   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 | \
+  IMAGE/firmware.bin = ls-clean | \
+                       ls-append $(1)-rcw.bin | pad-to 1M | \
+                       ls-append $(1)-uboot.bin | pad-to 3M | \
+                       ls-append $(1)-uboot-env.bin | pad-to 4M | \
+                       ls-append $(1)-ppa.itb | pad-to 9M | \
+                       ls-append $(1)-fman.bin | pad-to 15M | \
+                       ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
                        append-kernel | pad-to 32M | \
                        append-ubi | check-size 67108865
 endef
@@ -114,19 +99,24 @@ TARGET_DEVICES += ls1046ardb
 
 define Device/ls1012ardb
   DEVICE_TITLE := ls1012ardb-$(SUBTARGET)
-  DEVICE_PACKAGES +=   layerscape-rcw-ls1012ardb uboot-layerscape-$(SUBTARGET)-ls1012ardb \
-                       kmod-ppfe layerscape-ppfe layerscape-ppa-ls1012ardb
+  DEVICE_PACKAGES +=   layerscape-rcw-ls1012ardb layerscape-ppfe \
+                       layerscape-ppa-ls1012ardb kmod-ppfe
+  ifeq ($(SUBTARGET),armv8_32b)
+    DEVICE_PACKAGES += u-boot-ls1012ardb-image
+  endif
   DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1012a-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-ppfe | pad-to 15M | \
-                       append-ls-dtb $$(DEVICE_DTS) | pad-to 16M | \
+  IMAGE/firmware.bin = ls-clean | \
+                       ls-append $(1)-rcw.bin | pad-to 1M | \
+                       ls-append $(1)-uboot.bin | pad-to 3M | \
+                       ls-append $(1)-uboot-env.bin | pad-to 4M | \
+                       ls-append $(1)-ppa.itb | pad-to 10M | \
+                       ls-append pfe.itb | pad-to 15M | \
+                       ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
                        append-kernel | pad-to 32M | \
                        append-ubi | check-size 67108865
 endef
@@ -134,19 +124,24 @@ TARGET_DEVICES += ls1012ardb
 
 define Device/ls1012afrdm
   DEVICE_TITLE := ls1012afrdm-$(SUBTARGET)
-  DEVICE_PACKAGES +=   layerscape-rcw-ls1012afrdm uboot-layerscape-$(SUBTARGET)-ls1012afrdm \
-                       kmod-ppfe layerscape-ppfe layerscape-ppa-ls1012afrdm
+  DEVICE_PACKAGES +=   layerscape-rcw-ls1012afrdm layerscape-ppfe \
+                       layerscape-ppa-ls1012afrdm kmod-ppfe
+  ifeq ($(SUBTARGET),armv8_32b)
+    DEVICE_PACKAGES += u-boot-ls1012afrdm-image
+  endif
   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 | \
+  IMAGE/firmware.bin = ls-clean | \
+                       ls-append $(1)-rcw.bin | pad-to 1M | \
+                       ls-append $(1)-uboot.bin | pad-to 3M | \
+                       ls-append $(1)-uboot-env.bin | pad-to 4M | \
+                       ls-append $(1)-ppa.itb | pad-to 10M | \
+                       ls-append pfe.itb | pad-to 15M | \
+                       ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
                        append-kernel | pad-to 32M | \
                        append-ubi | check-size 67108865
 endef
@@ -164,13 +159,15 @@ define Device/ls1088ardb
   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 | \
+  IMAGE/firmware.bin = ls-clean | \
+                       ls-append $(1)-rcw.bin | pad-to 1M | \
+                       ls-append $(1)-uboot.bin | pad-to 3M | \
+                       ls-append $(1)-uboot-env.bin | pad-to 4M | \
+                       ls-append $(1)-ppa.itb | pad-to 10M | \
+                       ls-append $(1)-mc.itb | pad-to 13M | \
+                       ls-append $(1)-dpl.dtb | pad-to 14M | \
+                       ls-append $(1)-dpc.dtb | pad-to 15M | \
+                       ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
                        append-kernel | pad-to 32M | \
                        append-ubi | check-size 67108865
 endef
@@ -182,13 +179,15 @@ define Device/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 | \
+  IMAGE/firmware.bin = ls-clean | \
+                       ls-append $(1)-rcw.bin | pad-to 1M | \
+                       ls-append $(1)-uboot.bin | pad-to 3M | \
+                       ls-append $(1)-uboot-env.bin | pad-to 4M | \
+                       ls-append $(1)-ppa.itb | pad-to 10M | \
+                       ls-append $(1)-mc.itb | pad-to 13M | \
+                       ls-append $(1)-dpl.dtb | pad-to 14M | \
+                       ls-append $(1)-dpc.dtb | pad-to 15M | \
+                       ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
                        append-kernel | pad-to 32M | \
                        append-rootfs | pad-rootfs | check-size 67108865
 endef