layerscape: add kmod-i2c-mux to DEVICE_PACKAGES for traverse-ls1043

[openwrt/openwrt.git] / target / linux / layerscape / image / armv8_64b.mk

diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk
index 79e05efc1cb01536f345a129be30414c9991c3d2..a8e96d0ea75ab5e71b63506efa1122dbab2e9ed3 100644 (file)
--- a/target/linux/layerscape/image/armv8_64b.mk
+++ b/target/linux/layerscape/image/armv8_64b.mk
@@ -9,6 +9,7 @@ define Device/Default
   PROFILES := Default
   IMAGES := firmware.bin
   FILESYSTEMS := ubifs
+  MKUBIFS_OPTS := -m 1 -e 262016 -c 128
   KERNEL := kernel-bin | gzip | uImage gzip
   KERNEL_LOADADDR := 0x80080000
   KERNEL_ENTRY_POINT := 0x80080000
@@ -17,21 +18,18 @@ endef
 define Device/ls1012ardb
   DEVICE_TITLE := LS1012ARDB
   DEVICE_PACKAGES += \
-    layerscape-rcw-ls1012ardb \
     layerscape-ppfe \
-    layerscape-ppa-ls1012ardb \
+    tfa-ls1012ardb \
     kmod-ppfe
   DEVICE_DTS := freescale/fsl-ls1012a-rdb
-  UBIFS_OPTS := -m 1 -e 262016 -c 128
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1
   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)-bl2.pbl | pad-to 1M | \
+    ls-append $(1)-fip.bin | pad-to 5M | \
+    ls-append $(1)-uboot-env.bin | pad-to 10M | \
     ls-append pfe.itb | pad-to 15M | \
     ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
     append-kernel | pad-to 32M | \
@@ -42,19 +40,17 @@ TARGET_DEVICES += ls1012ardb
 define Device/ls1012afrwy
   DEVICE_TITLE := LS1012AFRWY
   DEVICE_PACKAGES += \
-    layerscape-rcw-ls1012afrwy \
     layerscape-ppfe \
-    layerscape-ppa-ls1012afrwy \
+    tfa-ls1012afrwy \
     kmod-ppfe
   DEVICE_DTS := freescale/fsl-ls1012a-frwy
   FILESYSTEMS := ext4
   IMAGES := firmware.bin sdcard.img
   IMAGE/firmware.bin := \
     ls-clean | \
-    ls-append $(1)-rcw.bin | pad-to 128K | \
+    ls-append $(1)-bl2.pbl | pad-to 128K | \
     ls-append pfe.itb | pad-to 384K | \
-    ls-append $(1)-ppa.itb | pad-to 1024K | \
-    ls-append $(1)-uboot.bin | pad-to 1856K | \
+    ls-append $(1)-fip.bin | pad-to 1856K | \
     ls-append $(1)-uboot-env.bin | pad-to 2048K | \
     check-size 2097153
   IMAGE/sdcard.img := \
@@ -69,17 +65,16 @@ TARGET_DEVICES += ls1012afrwy
 define Device/ls1043ardb
   DEVICE_TITLE := LS1043ARDB
   DEVICE_PACKAGES += \
-    layerscape-rcw-ls1043ardb \
     layerscape-fman-ls1043ardb \
-    layerscape-ppa-ls1043ardb
+    tfa-ls1043ardb \
+    fmc fmc-eth-config
   DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk
   FILESYSTEMS := squashfs
   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)-bl2.pbl | pad-to 1M | \
+    ls-append $(1)-fip.bin | pad-to 5M | \
+    ls-append $(1)-uboot-env.bin | pad-to 9M | \
     ls-append $(1)-fman.bin | pad-to 15M | \
     ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
     append-kernel | pad-to 32M | \
@@ -91,16 +86,17 @@ define Device/ls1043ardb-sdboot
   DEVICE_TITLE := LS1043ARDB (SD Card Boot)
   DEVICE_PACKAGES += \
     layerscape-fman-ls1043ardb \
