uboot-mediatek: remove swig requirement
authorRosen Penev <rosenp@gmail.com>
Thu, 23 Jul 2020 00:55:07 +0000 (17:55 -0700)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Thu, 23 Jul 2020 15:38:13 +0000 (17:38 +0200)
Ever since this package was introduced, the SDK for mt7629 failed to
build as it started failing on this package.

Fixed by porting Hauke's similar patch for uboot-sunxi to uboot-mediatek.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
package/boot/uboot-mediatek/Makefile
package/boot/uboot-mediatek/patches/010-no-binman.patch [new file with mode: 0644]

index f6745f6cad7d347ff9f97d01cf49a3fe49cfcc79..a7b47ecae5fe338433816ad9e9599a3aa7726bb8 100644 (file)
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_VERSION:=2020.04
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
 
 include $(INCLUDE_DIR)/u-boot.mk
diff --git a/package/boot/uboot-mediatek/patches/010-no-binman.patch b/package/boot/uboot-mediatek/patches/010-no-binman.patch
new file mode 100644 (file)
index 0000000..8a05a2d
--- /dev/null
@@ -0,0 +1,25 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1667,8 +1667,10 @@ u-boot-elf.lds: arch/u-boot-elf.lds prepare FORCE
+ ifeq ($(CONFIG_SPL),y)
+ spl/u-boot-spl-mtk.bin: spl/u-boot-spl
+-u-boot-mtk.bin: u-boot.dtb u-boot.img spl/u-boot-spl-mtk.bin FORCE
+-      $(call if_changed,binman)
++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,