summaryrefslogtreecommitdiffstats
path: root/board
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://git.denx.de/u-boot-microblazeWolfgang Denk2011-10-281-0/+6
|\ | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-microblaze: microblaze: Fix strict-aliasing rules for in_be32 microblaze: Wire up axi_ethernet driver initialization
| * microblaze: Wire up axi_ethernet driver initializationMichal Simek2011-10-241-0/+6
| | | | | | | | | | | | Initialize axi_ethernet driver. Signed-off-by: Michal Simek <monstr@monstr.eu>
* | GCC4.6: Remove debugX() usage from spc1920 hpiMarek Vasut2011-10-271-34/+34
| | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | GCC4.6: Add macros to mv_gen_reg.hMarek Vasut2011-10-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interrupts.c: In function 'interrupt_init_cpu': interrupts.c:40: error: 'ETHERNET0_INTERRUPT_CAUSE_REGISTER' undeclared (first use in this function) interrupts.c:40: error: (Each undeclared identifier is reported only once interrupts.c:40: error: for each function it appears in.) interrupts.c:40: error: 'ETHERNET1_INTERRUPT_CAUSE_REGISTER' undeclared (first use in this function) interrupts.c:40: error: 'ETHERNET2_INTERRUPT_CAUSE_REGISTER' undeclared (first use in this function) interrupts.c:44: error: 'ETHERNET0_INTERRUPT_MASK_REGISTER' undeclared (first use in this function) interrupts.c:44: error: 'ETHERNET1_INTERRUPT_MASK_REGISTER' undeclared (first use in this function) interrupts.c:44: error: 'ETHERNET2_INTERRUPT_MASK_REGISTER' undeclared (first use in this function) Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | GCC4.6: Squash error in cpc45/pd67290.cMarek Vasut2011-10-271-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | pd67290.c: In function 'cirrus_set_opts': pd67290.c:282: error: 'buf' undeclared (first use in this function) pd67290.c:282: error: (Each undeclared identifier is reported only once pd67290.c:282: error: for each function it appears in.) Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | GCC4.6: Squash warnings in PPChameleonEVB/flash.cMarek Vasut2011-10-271-1/+2
| | | | | | | | | | | | | | | | flash.c: In function 'flash_init': flash.c:54: warning: format '%08X' expects type 'unsigned int', but argument 4 has type 'struct flash_info_t *' Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
* | GCC4.6: Squash warnings in r360mpi/flash.cMarek Vasut2011-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | flash.c: In function 'flash_get_size': flash.c:222: warning: format '%08lx' expects type 'long unsigned int', but argument 3 has type 'int' flash.c:238: warning: format '%08lx' expects type 'long unsigned int', but argument 3 has type 'int' Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | GCC4.6: Squash warnings in pmc405de.cMarek Vasut2011-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | pmc405de.c: In function 'do_painit': pmc405de.c:444: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'phys_size_t' Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | GCC4.6: Squash warning in cmd_pmc440.cMarek Vasut2011-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | cmd_pmc440.c: In function 'do_painit': cmd_pmc440.c:371: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'phys_size_t' Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | GCC4.6: Squash warnings in tqm834x.cMarek Vasut2011-10-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tqm834x.c: In function 'initdram': tqm834x.c:126: warning: format '%d' expects type 'int', but argument 3 has type 'long int' tqm834x.c: In function 'set_cs_bounds': tqm834x.c:336: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'long int' tqm834x.c:336: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long int' tqm834x.c: In function 'set_cs_config': tqm834x.c:354: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'long int' Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | GCC4.6: Squash warnings in mpc8610hpcd.cMarek Vasut2011-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | mpc8610hpcd.c: In function 'misc_init_r': mpc8610hpcd.c:79: warning: format '%02lx' expects type 'long unsigned int', but argument 2 has type 'int' mpc8610hpcd.c:86: warning: format '%02lx' expects type 'long unsigned int', but argument 2 has type 'int' Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | GCC4.6: Squash warnings in diu.cMarek Vasut2011-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | diu.c: In function 'diu_set_pixel_clock': diu.c:77: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'u32' Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | GCC4.6: Squash warning in mpc5121ads.cMarek Vasut2011-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | mpc5121ads.c: In function 'misc_init_r': mpc5121ads.c:256: warning: format '%02lx' expects type 'long unsigned int', but argument 2 has type 'int' mpc5121ads.c:263: warning: format '%02lx' expects type 'long unsigned int', but argument 2 has type 'int' Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Mike Frysinger <vapier@gentoo.org>
* | cosmetic: s/BOARD_LATE_INIT/CONFIG_BOARD_LATE_INITHelmut Raiger2011-10-274-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | This renames BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT. Along the way it removes some leftover #define BOARD_LATE_INIT 1 and adds some basic documentation for board specific callbacks in README. Signed-off-by: Helmut Raiger <helmut.raiger@hale.at> Acked-by: Stefano Babic <sbabic@denx.de>
* | net: tftpput: Rename TFTP to TFTPGETSimon Glass2011-10-262-2/+2
| | | | | | | | | | | | | | | | This is a better name for this protocol. Also remove the typedef to keep checkpatch happy, and move zeroing of NetBootFileXferSize a little earlier since TFTPPUT will need to change this. Signed-off-by: Simon Glass <sjg@chromium.org>
* | altera_tse: Add support for dedicated descriptor memoryJoachim Foerster2011-10-261-1/+9
| | | | | | | | Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
* | Revert "km_arm: enable POST for these boards"Wolfgang Denk2011-10-241-32/+0
|/ | | | | | | | | This reverts commit a2da616311151ecfab8b8fcc510686fc3c0c9a21. THis was applied by accident - a more recent version of this change was already present, see commit 9400f8f 2011-10-05 22:03:11 +0200 km_arm: enable POST for these boards Signed-off-by: Wolfgang Denk <wd@denx.de>
* net: xilinx_enet: drop unused !NET_MULTI driverMike Frysinger2011-10-2310-4957/+0
| | | | | | | This driver doesn't support the NET_MULTI framework, and I can't find any boards/configs/files that reference this subdir, so punt it all. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* net: emaclite: Move RX/TX ping pong initialization toMichal Simek2011-10-231-6/+12
| | | | | | Init RX/TX ping pong directly from board not in the driver. Signed-off-by: Michal Simek <monstr@monstr.eu>
* MPC85xx: remove broken "mpq101" boardWolfgang Denk2011-10-235-442/+0
| | | | | | | | | | | The board stopped building some time ago, and the board maintainer agrtees to drop it - see http://article.gmane.org/gmane.comp.boot-loaders.u-boot/112674 Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Alex Dubov <oakad@yahoo.com> Cc: Andy Fleming <afleming@gmail.com> Cc: Kumar Gala <galak@kernel.crashing.org>
* build: add missing $(AR)->$(cmd_link_o_target) updateMike Frysinger2011-10-2213-13/+13
| | | | | | | | | Seems people fixed their files to use libfoo.o, but didn't actually update the creation targets to use $(cmd_link_o_target). Update the rest of the Makefile's found with grep. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Tested-by: Simon Glass <sjg@chromium.org>
* consolidate mdelay by providing a common function for all usersAnatolij Gustschin2011-10-224-12/+0
| | | | | | | | | There are several mdelay() definitions in the driver and board code. Remove them all and provide a common mdelay() in lib/time.c. Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
* adp-ag101: add board adp-ag101 supportMacpaul Lin2011-10-222-0/+133
| | | | | | | | Add evaluation board "adp-ag101" configuration file adp-ag101.h. Add adp-ag101.c board config and related settings. Add board adp-ag101 into boards.cfg Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* km/common: remove obsolete header fileHolger Brunck2011-10-221-4/+0
| | | | | | | | This header is unneeded due to code which was removed in the past. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Wolfgang Denk <wd@denx.de>
* km/common: fix ramfs development targetAndreas Huber2011-10-223-5/+17
| | | | | | | | | | Calucations of PRAM needs to take into account the 'rootfssize'. Memory available to the linux kernel 'mem=' is in all cases set to the total memory size minus the pram size. Signed-off-by: Andreas Huber <andreas.huber@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Wolfgang Denk <wd@denx.de>
* km/common: force set ethaddr only for KM kirkwood boardsHolger Brunck2011-10-221-0/+5
| | | | | | | | This prevents u-boot to print out "Can't overwrite "ethaddr"" each time a powerpc board starts. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Wolfgang Denk <wd@denx.de>
* km_arm: enable POST for these boardsValentin Longchamp2011-10-221-0/+32
| | | | | | | | | | | | The current km_arm boards have a Power-On test jumper. When this jumper is set, this triggers some Power-On tests on the board. This patch enables the support of this jumper for starting the memory_regions test when the jumper is set. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Cc: Prafulla Wadaskar <prafulla@marvell.com>
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2011-10-213-56/+56
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-mpc85xx: mpc85xx: Add inline GPIO acessor functions powerpc/85xx: wait for alignment before resetting SERDES RX lanes (SERDES9) powerpc/85xx: Fix P2020DS booting powerpc/85xx: Update USB device tree status based on pin settings fdt: Add new fdt_set_node_status & fdt_set_status_by_alias helpers powerpc/85xx: Add support for RMan LIODN initialization powerpc/85xx: Update device tree handling for SRIO powerpc/85xx: Update setting of SRIO LIODNs fm: Don't allow disabling of FM1-DTSEC1 fm-eth: Don't mark the MAC we use for MDIO as disabled in device tree
| * powerpc/85xx: wait for alignment before resetting SERDES RX lanes (SERDES9)Timur Tabi2011-10-201-8/+30
| | | | | | | | | | | | | | | | The work-around for P4080 erratum SERDES9 says that the SERDES receiver lanes should be reset after the XAUI starts tranmitting alignment signals. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Fix P2020DS bootingKumar Gala2011-10-181-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | The following commit removed the code that set odt_rd_cfg and odt_wr_cfg. With out this code P2020DS board will not boot: commit 712cf7ab0b58e51a69e339397457d3591b6b650e Author: York Sun <yorksun@freescale.com> Date: Mon Oct 3 09:19:53 2011 -0700 powerpc/mpc8xxx: Merge entries in DDR speed table Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * fdt: Add new fdt_set_node_status & fdt_set_status_by_alias helpersShengzhou Liu2011-10-182-48/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add common function fdt_set_node_status() to assist in various locations that we set a nodes status. This function utilizes the status values that are part of the EPAPR spec (on power.org). fdt_set_status_by_alias() is based on fdt_set_node_status() but uses an alias string to identify the node to update. We also add some shortcut functions to help the common cases of setting "okay" and "disabled": fdt_status_okay() fdt_status_disabled() fdt_status_okay_by_alias() fdt_status_disabled_by_alias() Finally, we fixup the corenet_ds ethernet code which previously had a function by the same name that can be replaced with the new helpers. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Gerald Van Baren <vanbaren@cideas.com>
* | ColdFire: Fix compilation with CONFIG_SYS_DRAMSZ1 definedstany MARCEL2011-10-191-0/+3
| | | | | | | | | | | | | | A temp variable was used but not declared, with CONFIG_SYS_DRAMSZ1 defined. This variable is now declared in the functione when needed. Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
* | ColdFire: Merge differentiated linking files into a sigle one by boardstany MARCEL2011-10-199-565/+0
| | | | | | | | | | | | | | | | The spa, stm, int, 32 and 16 linking files are identical so there is no need to differentiate them. A single lds file is now used, and _config rule are simplified. Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
* | ColdFire: Cleanup lds files for multiple defined symbolsstany MARCEL2011-10-1912-685/+149
|/ | | | | | | | | Lds files cleened to remove multiple defined section and modified to be compliant with --gc-sections added for ColdFire platform in a previous patch. Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* sandbox: Add sandbox boardSimon Glass2011-10-172-0/+91
| | | | | | | This adds basic files for the sandbox board. The lds file is very simple since we can rely mostly on the linker defaults. Signed-off-by: Simon Glass <sjg@chromium.org>
* Replace space and tab checks with isblankJason Hobbs2011-10-171-4/+5
| | | | | | | These are various places I found that checked for conditions equivalent to isblank. Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
* MX5: Make IPU display output and pixel format configurableMarek Vasut2011-10-171-3/+3
| | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Stefano Babic <sbabic@denx.de> Tested-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Anatolij Gustschin <agust@denx.de>
* VIDEO: MX5: Switch MX5 to CONFIG_VIDEOStefano Babic2011-10-171-15/+21
| | | | | | | | | | | | | | | | | The framebuffer driver for MX5 is based on CONFIG_LCD. In the current implementation, there is a serious bug because the required memory is allocated before relocation, but the driver knows only later which is the resolution of the display. The patch switches the driver to CONFIG_VIDEO and the memory is allocated by the driver itself. We also need to switch the vision2 board code and config file in the same commit so that this commit will be bisectable. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Anatolij Gustschin <agust@denx.de> Tested-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Anatolij Gustschin <agust@denx.de>
* punt unused clean/distclean targetsMike Frysinger2011-10-15381-2290/+0
| | | | | | | | | | The top level Makefile does not do any recursion into subdirs when cleaning, so these clean/distclean targets in random arch/board dirs never get used. Punt them all. MAKEALL didn't report any errors related to this that I could see. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* powerpc/mpc8548cds: Code cleanup and refactoringchenhui zhao2011-10-133-65/+38
| | | | | | | | | | | | - Rework tlb and law tables. - PCI2 is not available on MPC8548CDS, so remove it. - Move the memory map to the board config file. - Rewrite the board info according to the manual. - Remove unnecessary macros and redefine some macros to align with other boards. - Fix some typos. Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Merge branch 'master' of git://git.denx.de/u-boot-mipsWolfgang Denk2011-10-124-0/+241
|\ | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-mips: MIPS: Jz4740: Add qi_lb60 board support MIPS: Jz4740: Add NAND driver MIPS: Ingenic XBurst Jz4740 processor support
| * MIPS: Jz4740: Add qi_lb60 board supportXiangfu Liu2011-10-124-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the qi_lb60 (a.k.a QI Ben NanoNote) clamshell device from Qi hardware: http://en.qi-hardware.com/wiki/Ben_NanoNote http://en.qi-hardware.com/wiki/Main_Page http://en.wikipedia.org/wiki/Qi_hardware This Jz4740-based clamshell device does not use NOR flash to boot. The initial bring-up assumes that U-Boot is directly loaded into SDRAM using USB boot tool, and starts from 0x80100000. About USB boot tool ------------------- Jz4740 is one of the XBurst processors with USB boot functionality supported. The CPU can boot from a small ROM in the LSI, initialize CPU and USB module, then wait for USB commands from the USB host. We can send 8 KB binary data to the CPU cache using USB boot tool. USB boot tool is available to the public at Ingenic website. Also there is an alternative Debian package named xburst-tools. Signed-off-by: Xiangfu Liu <xiangfu@openmobilefree.net> Acked-by: Daniel <zpxu@ingenic.cn> Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* | powerpc/mpc8536ds: Invert SDHC_WP pin polarityXie Xiaobo2011-10-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | MPC8536 Rev 1.0 silicon have NMG_eSDHC118 erratum, so that the SDHC write protected pin polarity does not follow the SD card standard in MPC8536 Rev 1.0 silicon. The MPC8536DS board invert the SDHC_WP pin as a workaround. However, this silicon erratum has been fixed in Rev 1.1, So need invert the SDHC_WP polarity again when use the MPC8536 Rev1.1 and greater on MPC8536DS board. Signed-off-by: Xie Xiaobo <r63061@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | powerpc/mpc8536ds: Add eSPI support for MPC8536DSXie Xiaobo2011-10-091-4/+2
| | | | | | | | | | | | | | | | | | | | 1. The SD_DATA[4:7] signals are shared with the SPI chip selects on 8536DS, so don't set MPC85xx_PMUXCR_SD_DATA that config eSDHC data bus-width to 4-bit and enable SPI signals. 2. Add eSPI controller and SPI-FLASH definition. Signed-off-by: Xie Xiaobo <r63061@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | powerpc/mpc8xxx: Merge entries in DDR speed tableYork Sun2011-10-097-460/+472
|/ | | | | | | | | | | | | | | It is not necessary to keep multiple entries for the same setting in DDR speed tables. Merge them for smaller tables. Also restructure the tables for smaller size. Cleanup some typedefs. Enforce strict checking for speed table. If DIMM is running at higher than known speed, try to use the highest speed setting. If rank is unknown, it has to panic. Removed ODT overriding for P2020DS as it is not necessary. Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* net: drop !NET_MULTI codeMike Frysinger2011-10-055-9/+1
| | | | | | | | | | | This is long over due. All but two net drivers have been converted, but those have now been dropped. The only thing left to do is actually delete all references to NET_MULTI and code that is compiled when that is not defined. So here we scrub the core code. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* km_arm: enable POST for these boardsValentin Longchamp2011-10-051-0/+33
| | | | | | | | | | | | The current km_arm boards have a Power-On test jumper. When this jumper is set, this triggers some Power-On tests on the board. This patch enables the support of this jumper for starting the memory_regions test when the jumper is set. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Cc: Prafulla Wadaskar <prafulla@marvell.com>
* TQM8xx: make room for growing code size due to I/O accessor cleanupWolfgang Denk2011-10-052-136/+2
| | | | | | | | | | | | | Commit "PPC: Cleanup tqm8xx_pcmcia.c" will clean up the PCMCIA code to use I/O accessors instead of plain volatile pointer accesses. This will result in about 300 byte bigger code. Fix custom linker script to make room for this. While we are at it, drop unmaintained u-boot.lds.debug linker script. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Tested-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2011-10-041-35/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-nand-flash: PPC: Fix socrates NAND problem PPC: Fix fsl_upm.c by renaming nand handling functions NAND: Make page, erase, oob size available via cmd_nand mtd: eLBC NAND: remove elbc_fcm_ctrl->oob_poi NAND: Add -y option to nand scrub command NAND: Add nand read.raw and write.raw commands NAND: Really ignore bad blocks when scrubbing spl, nand: add 4bit HW ecc oob first nand_read_page function mxc_nand: fix a problem writing more than 32MB mxc_nand: fixed some typos (cosmetic) nand: increase chip_delay in mv kirkwood nand driver
| * PPC: Fix socrates NAND problemMarek Vasut2011-10-031-35/+35
| | | | | | | | | | | | | | | | | | nand.c:36: error: static declaration of 'nand_read_buf' follows non-static declaration /home/marex/u-boot/include/nand.h:139: error: previous declaration of 'nand_read_buf' was here Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
OpenPOWER on IntegriCloud