platform/kernel/u-boot.git
13 years agoarm1136: Fix NAND boot
Fabio Estevam [Wed, 9 Feb 2011 01:17:54 +0000 (01:17 +0000)]
arm1136: Fix NAND boot

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
Tested-by: Magnus Lilja <lilja.magnus@gmail.com>
13 years agoarm: get_sp() should always be compiled
Po-Yu Chuang [Tue, 15 Feb 2011 22:54:35 +0000 (22:54 +0000)]
arm: get_sp() should always be compiled

get_sp() was incorrectly excluded if none of
  CONFIG_SETUP_MEMORY_TAGS
  CONFIG_CMDLINE_TAG
  CONFIG_INITRD_TAG
  CONFIG_SERIAL_TAG
  CONFIG_REVISION_TAG
were defined.

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
13 years agoPantheon: Add Board Support for Marvell dkb board
Lei Wen [Wed, 9 Feb 2011 12:47:47 +0000 (18:17 +0530)]
Pantheon: Add Board Support for Marvell dkb board

DKB is a Development Board for PANTHEON TD/TTC(pxa920/pxa910) with
* Processor upto 806Mhz
* LPDDR1/2
* x8/x16 SLC/MLC NAND
* Footprints for eMMC & MMC x8 card

With Peripherals:
* Parallel LCD I/F
* Audio codecs (88PM8607)
* MIPI CSI-2 camera
* Marvell 88W8787 802.11n/BT module
* Marvell 2G/3G RF
* Dual analog mics & speakers, headset jack, LED, ambient
* USB2.0 HS host, OTG (mini AB)
* GPIO, GPIO expander with DIP switches for easier selection
* UART serial over USB, CIR

This patch adds basic board support with DRAM and UART functionality

Signed-off-by: Lei Wen <leiwen@marvell.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
13 years agomvmfp: add MFP configuration support for PANTHEON
Lei Wen [Wed, 9 Feb 2011 12:36:58 +0000 (18:06 +0530)]
mvmfp: add MFP configuration support for PANTHEON

This patch adds the Multiple Function Pin configuration support for
Marvell PANTHEON SoCs

Signed-off-by: Lei Wen <leiwen@marvell.com>
13 years agoserial: add pantheon soc support
Lei Wen [Wed, 9 Feb 2011 12:36:58 +0000 (18:06 +0530)]
serial: add pantheon soc support

Signed-off-by: Lei Wen <leiwen@marvell.com>
13 years agoARM: Add Support for Marvell Pantheon Familiy SoCs
Lei Wen [Wed, 9 Feb 2011 12:36:58 +0000 (18:06 +0530)]
ARM: Add Support for Marvell Pantheon Familiy SoCs

Pantheon Family processors are highly integrated SoCs
based on Sheeva_88SV331x-v5 PJ1 cpu core.
Ref:
http://www.marvell.com/products/processors/communications/marvell_pantheon_910_920_pb.pdf

SoC versions Supported:
1) PANTHEON920          (TD)
2) PANTHEON910          (TTC)

Signed-off-by: Lei Wen <leiwen@marvell.com>
13 years agomv: seperate kirkwood and armada from common setting
Lei Wen [Wed, 9 Feb 2011 12:36:58 +0000 (18:06 +0530)]
mv: seperate kirkwood and armada from common setting

Since there are lots of difference between kirkwood and armada series,
it is better to seperate them but still keep the most common file
shared by all marvell platform in the mv-common configure file.

This patch move the kirkwood only driver definitoin in mv-common to
the <soc_name>/config.h.

This patch is tested with compilation for armada100 and guruplug.

Signed-off-by: Lei Wen <leiwen@marvell.com>
13 years agoARM: fix write*() I/O accessors
Wolfgang Denk [Fri, 11 Feb 2011 12:25:48 +0000 (12:25 +0000)]
ARM: fix write*() I/O accessors

Commit 3c0659b "ARM: Avoid compiler optimization for readb, writeb
and friends." introduced I/O accessors with memory barriers.
Unfortunately the new write*() accessors introduced a bug:

