karo-tx-uboot.git
11 years agopost, i2c: add missing curly bracket in i2c_post_test
Heiko Schocher [Mon, 15 Nov 2010 07:20:39 +0000 (08:20 +0100)]
post, i2c: add missing curly bracket in i2c_post_test

If CONFIG_SYS_POST_I2C_ADDRS is not defined and CONFIG_SYS_POST_I2C
is activated, i2c_probe() is not called in the for statement,
because missing curly bracket.

Signed-off-by: Heiko Schocher <hs@denx.de>
11 years agoi2c, mpc5xxx: add multibus support
Heiko Schocher [Wed, 10 Nov 2010 07:57:55 +0000 (08:57 +0100)]
i2c, mpc5xxx: add multibus support

Tested on upcoming hydra (mpc5200 based) board.

Signed-off-by: Heiko Schocher <hs@denx.de>
11 years agoNet: clarify board/cpu_eth_init calls
Ben Warren [Wed, 1 Sep 2010 06:05:04 +0000 (23:05 -0700)]
Net: clarify board/cpu_eth_init calls

This has always been confusing, and the idea of these functions returning the
number of interfaces initialized was half-baked and ultimately pointless.
Instead, act more like regular functions and return < 0 on failure, >= 0 on
success.

This change shouldn't break anything.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
11 years agoMakefile: move include for config.mk up
François Revol [Sat, 30 Oct 2010 15:42:00 +0000 (17:42 +0200)]
Makefile: move include for config.mk up

Reorder including config.mk before the HOSTCC check, so HOSTCC is
actually defined when checking for it.

Signed-off-by: François Revol <revol@free.fr>
Cleaned up commit message
Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agoMAKEALL: Do a sanity check on user-supplied arguments
Peter Tyser [Fri, 29 Oct 2010 22:59:06 +0000 (17:59 -0500)]
MAKEALL: Do a sanity check on user-supplied arguments

