From patchwork Mon Mar 26 22:40:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 148840 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 0BFDCB6EEF for ; Tue, 27 Mar 2012 09:40:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BD521281A8; Tue, 27 Mar 2012 00:40:54 +0200 (CEST) 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 liHCvTIN6wi6; Tue, 27 Mar 2012 00:40:54 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BDA45281AB; Tue, 27 Mar 2012 00:40:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 37F3A281AB for ; Tue, 27 Mar 2012 00:40:51 +0200 (CEST) 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 J1myGIuKAPGm for ; Tue, 27 Mar 2012 00:40:49 +0200 (CEST) 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-ob0-f172.google.com (mail-ob0-f172.google.com [209.85.214.172]) by theia.denx.de (Postfix) with ESMTPS id 012C8281A8 for ; Tue, 27 Mar 2012 00:40:47 +0200 (CEST) Received: by obbtb4 with SMTP id tb4so5612395obb.3 for ; Mon, 26 Mar 2012 15:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:sender:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=Z/k34Wx83h1B6OozTmCwjo7JMVC+sRMsV/nkHTkZcqQ=; b=g1EkLeX83/pwzYHsxwlQ9me5cot7K1PVgbZlXKbtO9+ua3UYG+4yKgaTmajcIsp2yI BHz9XMfg5F1FsLDLwj3susNfCBp+Lrb3B3AuarErOweX8jYTgn7TUYHG5TKQGXMBdWit iuGj9/WPuoTM67dLaMAzArfuicr4cqH1YANhWSrcOCZ87XImtQ75N1/092WGV812HAoo MOVsUgwbEVafHDSHehzw0oQCLa6Z/QcA2lCcN8SDpJbEDzFft+XMfLjaFEv1iPitgKdH om6TRz+yr2VzNSFh+qCP9IecbrrLsU+wfXZO0FWpbfdIU6UmMX+KaXieOcoEnJW5xSPr xgIw== Received: by 10.60.8.103 with SMTP id q7mr28724124oea.61.1332801646015; Mon, 26 Mar 2012 15:40:46 -0700 (PDT) Received: from bill-the-cat (ip68-230-54-74.ph.ph.cox.net. [68.230.54.74]) by mx.google.com with ESMTPS id aj16sm2158397oec.4.2012.03.26.15.40.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 15:40:45 -0700 (PDT) Date: Mon, 26 Mar 2012 15:40:43 -0700 From: Tom Rini To: Albert Aribaud Message-ID: <20120326224043.GJ21518@bill-the-cat> MIME-Version: 1.0 User-Agent: Mutt/1.5.20 (2009-06-14) Cc: u-boot@lists.denx.de Subject: [U-Boot] Please pull u-boot-ti/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 Hello, I've resolved the conflict with the SPL Linux series. The following changes since commit cd207cde948ecf9ff50a0fa1ae2650f65579c9c9: Marek Vasut (1): IXP: Fix GPIO_INT_ACT_LOW_SET() are available in the git repository at: git://git.denx.de/u-boot-ti master Christian Riesch (1): calimain, enbw_cmc: Fix typo in comments Grazvydas Ignotas (1): twl4030: fix potential power supply handling issues Heiko Schocher (1): ARM: davinci: fixes for cam_enc_4xx board Simon Schwarz (8): Add cmd_spl command devkit8000: add config for spl command omap-common: Add NAND SPL linux booting devkit8000/spl: init GPMC for dm9000 in SPL omap-common/spl: Add linux boot to SPL omap/spl: change output of spl_parse_image_header devkit8000: Implement and activate direct OS boot arm: Add Prep subcommand support to bootm Stefano Babic (8): Add cache functions to SPL for armv7 OMAP3: SPL: do not call I2C init if no I2C is set. SPL: call cleanup_before_linux() before booting Linux OMAP3: twister: add support to boot Linux from SPL NAND: TI: fix warnings in omap_gpmc.c OMAP3: mt_ventoux: updated timing for FPGA OMAP3: mt_ventoux: sets its own mtdparts Davinci: ea20: use gpio framework to access gpios Tom Rini (1): cam_enc_4xx: Rename 'images' to 'imgs' jacopo mondi (1): omap3_spi: receive transmit mode arch/arm/cpu/armv7/Makefile | 2 - arch/arm/cpu/armv7/cpu.c | 2 + arch/arm/cpu/armv7/omap-common/spl.c | 46 ++++- arch/arm/cpu/armv7/omap-common/spl_nand.c | 47 ++++- arch/arm/cpu/armv7/omap3/board.c | 2 + arch/arm/include/asm/bootm.h | 26 +++ arch/arm/include/asm/omap_common.h | 2 + arch/arm/lib/Makefile | 5 +- arch/arm/lib/bootm.c | 349 +++++++++++++++-------------- board/ait/cam_enc_4xx/cam_enc_4xx.c | 103 +++++---- board/ait/cam_enc_4xx/config.mk | 7 + board/ait/cam_enc_4xx/u-boot-spl.lds | 2 +- board/davinci/ea20/ea20.c | 38 +--- board/enbw/enbw_cmc/enbw_cmc.c | 2 +- board/omicron/calimain/calimain.c | 2 +- board/technexion/twister/twister.c | 23 ++ board/teejet/mt_ventoux/mt_ventoux.h | 11 +- board/timll/devkit8000/devkit8000.c | 37 +++ common/Makefile | 1 + common/cmd_spl.c | 188 ++++++++++++++++ doc/README.commands.spl | 31 +++ drivers/mtd/nand/omap_gpmc.c | 14 +- drivers/power/twl4030.c | 18 ++- drivers/spi/omap3_spi.c | 66 +++++- drivers/spi/omap3_spi.h | 2 + include/cmd_spl.h | 31 +++ include/configs/cam_enc_4xx.h | 13 +- include/configs/devkit8000.h | 15 +- include/configs/ea20.h | 2 + include/configs/mt_ventoux.h | 10 + include/configs/twister.h | 12 + include/image.h | 2 + 32 files changed, 835 insertions(+), 276 deletions(-) create mode 100644 arch/arm/include/asm/bootm.h create mode 100644 common/cmd_spl.c create mode 100644 doc/README.commands.spl create mode 100644 include/cmd_spl.h