The problem is that the argument "v" gets evaluated twice.  This
breaks code like used here (from "drivers/net/dnet.c"):

for (i = 0; i < wrsz; i++)
writel(*bufp++, &dnet->regs->TX_DATA_FIFO);

Use auxiliary variables to avoid such problems.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Albert Aribaud <albert.aribaud@free.fr>
Cc: Alexander Holler <holler@ahsoftware.de>
Cc: Dirk Behme <dirk.behme@googlemail.com>
13 years agoarm relocation: Fix calculation of board_init_r
Alexander Stein [Thu, 3 Feb 2011 10:52:29 +0000 (10:52 +0000)]
arm relocation: Fix calculation of board_init_r

Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
13 years agoarm: Tegra2: Add support for NVIDIA Seaboard board
Tom Warren [Thu, 27 Jan 2011 10:58:08 +0000 (10:58 +0000)]
arm: Tegra2: Add support for NVIDIA Seaboard board

Signed-off-by: Tom Warren <twarren@nvidia.com>
13 years agoarm: Tegra2: Add support for NVIDIA Harmony board
Tom Warren [Thu, 27 Jan 2011 10:58:07 +0000 (10:58 +0000)]
arm: Tegra2: Add support for NVIDIA Harmony board

Signed-off-by: Tom Warren <twarren@nvidia.com>
13 years agoserial: Add Tegra2 serial port support
Tom Warren [Thu, 27 Jan 2011 10:58:06 +0000 (10:58 +0000)]
serial: Add Tegra2 serial port support

Signed-off-by: Tom Warren <twarren@nvidia.com>
13 years agoarm: Tegra2: Add basic NVIDIA Tegra2 SoC support
Tom Warren [Thu, 27 Jan 2011 10:58:05 +0000 (10:58 +0000)]
arm: Tegra2: Add basic NVIDIA Tegra2 SoC support

Signed-off-by: Tom Warren <twarren@nvidia.com>
13 years agomx31pdk: Make the full boot log visible
Fabio Estevam [Wed, 9 Feb 2011 01:17:56 +0000 (01:17 +0000)]
mx31pdk: Make the full boot log visible

Use board_early_init_f so that the full boot log output can be displayed.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
13 years agomx31pdk: Use the new relocation scheme
Fabio Estevam [Wed, 9 Feb 2011 01:17:55 +0000 (01:17 +0000)]
mx31pdk: Use the new relocation scheme

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
13 years agoEfikaMX: switch to MACH_TYPE_MX51_EFIKAMX
Loïc Minier [Thu, 3 Feb 2011 04:19:09 +0000 (04:19 +0000)]
EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

Upstream linux moved from MACH_TYPE_MX51_LANGE51 to
MACH_TYPE_MX51_EFIKAMX.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
13 years agoFix compile warning in net/eth.c
Remy Bohmer [Sat, 19 Feb 2011 19:15:14 +0000 (20:15 +0100)]
Fix compile warning in net/eth.c

Signed-off-by: Remy Bohmer <linux@bohmer.net>
13 years agoFix build warnings in cmd_flash.c
Remy Bohmer [Sat, 19 Feb 2011 18:56:28 +0000 (19:56 +0100)]
Fix build warnings in cmd_flash.c

These variables are only used in case CONFIG_SYS_NO_FLASH is NOT set:
struct mtd_device *dev;
struct part_info *part;
u8 dev_type, dev_num, pnum;

Signed-off-by: Remy Bohmer <linux@bohmer.net>
13 years agoUSB-RNDIS: Send RNDIS state on disconnecting
Vitaly Kuzmichev [Fri, 11 Feb 2011 15:18:35 +0000 (18:18 +0300)]
USB-RNDIS: Send RNDIS state on disconnecting

Add waiting for receiving Ethernet gadget state on the Windows host
side before dropping pullup, but keep it for debug.

Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
13 years agoUSB: Add USB RNDIS gadget protocol
Vitaly Kuzmichev [Fri, 11 Feb 2011 15:18:34 +0000 (18:18 +0300)]
USB: Add USB RNDIS gadget protocol

