diff --git a/package/boot/arm-trusted-firmware-mediatek/Makefile b/package/boot/arm-trusted-firmware-mediatek/Makefile index 91530b097bd..7a1c20f7268 100644 --- a/package/boot/arm-trusted-firmware-mediatek/Makefile +++ b/package/boot/arm-trusted-firmware-mediatek/Makefile @@ -211,8 +211,8 @@ define Trusted-Firmware-A/mt7981-emmc-ddr3 DDR_TYPE:=ddr3 endef -define Trusted-Firmware-A/mt7981-emmc-ddr3-1866mhz - NAME:=MediaTek MT7981 (eMMC, DDR3 1866 MHz) +define Trusted-Firmware-A/mt7981-emmc-ddr3-1866 + NAME:=MediaTek MT7981 (eMMC, DDR3 1866 MT/s) BOOT_DEVICE:=emmc BUILD_SUBTARGET:=filogic PLAT:=mt7981 @@ -244,8 +244,8 @@ define Trusted-Firmware-A/mt7981-spim-nand-ddr3 DDR_TYPE:=ddr3 endef -define Trusted-Firmware-A/mt7981-spim-nand-ddr3-1866mhz - NAME:=MediaTek MT7981 (SPI-NAND via SPIM, DDR3 1866 MHz) +define Trusted-Firmware-A/mt7981-spim-nand-ddr3-1866 + NAME:=MediaTek MT7981 (SPI-NAND via SPIM, DDR3 1866 MT/s) BOOT_DEVICE:=spim-nand BUILD_SUBTARGET:=filogic PLAT:=mt7981 @@ -679,13 +679,13 @@ TFA_TARGETS:= \ mt7622-sdmmc-2ddr \ mt7981-ram-ddr3 \ mt7981-emmc-ddr3 \ - mt7981-emmc-ddr3-1866mhz \ + mt7981-emmc-ddr3-1866 \ mt7981-nor-ddr3 \ mt7981-nor-ddr4 \ mt7981-sdmmc-ddr3 \ mt7981-snand-ddr3 \ mt7981-spim-nand-ddr3 \ - mt7981-spim-nand-ddr3-1866mhz \ + mt7981-spim-nand-ddr3-1866 \ mt7981-spim-nand-ubi-ddr4 \ mt7981-ram-ddr4 \ mt7981-emmc-ddr4 \ diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile index f535489449d..c01e4119575 100644 --- a/package/boot/uboot-mediatek/Makefile +++ b/package/boot/uboot-mediatek/Makefile @@ -263,8 +263,8 @@ define U-Boot/mt7981_cmcc_rax3000m-emmc-ddr3 UBOOT_IMAGE:=u-boot.fip BL2_BOOTDEV:=emmc BL2_SOC:=mt7981 - BL2_DDRTYPE:=ddr3-1866mhz - DEPENDS:=+trusted-firmware-a-mt7981-emmc-ddr3-1866mhz + BL2_DDRTYPE:=ddr3-1866 + DEPENDS:=+trusted-firmware-a-mt7981-emmc-ddr3-1866 endef define U-Boot/mt7981_cmcc_rax3000m-emmc-ddr4 @@ -287,8 +287,8 @@ define U-Boot/mt7981_cmcc_rax3000m-nand-ddr3 UBOOT_IMAGE:=u-boot.fip BL2_BOOTDEV:=spim-nand BL2_SOC:=mt7981 - BL2_DDRTYPE:=ddr3-1866mhz - DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3-1866mhz + BL2_DDRTYPE:=ddr3-1866 + DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3-1866 endef define U-Boot/mt7981_cmcc_rax3000m-nand-ddr4 @@ -311,8 +311,8 @@ define U-Boot/mt7981_comfast_cf-wr632ax UBOOT_IMAGE:=u-boot.fip BL2_BOOTDEV:=spim-nand BL2_SOC:=mt7981 - BL2_DDRTYPE:=ddr3-1866mhz - DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3-1866mhz + BL2_DDRTYPE:=ddr3-1866 + DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3-1866 endef define U-Boot/mt7981_cudy_tr3000-v1 diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 3aac9bc822a..a5050d9760d 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -923,11 +923,11 @@ define Device/cmcc_rax3000m nand-ddr4-bl31-uboot.fip nand-ddr4-preloader.bin ARTIFACT/emmc-gpt.bin := mt798x-gpt emmc ARTIFACT/emmc-ddr3-bl31-uboot.fip := mt7981-bl31-uboot cmcc_rax3000m-emmc-ddr3 - ARTIFACT/emmc-ddr3-preloader.bin := mt7981-bl2 emmc-ddr3-1866mhz + ARTIFACT/emmc-ddr3-preloader.bin := mt7981-bl2 emmc-ddr3-1866 ARTIFACT/emmc-ddr4-bl31-uboot.fip := mt7981-bl31-uboot cmcc_rax3000m-emmc-ddr4 ARTIFACT/emmc-ddr4-preloader.bin := mt7981-bl2 emmc-ddr4 ARTIFACT/nand-ddr3-bl31-uboot.fip := mt7981-bl31-uboot cmcc_rax3000m-nand-ddr3 - ARTIFACT/nand-ddr3-preloader.bin := mt7981-bl2 spim-nand-ddr3-1866mhz + ARTIFACT/nand-ddr3-preloader.bin := mt7981-bl2 spim-nand-ddr3-1866 ARTIFACT/nand-ddr4-bl31-uboot.fip := mt7981-bl31-uboot cmcc_rax3000m-nand-ddr4 ARTIFACT/nand-ddr4-preloader.bin := mt7981-bl2 spim-nand-ddr4 endef @@ -991,7 +991,7 @@ define Device/comfast_cf-wr632ax-ubootmod IMAGE/sysupgrade.itb := append-kernel | \ fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata ARTIFACTS := preloader.bin bl31-uboot.fip - ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3-1866mhz + ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3-1866 ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot comfast_cf-wr632ax $(call Device/comfast_cf-wr632ax-common) endef