From patchwork Mon Sep 26 11:35:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 116405 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 72F17B6F72 for ; Mon, 26 Sep 2011 21:35:31 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 03E24282EA; Mon, 26 Sep 2011 13:35:29 +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 U8q5xFNfeWoi; Mon, 26 Sep 2011 13:35:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F393A28228; Mon, 26 Sep 2011 13:35:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AA45F28228 for ; Mon, 26 Sep 2011 13:35:23 +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 xmlY7nV6VBm9 for ; Mon, 26 Sep 2011 13:35:22 +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-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by theia.denx.de (Postfix) with ESMTP id 0CC4D281CF for ; Mon, 26 Sep 2011 13:35:20 +0200 (CEST) Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 1FC341824443; Mon, 26 Sep 2011 13:35:19 +0200 (CEST) X-Auth-Info: q8Ld5ZSqUX7HEnry8T6pkjTICc7q5ck35wJV0rrAVW8= Received: from [192.168.2.105] (unknown [88.149.182.160]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA id C155C1C0012F; Mon, 26 Sep 2011 13:35:19 +0200 (CEST) Message-ID: <4E806377.70701@denx.de> Date: Mon, 26 Sep 2011 13:35:19 +0200 From: Stefano Babic User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.21) Gecko/20110831 Lightning/1.0b2 Mnenhy/0.8.4 Thunderbird/3.1.13 MIME-Version: 1.0 To: albert.u.boot@aribaud.net X-Enigmail-Version: 1.1.2 Cc: U-Boot@lists.denx.de Subject: [U-Boot] Please pull u-boot-imx/next into arm/next X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 u-boot-imx/next (already rebased on u-boot-arm/next after you merged u-boot-ti) into your u-boot-arm/next. Best regards, Stefano The following changes since commit f3340eeaf574b3297e801a563089c90d23e84f8d: arm, davinci, da8xx: add cpuinfo (2011-09-23 15:50:39 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git next Fabio Estevam (25): ARM: mx25: Print the silicon revison ARM: mx25: Print the source of reset MX31: mx31pdk: Remove nand_spl config.mk file MX31: Improve readability for reset cause mx31pdk: Change the prompt as per other i.MX boards MX25: tx25: Avoid the usage of extern in C file MX25: Add initial support for MX25PDK MX31: Disable watchdog during low-power modes mx31pdk: Remove dram_init_banksize() mx25pdk: Remove dram_init_banksize() mx31ads: Remove dram_init_banksize() imx31_litekit: Remove dram_init_banksize() mx31pdk: Place machine ID into board config mx25pdk: Place machine ID into board config mx31ads: Place machine ID into board config imx31_litekit: Place machine ID into board config mx51evk: Place machine ID into board config mx53loco: Place machine ID into board config mx53smd: Place machine ID into board config mx53ard: Place machine ID into board config mx53evk: Place machine ID into board config zmx25: Remove dram_init_banksize() zmx25: Place machine ID into board config zmx25: Fix build warning due to 'get_reset_cause' defined but not used vision2: Place machine ID into board config Jason Liu (1): cosmetic: fsl_pmic: cosmetic for the help message Marek Vasut (19): EfikaMX: Adjust undocumented magic constant in config file FEC: Use proper accessor to read register in debug call FEC: Use defined constant instead of magic number FEC: Kill mode select FIXME's FEC: Add RMII mode support FEC: Allow selection of MII mode via CONFIG_FEC_XCV_TYPE FEC: Abstract access to fec->eth in MII operations FEC: Allow multiple FECes FEC: Allow registering MII postconfiguration callback FEC: Add timeout for chip reset FEC: Squish "got MAC from fuse" message, make it debug() FEC: Move imx_get_mac_from_fuse() definition to fec_mxc.h MX5: Modify the PLL decoding algorithm MX5: Add AHB clock reporting and fix IPG clock reporting MX5: Clean up the output of "clocks" command I2C: mxc_i2c rework ATA: Squash warnings in mxc_ata. EfikaMX: Add imximage config for Efika SB EfikaSB: Add preliminary EfikaSB support MAINTAINERS | 2 + arch/arm/cpu/arm1136/mx31/generic.c | 2 +- arch/arm/cpu/arm1136/mx31/timer.c | 4 +- arch/arm/cpu/arm926ejs/mx25/generic.c | 53 +++- arch/arm/cpu/armv7/mx5/clock.c | 114 +++++-- arch/arm/include/asm/arch-mx25/imx-regs.h | 4 +- arch/arm/include/asm/arch-mx25/sys_proto.h | 29 ++ arch/arm/include/asm/arch-mx27/imx-regs.h | 1 - arch/arm/include/asm/arch-mx31/imx-regs.h | 2 + arch/arm/include/asm/arch-mx35/imx-regs.h | 2 - arch/arm/include/asm/arch-mx5/crm_regs.h | 11 + arch/arm/include/asm/arch-mx5/imx-regs.h | 5 +- board/efikamx/efikamx.c | 124 ++++++-- board/efikamx/{imximage.cfg => imximage_mx.cfg} | 0 board/efikamx/{imximage.cfg => imximage_sb.cfg} | 26 +- board/freescale/mx25pdk/Makefile | 49 +++ board/freescale/mx25pdk/imximage.cfg | 73 ++++ board/freescale/mx25pdk/lowlevel_init.S | 21 ++ board/freescale/mx25pdk/mx25pdk.c | 56 +++ board/freescale/mx31ads/mx31ads.c | 7 - board/freescale/mx31pdk/mx31pdk.c | 7 - board/freescale/mx51evk/mx51evk.c | 1 - board/freescale/mx53ard/mx53ard.c | 1 - board/freescale/mx53evk/mx53evk.c | 1 - board/freescale/mx53loco/mx53loco.c | 1 - board/freescale/mx53smd/mx53smd.c | 1 - board/karo/tx25/tx25.c | 3 +- board/logicpd/imx31_litekit/imx31_litekit.c | 7 - board/syteco/zmx25/zmx25.c | 8 - board/ttcontrol/vision2/vision2.c | 1 - boards.cfg | 5 +- drivers/block/mxc_ata.c | 22 +- drivers/i2c/mxc_i2c.c | 422 ++++++++++++++++------- drivers/misc/fsl_pmic.c | 2 +- drivers/net/fec_mxc.c | 170 ++++++--- drivers/net/fec_mxc.h | 9 +- include/configs/efikamx.h | 6 +- include/configs/imx31_litekit.h | 4 +- include/configs/mx25pdk.h | 108 ++++++ include/configs/mx31ads.h | 2 + include/configs/mx31pdk.h | 4 +- include/configs/mx51evk.h | 1 + include/configs/mx53ard.h | 2 + include/configs/mx53evk.h | 2 + include/configs/mx53loco.h | 2 + include/configs/mx53smd.h | 4 +- include/configs/vision2.h | 2 + include/configs/zmx25.h | 1 + include/netdev.h | 7 +- nand_spl/board/freescale/mx31pdk/Makefile | 2 +- nand_spl/board/freescale/mx31pdk/config.mk | 1 - 51 files changed, 1073 insertions(+), 321 deletions(-) create mode 100644 arch/arm/include/asm/arch-mx25/sys_proto.h copy board/efikamx/{imximage.cfg => imximage_mx.cfg} (100%) rename board/efikamx/{imximage.cfg => imximage_sb.cfg} (90%) create mode 100644 board/freescale/mx25pdk/Makefile create mode 100644 board/freescale/mx25pdk/imximage.cfg create mode 100644 board/freescale/mx25pdk/lowlevel_init.S create mode 100644 board/freescale/mx25pdk/mx25pdk.c create mode 100644 include/configs/mx25pdk.h delete mode 100644 nand_spl/board/freescale/mx31pdk/config.mk