Port USB gadget RNDIS protocol support from linux-2.6.26
(.27 gadget stack actually has composite drivers).

Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
13 years agoUSB-CDC: Move struct declaration before its use
Vitaly Kuzmichev [Fri, 11 Feb 2011 15:18:33 +0000 (18:18 +0300)]
USB-CDC: Move struct declaration before its use

Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
13 years agoUSB-CDC: Port struct net_device_stats
Vitaly Kuzmichev [Fri, 11 Feb 2011 15:18:32 +0000 (18:18 +0300)]
USB-CDC: Port struct net_device_stats

Port struct net_device_stats and statistics collecting needed for
RNDIS protocol.

Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
13 years agoUSB-CDC: handle interrupt after dropped pullup
Vitaly Kuzmichev [Fri, 11 Feb 2011 15:18:31 +0000 (18:18 +0300)]
USB-CDC: handle interrupt after dropped pullup

Disconnecting USB gadget with pending interrupt may cause its wrong
handling in the next time when interface will be started again
(especially actual for RNDIS). This interrupt may force the gadget
to queue unexpected response before setup stage.
Despite the fact that such interrupt handled after dropped pullup
also may add pending response, this will not bring to any issues due to
usb_ep_disable (which clears the queue) called on gadget unregistering.

Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
13 years agoAdd support for ASIX AX88772 USB 2.0 10/100Mbit Ethernet Adaptor
Simon Glass [Wed, 16 Feb 2011 19:14:34 +0000 (11:14 -0800)]
Add support for ASIX AX88772 USB 2.0 10/100Mbit Ethernet Adaptor

Driver originally written by NVIDIA Corporation, modified to
handle odd-length packets.

Signed-off-by: Simon Glass <sjg@chromium.org>
13 years agoAdd USB host ethernet adapter support
Simon Glass [Wed, 16 Feb 2011 19:14:33 +0000 (11:14 -0800)]
Add USB host ethernet adapter support

This adds support for using USB Ethernet dongles in host mode. This is just
the framework - drivers will come later. A new config option called
CONFIG_USB_HOST_ETHER can be defined in board config files to switch this
on.

The was originally written by NVIDIA and was cleaned up for release by the
Chromium authors.

Signed-off-by: Simon Glass <sjg@chromium.org>
13 years agoFix EHCI usb submit timeout and unify with OHCI
Simon Glass [Mon, 7 Feb 2011 22:42:16 +0000 (14:42 -0800)]
Fix EHCI usb submit timeout and unify with OHCI

Changed both to use a common timeout for URB submission, since they were using
different values and EHCI's was too short.

Also fixed EHCI to actually check if urb submission succeeded, rather than
silently continuing into the weeds.

Change-Id: I7f71499ffaa05187d8e5618db2419e1606007b82

Signed-off-by: Simon Glass <sjg@chromium.org>
13 years agoadd checking the CONFIG_ENV_IS_IN_SPI_FLASH in Enbedded env
Yoshihiro Shimoda [Tue, 25 Jan 2011 00:28:19 +0000 (09:28 +0900)]
add checking the CONFIG_ENV_IS_IN_SPI_FLASH in Enbedded env

Fix the problem which cannot build the U-boot, if we only set
the CONFIG_ENV_IS_IN_SPI_FLASH.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agonet: ne2000: Add spport RTL-8019AS
Nobuhiro Iwamatsu [Tue, 26 Oct 2010 11:32:00 +0000 (20:32 +0900)]
net: ne2000: Add spport RTL-8019AS

Add infomation of RTL-8016AS to hw_info.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
13 years agounzip: return uncompressed size in `filesize', and print it.
Wolfgang Denk [Fri, 11 Feb 2011 19:20:51 +0000 (20:20 +0100)]
unzip: return uncompressed size in `filesize', and print it.

