mvebu: cortex-a53: uDPU/eDPU: cleanup recipe a bit

Reuse Device/FitImage recipe instead of open coding it and
drop duplicate KERNEL_INITRAMFS recipe for eDPU.

While at it, lets clean up the boot script to drop uneeded console
setting, earlycon etc.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>

diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index 8c85dedd3511456f32158202e1c2062628e3402c..a1fa4b9f8d04636febeb45b1f4c6ccd97843b5ff 100644 (file)
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -138,7 +138,7 @@ endef
 
 define Build/uDPU-firmware
        (rm -fR $@-fw; mkdir -p $@-fw)
-       $(CP) $(BIN_DIR)/$(DEVICE_IMG_PREFIX)-initramfs.itb $@-fw/recovery.itb
+       $(CP) $(BIN_DIR)/$(KERNEL_INITRAMFS_IMAGE) $@-fw/recovery.itb
        $(CP) $(IMAGE_ROOTFS) $@-fw/rootfs.tgz
        $(CP) $@-boot.scr $@-fw/boot.scr
        $(TAR) -czp --numeric-owner --owner=0 --group=0 --sort=name \

diff --git a/target/linux/mvebu/image/cortexa53.mk b/target/linux/mvebu/image/cortexa53.mk
index e90f01308cbfe0bdbc59be2422effe7ec9a610f0..65e64ac512ff816d26c4b9176b9c0a2372c021d2 100644 (file)
--- a/target/linux/mvebu/image/cortexa53.mk
+++ b/target/linux/mvebu/image/cortexa53.mk
@@ -99,12 +99,11 @@ TARGET_DEVICES += marvell_armada-3720-db
 
 define Device/methode_udpu
   $(call Device/Default-arm64)
+  $(call Device/FitImage)
   DEVICE_VENDOR := Methode
   DEVICE_MODEL := micro-DPU (uDPU)
   DEVICE_DTS := armada-3720-uDPU
   KERNEL_LOADADDR := 0x00800000
-  KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
-  KERNEL_INITRAMFS_SUFFIX := .itb
   DEVICE_PACKAGES += f2fs-tools fdisk kmod-i2c-pxa kmod-hwmon-lm75 kmod-dsa-mv88e6xxx
   DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(2)
   FILESYSTEMS := targz
@@ -118,7 +117,6 @@ define Device/methode_edpu
   $(call Device/methode_udpu)
   DEVICE_MODEL := eDPU
   DEVICE_DTS := armada-3720-eDPU
-  KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
 endef
 TARGET_DEVICES += methode_edpu
 

diff --git a/target/linux/mvebu/image/udpu.bootscript b/target/linux/mvebu/image/udpu.bootscript
index e646b42e8907d3d02876e3ea88e936da50e6d434..741254e460bcc5946d936b9222677227c3602f6f 100644 (file)
--- a/target/linux/mvebu/image/udpu.bootscript
+++ b/target/linux/mvebu/image/udpu.bootscript
@@ -19,17 +19,12 @@ if test ${kernel_addr_r}; then
        setenv kernel_addr_r 0x5000000
 fi
 
-if test ${fdt_add_r}; then
-       setenv fdt_addr_r 0x4f00000
-fi
-
-setenv console 'console=ttyMV0,115200 earlycon=ar3700_uart,0xd0012000 rootfs_mount_options.compress_algorithm=zstd'
+setenv console 'rootfs_mount_options.compress_algorithm=zstd'
 setenv bootargs ${console} $rootdev rw rootwait
 
-load mmc ${mmcdev}:1 ${fdt_addr_r} @DTB@.dtb
 load mmc ${mmcdev}:1 ${kernel_addr_r} Image
 
-booti ${kernel_addr_r} - ${fdt_addr_r}
+bootm ${kernel_addr_r}
 
 # If the boot command fails, fallback to recovery image
 echo '-- Boot failed, falling back to the recovery image --'