Add a check to make sure that the user's arguments actually find a board
in boards.cfg.  Previously, if a user misspelled an argument the
argument would be discarded without warning.  For example, running
'MAKEALL -c 85xx' with the intention of compiling all Freescale 85xx
boards would instead silently discard the '-c 85xx' argument since the
proper cpu name is 'mpc85xx' and then proceed to compile all PowerPC
boards (MAKEALL's default).

Also fix an unrelated typo.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
11 years agopci: Use intelligent indentation for CONFIG_PCI_SCAN_SHOW
Peter Tyser [Fri, 29 Oct 2010 22:59:29 +0000 (17:59 -0500)]
pci: Use intelligent indentation for CONFIG_PCI_SCAN_SHOW

When CONFIG_PCI_SCAN_SHOW is defined U-Boot prints out PCI devices as
they are found during bootup, eg:
  PCIE1: connected as Root Complex
        01:00.0 - 10b5:8518 - Bridge device
        02:01.0 - 10b5:8518 - Bridge device
        03:00.0 - 10b5:8112 - Bridge device
        04:01.0 - 8086:1010 - Network controller
        04:01.1 - 8086:1010 - Network controller
        02:02.0 - 10b5:8518 - Bridge device
        02:03.0 - 10b5:8518 - Bridge device
        06:00.0 - 10b5:8518 - Bridge device
        07:00.0 - 10b5:8518 - Bridge device
        08:00.0 - 1957:0040 - Processor
        07:01.0 - 10b5:8518 - Bridge device
        09:00.0 - 10b5:8112 - Bridge device
        07:02.0 - 10b5:8518 - Bridge device
  PCIE1: Bus 00 - 0b
  PCIE2: connected as Root Complex
        0d:00.0 - 1957:0040 - Processor
  PCIE2: Bus 0c - 0d

This information is useful, but its difficult to determine the PCI bus
topology.  To things clearer, we can use indention to make it more
obvious how the PCI bus is organized.  For the example above, the
updated output with this change is:

  PCIE1: connected as Root Complex
    01:00.0     - 10b5:8518 - Bridge device
     02:01.0    - 10b5:8518 - Bridge device
      03:00.0   - 10b5:8112 - Bridge device
       04:01.0  - 8086:1010 - Network controller
       04:01.1  - 8086:1010 - Network controller
     02:02.0    - 10b5:8518 - Bridge device
     02:03.0    - 10b5:8518 - Bridge device
      06:00.0   - 10b5:8518 - Bridge device
       07:00.0  - 10b5:8518 - Bridge device
        08:00.0 - 1957:0040 - Processor
       07:01.0  - 10b5:8518 - Bridge device
        09:00.0 - 10b5:8112 - Bridge device
       07:02.0  - 10b5:8518 - Bridge device
  PCIE1: Bus 00 - 0b
  PCIE2: connected as Root Complex
    0d:00.0     - 1957:0040 - Processor
  PCIE2: Bus 0c - 0d

In the examples above, an MPC8640 is connected to a PEX8518 PCIe switch
(01:00 and 02:0x), which is connected to another PEX8518 PCIe switch
(06:00 and 07:0x), which then connects to a MPC8572 processor (08:00).
Also, the MPC8640's PEX8518 PCIe switch is connected to a PCI ethernet
card (04:01) via a PEX8112 PCIe-to-PCI bridge (03:00).

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
11 years agopci: Fix ordering of devices when CONFIG_PCI_SCAN_SHOW
Peter Tyser [Fri, 29 Oct 2010 22:59:28 +0000 (17:59 -0500)]
pci: Fix ordering of devices when CONFIG_PCI_SCAN_SHOW

Move the printing of PCI device information to before the PCI device is
configured.  This prevents the case where recursive scanning results in
the deepest devices being printed first.

This change also makes PCI lockups during enumeration easier to
diagnose since the device that is being configured is printed out prior
to configuration.  Previously, it was not possible to determine which
device caused the PCI lockup.

Original example:
  PCIE1: connected as Root Complex
        04:01.0 - 8086:1010 - Network controller
        04:01.1 - 8086:1010 - Network controller
        03:00.0 - 10b5:8112 - Bridge device
        02:01.0 - 10b5:8518 - Bridge device
        02:02.0 - 10b5:8518 - Bridge device
        08:00.0 - 1957:0040 - Processor
        07:00.0 - 10b5:8518 - Bridge device
        09:00.0 - 10b5:8112 - Bridge device
        07:01.0 - 10b5:8518 - Bridge device
        07:02.0 - 10b5:8518 - Bridge device
        06:00.0 - 10b5:8518 - Bridge device
        02:03.0 - 10b5:8518 - Bridge device
        01:00.0 - 10b5:8518 - Bridge device
  PCIE1: Bus 00 - 0b

Updated example:
  PCIE1: connected as Root Complex
        01:00.0 - 10b5:8518 - Bridge device
        02:01.0 - 10b5:8518 - Bridge device
        03:00.0 - 10b5:8112 - Bridge device
        04:01.0 - 8086:1010 - Network controller
        04:01.1 - 8086:1010 - Network controller
        02:02.0 - 10b5:8518 - Bridge device
        02:03.0 - 10b5:8518 - Bridge device
        06:00.0 - 10b5:8518 - Bridge device
        07:00.0 - 10b5:8518 - Bridge device
        08:00.0 - 1957:0040 - Processor
        07:01.0 - 10b5:8518 - Bridge device
        09:00.0 - 10b5:8112 - Bridge device
        07:02.0 - 10b5:8518 - Bridge device
  PCIE1: Bus 00 - 0b

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
11 years agopci: Clean up PCI info when CONFIG_PCI_SCAN_SHOW
Peter Tyser [Fri, 29 Oct 2010 22:59:27 +0000 (17:59 -0500)]
pci: Clean up PCI info when CONFIG_PCI_SCAN_SHOW

This change does the following:
- Removes the printing of the PCI interrupt line value.  This is
  normally set to 0 by U-Boot on bootup and is rarely used during
  everyday operation.

- Prints out the PCI function number of a device.  Previously a device
  with multiple functions would be printed identically 2 times, which is
  generally confusing.  For example, on an Intel 2 port gigabit Ethernet
  card the following was displayed:
    ...
    04  01  8086  1010  0200  00
    04  01  8086  1010  0200  00
    ...

- Prints a text description of each device's PCI class instead of the
  raw PCI class code.  The textual description makes it much easier to
  determine what devices are installed on a PCI bus.

- Changes the general formatting of the PCI device output.

Previous output:
  PCIE1: connected as Root Complex
          04  01  8086  1010  0200  00
          04  01  8086  1010  0200  00
          03  00  10b5  8112  0604  00
          02  01  10b5  8518  0604  00
          02  02  10b5  8518  0604  00
          08  00  1957  0040  0b20  00
          07  00  10b5  8518  0604  00
          09  00  10b5  8112  0604  00
          07  01  10b5  8518  0604  00
          07  02  10b5  8518  0604  00
          06  00  10b5  8518  0604  00
          02  03  10b5  8518  0604  00
          01  00  10b5  8518  0604  00
  PCIE1: Bus 00 - 0b
  PCIE2: connected as Root Complex
          0d  00  1957  0040  0b20  00
  PCIE2: Bus 0c - 0d

Updated output:
  PCIE1: connected as Root Complex
          04:01.0 - 8086:1010 - Network controller
          04:01.1 - 8086:1010 - Network controller
          03:00.0 - 10b5:8112 - Bridge device
          02:01.0 - 10b5:8518 - Bridge device
          02:02.0 - 10b5:8518 - Bridge device
          08:00.0 - 1957:0040 - Processor
          07:00.0 - 10b5:8518 - Bridge device
          09:00.0 - 10b5:8112 - Bridge device
          07:01.0 - 10b5:8518 - Bridge device
          07:02.0 - 10b5:8518 - Bridge device
          06:00.0 - 10b5:8518 - Bridge device
          02:03.0 - 10b5:8518 - Bridge device
          01:00.0 - 10b5:8518 - Bridge device
  PCIE1: Bus 00 - 0b
  PCIE2: connected as Root Complex
          0d:00.0 - 1957:0040 - Processor
  PCIE2: Bus 0c - 0d

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
11 years agofsl_pci_init: Quiet scanning printf()
Peter Tyser [Fri, 29 Oct 2010 22:59:26 +0000 (17:59 -0500)]
fsl_pci_init: Quiet scanning printf()

The "Scanning PCI bus X" message doesn't provide any real useful
information, so remove it.

Original output:
  PCIE1: connected as Root Complex
             Scanning PCI bus 01
          04  01  8086  1010  0200  00
          04  01  8086  1010  0200  00
          03  00  10b5  8112  0604  00
          02  01  10b5  8518  0604  00
          02  02  10b5  8518  0604  00
          08  00  1957  0040  0b20  00
          07  00  10b5  8518  0604  00
          09  00  10b5  8112  0604  00
          07  01  10b5  8518  0604  00
          07  02  10b5  8518  0604  00
          06  00  10b5  8518  0604  00
          02  03  10b5  8518  0604  00
          01  00  10b5  8518  0604  00
  PCIE1: Bus 00 - 0b
  PCIE2: connected as Root Complex
             Scanning PCI bus 0d
          0d  00  1957  0040  0b20  00
  PCIE2: Bus 0c - 0d

Updated output:
  PCIE1: connected as Root Complex
          04  01  8086  1010  0200  00
          04  01  8086  1010  0200  00
          03  00  10b5  8112  0604  00
          02  01  10b5  8518  0604  00
          02  02  10b5  8518  0604  00
          08  00  1957  0040  0b20  00
          07  00  10b5  8518  0604  00
          09  00  10b5  8112  0604  00
          07  01  10b5  8518  0604  00
          07  02  10b5  8518  0604  00
          06  00  10b5  8518  0604  00
          02  03  10b5  8518  0604  00
          01  00  10b5  8518  0604  00
  PCIE1: Bus 00 - 0b
  PCIE2: connected as Root Complex
          0d  00  1957  0040  0b20  00
  PCIE2: Bus 0c - 0d

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
CC: galak@kernel.crashing.org
11 years agompc85xx: Fix SERDES/eTSEC message indentation
Peter Tyser [Fri, 29 Oct 2010 22:59:25 +0000 (17:59 -0500)]
mpc85xx: Fix SERDES/eTSEC message indentation

Previously some mpc85xx boards printed indented messages such as the
following on bootup:
  printf("    eTSEC4 is in sgmii mode.\n");
  printf("    Serdes2 disalbed\n");

The bootup appearance looks cleaner if the indentation is removed which
aligns these messages with other bootup output.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
CC: galak@kernel.crashing.org
11 years agofsl: Clean up printing of PCI boot info
Peter Tyser [Fri, 29 Oct 2010 22:59:24 +0000 (17:59 -0500)]
fsl: Clean up printing of PCI boot info

Previously boards used a variety of indentations, newline styles, and
colon styles for the PCI information that is printed on bootup.  This
patch unifies the style to look like:

...
NAND:  1024 MiB
PCIE1: connected as Root Complex
           Scanning PCI bus 01
        04  01  8086  1010  0200  00
        04  01  8086  1010  0200  00
        03  00  10b5  8112  0604  00
        02  01  10b5  8518  0604  00
        02  02  10b5  8518  0604  00
        08  00  1957  0040  0b20  00
        07  00  10b5  8518  0604  00
        09  00  10b5  8112  0604  00
        07  01  10b5  8518  0604  00
        07  02  10b5  8518  0604  00
        06  00  10b5  8518  0604  00
        02  03  10b5  8518  0604  00
        01  00  10b5  8518  0604  00
PCIE1: Bus 00 - 0b
PCIE2: connected as Root Complex
           Scanning PCI bus 0d
        0d  00  1957  0040  0b20  00
PCIE2: Bus 0c - 0d
In:    serial
...

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
CC: wd@denx.de
CC: sr@denx.de
CC: galak@kernel.crashing.org
11 years agofsl_pci_init: Make fsl_pci_init_port() PCI/PCIe aware
Peter Tyser [Thu, 28 Oct 2010 20:24:59 +0000 (15:24 -0500)]
fsl_pci_init: Make fsl_pci_init_port() PCI/PCIe aware

Previously fsl_pci_init_port() always assumed that a port was a PCIe
port and would incorrectly print messages for a PCI port such as the
following on bootup:
    PCI1:  32 bit, 33 MHz, sync, host, arbiter
                Scanning PCI bus 00
    PCIE1 on bus 00 - 00

This change corrects the output of fsl_pci_init_port():
    PCI1:  32 bit, 33 MHz, sync, host, arbiter
                Scanning PCI bus 00
    PCI1 on bus 00 - 00

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
11 years agonet: Fix potential empty DHCP Parameter Request List
Jason Liu [Sun, 14 Nov 2010 04:23:09 +0000 (12:23 +0800)]
net: Fix potential empty DHCP Parameter Request List

Can't get IP address with dhcp due to the dhcp server not
allow the empty param list request under some network env

This patch is based on Gray Remlin's initial patch.

Signed-off-by: Jason Liu <r64343@freescale.com>
Signed-off-by: Gray Remlin <g_remlin@rocketmail.com>
11 years agoenv_mmc: fix compile warning
Lei Wen [Tue, 9 Nov 2010 23:39:23 +0000 (07:39 +0800)]
env_mmc: fix compile warning

hexport would complain implicit declaration, if we don't add the
include file.

env_mmc.c: In function 'saveenv':
env_mmc.c:109: warning: implicit declaration of function 'hexport'

Signed-off-by: Lei Wen <leiwen@marvell.com>
11 years agotools/env: cleanup host build flags
Daniel Hobi [Wed, 10 Nov 2010 13:11:21 +0000 (14:11 +0100)]
tools/env: cleanup host build flags

This patch makes tools/env/Makefile more similar to tools/imls:
- define HOSTSRCS and HOSTCPPFLAGS, so that .depend generation works.
- include U-Boot headers using -idirafter to prevent picking up
  u-boot/include/errno.h.
- use HOSTCFLAGS_NOPED (fw_env.c does not conform to -pedantic).

In order to cross-compile tools/env, override the HOSTCC variable
as in this example:

  make tools env HOSTCC=bfin-uclinux-gcc

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Tested-by: Detlev Zundel <dzu@denx.de>
Tested-by: Steve Sakoman <steve.sakoman@linaro.org>
11 years agoPowerPC: Don't destroy fixup table while doing fixups
Joakim Tjernlund [Thu, 4 Nov 2010 18:02:00 +0000 (19:02 +0100)]
PowerPC: Don't destroy fixup table while doing fixups

The fixup procedure just stored a constant value in the
fixup table rather than just adjusting the table.
Although that doesn't seem to do any harm, it prevents
relocation more that once.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
11 years agonet: e1000: Add initialized eth_device & e1000_hw structure
Kumar Gala [Fri, 12 Nov 2010 10:13:06 +0000 (04:13 -0600)]
net: e1000: Add initialized eth_device & e1000_hw structure

nic and hw structures are allocated via malloc i.e. return memory
is not zero initialized. Because of this few structure member like
"function pointers" are initialized with garbage values.

It may cause problem. for eg. during eth_initialize, dev->write_hwaddr
is used.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Fixed typo.
Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agonet: uli526x: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:47 +0000 (14:03 +0900)]
net: uli526x: Add initialized eth_device structure

