From patchwork Wed Apr 11 14:22:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 151802 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 151BAB7069 for ; Thu, 12 Apr 2012 00:22:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 88E9D28085; Wed, 11 Apr 2012 16:22:37 +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 MGhlDXJnNTty; Wed, 11 Apr 2012 16:22:37 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9A2182807D; Wed, 11 Apr 2012 16:22:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1E35A2807D for ; Wed, 11 Apr 2012 16:22:34 +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 3FvjsUds2P+h for ; Wed, 11 Apr 2012 16:22:32 +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 smtpi4.ngi.it (smtpi4.ngi.it [88.149.128.104]) by theia.denx.de (Postfix) with ESMTP id 645C428077 for ; Wed, 11 Apr 2012 16:22:30 +0200 (CEST) Received: from paperina.lan (unknown [88.149.182.160]) by smtpi4.ngi.it (Postfix) with ESMTP id 09F3042E48; Wed, 11 Apr 2012 16:22:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by paperina.lan (Postfix) with ESMTP id C750B140A105; Wed, 11 Apr 2012 16:22:29 +0200 (CEST) Received: from paperina.lan ([127.0.0.1]) by localhost (paperina.lan [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qsLrZ1eMnb2h; Wed, 11 Apr 2012 16:22:23 +0200 (CEST) Received: from [192.168.2.247] (papero.lan [192.168.2.247]) by paperina.lan (Postfix) with ESMTP id 1D138140A042; Wed, 11 Apr 2012 16:22:23 +0200 (CEST) Message-ID: <4F85939F.3010709@denx.de> Date: Wed, 11 Apr 2012 16:22:23 +0200 From: Stefano Babic User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-Version: 1.0 To: Albert ARIBAUD X-Enigmail-Version: 1.4 Cc: "U-Boot@lists.denx.de" Subject: [U-Boot] [GIT PULL] Pull request: u-boot-imx 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 Hi Albert, please pull from u-boot-imx. Note: I rebased on u-boot mainline, because I needed some patches for testing that were merged by Wolfgang, and I could not find in u-boot-arm. Let me know if this is a problem for you ;-) The following changes since commit 3f0675d1a532dbf1fd906103e4b61a6fb842c257: Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging (2012-04-09 21:34:27 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master Anatolij Gustschin (1): ARM1136: add cache flush and invalidate operations Eric Nelson (3): i.MX6: define CACHELINE_SIZE i.MX6: implement enable_caches() i.MX6: mx6qsabrelite: add cache commands if cache is enabled Fabio Estevam (4): mx28: Split the README into a common part and a m28 specific part mx28evk: Add a README file mx6qsabrelite: Add boot switch setting information into the README mx6qsabrelite: Fix the serial console port Marek Vasut (4): i.MX28: Fix initial stack pointer position i.MX28: Allow coexistence of PIO and DMA mode for SD/MMC DMA: Split the APBH DMA init into block and channel init M28: Pull out CONFIG_APBH_DMA so it's always enabled Stefano Babic (7): ARM: 926ejs: use debug() for misaligned addresses mx35: flea3: fix when cache functions are linked mx35: mx35pdk: fix when cache functions are linked MX31: mx31pdk: drop enable_caches from board file ARM: add u-boot.imx as target for i.MX SOCs ARM1136: MX35: Make asm routines volatile in cache ops MX35: mx35pdk: wrong board revision Troy Kisky (1): MX53: DDR: Fix ZQHWCTRL field TZQ_CS Vikram Narayanan (4): imx: Remove unneeded/repititive definitions from imx headers imx: Add GPIO_TO_PORT macro in the mxc_gpio driver imx: Use GPIO_TO_PORT macro in the gpio driver instead of (gpio >> 5) imx: Return gpio_set_value in gpio_direction_output arch/arm/cpu/arm1136/cpu.c | 103 ++++++++++++- arch/arm/cpu/arm926ejs/cache.c | 2 +- arch/arm/cpu/arm926ejs/mx28/mx28.c | 6 + arch/arm/cpu/armv7/config.mk | 3 + arch/arm/cpu/armv7/mx6/soc.c | 8 + arch/arm/include/asm/arch-mx28/dma.h | 4 +- arch/arm/include/asm/arch-mx35/mx35_pins.h | 2 - arch/arm/include/asm/arch-mx5/mx5x_pins.h | 2 - arch/arm/include/asm/arch-mx6/imx-regs.h | 4 +- board/freescale/mx31pdk/mx31pdk.c | 8 - board/freescale/mx35pdk/mx35pdk.c | 11 -- board/freescale/mx53ard/imximage_dd3.cfg | 2 +- board/freescale/mx53evk/imximage.cfg | 2 +- board/freescale/mx53loco/imximage.cfg | 2 +- board/freescale/mx53smd/imximage.cfg | 2 +- doc/README.m28 | 219 +-------------------------- doc/README.mx28_common | 226 ++++++++++++++++++++++++++++ doc/README.mx28evk | 29 ++++ doc/README.mx6qsabrelite | 3 +- drivers/dma/apbh_dma.c | 38 ++--- drivers/gpio/mxc_gpio.c | 12 +- drivers/mmc/mxsmmc.c | 53 +++++++- drivers/mtd/nand/mxs_nand.c | 11 +- include/configs/flea3.h | 2 + include/configs/m28evk.h | 8 +- include/configs/mx28evk.h | 2 +- include/configs/mx35pdk.h | 3 +- include/configs/mx6qarm2.h | 2 + include/configs/mx6qsabrelite.h | 8 +- 29 files changed, 492 insertions(+), 285 deletions(-) create mode 100644 doc/README.mx28_common create mode 100644 doc/README.mx28evk Stefano