From patchwork Mon Oct 29 23:49:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 195173 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id E9F302C009B for ; Tue, 30 Oct 2012 10:49:42 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 608494A425; Tue, 30 Oct 2012 00:49:40 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QNVXdQ+OSwzM; Tue, 30 Oct 2012 00:49:40 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 97D844A426; Tue, 30 Oct 2012 00:49:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1D0B64A426 for ; Tue, 30 Oct 2012 00:49:37 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p81YP+ciuvGx for ; Tue, 30 Oct 2012 00:49:36 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com [209.85.217.172]) by theia.denx.de (Postfix) with ESMTPS id 44DE04A425 for ; Tue, 30 Oct 2012 00:49:34 +0100 (CET) Received: by mail-lb0-f172.google.com with SMTP id k13so3814047lbo.3 for ; Mon, 29 Oct 2012 16:49:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=LvkrqPGCxUT2G+8SrsLFFfthMYzdy3MS5MyC1ZDVTqY=; b=aC31GLsruZbAz5uCblrQKUv2m3GYjwPunlAyrQ+vrIEgZN2pme2f6QOFtdbFz9tFhW cFLiKGGHbjumD7tjZ8Jy2gV42xYPrt71zcwsTd8A3nI95Eeb4zpVTUIFqJtvQ42QEmaK 14YXw9UV+5RgMHHLs0VONob7Q2eXzFNxxNWy5wa2dC295mPuD8RgJIM96Ce/yVvsZ0/s 31IYLZvuaR5QxkKphTaFAwPVrI8a13mdWVbSbDRtvyANtC9FPoYRRR4lgRBeDjsV81mX o4vtdF56z4Ne8uLeHZU1P6taxbG+pRQ/mPHVdzWjPjhR9tO00gSVzhGVjCJ7SkiVBLBm rvVg== MIME-Version: 1.0 Received: by 10.152.104.107 with SMTP id gd11mr28409817lab.25.1351554574091; Mon, 29 Oct 2012 16:49:34 -0700 (PDT) Received: by 10.114.29.103 with HTTP; Mon, 29 Oct 2012 16:49:34 -0700 (PDT) Date: Mon, 29 Oct 2012 16:49:34 -0700 Message-ID: From: Tom Warren To: Albert ARIBAUD Cc: Marek Vasut , Stephen Warren , u-boot@lists.denx.de, Tom Warren , Tom Rini Subject: [U-Boot] pull request for u-boot-tegra/master into ARM/master X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Albert, Please pull u-boot-tegra/master into ARM/master. Thanks! checkpatch is clean, and ./MAKEALL -a arm is clean (except for previous failures not created by these patches). Note that the serial: patch from Allen is already in u-boot/master, but is needed to get u-boot-tegra binaries to work correctly. The following changes since commit f04821a8ca714459481bd9fd315af2b5f92d99a6: Albert ARIBAUD (1): Merge remote-tracking branch 'u-boot-imx/master' are available in the git repository at: git://git.denx.de/u-boot-tegra master Allen Martin (5): SPL: make jump_to_image_no_args a weak symbol tegra: move to common SPL framework tegra20: initialize variable to avoid compiler warning serial: remove calls to serial_assign() arm720t: add back common.h include Lucas Stach (2): tegra: add Colibri T20 board support tegra: nand: make ONFI detection work Marc Dietrich (1): tegra: move common features to a common makefile Stephen Warren (10): ARM: tegra: define CONFIG_SYS_BOOTMAPSZ ARM: tegra: use standard variables to define load addresses ARM: tegra: Harmony: enable ULPI USB port ARM: tegra: Seaboard: enable multiple USB ports ARM: tegra: Whistler: remove unused USB alias ARM: enhance u-boot.lds to detect over-sized SPL ARM: tegra: derive CONFIG_SPL_MAX_SIZE instead of hard-coding it ARM: tegra: select between Seaboard/Ventana at compile time ARM: tegra: don't request GPIO from Seaboard's SPL ARM: tegra: combine duplicate Makefile rules MAINTAINERS | 4 + Makefile | 15 ++-- arch/arm/cpu/arm720t/interrupts.c | 2 + arch/arm/cpu/arm720t/tegra-common/spl.c | 91 +++----------------- arch/arm/cpu/tegra20-common/emc.c | 2 +- arch/arm/cpu/u-boot.lds | 4 + arch/arm/include/asm/arch-tegra20/spl.h | 28 ++++++ board/avionic-design/medcom-wide/Makefile | 6 +- board/avionic-design/plutux/Makefile | 6 +- board/avionic-design/tec/Makefile | 6 +- board/compal/paz00/Makefile | 6 +- board/compulab/trimslice/Makefile | 6 +- board/nvidia/common/Makefile | 4 +- board/nvidia/common/common.mk | 4 + board/nvidia/dts/tegra20-harmony.dts | 3 +- board/nvidia/dts/tegra20-whistler.dts | 5 +- board/nvidia/harmony/harmony.c | 9 ++ board/nvidia/seaboard/seaboard.c | 18 +--- .../colibri_t20-common/colibri_t20-common.c | 44 ++++++++++ .../colibri_t20-common/colibri_t20-common.h | 16 ++++ board/toradex/colibri_t20_iris/Makefile | 40 +++++++++ board/toradex/colibri_t20_iris/colibri_t20_iris.c | 46 ++++++++++ board/toradex/dts/tegra20-colibri_t20_iris.dts | 38 ++++++++ boards.cfg | 1 + common/cmd_nvedit.c | 3 - common/iomux.c | 10 -- common/spl/spl.c | 8 +- drivers/mtd/nand/tegra_nand.c | 36 ++++++++ include/configs/colibri_t20_iris.h | 83 ++++++++++++++++++ include/configs/harmony.h | 3 + include/configs/seaboard.h | 1 + include/configs/tegra-common-post.h | 32 ++++++- include/configs/tegra20-common.h | 10 ++- 33 files changed, 455 insertions(+), 135 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra20/spl.h create mode 100644 board/nvidia/common/common.mk create mode 100644 board/toradex/colibri_t20-common/colibri_t20-common.c create mode 100644 board/toradex/colibri_t20-common/colibri_t20-common.h create mode 100644 board/toradex/colibri_t20_iris/Makefile create mode 100644 board/toradex/colibri_t20_iris/colibri_t20_iris.c create mode 100644 board/toradex/dts/tegra20-colibri_t20_iris.dts create mode 100644 include/configs/colibri_t20_iris.h