The unzip command did not provide a way for the caller to get any
information about the uncompressed size.  To make it better usable in
scripts, we now store the uncompressed size in the `filesize'
variable, like we do when for example loading a file over the network
or when reading it from a file system.  Following that analogy, it is
only consequent to also print the size.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoitest: fix result of string compares
Wolfgang Denk [Tue, 8 Feb 2011 15:56:05 +0000 (16:56 +0100)]
itest: fix result of string compares

The implementation of the string compare function of the "itest"
command was weird, as only the length of the shortest argument was
included in the compare, with the result that something like
"itest.s abd == abddef" would return TRUE.  Fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
13 years agomicroblaze: Fix msr handling in interrupt_handler
Michal Simek [Mon, 7 Feb 2011 09:33:50 +0000 (10:33 +0100)]
microblaze: Fix msr handling in interrupt_handler

Fix ancient code which worked with MSR in a bad way.
Use rtid instruction which enable IRQs and jump.

Signed-off-by: Michal Simek <monstr@monstr.eu>
13 years agomicroblaze: Fix systems with MSR=0
Michal Simek [Mon, 7 Feb 2011 09:30:45 +0000 (10:30 +0100)]
microblaze: Fix systems with MSR=0

u-boot BSP generates XILINX_USE_MSR_INSTR macro
even for system with MSR=0. That's why explicitly
check that MSR=1.

Signed-off-by: Michal Simek <monstr@monstr.eu>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mips
Wolfgang Denk [Sat, 12 Feb 2011 19:37:47 +0000 (20:37 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mips

13 years agoeNET: Move initial Global Data into CAR
Graeme Russ [Sat, 12 Feb 2011 04:12:14 +0000 (15:12 +1100)]
eNET: Move initial Global Data into CAR

13 years agosc520: Release CAR and enable caching
Graeme Russ [Sat, 12 Feb 2011 04:12:12 +0000 (15:12 +1100)]
sc520: Release CAR and enable caching

13 years agox86: Convert board_init_f to use an init_sequence
Graeme Russ [Sat, 12 Feb 2011 04:12:10 +0000 (15:12 +1100)]
x86: Convert board_init_f to use an init_sequence

13 years agox86: Rearrange function calls in board_init_f
Graeme Russ [Sat, 12 Feb 2011 04:12:08 +0000 (15:12 +1100)]
x86: Rearrange function calls in board_init_f

13 years agox86: Split board_init_f() into init_fnc_t compatible functions
Graeme Russ [Sat, 12 Feb 2011 04:12:06 +0000 (15:12 +1100)]
x86: Split board_init_f() into init_fnc_t compatible functions

13 years agox86: Fix incorrect usage of relocation offset
Graeme Russ [Sat, 12 Feb 2011 04:12:05 +0000 (15:12 +1100)]
x86: Fix incorrect usage of relocation offset

x86 has always used relocation offset in the opposite sense to the ELF
standard - Fix this

13 years agox86: Move console initialisation into board_init_f
Graeme Russ [Sat, 12 Feb 2011 04:12:03 +0000 (15:12 +1100)]
x86: Move console initialisation into board_init_f

13 years agox86: Move test for cold boot into init functions
Graeme Russ [Sat, 12 Feb 2011 04:12:01 +0000 (15:12 +1100)]
x86: Move test for cold boot into init functions

13 years agox86: Move call to dram_init_f into board_init_f
Graeme Russ [Sat, 12 Feb 2011 04:11:59 +0000 (15:11 +1100)]
x86: Move call to dram_init_f into board_init_f

13 years agox86: Defer setup of final stack
Graeme Russ [Sat, 12 Feb 2011 04:11:58 +0000 (15:11 +1100)]
x86: Defer setup of final stack

13 years agosc520: Move RAM sizing code from asm to C
Graeme Russ [Sat, 12 Feb 2011 04:11:54 +0000 (15:11 +1100)]
sc520: Move RAM sizing code from asm to C

13 years agox86: Use Cache-As-RAM for initial stack
Graeme Russ [Sat, 12 Feb 2011 04:11:52 +0000 (15:11 +1100)]
x86: Use Cache-As-RAM for initial stack

13 years agox86: Move initial gd to fixed location
Graeme Russ [Sat, 12 Feb 2011 04:11:50 +0000 (15:11 +1100)]
x86: Move initial gd to fixed location

13 years agoeNET: General code cleanup
Graeme Russ [Sat, 12 Feb 2011 04:11:48 +0000 (15:11 +1100)]
eNET: General code cleanup

13 years agoeNET: Rearrange PAR assignments
Graeme Russ [Sat, 12 Feb 2011 04:11:47 +0000 (15:11 +1100)]
eNET: Rearrange PAR assignments

13 years agoeNET: Define MMCR values in config.h
Graeme Russ [Sat, 12 Feb 2011 04:11:45 +0000 (15:11 +1100)]
eNET: Define MMCR values in config.h

13 years agoeNET: Add RTC support to eNET
Graeme Russ [Sat, 12 Feb 2011 04:11:43 +0000 (15:11 +1100)]
eNET: Add RTC support to eNET

The SC520 has an inbuilt MC146818 - Enable it for the eNET board

13 years agoeNET: Fix eNET Interrupt Setup for Linux
Graeme Russ [Sat, 12 Feb 2011 04:11:41 +0000 (15:11 +1100)]
eNET: Fix eNET Interrupt Setup for Linux

Fix minor issues with the configuration of the hardware interrupts for
Linux when booting the eNET board

13 years agosc520: Remove printf calls from cpu_init_f
Graeme Russ [Sat, 12 Feb 2011 04:11:40 +0000 (15:11 +1100)]
sc520: Remove printf calls from cpu_init_f

In later patches, cpu_init_f will be called before console has been
initialised and printf will not be legitimately available

13 years agosc520: Move board specific settings to board init function
Graeme Russ [Sat, 12 Feb 2011 04:11:38 +0000 (15:11 +1100)]
sc520: Move board specific settings to board init function

13 years agosc520: Define MMCR address in include file
Graeme Russ [Sat, 12 Feb 2011 04:11:36 +0000 (15:11 +1100)]
sc520: Define MMCR address in include file

13 years agox86: Make cpu init functions weak
Graeme Russ [Sat, 12 Feb 2011 04:11:35 +0000 (15:11 +1100)]
x86: Make cpu init functions weak

13 years agox86: Call early_board_init when warm booting
Graeme Russ [Sat, 12 Feb 2011 04:11:33 +0000 (15:11 +1100)]
x86: Call early_board_init when warm booting

early_board_init has been skipped to avoid SDRAM corruption in the case
that a fully relocatable image has been loaded into SDRAM and is being
executed from SDRAM. x86 is being aligned with other architectures (ARM
and PPC in particlar) and will be using Cache-As-RAM to run a C
environment from Flash (or SRAM if you have some). early_board_init may
be needed to assist in the setup of Cache-As-RAM and the early C
environment

13 years agox86: Add processor flags header from linux
Graeme Russ [Sat, 12 Feb 2011 04:11:32 +0000 (15:11 +1100)]
x86: Add processor flags header from linux

13 years agox86: Move Global Descriptor Table defines to processor.h
Graeme Russ [Sat, 12 Feb 2011 04:11:30 +0000 (15:11 +1100)]
x86: Move Global Descriptor Table defines to processor.h

13 years agox86: Add stack dump to register dump
Graeme Russ [Sat, 12 Feb 2011 04:11:28 +0000 (15:11 +1100)]
x86: Add stack dump to register dump

13 years agox86: Fix mangled umlauts
Graeme Russ [Sat, 12 Feb 2011 04:11:26 +0000 (15:11 +1100)]
x86: Fix mangled umlauts

git mergetool has a nasty habit of mangling umlats - fix ones that have
been missed in previous submissions

13 years agosc520: Sort Makefile
Graeme Russ [Sat, 12 Feb 2011 04:11:25 +0000 (15:11 +1100)]
sc520: Sort Makefile

13 years agox86: Parametize values used in linker script
Graeme Russ [Sat, 12 Feb 2011 04:11:24 +0000 (15:11 +1100)]
x86: Parametize values used in linker script

13 years agoeNET: Create distinct board configurations
Graeme Russ [Sat, 12 Feb 2011 04:11:22 +0000 (15:11 +1100)]
eNET: Create distinct board configurations

Position independant functionality is due for removal from the x86
architecture, so create two distinct configurations - One for Flash and
one for SRAM

13 years agox86: Align config.mk and linker scripts with other arches
Graeme Russ [Sat, 12 Feb 2011 04:11:21 +0000 (15:11 +1100)]
x86: Align config.mk and linker scripts with other arches

13 years agox86: Fix definition of global_data struct for asm-offsets.c
Graeme Russ [Sat, 12 Feb 2011 04:11:21 +0000 (15:11 +1100)]
x86: Fix definition of global_data struct for asm-offsets.c

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Fri, 11 Feb 2011 20:23:33 +0000 (21:23 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

13 years agopowerpc/8xxx: Add additional cycle to write-to-read turnaound for DDR3
York Sun [Thu, 10 Feb 2011 18:13:10 +0000 (10:13 -0800)]
powerpc/8xxx: Add additional cycle to write-to-read turnaound for DDR3

When DDR data rate is higher than 1200MT/s or controller interleaving is
enabled, additional cycle for write-to-read turnaround is needed to satisfy
dynamic ODT timing.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: corrected p1_p2_rdb EEPROM address
Priyanka Jain [Tue, 8 Feb 2011 07:47:56 +0000 (13:17 +0530)]
powerpc/85xx: corrected p1_p2_rdb EEPROM address

Board EEPROM is used to read/save Ethernet MAC addresses.

Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Fix p1_p2_rdb boards.cfg
Kumar Gala [Thu, 10 Feb 2011 05:36:24 +0000 (23:36 -0600)]
powerpc/85xx: Fix p1_p2_rdb boards.cfg

We should have been defining the actual board name in the options, not
the processor.  Fix this for P1011RDB, P1020RDB, P2010RDB, and P2020RDB.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl: update CRC after setting EEPROM identifier
Timur Tabi [Wed, 9 Feb 2011 19:40:51 +0000 (13:40 -0600)]
fsl: update CRC after setting EEPROM identifier

The "mac id" command is used to initialize the EEPROM data to a specific
format, but it was not updating the CRC.  This didn't cause any real
problems, because writing the data to the EEPROM will always update the
CRC anyway, but it did result in a bogus CRC warning.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agocmd_bmp.c: message about compressed formats is debug info only.
Wolfgang Denk [Wed, 9 Feb 2011 14:11:10 +0000 (15:11 +0100)]
cmd_bmp.c: message about compressed formats is debug info only.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Wed, 9 Feb 2011 20:22:58 +0000 (21:22 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

13 years agoMerge branch 'next' of git://git.denx.de/u-boot-nios
Wolfgang Denk [Wed, 9 Feb 2011 19:54:53 +0000 (20:54 +0100)]
Merge branch 'next' of git://git.denx.de/u-boot-nios

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Wed, 9 Feb 2011 19:50:26 +0000 (20:50 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

13 years agoNAND: env: remember the flags used in the previous environment
Scott Wood [Tue, 8 Feb 2011 21:25:02 +0000 (15:25 -0600)]
NAND: env: remember the flags used in the previous environment

Previously, uninitialized stack space was being referenced.

Signed-off-by: Scott Wood <scottwood@freescale.com>
13 years agonios2: add gpio_is_valid
Thomas Chou [Mon, 27 Dec 2010 02:46:01 +0000 (10:46 +0800)]
nios2: add gpio_is_valid

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
13 years agonios2: use long for ssize_t
Thomas Chou [Mon, 27 Dec 2010 02:45:34 +0000 (10:45 +0800)]
nios2: use long for ssize_t

This is consistent with nios2-linux. And resolved the warning,

cmd_nvedit.c: In function `do_env_export':
cmd_nvedit.c:660: warning: size_t format, ssize_t arg (arg 3)

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
13 years agoaltera_spi: add spi_set_speed
Thomas Chou [Mon, 27 Dec 2010 01:30:17 +0000 (09:30 +0800)]
altera_spi: add spi_set_speed

