From patchwork Wed Jan 23 21:25:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1030196 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jefQ4UJf"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43lJHZ0jrkz9s55 for ; Thu, 24 Jan 2019 08:26:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=P+uOKWOeUBQTDVbH6T5mdx6HMKihcJ9Hr5Rd84rQ7L8=; b=jefQ4UJfXg6QIZ Z0oqKQP2lMCK5kentxwGT8UHtPBU5FP753BORqH5QOBQOaneiJRVgbh0qoR77HQHjkoElwDRHbXmc PGlo789Ga2zUf7phdiOauBzjWDmRMjAUNczGF9pCZKmUyD6xTK6w4qXq2qddMHpMrOaPiIMHRcdOs QybUC3B1HgmNZczl8N3ECLvZtxjgl3Yjw5nt619KndatuVbwoZoSSwK28HtWt4Y21qyF6hVR/mF94 0InmDa0YqT/o0fpugwcrcfw4ITtb5d7kA+WPAHSGMEZ8Vvb86k1irePJl3S1HLGU5Fhw63iU6uwnU p47PEeoSj3SoqV7bpGhA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gmQ1x-0007tR-9Y; Wed, 23 Jan 2019 21:25:53 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gmQ1p-0007t0-TV for openwrt-devel@lists.openwrt.org; Wed, 23 Jan 2019 21:25:47 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 63FCD3EC3; Wed, 23 Jan 2019 22:25:43 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id c9898682; Wed, 23 Jan 2019 22:25:42 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Wed, 23 Jan 2019 22:25:38 +0100 Message-Id: <1548278739-31496-1-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190123_132546_105951_8F00FA8A X-CRM114-Status: UNSURE ( 9.25 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] Subject: [OpenWrt-Devel] [PATCH 1/2] u-boot.mk: Fix building of recent U-Boot sources X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This patch fixes following error with U-Boot 2019.01 on imx6: In file included from tools/lib/crc16.c:1:0: ./tools/../lib/crc16.c: In function 'crc16_ccitt': ./tools/../lib/crc16.c:70:2: error: 'for' loop initial declarations are only allowed in C99 mode for (int i = 0; i < len; i++) ^ ./tools/../lib/crc16.c:70:2: note: use option -std=c99 or -std=gnu99 to compile your code Code was introduced in the upstream v2019.01-rc1-154-g51c2345: commit 51c2345bd24837f9f67f16268da6dc71573f1325 Author: Philipp Tomsich Date: Sun Nov 25 19:22:19 2018 +0100 Roll CRC16-CCITT into the hash infrastructure Upstream has added -std=gnu11 host flag in v2018.07-rc2-1-gfa89399: commit fa893990e9b53425af5f5059e04a2bffde91ccf9 Author: Tom Rini Date: Tue Jun 19 23:53:54 2018 -0400 Makefile: Ensure we build with -std=gnu11 Build tested on imx6: apalis, mx6sabresd, nitrogen6dl, nitrogen6dl2g, nitrogen6q, nitrogen6q2g, nitrogen6s, nitrogen6s1g, wandboard Run tested: apalis (pending PR #1595) Signed-off-by: Petr Štetiar --- include/u-boot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/u-boot.mk b/include/u-boot.mk index babb764..26e1685 100644 --- a/include/u-boot.mk +++ b/include/u-boot.mk @@ -42,7 +42,7 @@ TARGET_DEP = TARGET_$(BUILD_TARGET)$(if $(BUILD_SUBTARGET),_$(BUILD_SUBTARGET)) UBOOT_MAKE_FLAGS = \ HOSTCC="$(HOSTCC)" \ - HOSTCFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS)" \ + HOSTCFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -std=gnu11" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" define Build/U-Boot/Target From patchwork Wed Jan 23 21:25:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1030197 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="J5wUsuA1"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43lJHg1KLhz9s55 for ; Thu, 24 Jan 2019 08:26:06 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OHVxTVhI33tJQXJtANpzNNCK9XxpEEx082viujroYI0=; b=J5wUsuA1PoI/MF ETvVerlWzLHX4Ga82usp2kpeapbP3/V5X/uADKcU3dJ2getpHwKyvIx219wyvLcyL9i7mOsV9W2Ox 2rt/mU+rH07q0b+Ow/AAH0NFWWNiZTUhePDONF1lo6sqRBP2YQ1vv4COH7JD6rnPJHtIFixJqAEMS q5YtoK3RDoFMjnkthg19N/1J1qETOkB48MG9wTSyUukLpgVZUgMJde27Q1gjbTYUA5qIitx1EmbBG V6FvkqfbjKaOqErBJPtqPDlLRRv0vuiETXdxfUPuafAehIOh0XxrYP1OOZtyvLy4LoRqDbL6B1oLg gm7Rw1/2yJrcB+U7x5KQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gmQ26-00082i-0L; Wed, 23 Jan 2019 21:26:02 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gmQ1x-0007tq-7d for openwrt-devel@lists.openwrt.org; Wed, 23 Jan 2019 21:25:57 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id A36613EC4; Wed, 23 Jan 2019 22:25:51 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id a0e585dc; Wed, 23 Jan 2019 22:25:50 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Wed, 23 Jan 2019 22:25:39 +0100 Message-Id: <1548278739-31496-2-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1548278739-31496-1-git-send-email-ynezz@true.cz> References: <1548278739-31496-1-git-send-email-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190123_132553_880391_8B8855AC X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] Subject: [OpenWrt-Devel] [PATCH 2/2] uboot-imx6: Bump to 2019.01 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Vid , =?utf-8?q?Petr_=C5=A0tetiar?= , Koen Vandeputte , Felix Fietkau Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Build tested: apalis, mx6sabresd, nitrogen6dl, nitrogen6dl2g, nitrogen6q, nitrogen6q2g, nitrogen6s, nitrogen6s1g, wandboard Run tested: apalis (pending PR #1595) Cc: Felix Fietkau Cc: Vladimir Vid Cc: Koen Vandeputte Signed-off-by: Petr Štetiar --- package/boot/uboot-imx6/Makefile | 4 ++-- package/boot/uboot-imx6/patches/100-wandboard-enable-fit.patch | 6 +++--- .../boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/boot/uboot-imx6/Makefile b/package/boot/uboot-imx6/Makefile index 3eba249..25d68bf 100644 --- a/package/boot/uboot-imx6/Makefile +++ b/package/boot/uboot-imx6/Makefile @@ -7,10 +7,10 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=2018.03 +PKG_VERSION:=2019.01 PKG_RELEASE:=1 -PKG_HASH:=7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd +PKG_HASH:=50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/uboot-imx6/patches/100-wandboard-enable-fit.patch b/package/boot/uboot-imx6/patches/100-wandboard-enable-fit.patch index 6bfcc1f..3ab6152 100644 --- a/package/boot/uboot-imx6/patches/100-wandboard-enable-fit.patch +++ b/package/boot/uboot-imx6/patches/100-wandboard-enable-fit.patch @@ -1,6 +1,6 @@ --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig -@@ -27,7 +27,7 @@ CONFIG_CMD_I2C=y +@@ -29,7 +29,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SATA=y CONFIG_CMD_USB=y @@ -8,8 +8,8 @@ +# CONFIG_CMD_CACHE is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y - CONFIG_DM=y -@@ -39,3 +39,5 @@ CONFIG_USB_STORAGE=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +@@ -43,3 +43,5 @@ CONFIG_USB=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch index 0883eb7..4b34a83 100644 --- a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch +++ b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch @@ -1,7 +1,7 @@ --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c -@@ -334,6 +334,12 @@ int board_init(void) - return ret; +@@ -290,6 +290,12 @@ static void setup_iomux_enet(void) + udelay(100); } +void board_boot_order(u32 *spl_boot_list) @@ -10,12 +10,12 @@ + spl_boot_list[1] = BOOT_DEVICE_MMC1; +} + - static bool is_hummingboard(void) + int board_phy_config(struct phy_device *phydev) { - int val1, val2; + if (phydev->drv->config) --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c -@@ -136,7 +136,7 @@ int g_dnl_bind_fixup(struct usb_device_d +@@ -167,7 +167,7 @@ int g_dnl_bind_fixup(struct usb_device_d /* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */ u32 spl_boot_mode(const u32 boot_device) {