aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-03-05 23:53:51 +0000
committerDaniel Golle <daniel@makrotopia.org>2021-03-05 23:55:56 +0000
commit9663562188bb1039e93acacaf3e1c164fdddf021 (patch)
tree98536697c5f39bd759914ddd8b5be13cc3949da0
parentb4aad29a1d7ad77d67073c1c54b28c429c64ed9b (diff)
downloadupstream-9663562188bb1039e93acacaf3e1c164fdddf021.tar.gz
upstream-9663562188bb1039e93acacaf3e1c164fdddf021.tar.bz2
upstream-9663562188bb1039e93acacaf3e1c164fdddf021.zip
arm-trusted-firmware-mediatek: don't select DDR3_FLYBY for 1ddr
DDR3_FLYBY has accidentally been set also for the 1-chip variant which lead to broken, unbootable images. Fix that. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--package/boot/arm-trusted-firmware-mediatek/Makefile16
1 files changed, 6 insertions, 10 deletions
diff --git a/package/boot/arm-trusted-firmware-mediatek/Makefile b/package/boot/arm-trusted-firmware-mediatek/Makefile
index d631c0093d..34f8c11575 100644
--- a/package/boot/arm-trusted-firmware-mediatek/Makefile
+++ b/package/boot/arm-trusted-firmware-mediatek/Makefile
@@ -35,55 +35,51 @@ define Trusted-Firmware-A/Default
PLAT:=mt7622
TFA_IMAGE:=bl2.img bl31.bin
BOOT_DEVICE:=
- DDR_BLOB:=
+ DDR3_FLYBY:=
endef
define Trusted-Firmware-A/mt7622-nor-1ddr
NAME:=MediaTek MT7622 (SPI-NOR, 1x DDR3)
BOOT_DEVICE:=nor
- DDR_BLOB:=1
endef
define Trusted-Firmware-A/mt7622-nor-2ddr
NAME:=MediaTek MT7622 (SPI-NOR, 2x DDR3)
BOOT_DEVICE:=nor
- DDR_BLOB:=2
+ DDR3_FLYBY:=1
endef
define Trusted-Firmware-A/mt7622-snand-1ddr
NAME:=MediaTek MT7622 (SPI-NAND, 1x DDR3)
BOOT_DEVICE:=snand
- DDR_BLOB:=1
endef
define Trusted-Firmware-A/mt7622-snand-2ddr
NAME:=MediaTek MT7622 (SPI-SNAND, 2x DDR3)
BOOT_DEVICE:=snand
- DDR_BLOB:=2
+ DDR3_FLYBY:=1
endef
define Trusted-Firmware-A/mt7622-emmc-1ddr
NAME:=MediaTek MT7622 (eMMC, 1x DDR3)
BOOT_DEVICE:=emmc
- DDR_BLOB:=1
endef
define Trusted-Firmware-A/mt7622-emmc-2ddr
NAME:=MediaTek MT7622 (eMMC, 2x DDR3)
BOOT_DEVICE:=emmc
- DDR_BLOB:=2
+ DDR3_FLYBY:=1
endef
define Trusted-Firmware-A/mt7622-sdmmc-1ddr
NAME:=MediaTek MT7622 (SDcard, 1x DDR3)
BOOT_DEVICE:=sdmmc
- DDR_BLOB:=1
endef
define Trusted-Firmware-A/mt7622-sdmmc-2ddr
NAME:=MediaTek MT7622 (SDcard, 2x DDR3)
BOOT_DEVICE:=sdmmc
- DDR_BLOB:=2
+ DDR3_FLYBY:=1
endef
TFA_TARGETS:= \
@@ -96,7 +92,7 @@ TFA_TARGETS:= \
mt7622-sdmmc-1ddr \
mt7622-sdmmc-2ddr
-TFA_MAKE_FLAGS += BOOT_DEVICE=$(BOOT_DEVICE) $(if eq($(DDR_BLOB),2),DDR3_FLYBY=1) all
+TFA_MAKE_FLAGS += BOOT_DEVICE=$(BOOT_DEVICE) $(if $(DDR3_FLYBY),DDR3_FLYBY=1) all
define Build/Configure
$(call Build/Configure/Default)