Added this for mmc_spi driver. Though altera spi core does not
support programmable speed. It is fixed when configured in
sopc-builder.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
13 years agonios2: add gpio_free
Thomas Chou [Fri, 24 Dec 2010 07:19:44 +0000 (15:19 +0800)]
nios2: add gpio_free

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
13 years agoMIPS: Move VCT boards to boards.cfg
Shinya Kuribayashi [Sat, 5 Feb 2011 10:35:21 +0000 (19:35 +0900)]
MIPS: Move VCT boards to boards.cfg

Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
Acked-by: Stefan Roese <sr@denx.de>
13 years agoppc4xx: Add DLVision-10G board support
Dirk Eibach [Fri, 21 Jan 2011 08:31:21 +0000 (09:31 +0100)]
ppc4xx: Add DLVision-10G board support

Board support for the Guntermann & Drunck DLVision-10G.
Adds support for multiple FPGAs per board for gdsys 405ep
architecture.
Adds support for dual link osd hardware for gdsys 405ep.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Sun, 6 Feb 2011 21:41:53 +0000 (22:41 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Sun, 6 Feb 2011 21:39:50 +0000 (22:39 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Sun, 6 Feb 2011 21:28:34 +0000 (22:28 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

13 years agompc83xx: Use correct register to calculate clocks.
Joakim Tjernlund [Thu, 27 Jan 2011 15:30:54 +0000 (16:30 +0100)]
mpc83xx: Use correct register to calculate clocks.

Use SPMR instead of HRCWL when calculating clocks as HCRWL
may be changed and the CPU will not pick up all changes
until there is a POR. u-boot will think SPMF has changed and get
the clocks wrong.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
13 years agompc83xx: fix pcie configuration space read/write
Leo Liu [Wed, 19 Jan 2011 11:50:47 +0000 (19:50 +0800)]
mpc83xx: fix pcie configuration space read/write

This patch fix a problem for the pcie enumeration when the mpc83xx
pcie controller is connected with switch or we use both of the two
pcie controller.

Signed-off-by: Leo Liu <liucai.lfn@gmail.com>
fix codingstyle and compiler warning: 'pcie_priv' defined but not used

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
13 years agoMIPS: Move Inca-IP targets to boards.cfg
Shinya Kuribayashi [Sat, 5 Feb 2011 09:33:36 +0000 (18:33 +0900)]
MIPS: Move Inca-IP targets to boards.cfg

At the same time, fix up CPU_CLOCK_RATE to have the CONFIG_ prefix to
work with boards.cfg.

Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
13 years agoMIPS: Move Qemu MIPS target to boards.cfg
Shinya Kuribayashi [Sat, 5 Feb 2011 09:25:44 +0000 (18:25 +0900)]
MIPS: Move Qemu MIPS target to boards.cfg

CONFIG_QEMU_MIPS is already provided by <configs/qemu-mips.h>, so we
don't generate it using the options fields in boards.cfg.

Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
13 years agoUSB: Change the necessary defines to get debug output
Alexander Holler [Fri, 28 Jan 2011 11:42:13 +0000 (12:42 +0100)]
USB: Change the necessary defines to get debug output

While debugging some USB stuff, I've first missed that there are actually
two defines necessary to get usefull output. The one needed to get debug output
for the communication with HUBs was burried somewhere deep inside the code.

Change that so that a #define DEBUG is enough while still leaving the possibility
to reduce unwanted debug output.

Signed-off-by: Alexander Holler <holler@ahsoftware.de>
13 years agoUSB: Fix device stati for removable and powerctrl (typo)
Alexander Holler [Thu, 27 Jan 2011 21:50:07 +0000 (22:50 +0100)]
USB: Fix device stati for removable and powerctrl (typo)

I currently don't know if the error could have other consequences
than a wrong output when turning debug on.

Signed-off-by: Alexander Holler <holler@ahsoftware.de>
13 years agoMIPS: Move Alchemy Au1x00 based boards to boards.cfg
Shinya Kuribayashi [Sat, 5 Feb 2011 08:43:22 +0000 (17:43 +0900)]
MIPS: Move Alchemy Au1x00 based boards to boards.cfg

CONFIG_GTH2 is already provided by <configs/gth2.h>, so we don't
generate it using the options fields in boards.cfg.

Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
13 years agocmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended
Shinya Kuribayashi [Sat, 5 Feb 2011 10:07:00 +0000 (19:07 +0900)]
cmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended

commit 8bde63eb3f79d68f693201528dafc8ae7aa087de ([MIPS] Rename Alchemy
processor configs into CONFIG_SOC_*) forgot to pick up this one.

Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
13 years agoMIPS: dbau1x00: Remove unused flash driver stub
Daniel Schwierzeck [Thu, 3 Feb 2011 13:17:10 +0000 (14:17 +0100)]
MIPS: dbau1x00: Remove unused flash driver stub

All dbau1x00 boards use the CFI driver so this stub driver is useless
and should not be compiled.

This patch fixes the error:

u-boot-git/board/dbau1x00/flash.c:34: multiple definition of `flash_init'
drivers/mtd/libmtd.o:u-boot-git/drivers/mtd/cfi_flash.c:2084: first defined here
board/dbau1x00/libdbau1x00.o: In function `write_buff':
u-boot-git/board/dbau1x00/flash.c:40: multiple definition of `write_buff'
drivers/mtd/libmtd.o:u-boot-git/drivers/mtd/cfi_flash.c:1265: first defined here

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Wolfgang Denk <wd@denx.de>
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
13 years agoMIPS: Purple: Fix multiple definition error on final linking of u-boot binary
Daniel Schwierzeck [Thu, 3 Feb 2011 13:17:09 +0000 (14:17 +0100)]
MIPS: Purple: Fix multiple definition error on final linking of u-boot binary

The linker of recent toolchains complains about multiple definitions
on final linking of u-boot binary. This patch removes all redundant
object files from u-boot.lds those are already added to .text section
by the linker.

That patch could not be tested but the resulting u-boot.map still looks
good. The start symbol is at 0xB0000000, the environment at 0xB0008000
so u-boot should boot.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Wolfgang Denk <wd@denx.de>
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
13 years agoMIPS: VCT: Fix enabling of unwanted options if networking or USB support are disabled
Daniel Schwierzeck [Thu, 3 Feb 2011 13:17:08 +0000 (14:17 +0100)]
MIPS: VCT: Fix enabling of unwanted options if networking or USB support are disabled

Some VCT boards lacks the support of networking or USB.
Additionally that support is disabled in small image
configurations.

If CONFIG_CMD_NET should not used the CONFIG_CMD_NFS option
have to be disabled too. Otherwise the linker fails with
unresolved symbols.

If CONFIG_VCT_SMALL_IMAGE is set than CONFIG_CMD_NET and
CONFIG_CMD_USB are disabled at the end of vct.h.
This is not adequate because CONFIG_CMD_USB enables additional
options and the linker fails again with unresolved symbols.

This patch adds an early check against CONFIG_VCT_SMALL_IMAGE
so the additional options are only enabled if they are really
needed.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Fri, 4 Feb 2011 20:44:46 +0000 (21:44 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

13 years agopowerpc/8xxx: Fix possible compile issue related to P1013
Kumar Gala [Fri, 4 Feb 2011 18:50:53 +0000 (12:50 -0600)]
powerpc/8xxx: Fix possible compile issue related to P1013

The P1013 is a single core version of P1022 and thus should use the
p1022_serdes.c code.  It was acciently pointing to p1013_serdes.c which
doesn't exist.

Reported-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Fri, 4 Feb 2011 19:38:27 +0000 (20:38 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

13 years agopowerpc/85xx: Enable ECC on MPC8572DS
York Sun [Wed, 26 Jan 2011 05:51:29 +0000 (21:51 -0800)]
powerpc/85xx: Enable ECC on MPC8572DS

Using hwconfig to turn on/off ECC, without re-compiling.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/mpc85xx: implement workaround for errata DDR111 and DDR134
York Sun [Wed, 26 Jan 2011 06:05:49 +0000 (22:05 -0800)]
powerpc/mpc85xx: implement workaround for errata DDR111 and DDR134

Workaround for the following errata:
DDR111 - MCKE signal may not function correctly at assertion of HRESET
DDR134 - The automatic CAS-to-Preamble feature of the DDR controller can
         calibrate to incorrect values

These two workarounds must be implemented together because they touch
common registers.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>