-    layerscape-ppa-ls1043ardb
+    tfa-ls1043ardb-sdboot \
+    fmc fmc-eth-config
   DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk
   FILESYSTEMS := ext4
   IMAGES := sdcard.img
   IMAGE/sdcard.img := \
     ls-clean | \
     ls-append-sdhead $(1) | pad-to 4K | \
-    ls-append $(1)-uboot.bin | pad-to 3M | \
-    ls-append $(1)-uboot-env.bin | pad-to 4M | \
-    ls-append ls1043ardb-ppa.itb | pad-to 9M | \
+    ls-append $(1)-bl2.pbl | pad-to 1M | \
+    ls-append $(1)-fip.bin | pad-to 5M | \
+    ls-append $(1)-uboot-env.bin | pad-to 9M | \
     ls-append ls1043ardb-fman.bin | pad-to 15M | \
     ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
     append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \
@@ -111,20 +107,18 @@ TARGET_DEVICES += ls1043ardb-sdboot
 define Device/ls1046ardb
   DEVICE_TITLE := LS1046ARDB
   DEVICE_PACKAGES += \
-    layerscape-rcw-ls1046ardb \
     layerscape-fman-ls1046ardb \
-    layerscape-ppa-ls1046ardb
+    tfa-ls1046ardb \
+    fmc fmc-eth-config
   DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk
-  UBIFS_OPTS := -m 1 -e 262016 -c 128
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1
   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)-bl2.pbl | pad-to 1M | \
+    ls-append $(1)-fip.bin | pad-to 5M | \
+    ls-append $(1)-uboot-env.bin | pad-to 9M | \
     ls-append $(1)-fman.bin | pad-to 15M | \
     ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
     append-kernel | pad-to 32M | \
@@ -136,16 +130,17 @@ define Device/ls1046ardb-sdboot
   DEVICE_TITLE := LS1046ARDB (SD Card Boot)
   DEVICE_PACKAGES += \
     layerscape-fman-ls1046ardb \
-    layerscape-ppa-ls1046ardb
+    tfa-ls1046ardb-sdboot \
+    fmc fmc-eth-config
   DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk
   FILESYSTEMS := ext4
   IMAGES := sdcard.img
   IMAGE/sdcard.img := \
     ls-clean | \
     ls-append-sdhead $(1) | pad-to 4K | \
-    ls-append $(1)-uboot.bin | pad-to 3M | \
-    ls-append $(1)-uboot-env.bin | pad-to 4M | \
-    ls-append ls1046ardb-ppa.itb | pad-to 9M | \
+    ls-append $(1)-bl2.pbl | pad-to 1M | \
+    ls-append $(1)-fip.bin | pad-to 5M | \
+    ls-append $(1)-uboot-env.bin | pad-to 9M | \
     ls-append ls1046ardb-fman.bin | pad-to 15M | \
     ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
     append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \
@@ -156,22 +151,19 @@ TARGET_DEVICES += ls1046ardb-sdboot
 define Device/ls1088ardb
   DEVICE_TITLE := LS1088ARDB
   DEVICE_PACKAGES += \
-    layerscape-rcw-ls1088ardb \
     layerscape-mc-ls1088ardb \
     layerscape-dpl-ls1088ardb \
-    layerscape-ppa-ls1088ardb \
+    tfa-ls1088ardb \
     restool
   DEVICE_DTS := freescale/fsl-ls1088a-rdb
-  UBIFS_OPTS := -m 1 -e 262016 -c 128
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 256KiB
   PAGESIZE := 1
   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)-bl2.pbl | pad-to 1M | \
+    ls-append $(1)-fip.bin | pad-to 5M | \
+    ls-append $(1)-uboot-env.bin | 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 | \
@@ -184,10 +176,9 @@ TARGET_DEVICES += ls1088ardb
 define Device/ls1088ardb-sdboot
   DEVICE_TITLE := LS1088ARDB (SD Card Boot)
   DEVICE_PACKAGES += \
