diff options
| author | Robert Marko | 2026-02-17 12:35:55 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-02-19 10:43:03 +0000 |
| commit | f2a532ec09ca1bc84a83f56f36190fa23ddcce04 (patch) | |
| tree | a58102f83103fb07838583d2b287e5d7964e7cef | |
| parent | f03bb44a08be2f1fb6bc82cfacff3fd08d7baa94 (diff) | |
| download | openwrt-f2a532ec09ca1bc84a83f56f36190fa23ddcce04.tar.gz | |
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>
| -rw-r--r-- | target/linux/mvebu/image/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/mvebu/image/cortexa53.mk | 4 | ||||
| -rw-r--r-- | target/linux/mvebu/image/udpu.bootscript | 9 |
3 files changed, 4 insertions, 11 deletions
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 8c85dedd35..a1fa4b9f8d 100644 --- 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 e90f01308c..65e64ac512 100644 --- 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 e646b42e89..741254e460 100644 --- 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 --' |