aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-05-28 12:48:29 +0800
committerPetr Štetiar <ynezz@true.cz>2020-07-11 14:44:22 +0200
commitc4d0e57e160e9d5c9ada8c99e385cdd5f742e79e (patch)
tree62da3a0ec8ec33ba955d3d929f2c44f50e897e87 /target
parent3a99b624d87b32a95210ae58bd782a144ba12fc2 (diff)
downloadupstream-c4d0e57e160e9d5c9ada8c99e385cdd5f742e79e.tar.gz
upstream-c4d0e57e160e9d5c9ada8c99e385cdd5f742e79e.tar.bz2
upstream-c4d0e57e160e9d5c9ada8c99e385cdd5f742e79e.zip
layerscape: support sysupgrade for squashfs rootfs
Support sysupgrade for all Layerscape boards with squashfs rootfs. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/layerscape/base-files/lib/upgrade/platform.sh17
-rw-r--r--target/linux/layerscape/image/armv7.mk7
-rw-r--r--target/linux/layerscape/image/armv8_64b.mk12
3 files changed, 29 insertions, 7 deletions
diff --git a/target/linux/layerscape/base-files/lib/upgrade/platform.sh b/target/linux/layerscape/base-files/lib/upgrade/platform.sh
index 1e1e28987b..9b8c07138f 100644
--- a/target/linux/layerscape/base-files/lib/upgrade/platform.sh
+++ b/target/linux/layerscape/base-files/lib/upgrade/platform.sh
@@ -1,5 +1,6 @@
#
# Copyright 2015-2019 Traverse Technologies
+# Copyright 2020 NXP
#
RAMFS_COPY_BIN="/usr/sbin/fw_printenv /usr/sbin/fw_setenv /usr/sbin/ubinfo /bin/echo"
@@ -33,7 +34,13 @@ platform_check_image() {
nand_do_platform_check "traverse-ls1043" $1
return $?
;;
- fsl,ls1012a-frdm)
+ fsl,ls1012a-frdm | \
+ fsl,ls1012a-rdb | \
+ fsl,ls1021a-twr | \
+ fsl,ls1043a-rdb | \
+ fsl,ls1046a-rdb | \
+ fsl,ls1088a-rdb | \
+ fsl,ls2088a-rdb)
return 0
;;
*)
@@ -55,7 +62,13 @@ platform_do_upgrade() {
traverse,ls1043s)
platform_do_upgrade_traverse_nandubi "$1"
;;
- fsl,ls1012a-frdm)
+ fsl,ls1012a-frdm | \
+ fsl,ls1012a-rdb | \
+ fsl,ls1021a-twr | \
+ fsl,ls1043a-rdb | \
+ fsl,ls1046a-rdb | \
+ fsl,ls1088a-rdb | \
+ fsl,ls2088a-rdb)
PART_NAME=firmware
default_do_upgrade "$1"
;;
diff --git a/target/linux/layerscape/image/armv7.mk b/target/linux/layerscape/image/armv7.mk
index e1a9efb8b6..27246740d5 100644
--- a/target/linux/layerscape/image/armv7.mk
+++ b/target/linux/layerscape/image/armv7.mk
@@ -1,5 +1,5 @@
#
-# Copyright 2018 NXP
+# Copyright 2018-2020 NXP
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,11 +8,13 @@
define Device/Default
PROFILES := Default
FILESYSTEMS := squashfs
- IMAGES := firmware.bin
+ IMAGES := firmware.bin sysupgrade.bin
KERNEL := kernel-bin | uImage none
KERNEL_NAME := zImage
KERNEL_LOADADDR := 0x80008000
KERNEL_ENTRY_POINT := 0x80008000
+ IMAGE/sysupgrade.bin := append-kernel | pad-to 16M | \
+ append-rootfs | pad-rootfs | check-size 50331649 | append-metadata
endef
define Device/ls1021atwr
@@ -29,6 +31,7 @@ define Device/ls1021atwr
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
append-kernel | pad-to 32M | \
append-rootfs | pad-rootfs | check-size 67108865
+ SUPPORTED_DEVICES := fsl,ls1021a-twr
endef
TARGET_DEVICES += ls1021atwr
diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk
index 3ad831b0b1..b7208b4c8f 100644
--- a/target/linux/layerscape/image/armv8_64b.mk
+++ b/target/linux/layerscape/image/armv8_64b.mk
@@ -1,5 +1,5 @@
#
-# Copyright 2018 NXP
+# Copyright 2018-2020 NXP
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -7,11 +7,13 @@
define Device/Default
PROFILES := Default
- IMAGES := firmware.bin
+ IMAGES := firmware.bin sysupgrade.bin
FILESYSTEMS := squashfs
KERNEL := kernel-bin | gzip | uImage gzip
KERNEL_LOADADDR := 0x80080000
KERNEL_ENTRY_POINT := 0x80080000
+ IMAGE/sysupgrade.bin := append-kernel | pad-to 16M | \
+ append-rootfs | pad-rootfs | check-size 50331649 | append-metadata
endef
define Device/ls1012afrdm
@@ -23,7 +25,6 @@ define Device/ls1012afrdm
kmod-ppfe
DEVICE_DTS := freescale/fsl-ls1012a-frdm
BLOCKSIZE := 256KiB
- IMAGES += sysupgrade.bin
IMAGE/firmware.bin := \
ls-clean | \
ls-append $(1)-bl2.pbl | pad-to 1M | \
@@ -58,6 +59,7 @@ define Device/ls1012ardb
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
append-kernel | pad-to 32M | \
append-rootfs | pad-rootfs | check-size 67108865
+ SUPPORTED_DEVICES := fsl,ls1012a-rdb
endef
TARGET_DEVICES += ls1012ardb
@@ -105,6 +107,7 @@ define Device/ls1043ardb
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
append-kernel | pad-to 32M | \
append-rootfs | pad-rootfs | check-size 67108865
+ SUPPORTED_DEVICES := fsl,ls1043a-rdb
endef
TARGET_DEVICES += ls1043ardb
@@ -150,6 +153,7 @@ define Device/ls1046ardb
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
append-kernel | pad-to 32M | \
append-rootfs | pad-rootfs | check-size 67108865
+ SUPPORTED_DEVICES := fsl,ls1046a-rdb
endef
TARGET_DEVICES += ls1046ardb
@@ -198,6 +202,7 @@ define Device/ls1088ardb
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
append-kernel | pad-to 32M | \
append-rootfs | pad-rootfs | check-size 67108865
+ SUPPORTED_DEVICES := fsl,ls1088a-rdb
endef
TARGET_DEVICES += ls1088ardb
@@ -248,6 +253,7 @@ define Device/ls2088ardb
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
append-kernel | pad-to 32M | \
append-rootfs | pad-rootfs | check-size 67108865
+ SUPPORTED_DEVICES := fsl,ls2088a-rdb
endef
TARGET_DEVICES += ls2088ardb