229623e310
MTK sent us their latest version of the staging uboot. Lets merge the patches. Signed-off-by: John Crispin <john@phrozen.org>
24 lines
826 B
Diff
24 lines
826 B
Diff
--- a/Makefile 2020-10-13 13:39:06.471438591 +0800
|
|
+++ b/Makefile 2020-10-13 13:39:39.190798462 +0800
|
|
@@ -1725,6 +1725,10 @@
|
|
|
|
ifeq ($(CONFIG_SPL),y)
|
|
spl/u-boot-spl-mtk.bin: spl/u-boot-spl
|
|
+OBJCOPYFLAGS_u-boot-mtk.bin = -I binary -O binary \
|
|
+ --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
|
|
+u-boot-mtk.bin: u-boot.img spl/u-boot-spl-mtk.bin FORCE
|
|
+ $(call if_changed,pad_cat)
|
|
else
|
|
MKIMAGEFLAGS_u-boot-mtk.bin = -T mtk_image \
|
|
-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \
|
|
--- a/arch/arm/mach-mediatek/Kconfig
|
|
+++ b/arch/arm/mach-mediatek/Kconfig
|
|
@@ -36,7 +36,6 @@ config TARGET_MT7629
|
|
bool "MediaTek MT7629 SoC"
|
|
select CPU_V7A
|
|
select SPL
|
|
- select BINMAN
|
|
help
|
|
The MediaTek MT7629 is a ARM-based SoC with a dual-core Cortex-A7
|
|
including DDR3, crypto engine, 3x3 11n/ac Wi-Fi, Gigabit Ethernet,
|