uli526x driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agonet: tsi108_eth: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:46 +0000 (14:03 +0900)]
net: tsi108_eth: Add initialized eth_device structure

tsi108_eth driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agonet: pcnet: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:45 +0000 (14:03 +0900)]
net: pcnet: Add initialized eth_device structure

pcnet driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agonet: ns8382x: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:44 +0000 (14:03 +0900)]
net: ns8382x: Add initialized eth_device structure

ns8382x driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agonet: natsemi: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:43 +0000 (14:03 +0900)]
net: natsemi: Add initialized eth_device structure

natsemi driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agonet: fec_mxc: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:42 +0000 (14:03 +0900)]
net: fec_mxc: Add initialized eth_device structure

This prevents access to the member of eth_device which is not initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agonet: eepro100: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:41 +0000 (14:03 +0900)]
net: eepro100: Add initialized eth_device structure

eepro100 driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agonet: dc2114x: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:40 +0000 (14:03 +0900)]
net: dc2114x: Add initialized eth_device structure

dc2114x driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agonet: rtl8139: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:39 +0000 (14:03 +0900)]
net: rtl8139: Add initialized eth_device structure

rtl8139 driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agonet: rtl8169: Add initialized eth_device structure
Nobuhiro Iwamatsu [Tue, 19 Oct 2010 05:03:38 +0000 (14:03 +0900)]
net: rtl8169: Add initialized eth_device structure

