From patchwork Fri Apr 8 04:47:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 90257 X-Patchwork-Delegate: wd@denx.de 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 5442BB6F84 for ; Fri, 8 Apr 2011 14:48:02 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C19EE2809F; Fri, 8 Apr 2011 06:48:00 +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 uOWvkwnn64IN; Fri, 8 Apr 2011 06:48:00 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D039228093; Fri, 8 Apr 2011 06:47:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2BAFF28093 for ; Fri, 8 Apr 2011 06:47:56 +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 xup2bjfsk9VO for ; Fri, 8 Apr 2011 06:47:54 +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 smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by theia.denx.de (Postfix) with ESMTPS id 04FD328091 for ; Fri, 8 Apr 2011 06:47:51 +0200 (CEST) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id E45001B401D; Fri, 8 Apr 2011 04:47:49 +0000 (UTC) From: Mike Frysinger To: Wolfgang Denk Date: Fri, 8 Apr 2011 00:47:50 -0400 Message-Id: <1302238070-32427-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1301821121-26743-1-git-send-email-vapier@gentoo.org> References: <1301821121-26743-1-git-send-email-vapier@gentoo.org> Cc: u-boot@lists.denx.de Subject: [U-Boot] Pull request u-boot-blackfin.git 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The following changes since commit 4db2fa7f9446d0f2fe8db3d62184b1212fe22707: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2011-04-05 12:24:20 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-blackfin.git master Andreas Schallenberg (1): Blackfin: dnp5370: new board port Chong Huang (1): Blackfin: bf525-ucr2: new board port Cliff Cai (1): Blackfin: bfin_sdh: set all timer bits before transfer Kyle Moffett (1): Blackfin: replace "bfin_reset_or_hang()" with "panic()" Mike Frysinger (29): Blackfin: bf518f-ezbrd: don't require SPI logic all the time Blackfin: skip RAM display for 0 mem systems Blackfin: drop CONFIG_SYS_TEXT_BASE from boards Blackfin: unify bootmode based LDR_FLAGS setup Blackfin: move CONFIG_BFIN_CPU back to board config.h Blackfin: bf527-sdp: update custom CFLAGS paths Blackfin: bf537-pnav/blackstamp/blackvme: drop empty config.mk files Blackfin: serial: clean up muxing a bit Blackfin: bf537-minotaur/bf537-srv1: undefine nfs when net is disabled Blackfin: bf537: fix L1 data defines Blackfin: bf561-ezkit/ibf-dsp561: invert env offset/addr logic Blackfin: fix bd_t handling Blackfin: BF50x: new processor port Blackfin: drop duplicate system mmr and L1 scratch defines Blackfin: BF52x: unify duplicated headers Blackfin: BF537: unify duplicated headers Blackfin: only check for os log when we have external memory Blackfin: turn off caches when self initializing Blackfin: default to L1 bank A when L1 bank B does not exist Blackfin: bf506f-ezkit: new board port Blackfin: adi boards: drop old ELF define Blackfin: bootrom.h: sync with toolchain Blackfin: bootldr: use common defines Blackfin: ldrinfo: new command Blackfin: adi boards: enable ldrinfo Blackfin: adi boards: enable CONFIG_MONITOR_IS_IN_RAM Blackfin: bf548-ezkit: move env sector Blackfin: bf518f-ezbrd: get MAC from flash Blackfin: bf526-ezbrd: get MAC from flash Sonic Zhang (1): Blackfin: bfin_sdh: add support for multiblock operations MAINTAINERS | 10 + README | 1 + arch/blackfin/config.mk | 15 +- arch/blackfin/cpu/cpu.h | 1 - arch/blackfin/cpu/gpio.c | 8 +- arch/blackfin/cpu/initcode.c | 25 +- arch/blackfin/cpu/reset.c | 18 +- arch/blackfin/cpu/serial.h | 72 +- arch/blackfin/cpu/start.S | 45 +- arch/blackfin/cpu/traps.c | 2 +- arch/blackfin/include/asm/blackfin_cdef.h | 6 + arch/blackfin/include/asm/blackfin_def.h | 10 + arch/blackfin/include/asm/config.h | 10 +- arch/blackfin/include/asm/mach-bf506/BF504_cdef.h | 1782 ++++++++++++++++++++ arch/blackfin/include/asm/mach-bf506/BF504_def.h | 944 +++++++++++ arch/blackfin/include/asm/mach-bf506/BF506_cdef.h | 11 + arch/blackfin/include/asm/mach-bf506/BF506_def.h | 11 + arch/blackfin/include/asm/mach-bf506/anomaly.h | 128 ++ arch/blackfin/include/asm/mach-bf506/def_local.h | 5 + arch/blackfin/include/asm/mach-bf506/gpio.h | 52 + arch/blackfin/include/asm/mach-bf506/portmux.h | 148 ++ arch/blackfin/include/asm/mach-bf506/ports.h | 59 + arch/blackfin/include/asm/mach-bf518/BF512_def.h | 6 - .../asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h | 994 ----------- .../asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h | 503 ------ arch/blackfin/include/asm/mach-bf527/BF522_cdef.h | 986 +++++++++++- arch/blackfin/include/asm/mach-bf527/BF522_def.h | 495 ++++++- arch/blackfin/include/asm/mach-bf527/BF524_cdef.h | 20 +- arch/blackfin/include/asm/mach-bf527/BF524_def.h | 12 +- arch/blackfin/include/asm/mach-bf527/BF526_cdef.h | 358 +---- arch/blackfin/include/asm/mach-bf527/BF526_def.h | 181 +-- arch/blackfin/include/asm/mach-bf533/BF531_def.h | 6 - arch/blackfin/include/asm/mach-bf533/BF532_def.h | 6 - arch/blackfin/include/asm/mach-bf533/BF533_def.h | 6 - .../asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h | 1624 ------------------ .../asm/mach-bf537/ADSP-EDN-BF534-extended_def.h | 819 --------- arch/blackfin/include/asm/mach-bf537/BF534_cdef.h | 1614 ++++++++++++++++++- arch/blackfin/include/asm/mach-bf537/BF534_def.h | 816 +++++++++- arch/blackfin/include/asm/mach-bf538/BF538_def.h | 6 - arch/blackfin/include/asm/mach-bf561/BF561_def.h | 7 +- .../include/asm/mach-common/bits/bootrom.h | 86 +- arch/blackfin/lib/board.c | 21 +- arch/blackfin/lib/u-boot.lds.S | 10 +- board/bct-brettl2/config.mk | 8 - .../config.mk => bf506f-ezkit/Makefile} | 34 +- board/bf506f-ezkit/bf506f-ezkit.c | 27 + board/bf518f-ezbrd/bf518f-ezbrd.c | 61 +- board/bf518f-ezbrd/config.mk | 8 - .../{blackstamp/config.mk => bf525-ucr2/Makefile} | 34 +- board/bf525-ucr2/bf525-ucr2.c | 16 + board/bf526-ezbrd/bf526-ezbrd.c | 29 +- board/bf526-ezbrd/config.mk | 8 - board/bf527-ad7160-eval/config.mk | 8 - board/bf527-ezkit/config.mk | 8 - board/bf527-sdp/config.mk | 10 +- board/bf533-ezkit/config.mk | 6 - board/bf533-stamp/config.mk | 6 - board/bf537-minotaur/config.mk | 8 +- board/bf537-srv1/config.mk | 8 +- board/bf537-stamp/config.mk | 6 - board/bf538f-ezkit/config.mk | 6 - board/bf548-ezkit/config.mk | 6 - board/bf561-acvilon/config.mk | 6 - board/bf561-ezkit/config.mk | 6 - board/cm-bf527/config.mk | 8 - board/cm-bf533/config.mk | 6 - board/cm-bf537e/config.mk | 6 - board/cm-bf537u/config.mk | 6 - board/cm-bf548/config.mk | 6 - board/cm-bf561/config.mk | 6 - board/{blackvme/config.mk => dnp5370/Makefile} | 36 +- board/dnp5370/dnp5370.c | 104 ++ board/ibf-dsp561/config.mk | 6 - board/ip04/config.mk | 6 - board/tcm-bf518/config.mk | 8 - board/tcm-bf537/config.mk | 6 - boards.cfg | 3 + common/Makefile | 1 + common/cmd_bootldr.c | 21 +- common/cmd_ldrinfo.c | 192 +++ doc/README.dnp5370 | 67 + drivers/mmc/bfin_sdh.c | 13 +- drivers/spi/bfin_spi.c | 2 + include/configs/bct-brettl2.h | 3 +- include/configs/bf506f-ezkit.h | 103 ++ include/configs/bf518f-ezbrd.h | 1 + include/configs/bf525-ucr2.h | 102 ++ include/configs/bf526-ezbrd.h | 1 + include/configs/bf527-ad7160-eval.h | 1 + include/configs/bf527-ezkit.h | 1 + include/configs/bf527-sdp.h | 1 + include/configs/bf533-ezkit.h | 1 + include/configs/bf533-stamp.h | 1 + include/configs/bf537-minotaur.h | 2 + include/configs/bf537-pnav.h | 1 + include/configs/bf537-srv1.h | 2 + include/configs/bf537-stamp.h | 1 + include/configs/bf538f-ezkit.h | 1 + include/configs/bf548-ezkit.h | 3 +- include/configs/bf561-acvilon.h | 3 +- include/configs/bf561-ezkit.h | 5 +- include/configs/bfin_adi_common.h | 3 +- include/configs/blackstamp.h | 1 + include/configs/blackvme.h | 3 +- include/configs/cm-bf527.h | 1 + include/configs/cm-bf533.h | 1 + include/configs/cm-bf537e.h | 1 + include/configs/cm-bf537u.h | 1 + include/configs/cm-bf548.h | 1 + include/configs/cm-bf561.h | 1 + include/configs/dnp5370.h | 128 ++ include/configs/ibf-dsp561.h | 5 +- include/configs/ip04.h | 1 + include/configs/tcm-bf518.h | 1 + include/configs/tcm-bf537.h | 1 + 115 files changed, 8203 insertions(+), 4930 deletions(-) create mode 100644 arch/blackfin/include/asm/mach-bf506/BF504_cdef.h create mode 100644 arch/blackfin/include/asm/mach-bf506/BF504_def.h create mode 100644 arch/blackfin/include/asm/mach-bf506/BF506_cdef.h create mode 100644 arch/blackfin/include/asm/mach-bf506/BF506_def.h create mode 100644 arch/blackfin/include/asm/mach-bf506/anomaly.h create mode 100644 arch/blackfin/include/asm/mach-bf506/def_local.h create mode 100644 arch/blackfin/include/asm/mach-bf506/gpio.h create mode 100644 arch/blackfin/include/asm/mach-bf506/portmux.h create mode 100644 arch/blackfin/include/asm/mach-bf506/ports.h delete mode 100644 arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h delete mode 100644 arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h delete mode 100644 arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h delete mode 100644 arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h rename board/{bf537-pnav/config.mk => bf506f-ezkit/Makefile} (57%) create mode 100644 board/bf506f-ezkit/bf506f-ezkit.c rename board/{blackstamp/config.mk => bf525-ucr2/Makefile} (57%) create mode 100644 board/bf525-ucr2/bf525-ucr2.c rename board/{blackvme/config.mk => dnp5370/Makefile} (54%) create mode 100644 board/dnp5370/dnp5370.c create mode 100644 common/cmd_ldrinfo.c create mode 100644 doc/README.dnp5370 create mode 100644 include/configs/bf506f-ezkit.h create mode 100644 include/configs/bf525-ucr2.h create mode 100644 include/configs/dnp5370.h