From patchwork Thu Jul 23 00:55:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1334294 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=B3acsonj; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=swG2nd7D; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BBv7127Tkz9sRk for ; Thu, 23 Jul 2020 10:57:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=QM4PGvjfX5RU7aIkyzidlNkfzUe6S21pSKxjobKWlwQ=; b=B3acsonj/c0PKxX+XwwzYUtHe9 zItKq831PLIaYDxTmbuUaRKwYlrt7dhuAUkKYe4kvIS6IX9hRvtfDAYBzF2pd7vPQhC1p3nWXAYsq QzM291JNJo2oHLc4VbD2PDp7ADWHFnP6n3m/dtD1S+ioCszquFf6vec55c3sGSY67+Hf8+18MG4u8 a9qoFxvcJOZdPf4Vzf6fpW+mdBb5h3qEf+Qrzskyo6CWvY5u2UOR8HiSzu6lyGj4eHxf/CsYRIhRa UmM0fwhPDCSII2kh3M3pwRLA255BUxPD9kkjfMYm8ZieME6M45nswkCRnx/5HaGA/Qc490QYnDVb0 mjAQFH+A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyPVz-0006fF-S4; Thu, 23 Jul 2020 00:55:15 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyPVx-0006ek-GP for openwrt-devel@lists.openwrt.org; Thu, 23 Jul 2020 00:55:14 +0000 Received: by mail-pl1-x641.google.com with SMTP id m16so1795491pls.5 for ; Wed, 22 Jul 2020 17:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=eVv9p0KGA9DMMU+KbDnws+ErZDCymv6k1qxX+n0aJtI=; b=swG2nd7DdAw1lrF75TJ7Oc4Gcs2dl63+pk/CBywgpTrsac/zK084z7iVZYABb+Yp+9 dx0A3NvTVbDrFxHAJa/7yGSbDxAACpQZBI1GSVnR1eGEwnEEM3xKibbjTVHj0ksIHCkD 0lvx3kXC2Je7NbfEqcZwy/V25Fn68QRIM3AyjY3h29xTGaV0rrKwHNJlF41S4uehAWbQ MGY5zNOD2tDhha3Tw9WwuHGFYmc+FP+vQ5RJzC6cI8jWlsu3zVMfwKejtL1p19u87Yaw ZkoPC7Q5MHMnmDWEEBiFbNVVJgKmMa5cQxNNabZuaB/SIHwkI/gzJGkaj2o7aYJhvBRe /XAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=eVv9p0KGA9DMMU+KbDnws+ErZDCymv6k1qxX+n0aJtI=; b=P5shqm9H7zfvGRwkh+oCfrES+7/HJY2Yl2oquIfOAoeE6mh2TZJ2mqdKl4l+vKINMD Ex1h1hl7AI1XO24nlSgfx8KRx8GESXoI6J1CNJ/t1f/6eLqs7sGp7CIxZ05qhpj4rlSp DeK+tSx2sHn1JjznsdXuGBVuOIDSkQy2ymvW1ybnxskOI9Bq+0h0dWzrqsTno99cbQPI 4NTL4b1xukJFWwW6HhGbK9IXEpIE8u3wQANhC3w5+v16VJibZIGjCgBVFNy/vqB6aIkv Fyi9eP7PIO8d6rRZsZUAi2GYYBcZbuWEW8VxrzJoQHJf7ft8UJx+aCI5XgMZEUKKVIoZ s51A== X-Gm-Message-State: AOAM533HgRv6CEJj+sUp3cIuernoiz896o4B77PUWvP7fvmPF91UwxBQ SniTu6/icvtFy7nPWGu3CqWhI+o0 X-Google-Smtp-Source: ABdhPJx5WCmtcuvxN1rO+BnZrIxXBwJhk2FAdhRwDrH04txrnFQqEdcDKHAQ898H5P5FleS2zeRdiQ== X-Received: by 2002:a17:902:2:: with SMTP id 2mr1812510pla.288.1595465709629; Wed, 22 Jul 2020 17:55:09 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id k189sm818021pfd.175.2020.07.22.17.55.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 17:55:09 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] uboot-mediatek: remove swig requirement Date: Wed, 22 Jul 2020 17:55:07 -0700 Message-Id: <20200723005507.987279-1-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200722_205513_564935_E99D0931 X-CRM114-Status: GOOD ( 11.25 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:641 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 --- package/boot/uboot-mediatek/Makefile | 2 +- .../patches/010-no-binman.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 package/boot/uboot-mediatek/patches/010-no-binman.patch diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile index f6745f6cad..a7b47ecae5 100644 --- a/package/boot/uboot-mediatek/Makefile +++ b/package/boot/uboot-mediatek/Makefile @@ -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 index 0000000000..8a05a2d41d --- /dev/null +++ b/package/boot/uboot-mediatek/patches/010-no-binman.patch @@ -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,