Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm-trusted-firmware-mediatek: don't select DDR3_FLYBY for 1ddr

Browse source 
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>
This commit is contained in:
Daniel Golle 2021-03-05 23:53:51 +00:00
parent b4aad29a1d
commit 9663562188
No known key found for this signature in database
GPG key ID: 5A8F39C31C3217CA
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
package/boot/arm-trusted-firmware-mediatek/Makefile
View file

@ -35,55 +35,51 @@ define Trusted-Firmware-A/Default
PLAT:=mt7622 PLAT:=mt7622
TFA_IMAGE:=bl2.img bl31.bin TFA_IMAGE:=bl2.img bl31.bin
BOOT_DEVICE:= BOOT_DEVICE:=
DDR_BLOB:= DDR3_FLYBY:=
endef endef
define Trusted-Firmware-A/mt7622-nor-1ddr define Trusted-Firmware-A/mt7622-nor-1ddr
NAME:=MediaTek MT7622 (SPI-NOR, 1x DDR3) NAME:=MediaTek MT7622 (SPI-NOR, 1x DDR3)
BOOT_DEVICE:=nor BOOT_DEVICE:=nor
DDR_BLOB:=1
endef endef
define Trusted-Firmware-A/mt7622-nor-2ddr define Trusted-Firmware-A/mt7622-nor-2ddr
NAME:=MediaTek MT7622 (SPI-NOR, 2x DDR3) NAME:=MediaTek MT7622 (SPI-NOR, 2x DDR3)
BOOT_DEVICE:=nor BOOT_DEVICE:=nor
DDR_BLOB:=2 DDR3_FLYBY:=1
endef endef
define Trusted-Firmware-A/mt7622-snand-1ddr define Trusted-Firmware-A/mt7622-snand-1ddr
NAME:=MediaTek MT7622 (SPI-NAND, 1x DDR3) NAME:=MediaTek MT7622 (SPI-NAND, 1x DDR3)
BOOT_DEVICE:=snand BOOT_DEVICE:=snand
DDR_BLOB:=1
endef endef
define Trusted-Firmware-A/mt7622-snand-2ddr define Trusted-Firmware-A/mt7622-snand-2ddr
NAME:=MediaTek MT7622 (SPI-SNAND, 2x DDR3) NAME:=MediaTek MT7622 (SPI-SNAND, 2x DDR3)
BOOT_DEVICE:=snand BOOT_DEVICE:=snand
DDR_BLOB:=2 DDR3_FLYBY:=1
endef endef
define Trusted-Firmware-A/mt7622-emmc-1ddr define Trusted-Firmware-A/mt7622-emmc-1ddr
NAME:=MediaTek MT7622 (eMMC, 1x DDR3) NAME:=MediaTek MT7622 (eMMC, 1x DDR3)
BOOT_DEVICE:=emmc BOOT_DEVICE:=emmc
DDR_BLOB:=1
endef endef
define Trusted-Firmware-A/mt7622-emmc-2ddr define Trusted-Firmware-A/mt7622-emmc-2ddr
NAME:=MediaTek MT7622 (eMMC, 2x DDR3) NAME:=MediaTek MT7622 (eMMC, 2x DDR3)
BOOT_DEVICE:=emmc BOOT_DEVICE:=emmc
DDR_BLOB:=2 DDR3_FLYBY:=1
endef endef
define Trusted-Firmware-A/mt7622-sdmmc-1ddr define Trusted-Firmware-A/mt7622-sdmmc-1ddr
NAME:=MediaTek MT7622 (SDcard, 1x DDR3) NAME:=MediaTek MT7622 (SDcard, 1x DDR3)
BOOT_DEVICE:=sdmmc BOOT_DEVICE:=sdmmc
DDR_BLOB:=1
endef endef
define Trusted-Firmware-A/mt7622-sdmmc-2ddr define Trusted-Firmware-A/mt7622-sdmmc-2ddr
NAME:=MediaTek MT7622 (SDcard, 2x DDR3) NAME:=MediaTek MT7622 (SDcard, 2x DDR3)
BOOT_DEVICE:=sdmmc BOOT_DEVICE:=sdmmc
DDR_BLOB:=2 DDR3_FLYBY:=1
endef endef
TFA_TARGETS:= \ TFA_TARGETS:= \
@ -96,7 +92,7 @@ TFA_TARGETS:= \
mt7622-sdmmc-1ddr \ mt7622-sdmmc-1ddr \
mt7622-sdmmc-2ddr 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 define Build/Configure
$(call Build/Configure/Default) $(call Build/Configure/Default)