rtl8169 does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
11 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Fri, 12 Nov 2010 23:38:08 +0000 (00:38 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

11 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Fri, 12 Nov 2010 23:34:53 +0000 (00:34 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

11 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Fri, 12 Nov 2010 23:25:30 +0000 (00:25 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

11 years agoTQM85xx: Fix bug introduced by 83xx/85xx/86xx: LBC register cleanup
Becky Bruce [Thu, 11 Nov 2010 17:33:05 +0000 (11:33 -0600)]
TQM85xx: Fix bug introduced by 83xx/85xx/86xx: LBC register cleanup

The size of the other bank needed to be added to the br0 setting;
this got dropped in the LBC cleanup.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Tested-by: Wolfgang Denk <wd@denx.de>
Acked-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agopowerpc/corenet_ds: display the RCW at boot
Timur Tabi [Fri, 5 Mar 2010 21:29:26 +0000 (21:29 +0000)]
powerpc/corenet_ds: display the RCW at boot

Display the 64-byte Reset Configuration Word (RCW) during boot, so that
there's no confusion as to what RCW U-boot is using.

Reset Configuration Word (RCW):
       000000004a500000 00000000 18181818 00008888
       0000001028402400 00002000 fe800000 01200000
       0000002000000000 00000000 00000000 000b0000
       0000003000000000 00000000 00000000 00000000

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agopowerpc/p4080ds: Move ICS refclk define into P4080DS.h
Kumar Gala [Thu, 30 Sep 2010 20:47:16 +0000 (15:47 -0500)]
powerpc/p4080ds: Move ICS refclk define into P4080DS.h

We appear to have different refclk's on the different corenet DS boards
so move the define out of the common header.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agopowerpc/corenet_ds: Move CONFIG_SYS_TEXT_BASE into corenet_ds.h
Kumar Gala [Wed, 20 Oct 2010 21:02:41 +0000 (16:02 -0500)]
powerpc/corenet_ds: Move CONFIG_SYS_TEXT_BASE into corenet_ds.h

CONFIG_SYS_TEXT_BASE setting is common across the 'corenet_ds' board
family so move it out of P4080DS.h and into corenet_ds.h

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agopowerpc/corenet_ds: Enable DHCP suport
Kumar Gala [Wed, 10 Nov 2010 14:40:41 +0000 (08:40 -0600)]
powerpc/corenet_ds: Enable DHCP suport

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agop1_p2_rdb: to set SQW/INT pin of RTC as INT line
Priyanka Jain [Mon, 25 Oct 2010 09:22:53 +0000 (14:52 +0530)]
p1_p2_rdb: to set SQW/INT pin of RTC as INT line

SQW/INT pin in RTC can be used for generating square wave(by default) or
as interrupt line.  U-boot is registering this pin for interrupts.
Configuring SQW/INT bit as interrupt line during board initialization
to avoid spurious interrupts generated by square wave.

Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agopowerpc/85xx: add CONFIG_SYS_TEXT_BASE_SPL for 85xx nand spl build
Haiying Wang [Wed, 10 Nov 2010 20:37:13 +0000 (15:37 -0500)]
powerpc/85xx: add CONFIG_SYS_TEXT_BASE_SPL for 85xx nand spl build

Introduce a SPL specific CONFIG_SYS_TEXT_BASE_SPL define to be used by
the linker.  This has similiar semantics to CONFIG_SYS_TEXT_BASE however
since SPL is a unqiue image we introduce a new variable to control its
text base address.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agopowerpc/85xx: rename CONFIG_SYS_TEXT_BASE to CONFIG_SYS_MONITOR_BASE
Haiying Wang [Wed, 10 Nov 2010 20:37:13 +0000 (15:37 -0500)]
powerpc/85xx: rename CONFIG_SYS_TEXT_BASE to CONFIG_SYS_MONITOR_BASE

Use CONFIG_SYS_MONITOR_BASE instead of CONFIG_SYS_TEXT_BASE in early
init code so we can share the same code with NAND or NOR boot and not
have additional ifdefs in here.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agopowerpc/85xx: Fix lds for nand build
Haiying Wang [Wed, 10 Nov 2010 19:32:36 +0000 (14:32 -0500)]
powerpc/85xx: Fix lds for nand build

Fix u-boot-nand.lds and u-boot-nand_spl.lds according to:

Author: Peter Tyser <ptyser@xes-inc.com>
Date:   Wed Sep 29 14:05:56 2010 -0500
commit fbe53f59bd40b3b1ab66dc98859e26589d64d1b7
    85xx: Use gc-sections to reduce image size

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agopowerpc/8xxx: Enable e1000 driver on some FSL boards
Kumar Gala [Wed, 10 Nov 2010 05:19:50 +0000 (23:19 -0600)]
powerpc/8xxx: Enable e1000 driver on some FSL boards

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agopowerpc/8xxx: Fix merge issue with P2020DS DDR2 build config
Kumar Gala [Wed, 10 Nov 2010 05:19:27 +0000 (23:19 -0600)]
powerpc/8xxx: Fix merge issue with P2020DS DDR2 build config

When P2020DS DDR2 was merged it was merged incorrectly and propogated to
boards.cfg.  Fix this by moving DDR2 config to be associated with
P2020DS and not P1_P2_RDB.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
11 years agosf: ramtron: new spi fram driver
Reinhard Meyer [Tue, 5 Oct 2010 14:56:40 +0000 (16:56 +0200)]
sf: ramtron: new spi fram driver

Supports most types that support Read-Id and the FM25H20.

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
11 years agoenv_sf: remove warning introduced with last patch
Stefano Babic [Fri, 29 Oct 2010 09:49:45 +0000 (11:49 +0200)]
env_sf: remove warning introduced with last patch

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-marvell
Wolfgang Denk [Fri, 29 Oct 2010 20:03:00 +0000 (22:03 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-marvell

Conflicts:
include/configs/km_arm.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-imx
Wolfgang Denk [Fri, 29 Oct 2010 19:50:24 +0000 (21:50 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-imx

11 years agoMerge branch 'master' of git://git.denx.de/u-boot-samsung
Wolfgang Denk [Fri, 29 Oct 2010 19:47:48 +0000 (21:47 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-samsung

11 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Fri, 29 Oct 2010 19:46:08 +0000 (21:46 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

11 years agoMerge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa
Wolfgang Denk [Fri, 29 Oct 2010 19:44:40 +0000 (21:44 +0200)]
Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

11 years agoDrop support for CONFIG_SKIP_RELOCATE_UBOOT
Wolfgang Denk [Thu, 28 Oct 2010 18:52:49 +0000 (20:52 +0200)]
Drop support for CONFIG_SKIP_RELOCATE_UBOOT

For ARM systems, before ELF relocation was introduced,
CONFIG_SKIP_RELOCATE_UBOOT coul be used to prevent *COPYING* the
U-Boot image from whereever it was loaded to it's link address
(CONFIG_SYS_TEXT_BASE).  The name was badly chosen, as no relocation
was performed at all, it was just a memcpy().

With ELF relocation, this does not work like that any more, and
related boards need to be fixed anyway.  So don't keep this relict any
longer.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Reinhard Meyer <u-boot@emk-elektronik.de>
11 years agoDrop support for CONFIG_SYS_ARM_WITHOUT_RELOC
Wolfgang Denk [Thu, 28 Oct 2010 18:35:36 +0000 (20:35 +0200)]
Drop support for CONFIG_SYS_ARM_WITHOUT_RELOC

When this define was introduced, the idea was to provide a soft
migration path for ARM boards to get adapted to the new relocation
support.  However, other recent changes led to a different
implementation (ELF relocation), where this no longer works.  By now
CONFIG_SYS_ARM_WITHOUT_RELOC does not only not help any more, but it
actually hurts because it obfuscates the actual code by sprinkling it
with lots of dead and non-working debris.

So let's make a clean cut and drop CONFIG_SYS_ARM_WITHOUT_RELOC.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Reinhard Meyer <u-boot@emk-elektronik.de>
11 years agoReplace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC
Wolfgang Denk [Thu, 28 Oct 2010 18:00:11 +0000 (20:00 +0200)]
Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_NEEDS_MANUAL_RELOC

By now, the majority of architectures have working relocation
support, so the few remaining architectures have become exceptions.
To make this more obvious, we make working relocation now the default
case, and flag the remaining cases with CONFIG_NEEDS_MANUAL_RELOC.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Reinhard Meyer <u-boot@emk-elektronik.de>
11 years agoKirkwood: bugfix: DRAM size initialization
Tanmay Upadhyay [Thu, 28 Oct 2010 14:36:22 +0000 (20:06 +0530)]
Kirkwood: bugfix: DRAM size initialization

If start of any DRAM bank is greater than total DDR size, remaining DDR banks' start address & size were left un-initialized in dram_init function. This could break other functions who uses array 'gd->bd->bi_dram'. Kirkwood network driver is one example. This also stops Linux kernel from booting.

v2 - Set start address also to 0. Without this Linux kernel couldn't
     boot up

Signed-off-by: Tanmay Upadhyay <tanmay.upadhyay@einfochips.com>
11 years agokirkwood: get rid of config.mk files
Prafulla Wadaskar [Wed, 27 Oct 2010 12:16:06 +0000 (17:46 +0530)]
kirkwood: get rid of config.mk files

After moving the definition of CONFIG_SYS_TEXT_BASE to the respective
board config files, all Marvell kirkwood board have just a single and
common entry in their config.mk files:

KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg

Replace the only reference to KWD_CONFIG in the top level Makefile by
an equivalent setting, and remove all kirkwood config.mk files.

Signed-off-by: Wolfgang Denk <wd at denx.de>
Cc: Prafulla Wadaskar <prafulla at marvell.com>
Cc: Siddarth Gore <gores at marvell.com>
Cc: Simon Kagstrom <simon.kagstrom at netinsight.net>
Cc: Heiko Schocher <hs at denx.de>
Cc: Eric Cooper <ecc at cmu.edu>
Acked-by: Wolfgang Denk <wd at denx.de>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
11 years agokirkwood: guruplug: Relocate NAND environment area
Gray Remlin [Thu, 28 Oct 2010 13:32:12 +0000 (19:02 +0530)]
kirkwood: guruplug: Relocate NAND environment area

Current default options increase u-boot size to overlap the location of the environment in NAND, move environment higher up

Signed-off-by: Gray Remlin <g_remlin@rocketmail.com>
11 years agomx51evk: support new relocation scheme
Shawn Guo [Thu, 28 Oct 2010 02:13:15 +0000 (10:13 +0800)]
mx51evk: support new relocation scheme

This patch is to fix build breakage and support new relocation
scheme for mx51evk.

- Correct IRAM base address and add size definition

  The IRAM starts from 0x1FFE0000 on final revsion i.mx51 than
  0x1FFE8000 which is for older revision.

- Include imx-regs.h in mx51evk.h

  Definitions like CSD0_BASE_ADDR and IRAM_BASE_ADDR can be
  referred to.

- Define CONFIG_SYS_INIT_RAM_ADDR and CONFIG_SYS_INIT_RAM_SIZE

  They are used to define init RAM layout.

- Remove comment for CONFIG_SYS_GBL_DATA_SIZE which has been
  buried by Wolfgang's commit below

  25ddd1fb: Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value

Signed-off-by: Shawn Guo <shawn.gsc@gmail.com>
11 years agomx51evk: consolidate env for mmcboot and netboot
Shawn Guo [Mon, 25 Oct 2010 15:20:30 +0000 (23:20 +0800)]
mx51evk: consolidate env for mmcboot and netboot

This patch is to consolidate default mx51evk env for two primary
boot modes, mmcboot and netboot.

It also cleans some unused env like netdev, uboot and redundant
env like loadaddr since CONFIG_LOADADDR already defines it.

Signed-off-by: Shawn Guo <shawn.gsc@gmail.com>
11 years agomx51evk: Fix 2 hours reset issue
Shawn Guo [Wed, 27 Oct 2010 15:36:04 +0000 (23:36 +0800)]
mx51evk: Fix 2 hours reset issue

The mx51evk u-boot has an issue that system will get reset
every 2 hours.

MC13892 has an inside charge timer which expires in 120 minutes.
If ICHRG and CHGAUTOB are not set properly, this timer expiration
will get system power recycled.

Since mx51evk has no Li-Ion battery on board, the patch sets
ICHRG in externally powered mode and sets CHGAUTOB bit to avoid
automatic charging, so that system will not get reset by this
timer expiration.

The patch also corrects the bit field definition of register 48
(Charger 0) per latest MC13892 Reference Manual.

Signed-off-by: Shawn Guo <shawn.gsc@gmail.com>
11 years agoMX51: remove warning in clock.c
Stefano Babic [Thu, 28 Oct 2010 09:08:52 +0000 (11:08 +0200)]
MX51: remove warning in clock.c

The patch removes the warning:

clock.c:291: warning: initialization from incompatible pointer type

after  constification of args[]

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agoimx25: Fix reset
Matthias Weisser [Wed, 27 Oct 2010 14:34:38 +0000 (16:34 +0200)]
imx25: Fix reset

This patch fixes the reset command on imx25. The watchdog registers are 16
bits in size and not 32. This patch also adds the service register codes as
constants.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
11 years agoMX5:use common u-boot.lds of cpu layer
Jason Liu [Thu, 21 Oct 2010 01:11:47 +0000 (09:11 +0800)]
MX5:use common u-boot.lds of cpu layer

Remove u-boot.lds from mx5 and use the common u-boot.lds
of cpu layer. This patch also fix the building errors:

arch/arm/cpu/armv7/start.o: In function `_rel_dyn_start_ofs':
arch/arm/cpu/armv7/start.S:283: undefined reference to `__rel_dyn_start'
arch/arm/cpu/armv7/start.o: In function `_rel_dyn_end_ofs':
arch/arm/cpu/armv7/start.S:283: undefined reference to `__rel_dyn_end'
arch/arm/cpu/armv7/start.o: In function `_dynsym_start_ofs':
arch/arm/cpu/armv7/start.S:283: undefined reference to `__dynsym_start'

Signed-off-by: Jason Liu <r64343@freescale.com>
11 years agoMX51: add CONFIG_SYS_TEXT_BASE to vision2 board, use general ld script
Stefano Babic [Wed, 20 Oct 2010 07:23:06 +0000 (09:23 +0200)]
MX51: add CONFIG_SYS_TEXT_BASE to vision2 board, use general ld script

Recent patch changed TEXT_BASE to CONFIG_SYS_TEXT_BASE and
vision2 board was not updated.

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agoAdd generic support for samsung s3c2440
C Nauman [Tue, 26 Oct 2010 14:04:31 +0000 (23:04 +0900)]
Add generic support for samsung s3c2440

This patch adds generic support for the Samsung s3c2440 processor.

Global s3c24x0 changes to struct members converting from upper case to
lower case.

Signed-off-by: Craig Nauman <cnauman@diagraph.com>
Cc: kevin.morfitt@fearnside-systems.co.uk
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoBlackfin: config.mk: drop manual stripping of config vars
Mike Frysinger [Tue, 19 Oct 2010 06:48:34 +0000 (02:48 -0400)]
Blackfin: config.mk: drop manual stripping of config vars

Now that the common code takes care of stripping away quotes and such
from numeric options, we no longer need to do so ourselves.  So drop
the custom code we have in the Blackfin config.mk.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
11 years agoBlackfin: fix building after asm-offsets.h intro
Mike Frysinger [Thu, 28 Oct 2010 01:10:58 +0000 (21:10 -0400)]
Blackfin: fix building after asm-offsets.h intro

Since some of the defines in our config.h use the generated defines, we
need to include the generated header.  This fixes building of the Blackfin
start.S file (where the stack is setup).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
11 years agoarm/pxa: remove unused arch-pxa/macro.h
Mikhail Kshevetskiy [Wed, 27 Oct 2010 21:47:24 +0000 (01:47 +0400)]
arm/pxa: remove unused arch-pxa/macro.h

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
11 years agoPrepare v2010.12-rc1 v2010.12-rc1
Wolfgang Denk [Wed, 27 Oct 2010 20:49:13 +0000 (22:49 +0200)]
Prepare v2010.12-rc1

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agoCoding Style cleanup
Wolfgang Denk [Wed, 27 Oct 2010 20:48:30 +0000 (22:48 +0200)]
Coding Style cleanup

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agocmd_onenand.c: Fix command usage help.
Enric Balletbo i Serra [Tue, 19 Oct 2010 09:13:21 +0000 (11:13 +0200)]
cmd_onenand.c: Fix command usage help.

Running the onenand command without arguments does nothing, with this
patch shows the command usage.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
11 years agommc: seperate block number into small parts for multi-write cmd
Lei Wen [Thu, 14 Oct 2010 05:38:11 +0000 (13:38 +0800)]
mmc: seperate block number into small parts for multi-write cmd

Constraint the mmc framework to only send no more than 65535
blocks in one go during the multi-write command. This constraint
comes due to the limitation of 16bit width block counter register
at some hardware.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Cc: Reinhard Meyer <u-boot@emk-elektronik.de>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-sparc
Wolfgang Denk [Wed, 27 Oct 2010 18:37:33 +0000 (20:37 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-sparc

11 years agoenv_sf: updated to the new environment code
Stefano Babic [Wed, 27 Oct 2010 09:06:20 +0000 (11:06 +0200)]
env_sf: updated to the new environment code

Functions to store/retrieve the environment from a SPI flash was not updated
to the new environment code. The non-redundant case was
not working correctly, reporting ""Environment SPI flash not initialized"
and the code was not compiled clean in the redundant case.

The patch fixes these issue and makes the code more coherent
with other environment storage (nand, flash).

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agoMakefile: fix dependencies for building NAND_SPL
Wolfgang Denk [Wed, 27 Oct 2010 09:06:51 +0000 (11:06 +0200)]
Makefile: fix dependencies for building NAND_SPL

Building of NAND based boards failed sometimes (especially on MP
systems) because of incorrect / missing dependencies.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
11 years agomake-asm-offsets: fix sed script
Wolfgang Denk [Wed, 27 Oct 2010 06:31:42 +0000 (08:31 +0200)]
make-asm-offsets: fix sed script

When copying the "sed" script to generate the asm-offsets.h file from
the Linux Kbuild script into the make-asm-offsets file I missed the
fact that the former runs in a "make" context and thus uses double
"$$" to escape a single "$", while the latter is a shell script, where
this must not be done.  Unfortunately the problem did not show up
during the initial tests on Power Architecture systems, but on ARM the
generated asm-offsets.h was not correct.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
11 years agomcu25: fix out of tree building
Wolfgang Denk [Wed, 27 Oct 2010 08:29:56 +0000 (10:29 +0200)]
mcu25: fix out of tree building

Out of tree building of the Netstal mcu25 board failed like
that:

Configuring for mcu25 board...
Assembler messages: Fatal error: can't create /work/wd/tmp-ppc/board/netstal/mcu25/../common/fixed_sdram.o: No such file or directory
Assembler messages: Fatal error: can't create /work/wd/tmp-ppc/board/netstal/mcu25/../common/nm_bsp.o: No such file or directory

Adapt (and simplify) the Makefile.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Niklaus Giger <niklaus.giger@netstal.com>
11 years agoRevert "cmd_net: drop spurious comma in U_BOOT_CMD"
Wolfgang Denk [Tue, 26 Oct 2010 21:42:23 +0000 (23:42 +0200)]
Revert "cmd_net: drop spurious comma in U_BOOT_CMD"

This commit causes build errors like this:

cmd_net.c:301:1: error: macro "U_BOOT_CMD" requires 6 arguments, but only 5 given
cmd_net.c:298: warning: data definition has no type or storage class
cmd_net.c:298: warning: type defaults to 'int' in declaration of 'U_BOOT_CMD'

This reverts commit 8f4cb77ef7183ce1bb3f767604a0677c6f6d84a7.

11 years agopost/drivers/i2c.c: fix compile error
Wolfgang Denk [Tue, 26 Oct 2010 21:22:36 +0000 (23:22 +0200)]
post/drivers/i2c.c: fix compile error

Commit 7e263ce "post/i2c: Clean up detection logic" added a "const"
qualifier to the declaration of i2c_addr_list[], missing the fact that
the list gets modified later in the code, which results in build
errors like these:

i2c.c: In function 'i2c_post_test':
i2c.c:88: error: assignment of read-only location

Remove the incorrect "const".

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Heiko Schocher <hs@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agoARM: use the same branch insn on all architectures
Wolfgang Denk [Sat, 23 Oct 2010 21:22:38 +0000 (23:22 +0200)]
ARM: use the same branch insn on all architectures

For the "fixloop" implementation in start.S a number of different
instructions was used.  Unify code so all architectures use "blo"
here because it is more robust in case of incorrect alignments.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Albert ARIBAUD <albert.aribaud@free.fr>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agoRemove config.mk for da8xxevm based boards.
Sughosh Ganu [Fri, 22 Oct 2010 19:28:03 +0000 (00:58 +0530)]
Remove config.mk for da8xxevm based boards.

Move CONFIG_SYS_TEXT_BASE to the board's config file, and remove the
now unnecessary config.mk file.

Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
11 years agoarm, bootm: Fix compile warning
Heiko Schocher [Mon, 25 Oct 2010 06:33:38 +0000 (08:33 +0200)]
arm, bootm: Fix compile warning

Fix warning:

bootm.c: In function 'bootm_linux_fdt':
bootm.c:181: warning: unused variable 's'
bootm.c:180: warning: unused variable 'bd'

Signed-off-by: Heiko Schocher <hs@denx.de>
11 years agocmd_net: drop spurious comma in U_BOOT_CMD
Mike Frysinger [Wed, 20 Oct 2010 07:33:30 +0000 (03:33 -0400)]
cmd_net: drop spurious comma in U_BOOT_CMD

Building for boards that have CONFIG_CMD_CDP enabled fail with:
cmd_net.c:301: error: expected expression before ',' token

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
11 years agoarm1176: fix relocation
Darius Augulis [Mon, 25 Oct 2010 10:48:03 +0000 (13:48 +0300)]
arm1176: fix relocation

Fix relocation code for arm1176, do it like other ARM
CPU's are doing.
Tested only with CONFIG_SKIP_RELOCATE_UBOOT defined
and using nand_spl (booting from nand). Test done on
s3c6410 based board (not yet supported in main line).

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
11 years agoARM: fix address setup in start.S
Darius Augulis [Mon, 25 Oct 2010 10:45:35 +0000 (13:45 +0300)]
ARM: fix address setup in start.S

Fix address setup bug for ARM.
This bug stops u-boot booting if
CONFIG_SKIP_RELOCATE_UBOOT is defined.

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
11 years agoReplace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value
Wolfgang Denk [Tue, 26 Oct 2010 12:34:52 +0000 (14:34 +0200)]
Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value

CONFIG_SYS_GBL_DATA_SIZE has always been just a bad workarond for not
being able to use "sizeof(struct global_data)" in assembler files.
Recent experience has shown that manual synchronization is not
reliable enough.  This patch renames CONFIG_SYS_GBL_DATA_SIZE into
GENERATED_GBL_DATA_SIZE which gets automatically generated by the
asm-offsets tool.  In the result, all definitions of this value can be
deleted from the board config files.  We have to make sure that all
files that reference such data include the new <asm-offsets.h> file.

No other changes have been done yet, but it is obvious that similar
changes / simplifications can be done for other, related macro
definitions as well.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
11 years agoinclude/asm-offsets.h: automatically generate assembler constants
Wolfgang Denk [Mon, 25 Oct 2010 22:08:35 +0000 (00:08 +0200)]
include/asm-offsets.h: automatically generate assembler constants

A recurrent issue is that certain C level constructs like sizeof() or
offsetof() cannot be used in assembler files, which is inconvenient
when such constructs are used in the definition of macro names etc.

To avoid duplication of such definitions (and thus another cause of
problems), we adapt the Linux way to automatically generate the
respective definitions from the respective C header files.

In Linux, this is implemented in include/linux/kbuild.h, Kbuild, and
arch/*/kernel/asm-offsets.c; we adapt the code from the Linux v2.6.36
kernel tree.

We also copy the concept of the include/generated/ directory which can
be used to hold other automatically generated files as well.

We start with an architecture-independent lib/asm-offsets.c which
generates include/generated/generic-asm-offsets.h (included by
include/asm-offsets.h, which is what will be referred to in the actual
source code).  Later this may be extended by architecture-specific
arch/*/lib/asm-offsets.c files that will generate a
include/generated/asm-offsets.h.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
11 years agoRename CONFIG_SYS_INIT_RAM_END into CONFIG_SYS_INIT_RAM_SIZE
Wolfgang Denk [Tue, 26 Oct 2010 11:32:32 +0000 (13:32 +0200)]
Rename CONFIG_SYS_INIT_RAM_END into CONFIG_SYS_INIT_RAM_SIZE

CONFIG_SYS_INIT_RAM_END was a misnomer as it suggests this might be
some end address; to make the meaning more clear we rename it into
CONFIG_SYS_INIT_RAM_SIZE

No other code changes are performed in this patch, only minor editing
of white space (due to the changed length) and the comments was done,
where noticed.

Note that the code for the PATI and cmi_mpc5xx board configurations
looks seriously broken.  Last known maintainers on Cc:

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Denis Peter <d.peter@mpl.ch>
Cc: Martin Winistoerfer <martinwinistoerfer@gmx.ch>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Tue, 26 Oct 2010 18:58:49 +0000 (20:58 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

11 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Tue, 26 Oct 2010 18:57:41 +0000 (20:57 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

11 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Tue, 26 Oct 2010 18:55:39 +0000 (20:55 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

11 years agoARM: Use consistent assembler syntax
Gray Remlin [Sun, 24 Oct 2010 15:18:31 +0000 (16:18 +0100)]
ARM: Use consistent assembler syntax

Signed-off-by: Gray Remlin <g_remlin@rocketmail.com>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agoBlackfin: adi boards: set compiled size limits
Mike Frysinger [Tue, 19 Oct 2010 22:02:43 +0000 (18:02 -0400)]
Blackfin: adi boards: set compiled size limits

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
11 years agoBlackfin: bf527-ezkit-v2: move to boards.cfg
Mike Frysinger [Tue, 19 Oct 2010 06:41:26 +0000 (02:41 -0400)]
Blackfin: bf527-ezkit-v2: move to boards.cfg

Now that the boards.cfg file supports options to mkconfig, we can move
the bf527-ezkit-v2 target out of the Makefile and into boards.cfg.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
11 years agoppc4xx: Add Io and IoCon 405EP board support
Dirk Eibach [Thu, 21 Oct 2010 08:50:05 +0000 (10:50 +0200)]
ppc4xx: Add Io and IoCon 405EP board support

Board support for the Guntermann & Drunck CATCenter Io.
Board support for the Guntermann & Drunck IoCon.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
11 years agoMerge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Wolfgang Denk [Mon, 25 Oct 2010 06:06:52 +0000 (08:06 +0200)]
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

11 years agoARMV7: OMAP: I2C driver: Fix bug found in 37XX testing
Steve Sakoman [Fri, 22 Oct 2010 20:48:00 +0000 (13:48 -0700)]
ARMV7: OMAP: I2C driver: Fix bug found in 37XX testing

On OMAP36/37XX the standard on chip pullups are not sufficient to
ensure proper i2c operation without external pullups or switching
to high speed mode and enabling special on chip pullups.

This is an issue for Beagle xM, which does not have external pullups
on the expansion board i2c lines.

The issue manifests itself as an AL (arbitration lost) error when
probing for a non-existent device (i.e. on a Beagle xM with no expansion
boards attached).  This issue does not occur on expansion boards that
include pullups or on Overo 37XX COM's since they include pull-ups.

This patch fixes the issue by checking for the AL bit in the i2c_probe
function.

Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org>
11 years agohcu4, hcu5: fix out of tree building
Wolfgang Denk [Sun, 24 Oct 2010 14:49:12 +0000 (16:49 +0200)]
hcu4, hcu5: fix out of tree building

Out of tree building of the Netstal hcu4 and hcu5 boards failed like
that:

Assembler messages:
Fatal error: can't create /work/wd/tmp-ppc/board/netstal/hcu4/../common/fixed_sdram.o: No such file or directory
Assembler messages:
Fatal error: can't create /work/wd/tmp-ppc/board/netstal/hcu4/../common/nm_bsp.o: No such file or directory
make[1]: *** [/work/wd/tmp-ppc/board/netstal/hcu4/../common/fixed_sdram.o] Error 2

Adapt (and simplify) the respective Makefiles.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Niklaus Giger <niklaus.giger@netstal.com>
11 years agoMPC8315ERD: fix build error
Wolfgang Denk [Sun, 24 Oct 2010 14:07:23 +0000 (16:07 +0200)]
MPC8315ERD: fix build error

Commit 29c6fbe "MPC5121: Add USB EHCI support" renamed
CONFIG_SYS_MPC8xxx_USB_ADDR into CONFIG_SYS_FSL_USB_ADDR but missed
to update arch/powerpc/cpu/mpc83xx/cpu_init.c, resulting in:

cpu_init.c: In function 'cpu_init_f':
cpu_init.c:332: error: 'CONFIG_SYS_MPC8xxx_USB_ADDR' undeclared (first use in this function)
cpu_init.c:332: error: (Each undeclared identifier is reported only once
cpu_init.c:332: error: for each function it appears in.)
make[1]: *** [/work/wd/tmp-ppc/arch/powerpc/cpu/mpc83xx/cpu_init.o] Error 1

Fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kim Phillips <kim.phillips@freescale.com>
11 years agoVoVPN-GW_100MHz: drop unsupported board configuration
Wolfgang Denk [Sun, 24 Oct 2010 13:46:08 +0000 (15:46 +0200)]
VoVPN-GW_100MHz: drop unsupported board configuration

The 100MHz configuation of the VoVPN-GW has never been supported, so
drop it now.

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agolite5200b_PM: fix compile warning
Wolfgang Denk [Sun, 24 Oct 2010 13:37:12 +0000 (15:37 +0200)]
lite5200b_PM: fix compile warning

Fix warning:

icecube.c: In function 'lite5200b_wakeup':
icecube.c:83: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'void (*)(void)'

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agoMAKEALL: drop non-existent i386 config
Mike Frysinger [Wed, 20 Oct 2010 07:34:19 +0000 (03:34 -0400)]
MAKEALL: drop non-existent i386 config

11 years agoARM: fix relocation support for onenand device.
Enric Balletbo i Serra [Tue, 19 Oct 2010 09:13:22 +0000 (11:13 +0200)]
ARM: fix relocation support for onenand device.

We also have to relocate the onenand command table manually, otherwise
onenand command don't work.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>