From patchwork Tue Sep 15 20:37:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pushpal Sidhu X-Patchwork-Id: 518110 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6E56F140324 for ; Wed, 16 Sep 2015 06:38:27 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A489E28C674; Tue, 15 Sep 2015 22:37:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id E3FA528C66F for ; Tue, 15 Sep 2015 22:37:01 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gateworks. - helo: .mail-pa0-f48.google. - helo-domain: .google.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=1; rate: -5.5 Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 15 Sep 2015 22:37:00 +0200 (CEST) Received: by padhy16 with SMTP id hy16so186146624pad.1 for ; Tue, 15 Sep 2015 13:38:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tkkaJckmSpJoEpum63y7n7EzL2ALmAFbyYeYRA/KJfY=; b=YBD+b/GF1vzQNQSVBth8sWnWpX6BeLuvkbmFTvinWsvDsaeXrBEsICM2/NVl77NtLI AMMGyD+uLoiqetuY0QBcdQeVBbfoXXIol6lmgY0n4JNyTyScjRf0fVo1T8wn7rzpWMkD qBmt/3cobnc9ZkcIZO5jktpEYrebSsesjED+qsiFyNOcCZ1QmLEqt5F4IErxGTXgjDu2 spWF2waNg4nsTmbKAhUyBLZTLMtbA92ihrsRBDspnfKZ6S/xMz9DsotxU7lcpVTPY3lB EBDqamj2j7mqz4BIqSzVPVXxYW4g0zFqf4SEI+0zYQxl8la9PZbFH3sSon44m+clXOy9 uzCA== X-Gm-Message-State: ALoCoQnD/8+NioZrEbYRGTkQM/d8vi7cPvUYIlx69pZXwIhK0MMYY4c+cEjxbwprZRN3lQoblDa9 X-Received: by 10.68.111.165 with SMTP id ij5mr50571558pbb.59.1442349489267; Tue, 15 Sep 2015 13:38:09 -0700 (PDT) Received: from psidhu.gw (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by smtp.gmail.com with ESMTPSA id we9sm23813281pab.3.2015.09.15.13.38.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Sep 2015 13:38:08 -0700 (PDT) From: Pushpal Sidhu To: Luka Perkov Date: Tue, 15 Sep 2015 13:37:38 -0700 Message-Id: <1442349458-14224-1-git-send-email-psidhu@gateworks.com> X-Mailer: git-send-email 2.5.1 Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH] imx6: fix platform checking X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Fix platform checking when configuring networks and when doing sysupgrade. Signed-off-by: Pushpal Sidhu --- target/linux/imx6/base-files/etc/uci-defaults/02_network | 12 ++++++------ target/linux/imx6/base-files/lib/upgrade/platform.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/linux/imx6/base-files/etc/uci-defaults/02_network b/target/linux/imx6/base-files/etc/uci-defaults/02_network index 0e60e22..bf83063 100644 --- a/target/linux/imx6/base-files/etc/uci-defaults/02_network +++ b/target/linux/imx6/base-files/etc/uci-defaults/02_network @@ -15,16 +15,16 @@ board=$(imx6_board_name) ucidef_set_interface_loopback case "$board" in -"gw51xx" |\ -"gw52xx") +*gw51xx |\ +*gw52xx) ucidef_set_interface_lan 'eth0' ;; -"gw53xx" |\ -"gw54xx" |\ -"gw552x") +*gw53xx |\ +*gw54xx |\ +*gw552x) ucidef_set_interfaces_lan_wan 'eth0' 'eth1' ;; -"wandboard") +*wandboard) ucidef_set_interface_wan 'eth0' ;; esac diff --git a/target/linux/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx6/base-files/lib/upgrade/platform.sh index c48e2c9..0bbf110 100755 --- a/target/linux/imx6/base-files/lib/upgrade/platform.sh +++ b/target/linux/imx6/base-files/lib/upgrade/platform.sh @@ -8,7 +8,7 @@ platform_check_image() { local board=$(imx6_board_name) case "$board" in - gw54xx) + *gw5*) nand_do_platform_check $board $1 return $?; ;; @@ -22,7 +22,7 @@ platform_pre_upgrade() { local board=$(imx6_board_name) case "$board" in - gw54xx) + *gw5*) nand_do_upgrade "$1" ;; esac