diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2021-03-05 17:14:02 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-03-05 17:42:10 +0000 |
| commit | dc416983bb45f040700612891a9c46ca92e027ff (patch) | |
| tree | 78237ec2ec1db27277a993a04920e64fe68220f0 /package/boot/arm-trusted-firmware-mediatek/patches | |
| parent | 9f714398e060c6338fbfad44cdbfa8c940dbb84b (diff) | |
| download | upstream-dc416983bb45f040700612891a9c46ca92e027ff.tar.gz upstream-dc416983bb45f040700612891a9c46ca92e027ff.tar.bz2 upstream-dc416983bb45f040700612891a9c46ca92e027ff.zip | |
arm-trusted-firmware-mediatek: update to ATF 2.4 (2021-02-25)
All necessary blobs are now contained in the upstream repository, no
more wild replacing of blobs needed.
This new version also contains new storage drivers for (SPI-)NAND which
already comes with support for FM35Q1GA, so that patch can be dropped
as well.
Tested on:
* Bananapi BPi-R64
- sdmmc-2ddr
- emmc-2ddr
* Linksys E8450
- snand-1ddr
All works fine (booting Bananapi BPi-R64 from SD Card does NOT require
a signed image, so patch arm-trusted-firmware-mediatek to allow doing
that).
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/boot/arm-trusted-firmware-mediatek/patches')
2 files changed, 17 insertions, 24 deletions
diff --git a/package/boot/arm-trusted-firmware-mediatek/patches/001-make-brom-sign-key-optional-again.patch b/package/boot/arm-trusted-firmware-mediatek/patches/001-make-brom-sign-key-optional-again.patch new file mode 100644 index 0000000000..60b221ad5f --- /dev/null +++ b/package/boot/arm-trusted-firmware-mediatek/patches/001-make-brom-sign-key-optional-again.patch @@ -0,0 +1,17 @@ +Index: arm-trusted-firmware-mediatek-2021-02-25-1220acb0/plat/mediatek/mt7622/platform.mk +=================================================================== +--- arm-trusted-firmware-mediatek-2021-02-25-1220acb0.orig/plat/mediatek/mt7622/platform.mk ++++ arm-trusted-firmware-mediatek-2021-02-25-1220acb0/plat/mediatek/mt7622/platform.mk +@@ -99,9 +99,9 @@ BL2_SOURCES += drivers/mmc/mmc.c \ + BROM_HEADER_TYPE := sdmmc + CPPFLAGS += -DMSDC_INDEX=1 + DEVICE_HEADER_OFFSET ?= 0x80000 +-ifeq ($(BROM_SIGN_KEY),) +-$(error BootROM signing key is required for SD booting. Please specify BROM_SIGN_KEY) +-endif ++#ifeq ($(BROM_SIGN_KEY),) ++#$(error BootROM signing key is required for SD booting. Please specify BROM_SIGN_KEY) ++#endif + endif + ifeq ($(BOOT_DEVICE),snand) + include ${MTK_PLAT}/common/drivers/snfi/mtk-snand.mk diff --git a/package/boot/arm-trusted-firmware-mediatek/patches/010-nandx-add-fidelix-spi-nand.patch b/package/boot/arm-trusted-firmware-mediatek/patches/010-nandx-add-fidelix-spi-nand.patch deleted file mode 100644 index d0a8f7616a..0000000000 --- a/package/boot/arm-trusted-firmware-mediatek/patches/010-nandx-add-fidelix-spi-nand.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/plat/mediatek/common/drivers/nandx/core/nand/device_spi.c -+++ b/plat/mediatek/common/drivers/nandx/core/nand/device_spi.c -@@ -150,6 +150,21 @@ static struct device_spi spi_nand[] = { - &spi_extend_cmds, 0xff, 0xff - }, - { -+ NAND_DEVICE("FM35X1GA", -+ NAND_PACK_ID(0xe5, 0x71, 0, 0, 0, 0, 0, 0), -+ 2, 0, 3, 3, -+ 1, 1, 1, 1024, KB(128), KB(2), 64, 1, -+ &spi_cmds, &spi_addressing, &spi_status[0], -+ &spi_endurance, &spi_array_timing), -+ { -+ NAND_SPI_PROTECT(0xa0, 1, 2, 6), -+ NAND_SPI_CONFIG(0xb0, 4, 6, 1), -+ NAND_SPI_STATUS(0xc0, 4, 5), -+ NAND_SPI_CHARACTER(0xff, 0xff, 0xff, 0xff) -+ }, -+ &spi_extend_cmds, 0xff, 0xff -+ }, -+ { - NAND_DEVICE("NO-DEVICE", - NAND_PACK_ID(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, |