From patchwork Tue May 14 06:20:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sonic Zhang X-Patchwork-Id: 243614 X-Patchwork-Delegate: trini@ti.com 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 2336D2C00B3 for ; Tue, 14 May 2013 16:21:04 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 88C4D4A0B5; Tue, 14 May 2013 08:21:02 +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 tNcQctHiKSoj; Tue, 14 May 2013 08:21:02 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A55674A092; Tue, 14 May 2013 08:21:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AA8E64A0A6 for ; Tue, 14 May 2013 08:20:58 +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 HdGxsECGNEzn for ; Tue, 14 May 2013 08:20:53 +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-f170.google.com (mail-ob0-f170.google.com [209.85.214.170]) by theia.denx.de (Postfix) with ESMTPS id 27F894A0A2 for ; Tue, 14 May 2013 08:20:47 +0200 (CEST) Received: by mail-ob0-f170.google.com with SMTP id er7so159556obc.29 for ; Mon, 13 May 2013 23:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=noOICIZZUigIcFUV5W7QgFamaxwHij5wbKWJPPgettQ=; b=qGuaCtUEh86zKRXOAmz274Jk68sbKS8hrGAImDd7ASn4F2QpA2Y6mcFRYivTy4hTHq sYCevRO07GXnyiUidR+Agb7bP/KX7P4Yg+5cqN8bWcvrZEvwWJYM0gWyNYM/ve0CHh5u dDKEp/teDvHIx8yzwu3XPocUW/UJhUgsHcw/T902KQFJdEOpNvftiF8T0/ITnmUxnjJ5 vuDQ112lAScSTqJPxOyyNO/GthuHkElhfE2LmK++rNO4RouHTkE+6ldQjSorgxAcy1IR 9dNF8JeRCtw4O+qASt2c1lb1pKsUELwkVuvNnZpFG2ENRLe0i4n5uwWFEe+6qgrxg3Ud Tv7g== MIME-Version: 1.0 X-Received: by 10.60.34.69 with SMTP id x5mr15450615oei.110.1368512446469; Mon, 13 May 2013 23:20:46 -0700 (PDT) Received: by 10.182.116.161 with HTTP; Mon, 13 May 2013 23:20:46 -0700 (PDT) Date: Tue, 14 May 2013 14:20:46 +0800 Message-ID: From: Sonic Zhang To: Tom Rini Cc: u-boot-devel@blackfin.uclinux.org, U-Boot Subject: [U-Boot] Pull request v2: u-boot-blackfin 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 Tom, Please pull the following patches from u-boot-blackfin into your tree. In this second pull request: - CONFIG_CMD_SOFTSWITCH document is added to the README file. - The tools/patman folder is synced with upstream master. - 3 missing patches were sent to the mailing list. Thanks The following changes since commit bbd0f7e3ba66d288a2f146f1c7797801e04598ae: Move FDT_RAMDISK_OVERHEAD from fdt.h to libfdt_env.h (2013-05-10 19:04:50 -0400) are available in the git repository at: git://git.denx.de/u-boot-blackfin.git master for you to fetch changes up to da34aae5fba36c1f1989fdd41fffa723f300eaad: bfin: Move gpio support for bf54x and bf60x into the generic driver folder. (2013-05-13 16:30:27 +0800) ---------------------------------------------------------------- Bob Liu (3): blackfin: reduce size of u-boot.ldr in bf548-ezkit default config. blackfin: add baudrate to bdinfo blackfin: bf609: add softswitch config command Marek Vasut (1): blackfin: The buf variable in bfin_mac.c is not used and produces warning, Mike Frysinger (1): Blackfin: adjust asm constraints with NMI workaround Scott Jiang (3): bfin: Remove spi dma function in bf5xx. bfin: discard invalid data and clear RXS in bf5xx spi driver bf609: add SPI register base address Sonic Zhang (14): blackfin: Change the member's type in dma structures. blackfin: limit the max memory dma peripheral transfer size to 4 bytes. blackfin: run core1 from L1 code sram start address in uboot init code on core 0 blackfin: Set correct early debug serial baudrate. blackfin: Correct early serial mess output in BYPASS boot mode. blackfin: bf609: implement soft switch blackfin: Fit u-boot image size into limited nor flash on blackfin. blackfin: Enable early print via the generic serial API. blackfin: Add memory virtual console to blackfin serial driver. blackfin: Uart divisor should be set after their values are generated. blackfin: Move blackfin watchdog driver out of the blackfin arch folder. blackfin: Move blackfin serial driver out of blackfin arch folder. blackfin: Add comments for watchdog event initialization. bfin: Move gpio support for bf54x and bf60x into the generic driver folder. README | 1 + arch/blackfin/cpu/Makefile | 4 +- arch/blackfin/cpu/cpu.c | 32 +- arch/blackfin/cpu/gpio.c | 145 +------ arch/blackfin/cpu/initcode.c | 71 ++-- arch/blackfin/cpu/start.S | 29 +- arch/blackfin/include/asm/clock.h | 78 ++++ arch/blackfin/include/asm/dma.h | 24 +- arch/blackfin/include/asm/gpio.h | 62 +-- arch/blackfin/include/asm/mach-bf561/BF561_def.h | 2 + arch/blackfin/include/asm/mach-bf609/BF609_def.h | 5 + arch/blackfin/include/asm/portmux.h | 5 - arch/blackfin/{cpu => include/asm}/serial.h | 23 +- arch/blackfin/{cpu => include/asm}/serial1.h | 48 +-- arch/blackfin/{cpu => include/asm}/serial4.h | 27 +- arch/blackfin/include/asm/soft_switch.h | 18 + arch/blackfin/lib/board.c | 6 +- arch/blackfin/lib/clocks.c | 12 +- arch/blackfin/lib/string.c | 9 +- board/bf609-ezkit/soft_switch.c | 171 ++++++++ board/bf609-ezkit/soft_switch.h | 80 ++++ common/Makefile | 1 + common/cmd_softswitch.c | 41 ++ doc/README.watchdog | 3 + drivers/gpio/Makefile | 1 + drivers/gpio/adi_gpio2.c | 440 +++++++++++++++++++++ drivers/net/bfin_mac.c | 2 - drivers/serial/Makefile | 1 + .../cpu/serial.c => drivers/serial/serial_bfin.c | 110 ++++-- drivers/spi/bfin_spi.c | 105 +---- drivers/watchdog/Makefile | 1 + .../cpu/watchdog.c => drivers/watchdog/bfin_wdt.c | 7 +- include/configs/bf527-ezkit.h | 12 +- include/configs/bf537-stamp.h | 10 +- include/configs/bf548-ezkit.h | 25 +- include/configs/bf561-ezkit.h | 5 + include/configs/bf609-ezkit.h | 10 + include/configs/bfin_adi_common.h | 14 +- include/watchdog.h | 3 +- 39 files changed, 1164 insertions(+), 479 deletions(-) create mode 100644 arch/blackfin/include/asm/clock.h rename arch/blackfin/{cpu => include/asm}/serial.h (82%) rename arch/blackfin/{cpu => include/asm}/serial1.h (94%) rename arch/blackfin/{cpu => include/asm}/serial4.h (86%) create mode 100644 arch/blackfin/include/asm/soft_switch.h create mode 100644 board/bf609-ezkit/soft_switch.c create mode 100644 board/bf609-ezkit/soft_switch.h create mode 100644 common/cmd_softswitch.c create mode 100644 drivers/gpio/adi_gpio2.c rename arch/blackfin/cpu/serial.c => drivers/serial/serial_bfin.c (79%) rename arch/blackfin/cpu/watchdog.c => drivers/watchdog/bfin_wdt.c (64%)