aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorBiwen Li <biwen.li@nxp.com>2019-05-06 11:26:09 +0800
committerPetr Štetiar <ynezz@true.cz>2019-06-06 15:40:09 +0200
commitc07d3302b3cd4fc50ff380239f4541df7526df82 (patch)
tree42d639418c68700fa1609458f432aa8fa75d22c3 /target/linux/layerscape
parent17dcbe1b8e2b7074ab1822f117e48a5c04997e4a (diff)
downloadupstream-c07d3302b3cd4fc50ff380239f4541df7526df82.tar.gz
upstream-c07d3302b3cd4fc50ff380239f4541df7526df82.tar.bz2
upstream-c07d3302b3cd4fc50ff380239f4541df7526df82.zip
layerscape: convert to use TF-A for firmware
This patch is to convert to use TF-A for firmware. - Use un-swapped rcw since swapping will be done in TF-A. - Use u-boot with TF-A defconfig. - Rework memory map for TF-A introduction. Signed-off-by: Biwen Li <biwen.li@nxp.com> Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/image/armv8_64b.mk88
1 files changed, 39 insertions, 49 deletions
diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk
index 5f3a511978..fa81cfd747 100644
--- a/target/linux/layerscape/image/armv8_64b.mk
+++ b/target/linux/layerscape/image/armv8_64b.mk
@@ -18,9 +18,8 @@ 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
UBINIZE_OPTS := -E 5
@@ -28,10 +27,9 @@ define Device/ls1012ardb
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,19 +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
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 | \
@@ -135,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 | \
@@ -155,10 +151,9 @@ 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
UBINIZE_OPTS := -E 5
@@ -166,10 +161,9 @@ define Device/ls1088ardb
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 | \
@@ -182,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
@@ -193,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 | \
@@ -209,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 | \