-    layerscape-rcw-ls1088ardb-sdboot \
     layerscape-mc-ls1088ardb \
     layerscape-dpl-ls1088ardb \
-    layerscape-ppa-ls1088ardb \
+    tfa-ls1088ardb-sdboot \
     restool
   DEVICE_DTS := freescale/fsl-ls1088a-rdb
   FILESYSTEMS := ext4
@@ -195,10 +186,9 @@ define Device/ls1088ardb-sdboot
   IMAGE/sdcard.img := \
     ls-clean | \
     ls-append-sdhead $(1) | pad-to 4K | \
-    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 ls1088ardb-ppa.itb | pad-to 10M | \
+    ls-append $(1)-bl2.pbl | pad-to 1M | \
+    ls-append $(1)-fip.bin | pad-to 5M | \
+    ls-append $(1)-uboot-env.bin | pad-to 10M | \
     ls-append ls1088ardb-mc.itb | pad-to 13M | \
     ls-append ls1088ardb-dpl.dtb | pad-to 14M | \
     ls-append ls1088ardb-dpc.dtb | pad-to 15M | \
@@ -211,19 +201,17 @@ TARGET_DEVICES += ls1088ardb-sdboot
 define Device/ls2088ardb
   DEVICE_TITLE := LS2088ARDB
   DEVICE_PACKAGES += \
-    layerscape-rcw-ls2088ardb \
     layerscape-mc-ls2088ardb \
     layerscape-dpl-ls2088ardb \
-    layerscape-ppa-ls2088ardb \
+    tfa-ls2088ardb \
     restool
   DEVICE_DTS := freescale/fsl-ls2088a-rdb
   FILESYSTEMS := squashfs
   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)-bl2.pbl | pad-to 1M | \
+    ls-append $(1)-fip.bin | pad-to 5M | \
+    ls-append $(1)-uboot-env.bin | 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 | \
@@ -233,18 +221,18 @@ define Device/ls2088ardb
 endef
 TARGET_DEVICES += ls2088ardb
 
-define Device/traverse-five64
+define Device/traverse-ls1043
   KERNEL_NAME := Image
   KERNEL_SUFFIX := -kernel.itb
   KERNEL_INSTALL := 1
   FDT_LOADADDR = 0x90000000
   FILESYSTEMS := ubifs
-  DEVICE_TITLE := Traverse LS1043 Boards (Five64, LS1043S)
+  DEVICE_TITLE := Traverse LS1043 Boards
   DEVICE_PACKAGES += \
     layerscape-fman-ls1043ardb \
-    uboot-envtools uboot-traverse-ls1043v uboot-traverse-ls1043v-sdcard \
-    kmod-i2c-core kmod-i2c-mux-pca954x \
-    kmod-hwmon-core kmod-hwmon-ltc2990 kmod-hwmon-pac1934 kmod-hwmon-emc17xx\
+    uboot-envtools \
+    kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x \
+    kmod-hwmon-core \
     kmod-gpio-pca953x kmod-input-gpio-keys-polled \
     kmod-rtc-isl1208
   DEVICE_DESCRIPTION = \
@@ -255,9 +243,9 @@ define Device/traverse-five64
   DEVICE_DTS_CONFIG = ls1043s
   KERNEL := kernel-bin | gzip | traverse-fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb $$(FDT_LOADADDR)
   KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb $$(FDT_LOADADDR)
-  IMAGES = root sysupgrade.tar
+  IMAGES = root sysupgrade.bin
   IMAGE/root = append-rootfs
-  IMAGE/sysupgrade.tar = sysupgrade-tar
-  UBIFS_OPTS := -m 2048 -e 124KiB -c 4096
+  IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
+  MKUBIFS_OPTS := -m 2048 -e 124KiB -c 4096
 endef
-TARGET_DEVICES += traverse-five64
+TARGET_DEVICES += traverse-ls1043