From patchwork Thu Mar 3 14:57:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 591487 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id A974514017E for ; Fri, 4 Mar 2016 01:59:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b=0CzPspeh; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9DA8D95978; Thu, 3 Mar 2016 14:59:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UfBoN1QhGntn; Thu, 3 Mar 2016 14:59:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DF0049598B; Thu, 3 Mar 2016 14:59:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A28AA1C1569 for ; Thu, 3 Mar 2016 14:59:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9372D9246C for ; Thu, 3 Mar 2016 14:59:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xVvzpA+Kuts6 for ; Thu, 3 Mar 2016 14:59:20 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by whitealder.osuosl.org (Postfix) with ESMTPS id D9C0C9247D for ; Thu, 3 Mar 2016 14:57:26 +0000 (UTC) Received: by mail-wm0-f51.google.com with SMTP id l68so38693796wml.0 for ; Thu, 03 Mar 2016 06:57:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1KiQpwsDlMcYbHCNdqLvXgANs9bLzJx/+/NxbjzGJ/s=; b=0CzPspehM86S76y3yPHEPflohsfFwvk0qOHEgsTd+Bo2vvnfSufSjBs8HA/s90ve6j k4p/xE5zD0E0y1yt5eGUOq7RRaZF2uEV7KFJVd21f1lpIg+ulo2xBnb5m3nNdsKgog08 ZlZlpJHoVQq61xloxNHC6fYbaEWZve0Yv2WpyW5Os5GvlJKCLBlBJJiNlnjAit3g+tjv StZ4Z5ZRr02Vf/cfolv2eyFgUpauhbHlQP58f1LDIZpxKpvN0ICuhBCLNsUu2kiZ3Evn DfEnhVSHDbxMlwsyPp7imebNiH06jD5pxOXmBsQ+L23FJlwfcbz2sU8bxwsX1wjKKnYq KU2A== 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:in-reply-to :references; bh=1KiQpwsDlMcYbHCNdqLvXgANs9bLzJx/+/NxbjzGJ/s=; b=F+H/ckQzvUazcsyrBXSR8XDLQaN3L2JR0CH3Z+5ao+jETc0Q2H+AmC39K6R2268QsA OinN7kKElxjs4zHnazVKOFX8hTW6+MFPksC8ZEpu7MZULlc6YSEg3RlOECubVUVSKFvu kMU4XWI0g/VfskaIaaJqzPMjwPJz5rGgpERjn24ewx6xViwsRk4mnOjSApujy10F17QL 2Lk/n22zkstgZ+YPg7nq+UxHcj/IufAdpUxK/X5bry8s0rkXsbFFZNoRhcQPEwuFJPOO Cv+4CuGNOtp6lQ4y9Sbefgfrgs4yDSr4kx63nQv0OyFCR4BwLVgpmYBoS/O9O/Rx3tyT 7W/Q== X-Gm-Message-State: AD7BkJLgSgmSVXbkqZI9S5jkDaDkSwyuj9mYKn3GoQ4mcngjnmvRm1AlVHsv0jKmED4R9Q== X-Received: by 10.194.47.237 with SMTP id g13mr3644611wjn.142.1457017045599; Thu, 03 Mar 2016 06:57:25 -0800 (PST) Received: from t450s.lan (89-92-156-188.hfc.dyn.abo.bbox.fr. [89.92.156.188]) by smtp.googlemail.com with ESMTPSA id w11sm9317833wmg.21.2016.03.03.06.57.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Mar 2016 06:57:25 -0800 (PST) From: Gary Bisson To: buildroot@busybox.net Date: Thu, 3 Mar 2016 15:57:17 +0100 Message-Id: <1457017038-4023-2-git-send-email-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457017038-4023-1-git-send-email-gary.bisson@boundarydevices.com> References: <1457017038-4023-1-git-send-email-gary.bisson@boundarydevices.com> Subject: [Buildroot] [PATCH 1/2] board/boundarydevices: update u-boot scripts for i.MX7 support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also remove useless tfp410 enablement since a basic kernel driver has been added. Signed-off-by: Gary Bisson --- board/boundarydevices/nitrogen6x/6x_bootscript.txt | 33 +++++++++++----------- board/boundarydevices/nitrogen6x/6x_upgrade.txt | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/board/boundarydevices/nitrogen6x/6x_bootscript.txt b/board/boundarydevices/nitrogen6x/6x_bootscript.txt index 4a9be0b..e8a08aa 100644 --- a/board/boundarydevices/nitrogen6x/6x_bootscript.txt +++ b/board/boundarydevices/nitrogen6x/6x_bootscript.txt @@ -1,8 +1,19 @@ setenv bootargs '' -a_script=0x10800000 -a_zImage=0x10800000 -a_fdt=0x13000000 +if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then + a_script=0x80800000 + a_zImage=0x80800000 + a_fdt=0x83000000 + m4='' + if itest.s "x1" == "x$m4enabled" ; then + run m4boot; + m4='-m4'; + fi +else + a_script=0x10800000 + a_zImage=0x10800000 + a_fdt=0x13000000 +fi setenv initrd_high 0xffffffff if itest.s "x" == "x${dtbname}" ; then @@ -13,15 +24,9 @@ if itest.s "x" == "x${dtbname}" ; then elif itest.s x6QP == "x${cpu}" ; then dtbname=imx6qp-${board}.dtb; elif itest.s x6SX == "x${cpu}" ; then - if itest.s "x1" != "x$m4enabled" ; then - dtbname=imx6sx-${board}.dtb; - else - run m4boot; - dtbname=imx6sx-${board}-m4.dtb; - fi - a_script=0x80800000 - a_zImage=0x80800000 - a_fdt=0x83000000 + dtbname=imx6sx-${board}${m4}.dtb; + elif itest.s x7D == "x${cpu}" ; then + dtbname=imx7d-${board}${m4}.dtb; else dtbname=imx6q-${board}.dtb; fi @@ -47,10 +52,6 @@ else exit; fi -# first enable tfp410 -i2c dev 1 -i2c mw 38 8.1 bd - cmd_xxx_present= fdt resize if itest.s "x" != "x${cmd_custom}" ; then diff --git a/board/boundarydevices/nitrogen6x/6x_upgrade.txt b/board/boundarydevices/nitrogen6x/6x_upgrade.txt index 9715f16..e012ff9 100644 --- a/board/boundarydevices/nitrogen6x/6x_upgrade.txt +++ b/board/boundarydevices/nitrogen6x/6x_upgrade.txt @@ -7,7 +7,7 @@ offset=0x400 a_uImage1=0x12000000 a_uImage2=0x12400000 -if itest.s x6SX == "x$cpu" ; then +if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then a_uImage1=0x82000000 a_uImage2=0x82400000 fi