oweals/u-boot.git
14 years agotsec: Add TSEC_FIBER flag
Peter Tyser [Mon, 9 Nov 2009 19:09:48 +0000 (13:09 -0600)]
tsec: Add TSEC_FIBER flag

The TSEC_FIBER flag should be set when a PHY is operating with an
external fiber interface.  Currently it is only used to notify a user
that the PHY is operating in fiber mode.

A short description was also added to the other TSEC flag defines so
that it is clear how they differ from one another.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Add support for using the BCM5482 PHY in fiber mode
Peter Tyser [Mon, 9 Nov 2009 19:09:47 +0000 (13:09 -0600)]
tsec: Add support for using the BCM5482 PHY in fiber mode

The BCM5482 PHY supports both copper and fiber as an ethernet medium.
By enabling its copper/fiber mode auto-detection feature it can
dynamically determine if it should be configured for copper or fiber.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: General cleanup
Peter Tyser [Mon, 9 Nov 2009 19:09:46 +0000 (13:09 -0600)]
tsec: General cleanup

- Cleanup formatting of phy_info structures

- Fix lines > 80 chars

- Fix some random indentation inconsistencies

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Make functions/data static when possible
Peter Tyser [Mon, 9 Nov 2009 19:09:45 +0000 (13:09 -0600)]
tsec: Make functions/data static when possible

This is generally good practice and saves ~150 bytes.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Clean up Broadcom PHY status parsing
Peter Tyser [Mon, 9 Nov 2009 19:09:44 +0000 (13:09 -0600)]
tsec: Clean up Broadcom PHY status parsing

- Remove unnecessary printing "Enet starting in <speed>/<duplex>"
    This same information is already printed during normal ethernet
    operation in the form "Speed: 1000, full duplex".

- Add a check for link before determining link speed and duplex
    If there is no link, speed/duplex don't matter.  This also removes
    the annoying and unneeded "Auto-neg error, defaulting to 10BT/HD"
    message that occurs when no link is detected.

- Whitespace and line > 80 characters cleanup

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Force TBI PHY to 1000Mbps full duplex in SGMII mode
Peter Tyser [Tue, 3 Nov 2009 23:52:07 +0000 (17:52 -0600)]
tsec: Force TBI PHY to 1000Mbps full duplex in SGMII mode

In SGMII mode the link between a processor's internal TBI PHY and an
external PHY should always be 1000Mbps, full duplex.  Also, the SGMII
interface between an internal TBI PHY and external PHY does not
support in-band auto-negotation.

Previously, when configured for SGMII mode a TBI PHY would attempt to
restart auto-negotation during initializtion.  This auto-negotation
between a TBI PHY and external PHY would fail and result in unusable
ethernet operation.

Forcing the TBI PHY and and external PHY to link at 1000Mbps full duplex
in SGMII mode resolves this issue of auto-negotation failing.

Note that 10Mbps and 100Mbps operation is still possible on the external
side of the external PHY even when SGMII is operating at 1000Mbps.
The SGMII interface still operates at 1000Mbps, but each byte of data
is repeated 100 or 10 times for 10/100Mbps and the external PHY handles
converting this data stream into proper 10/100Mbps signalling.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoNET: Fix MAC addr handling for smc911x
Seunghyeon Rhee [Mon, 2 Nov 2009 08:00:00 +0000 (00:00 -0800)]
NET: Fix MAC addr handling for smc911x

This patch turns off MAC address mismatch warning when
optional eeprom programmed with MAC address is not available.
In that case, smc911x's MAC address register has its default
value ff:ff:ff:ff:ff:ff and it's not a valid address. This
makes eth_initialize() show the warning which has no
meaningful information while environment variable ethaddr
overrides the address read from the register. If there's no
eeprom and the value of MAC address register is not valid
after initialization, dev->enetaddr had better not be updated
and maintain its initial value 00:00:00:00:00:00, which I
think is what eth_initialize() expects. This is not a bug fix.
Even without this patch, the driver works fine. It's just for
enhancing the way of displaying messages.

Signed-off-by: Seunghyeon Rhee <seunghyeon@lpmtec.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agocs8900_initialize() cleanup
Matthias Kaehlcke [Thu, 21 Jan 2010 21:16:34 +0000 (22:16 +0100)]
cs8900_initialize() cleanup

cs8900_initialize(): remove unecessary calls to free() and fix memory leak

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agosmc91111_eeprom: fix linking error
Mike Frysinger [Thu, 21 Jan 2010 10:04:59 +0000 (05:04 -0500)]
smc91111_eeprom: fix linking error

Building for a bf533-stamp ends up with this error:
smc91111_eeprom.o: In function `smc91111_eeprom':
examples/standalone/smc91111_eeprom.c:58: undefined reference to `memset'
make[2]: *** [smc91111_eeprom] Error 1

The new eth_struct definition means gcc has to zero out the structure on
the stack, and some gcc versions optimize this with an implicit call to
memset.  So tweak the structure style to avoid that gcc feature.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Wed, 27 Jan 2010 19:19:08 +0000 (20:19 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

14 years agoFix compiler warning in imximage.c due to getline prototype
Kumar Gala [Wed, 27 Jan 2010 16:16:56 +0000 (10:16 -0600)]
Fix compiler warning in imximage.c due to getline prototype

imximage.c: In function 'imximage_parse_cfg_file':
imximage.c:142: warning: implicit declaration of function 'getline'

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx: Add support for 'cpu disable' command
Kumar Gala [Tue, 12 Jan 2010 18:56:05 +0000 (12:56 -0600)]
85xx: Add support for 'cpu disable' command

Support disabling of a core via user command 'cpu disable'.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago86xx: Add support for 'cpu disable' command
Kumar Gala [Tue, 12 Jan 2010 17:51:52 +0000 (11:51 -0600)]
86xx: Add support for 'cpu disable' command

Support disabling of a core via user command 'cpu disable'.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoAdd support to disable cpu's in multicore processors
Kumar Gala [Tue, 12 Jan 2010 17:42:43 +0000 (11:42 -0600)]
Add support to disable cpu's in multicore processors

Add a disable sub-command to the cpu command that allows for disabling
cores in multicore processors.  This can be useful for systems that are
using multicore chips but aren't utilizing all the cores as a way to
reduce power and possibly improve performance.

Also updated an added missing copyright.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Tue, 26 Jan 2010 21:32:38 +0000 (22:32 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Tue, 26 Jan 2010 21:29:51 +0000 (22:29 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

14 years ago83xx, kmeter1: fix compile error
Heiko Schocher [Wed, 20 Jan 2010 08:05:32 +0000 (09:05 +0100)]
83xx, kmeter1: fix compile error

- delete double MTDIDS_DEFAULT and MTDPARTS_DEFAULT
  defines in board config file.
- add mising CONFIG_KM_UBI_PARTITION_NAME define

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoadd ability to handle compressed images to imxtract
Wolfgang Wegner [Thu, 10 Dec 2009 09:11:21 +0000 (10:11 +0100)]
add ability to handle compressed images to imxtract

imxtract currently can not handle compressed images. This patch adds
handling for bzip2 and zip compression. In both cases, a destination
address has to be specified for extraction.

Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
14 years agoppc: remove -ffixed-r14 gcc option.
Joakim Tjernlund [Tue, 19 Jan 2010 13:41:57 +0000 (14:41 +0100)]
ppc: remove -ffixed-r14 gcc option.

This is no loger needed, free up r14 for general usage.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
14 years agoppc: Update README about the new GOT ptr.
Joakim Tjernlund [Tue, 19 Jan 2010 13:41:58 +0000 (14:41 +0100)]
ppc: Update README about the new GOT ptr.

r14 is no longer used as non volatile GOT ptr. Instead
the volatile r12 is used so be sure to do GET_GOT in
asm code when you need to access global data.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
14 years agoppc: Use r12 instead of r14 as GOT pointer.
Joakim Tjernlund [Tue, 19 Jan 2010 13:41:56 +0000 (14:41 +0100)]
ppc: Use r12 instead of r14 as GOT pointer.

r14 is not supposed to be clobbered by functions. Switch
to r12 and call GET_GOT when needed. This will allow u-boot
to loose the -ffixed-r14 gcc option.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
14 years agoppc: Loose GOT access in IRQ
Joakim Tjernlund [Tue, 19 Jan 2010 13:41:55 +0000 (14:41 +0100)]
ppc: Loose GOT access in IRQ

Using the GOT in IRQ handlers requires r14 to be -ffixed-r14.
Avoid this by relocatate transfer_to_handler too.
This will allow to free up r14 later on.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
14 years ago85xx/p1_p2_rdb: enable hwconfig
Vivek Mahajan [Thu, 7 Jan 2010 08:57:14 +0000 (14:27 +0530)]
85xx/p1_p2_rdb: enable hwconfig

Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoqe: fixup the snum for MPC8569 Rev2.0
Liu Yu [Fri, 15 Jan 2010 06:58:40 +0000 (14:58 +0800)]
qe: fixup the snum for MPC8569 Rev2.0

Since 1.0 and 2.0 use different snum table,
we fixup the snum value according to SPRN_SVR.

Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoFix the local bus divider mapping
Dave Liu [Tue, 17 Nov 2009 12:49:05 +0000 (20:49 +0800)]
Fix the local bus divider mapping

The real clock divider is 4 times of the bits LCRR[CLKDIV],
according the latest RevF RM.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Add ATM config for MPC8569MDS
Liu Yu [Fri, 27 Nov 2009 07:31:52 +0000 (15:31 +0800)]
ppc/85xx: Add ATM config for MPC8569MDS

Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Add PIB/ATM support for MPC8569mds
Liu Yu [Fri, 27 Nov 2009 07:31:51 +0000 (15:31 +0800)]
ppc/85xx: Add PIB/ATM support for MPC8569mds

Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl_esdhc: fix wrong clock mask
Li Yang [Thu, 7 Jan 2010 08:00:13 +0000 (16:00 +0800)]
fsl_esdhc: fix wrong clock mask

Fix typo in SYSCTL_CLOCK_MASK, which caused residual in high bits of SDCLKFS.

Signed-off-by: Jin Qing <B24347@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoRevert "ppc/p4080: Fix reporting of PME & FM clock frequencies"
Kumar Gala [Mon, 25 Jan 2010 17:01:51 +0000 (11:01 -0600)]
Revert "ppc/p4080: Fix reporting of PME & FM clock frequencies"

This reverts commit bc20f9a9527afe8ae406a74f74765d4323f04922.

The original code was correct.  I clearly need glasses or a brown
paper bag.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/p4080: Fix mask width of RCW fields MEM_PLL_RAT, SYS_PLL_RAT
James Yang [Tue, 12 Jan 2010 21:50:18 +0000 (15:50 -0600)]
ppc/p4080: Fix mask width of RCW fields MEM_PLL_RAT, SYS_PLL_RAT

The masks for MEM_PLL_RAT and SYS_PLL_RAT should have been 5-bits
instead of 4.

Signed-off-by: James Yang <James.Yang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agojffs2: fix hangs/crashs when not using CONFIG_JFFS2_PART_SIZE
Mike Frysinger [Fri, 8 Jan 2010 13:03:06 +0000 (08:03 -0500)]
jffs2: fix hangs/crashs when not using CONFIG_JFFS2_PART_SIZE

Commit b5b004ad8a0ac6f98bd5708ec8b22fbddd1c1042 caused the sector_size to
be calculated incorrectly when the part size was not hardcoded.  This is
because the new code relied on part->size but tried to do the calculation
before it was initialized properly, and it did not take into consideration
the magic SIZE_REMAINING define.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agogetline: split out for darwin systems
Mike Frysinger [Fri, 8 Jan 2010 07:48:03 +0000 (02:48 -0500)]
getline: split out for darwin systems

At least on OS X 10.5 and older, getline does not exist.  So split out the
function from the mingw code so that we can pull it in for Darwin systems.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agotools: give explicit libfdt paths
Mike Frysinger [Fri, 22 Jan 2010 00:59:04 +0000 (19:59 -0500)]
tools: give explicit libfdt paths

The current libfdt object rules hard depend implicitly on the .depend file
being correct.  If it isn't, then it is unable to properly compile the
objects.  Give it a full path like all the other implicit rules here so it
will always work in face of .depend issues.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agogzip/zlib: make features optional
Mike Frysinger [Fri, 22 Jan 2010 00:30:36 +0000 (19:30 -0500)]
gzip/zlib: make features optional

If you really want to slim down U-Boot and you would rather use a higher
compression scheme (like LZMA), it'd be nice to disable gzip/zlib since
these code bases take up a significant amount of space.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agomkimage: Add Freescale imx Boot Image support (imximage)
Stefano Babic [Wed, 20 Jan 2010 17:19:10 +0000 (18:19 +0100)]
mkimage: Add Freescale imx Boot Image support (imximage)

This patch adds support for "imximage" (MX Boot Image)
to the mkimage utility. The imximage is used on the Freescales's
MX.25, MX.35 and MX.51 processors.

Further details under doc/README.imximage.

This patch was tested on a Freescale mx51evk board.

Signed-off-by: Stefano Babic <sbabic@denx.de>
14 years agompc5xxx: Support CPU internal watchdog.
Detlev Zundel [Wed, 20 Jan 2010 13:28:48 +0000 (14:28 +0100)]
mpc5xxx: Support CPU internal watchdog.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agompc512x: Add display of reset status register
Detlev Zundel [Fri, 22 Jan 2010 13:47:59 +0000 (14:47 +0100)]
mpc512x: Add display of reset status register

Content of the RSR is put into gd early so we can output it together
with the CPU info.  The clearing of gd in board_init_f is redundant for
this architecture as it is done in cpu_init_f so we remove it.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agoMerge branch 'master-sync' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Sat, 23 Jan 2010 16:42:03 +0000 (17:42 +0100)]
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

14 years agoat91: Enable slow master clock on meesc board
Daniel Gorsulowski [Wed, 20 Jan 2010 07:00:11 +0000 (08:00 +0100)]
at91: Enable slow master clock on meesc board

Normally the processor clock has a divisor of 2.
In some cases this this needs to be set to 4.
Check the user has set environment mdiv to 4 to change the divisor.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
14 years agoSPEAr : Support added for SPEAr320 board
Vipin KUMAR [Fri, 15 Jan 2010 13:45:53 +0000 (19:15 +0530)]
SPEAr : Support added for SPEAr320 board

SPEAr320 SoC support contains basic spear320 support along with the
usage of following drivers
- serial driver(UART)
- i2c driver
- smi driver
- nand driver(FSMC)
- usbd driver
- emi driver(cfi support)

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : Support added for SPEAr310 board
Vipin KUMAR [Fri, 15 Jan 2010 13:45:52 +0000 (19:15 +0530)]
SPEAr : Support added for SPEAr310 board

SPEAr310 SoC support contains basic spear310 support along with the
usage of following drivers
- serial driver(UART)
- i2c driver
- smi driver
- nand driver(FSMC)
- usbd driver
- emi driver(cfi support)

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : emi controller initialization for CFI driver support
Vipin KUMAR [Fri, 15 Jan 2010 13:45:51 +0000 (19:15 +0530)]
SPEAr : emi controller initialization for CFI driver support

SPEAr310 and SPEAr320 SoCs contain an EMI controller to interface
Paraller NOR flashes. This patch adds the support for this IP

The standard CFI driver is used to interface with NOR flashes

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : Support added for SPEAr300 board
Vipin KUMAR [Fri, 15 Jan 2010 13:45:50 +0000 (19:15 +0530)]
SPEAr : Support added for SPEAr300 board

SPEAr300 SoC support contains basic spear300 support along with the
usage of following drivers
- serial driver(UART)
- i2c driver
- smi driver
- nand driver(FSMC)
- usbd driver

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : Support for HW mac id read/write from i2c mem
Vipin KUMAR [Fri, 15 Jan 2010 13:45:49 +0000 (19:15 +0530)]
SPEAr : Support for HW mac id read/write from i2c mem

This patch adds the  support to read and write mac id from i2c
memory.
For reading:
if (env contains ethaddr)
pick env ethaddr
else
pick ethaddr from i2c memory
For writing:
chip_config ethaddr XX:XX:XX:XX:XX:XX writes the mac id
in i2c memory

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : Support added for SPEAr600 board
Vipin KUMAR [Fri, 15 Jan 2010 13:45:48 +0000 (19:15 +0530)]
SPEAr : Support added for SPEAr600 board

SPEAr600 SoC support contains basic spear600 support along with the
usage of following drivers
- serial driver(UART)
- i2c driver
- smi driver
- nand driver(FSMC)
- usbd driver

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : usbd driver support for SPEAr SoCs
Vipin KUMAR [Fri, 15 Jan 2010 13:45:47 +0000 (19:15 +0530)]
SPEAr : usbd driver support for SPEAr SoCs

SPEAr SoCs contain a synopsys usb device controller.
USB Device IP can work in 2 modes
- DMA mode
- Slave mode

The driver adds support only for slave mode operation of usb
device IP. This driver is used along with standard USBTTY
driver to obtain a tty interface over USB on the host

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : nand driver support for SPEAr SoCs
Vipin KUMAR [Fri, 15 Jan 2010 13:45:46 +0000 (19:15 +0530)]
SPEAr : nand driver support for SPEAr SoCs

SPEAr SoCs contain an FSMC controller which can be used to interface
with a range of memories eg. NAND, SRAM, NOR.
Currently, this driver supports interfacing FSMC with NAND memories

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : smi driver support for SPEAr SoCs
Vipin KUMAR [Fri, 15 Jan 2010 13:45:45 +0000 (19:15 +0530)]
SPEAr : smi driver support for SPEAr SoCs

SPEAr SoCs contain a serial memory interface controller. This
controller is used to interface with spi based memories.
This patch adds the driver for this IP.

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : i2c driver support added for SPEAr SoCs
Vipin KUMAR [Fri, 15 Jan 2010 13:45:44 +0000 (19:15 +0530)]
SPEAr : i2c driver support added for SPEAr SoCs

SPEAr SoCs contain a synopsys i2c controller.
This patch adds the driver for this IP.

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : Adding basic SPEAr architecture support.
Vipin KUMAR [Fri, 15 Jan 2010 13:45:43 +0000 (19:15 +0530)]
SPEAr : Adding basic SPEAr architecture support.

SPEAr Architecture support added. It contains the support for
following SPEAr blocks
- Timer
- System controller
- Misc registers

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoSPEAr : Adding README.spear in doc
Vipin KUMAR [Fri, 15 Jan 2010 13:45:42 +0000 (19:15 +0530)]
SPEAr : Adding README.spear in doc

README.spear contains information about SPEAr architecture and
build options etc

Signed-off-by: Vipin <vipin.kumar@st.com>
14 years agoARM Update mach-types
Tom Rix [Thu, 21 Jan 2010 00:00:28 +0000 (18:00 -0600)]
ARM Update mach-types

Fetched from http://www.arm.linux.org.uk/developer/machines/download.php
And built with

repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
commit 2045124ffd1a5e46d157349016a2c50f19c8c91d

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoKirkwood: Makefile cleanup- fixed ordering (cosmetic change)
Prafulla Wadaskar [Mon, 16 Nov 2009 12:59:25 +0000 (18:29 +0530)]
Kirkwood: Makefile cleanup- fixed ordering (cosmetic change)

As per coding guidlines, it is good to maintain proper ordering
in the makefiles.
This was missed during initial coding, corrected here.

This was discovered during orion5x code review
Thanks to Albert Aribaud for this.

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
14 years agoKirkwood: Upgated licencing for files imported from linux source to GPLv2 or later
Prafulla Wadaskar [Wed, 23 Dec 2009 21:25:23 +0000 (02:55 +0530)]
Kirkwood: Upgated licencing for files imported from linux source to GPLv2 or later

These are few files directly imported from Linux kernel source.
Those are not modifyed at all ar per strategy.
These files contains source with GPLv2 only
whereas u-boot expects GPLv2 or latter

These files are updated for the same from prior permission from original writes

Acked-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
14 years agos5pc1xx: update cache routines
Minkyu Kang [Fri, 18 Dec 2009 06:03:51 +0000 (15:03 +0900)]
s5pc1xx: update cache routines

Because of v7_flush_dcache_all is moved to omap3/cache.S
and s5pc110 needs cache routines, update s5pc1xx cache routines.

l2_cache_enable and l2_caceh_disable are moved from cache.c to cache.S
and invalidate_dcache is modified for SoC specific.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
14 years agosamsung: fix DMC1_MEM_CFG for s3c64xx
Seunghyeon Rhee [Thu, 3 Dec 2009 00:41:49 +0000 (09:41 +0900)]
samsung: fix DMC1_MEM_CFG for s3c64xx

The MSB of DMC1_MEM_CFG can be set to '1' for separate CKE control
for S3C6400. In the configuration of SMDK6400, however, two 16-bit
mDDR (SAMSUNG K4X51163) chips are used in parallel to form 32-bit
memory bus and there is no need to control CKE for each chip
separately. AFAIK, CKE1 is not at all connected. Only CKE0 is
used. Futhermore, it should be '0' always for S3C6410. When tested
with a board which has a S3C6410 and the same memory configuration,
a side effect is observed that u-boot command "reset" doesn't work
leading to system hang. Leaving the bit clear is safe in most cases.

Signed-off-by: Seunghyeon Rhee <seunghyeon@lpmtec.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
14 years agoppc4xx: Kilauea: Add CPLD version detection and EBC reconfiguration
Stefan Roese [Thu, 21 Jan 2010 10:37:31 +0000 (11:37 +0100)]
ppc4xx: Kilauea: Add CPLD version detection and EBC reconfiguration

A newer CPLD version on the 405EX evaluation board requires a different
EBC controller setup for the CPLD register access. This patch adds a CPLD
version detection for Kilauea and code to reconfigure the EBC controller
(chip select 2) for the old CPLD if no new version is found.

Additionally the CPLD version is printed upon bootup:

Board: Kilauea - AMCC PPC405EX Evaluation Board (CPLD rev. 0)

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Wolfgang Denk <wd@denx.de>
Cc: Zhang Bao Quan <bqzhang@udtech.com.cn>
14 years agoppc4xx: Fix sending type 1 PCI transactions
Felix Radensky [Fri, 22 Jan 2010 23:35:24 +0000 (01:35 +0200)]
ppc4xx: Fix sending type 1 PCI transactions

The list of 4xx SoCs that should send type 1 PCI transactions
is not defined correctly. As a result PCI-PCI bridges and devices
behind them are not identified. The following 4xx variants should
send type 1 transactions: 440GX, 440GP, 440SP, 440SPE, 460EX and 460GT.

Signed-off-by: Felix Radensky <felix@embedded-sol.com>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agompc512x: Use in/out accessors for all registers
Detlev Zundel [Thu, 21 Jan 2010 16:55:58 +0000 (17:55 +0100)]
mpc512x: Use in/out accessors for all registers

This is not only a cosmetic change as it fixes the real bug of board
reset not working with the ELDK 4.2 toolchain.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agotools: allow people to compile w/out configuring
Mike Frysinger [Thu, 21 Jan 2010 09:03:22 +0000 (04:03 -0500)]
tools: allow people to compile w/out configuring

It's useful to be able to build up the host tools without having to select
a board first.  Pretty much all tools in there are config-independent
anyways.

Also add a shortcut "tools-all" to quickly build all host tools that are
actually config-independent to allow for simple test builds.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoubsha1: drop unnecessary includes/prototypes
Mike Frysinger [Thu, 21 Jan 2010 09:03:21 +0000 (04:03 -0500)]
ubsha1: drop unnecessary includes/prototypes

This code doesn't use any config.h defines, and the sha1.h header already
declares a sha1_csum prototype.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoimage.h: avoid command.h for host tools
Mike Frysinger [Thu, 21 Jan 2010 09:03:20 +0000 (04:03 -0500)]
image.h: avoid command.h for host tools

The u-boot command structures don't get used with host systems, so don't
bother including it when building host code.  This avoids an implicit need
on config.h in the process.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoRemoving Atmel from ARM926EJ-S Systems
Matthias Weisser [Mon, 18 Jan 2010 09:58:13 +0000 (10:58 +0100)]
Removing Atmel from ARM926EJ-S Systems

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
14 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Thu, 21 Jan 2010 21:27:59 +0000 (22:27 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Thu, 21 Jan 2010 21:27:54 +0000 (22:27 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

14 years agolmb: only force on arches that use it
Mike Frysinger [Tue, 3 Nov 2009 16:35:59 +0000 (11:35 -0500)]
lmb: only force on arches that use it

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agosha1: add dedicated config option
Mike Frysinger [Mon, 18 Jan 2010 02:08:00 +0000 (21:08 -0500)]
sha1: add dedicated config option

The sha1 code is currently compiled for everyone, but in reality, it's
only used by the FIT code.  So make it optional just like MD5.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mips
Wolfgang Denk [Thu, 21 Jan 2010 21:03:28 +0000 (22:03 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mips

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Thu, 21 Jan 2010 21:02:21 +0000 (22:02 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Thu, 21 Jan 2010 20:54:37 +0000 (21:54 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

14 years agoppc4xx: Allow setting a single SPD EEPROM address for DDR2 DIMMs
Felix Radensky [Tue, 19 Jan 2010 19:19:06 +0000 (21:19 +0200)]
ppc4xx: Allow setting a single SPD EEPROM address for DDR2 DIMMs

On platforms where SPD EEPROM and another EEPROM have adjacent
I2C addresses SPD_EEPROM_ADDRESS should be defined as a single
element array, otherwise DDR2 setup code would fail with the
following error:

ERROR: Unknown DIMM detected in slot 1

However, fixing SPD_EEPROM_ADDRESS would result in another
error:

ERROR: DIMM's DDR1 and DDR2 type can not be mixed.

This happens because initdram() routine does not explicitly
initialize dimm_populated array. This patch fixes the problem.

Signed-off-by: Felix Radensky <felix@embedded-sol.com>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoppc4xx: Fix reporting of bootstrap options G and F on 460EX/GT
Felix Radensky [Tue, 19 Jan 2010 15:37:13 +0000 (17:37 +0200)]
ppc4xx: Fix reporting of bootstrap options G and F on 460EX/GT

Bootstrap options G and F are reported incorrectly (G instead
of F and vice versa). This patch fixes this.

Signed-off-by: Felix Radensky <felix@embedded-sol.com>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoMIPS: qemu_mips: Import asm/unaligned.h from the Linux kernel
Shinya Kuribayashi [Wed, 20 Jan 2010 12:07:00 +0000 (21:07 +0900)]
MIPS: qemu_mips: Import asm/unaligned.h from the Linux kernel

with a few adjustments for U-Boot.  This fixes the following build error:

make -C lib_generic/
zlib.c:31:27: error: asm/unaligned.h: No such file or directory
zlib.c: In function 'inflate_fast':
zlib.c:641: warning: implicit declaration of function 'get_unaligned'
make[1]: *** [zlib.o] Error 1
make[1]: Leaving directory `/home/skuribay/git/u-boot.git/lib_generic'
make: *** [lib_generic/libgeneric.a] Error 2

Reported-by: Himanshu Chauhan <himanshu@symmetricore.com>
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
14 years agoMX31: Activate NAND environment on i.MX31 PDK board.
Magnus Lilja [Sun, 17 Jan 2010 16:46:11 +0000 (17:46 +0100)]
MX31: Activate NAND environment on i.MX31 PDK board.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
14 years agoMXC: Add large page oob layout for i.MX31 NAND controller.
Magnus Lilja [Sun, 17 Jan 2010 16:46:10 +0000 (17:46 +0100)]
MXC: Add large page oob layout for i.MX31 NAND controller.

Import the large page oob layout from Linux mxc_nand.c driver.

The CONFIG_SYS_NAND_LARGEPAGE option is used to activate
the large page oob layout. Run time detection is not supported
as this moment.

This has been tested on the i.MX31 PDK board with a large
page NAND device.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
14 years agomxc_nand: Update driver to work with i.MX31.
Magnus Lilja [Wed, 11 Nov 2009 19:18:43 +0000 (20:18 +0100)]
mxc_nand: Update driver to work with i.MX31.

Tested on i.MX31 Litekit.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
14 years agoMX31: Add struct definition for clock control module in i.MX31.
Magnus Lilja [Wed, 11 Nov 2009 19:18:42 +0000 (20:18 +0100)]
MX31: Add struct definition for clock control module in i.MX31.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
14 years agomicroblaze: zlib needs asm/unaligned.h
Michal Simek [Tue, 19 Jan 2010 11:03:25 +0000 (12:03 +0100)]
microblaze: zlib needs asm/unaligned.h

Microblaze has own hw unaligned handler if is available.
Use big endian version.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Remove getenv_IPaddr prototype
Michal Simek [Tue, 19 Jan 2010 11:03:24 +0000 (12:03 +0100)]
microblaze: Remove getenv_IPaddr prototype

Commit 6a45e384955262882375a2785426dc65aeb636c4
should remove reference from Microblaze too.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agoMAINTAINERS: fix nhk8815 board name
Alessandro Rubini [Mon, 18 Jan 2010 21:38:38 +0000 (22:38 +0100)]
MAINTAINERS: fix nhk8815 board name

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
14 years agoFix breakage in SMC EEPROM standalone applications
Ben Warren [Mon, 18 Jan 2010 19:35:31 +0000 (11:35 -0800)]
Fix breakage in SMC EEPROM standalone applications

Commit 6a45e384955262882375a2785426dc65aeb636c4 (Make getenv_IPaddr() global)
inadvertently added ' #include "net.h" ' to the standalone programs, creating
duplicate definitions of 'struct eth_device'.  This patch removes the local
definitions and removes other code that breaks due to the change in definition.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
14 years agoMakefile: fix parallel build
Daniel Hobi [Mon, 18 Jan 2010 17:13:39 +0000 (18:13 +0100)]
Makefile: fix parallel build

During parallel build, the top Makefile spawns multiple sub-makes for
targets in cpu/$(CPU) and $(dir $(LDSCRIPT)). If the .depend files are
not present in these directories, the sub-makes may end up generating
these files simultaneously which leads to corrupted content.

A typical error message is:

.depend:39: *** multiple target patterns.  Stop.

This patch serializes the creation of .depend in cpu/$(CPU) and
$(dir $(LDSCRIPT)) by adding these directories to the depend target
in the top Makefile.

Other directories in $(LIBS) are not affected since they contain only
one Make target and thus only one sub-make is spawned per directory.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: add support for kgdb
Robin Getz [Mon, 21 Dec 2009 21:35:48 +0000 (16:35 -0500)]
Blackfin: add support for kgdb

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoasm-generic/signal.h: import from linux
Robin Getz [Mon, 21 Dec 2009 22:55:22 +0000 (17:55 -0500)]
asm-generic/signal.h: import from linux

We need signal.h for Blackfin/KGDB, so import the asm-generic/signal.h
for people to leverage.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoCRAMFS: support cramfs in RAM
Heiko Schocher [Thu, 7 Jan 2010 07:55:54 +0000 (08:55 +0100)]
CRAMFS: support cramfs in RAM

cramfsls and cramfsload are added to the command list.
A cramfs placed at 'cramfs_addr' can the be listed with 'cramfsls' and files
can be loaded with 'cramfsload'. 'cramfs_addr' is an environment variable
specifying the address the cramfs is located.
This works for powerpc and for ARM.

Use CONFIG_CMD_CRAMFS.

Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agopowerpc: keymile boards updates
Heiko Schocher [Thu, 7 Jan 2010 07:55:50 +0000 (08:55 +0100)]
powerpc: keymile boards updates

- malloc size 4 MB for all keymile boards
- use generic FDT code for fixing up the DTS
- enable unit-led at startup for keymile boards
- remove some dts updates for keymile boards
- ppc_83xx, kmeter1: take FE/GbE PHYs out of reset
- ppc_83xx, kmeter1: change from Intel Strata to Spansion 64MB flash
  changed from Intel Strata to Spansion 64MB flash and changed flash layout.
+---------+----------+-----------------------+-----------------------------+
| name    | size     | range                 | description                 |
+---------+----------+-----------------------+-----------------------------+
| u-boot  |   768 KB | 0xf0000000-0xf00bffff | for u-boot                  |
| env     |   128 KB | 0xf00c0000-0xf00dffff | for environment             |
| envred  |   128 KB | 0xf00e0000-0xf00fffff | for environment (redundant) |
| ubi0    | 64512 KB | 0xf0100000-0xf3ffffff | ubi0 for ubi volumes        |
+---------+----------+-----------------------+-----------------------------+

Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agoenv, eeprom: add redundant environment support
Heiko Schocher [Thu, 7 Jan 2010 07:55:44 +0000 (08:55 +0100)]
env, eeprom: add redundant environment support

Add redundant environment support for environment lying on a EEPROM.

Tested on uppcoming suen3 support

Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
14 years agocmd_eeprom: I2C updates
Heiko Schocher [Thu, 7 Jan 2010 07:55:40 +0000 (08:55 +0100)]
cmd_eeprom: I2C updates

- CONFIG_ENV_EEPROM_IS_ON_I2C
  define this, if you have I2C and SPI activated, and your
  EEPROM, which holds the environment, is on the I2C bus.

- CONFIG_I2C_ENV_EEPROM_BUS
  if you have an Environment on an EEPROM reached over
  I2C muxes, you can now define, how to reach this
  EEPROM.

Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agomove definition of macros likely and unlikely to compiler.h
Matthias Kaehlcke [Tue, 22 Dec 2009 22:05:45 +0000 (23:05 +0100)]
move definition of macros likely and unlikely to compiler.h

the macros likely and unlikely were defined in include/linux/mtd/compat.h,
but used in code not related to MTD. moved the macro definitions to compiler.h

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
14 years agocmd_bootm.c: Change interpretation of standalone image parameters.
Detlev Zundel [Tue, 22 Dec 2009 11:43:02 +0000 (12:43 +0100)]
cmd_bootm.c: Change interpretation of standalone image parameters.

Current code uses the second argument to bootm for standalone images to
override the load address specified in the image instead of passing all
parameters as is to the application.  This behaviour is not documented
and not in line with how the go command works for standalone applications,
so we simply drop it.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agocmd_bootm.c: Do not load a ramdisk when not booting a kernel.
Detlev Zundel [Tue, 22 Dec 2009 11:43:01 +0000 (12:43 +0100)]
cmd_bootm.c: Do not load a ramdisk when not booting a kernel.

In case we boot an image marked as 'standalone' and 'linux', the current
code erroneously tried to load a ramdisk.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agokgdb: update mem2hex/hex2mem funcs
Robin Getz [Mon, 21 Dec 2009 23:40:44 +0000 (18:40 -0500)]
kgdb: update mem2hex/hex2mem funcs

Convert the funcs to do the conversion inline so that we can do the copy
all at once with memcpy.  This let's us push out an weird arch-specific
issue with accessing different regions of memory to the memcpy function
like the MMRs on Blackfin systems, and it should be a bit faster.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agokgdb: drop duplicate debugger_exception_handler
Mike Frysinger [Mon, 21 Dec 2009 23:40:43 +0000 (18:40 -0500)]
kgdb: drop duplicate debugger_exception_handler

The debugger_exception_handler definition is the same for everyone, so use
the common one now.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agokgdb: add default generic stubs
Robin Getz [Mon, 21 Dec 2009 23:40:42 +0000 (18:40 -0500)]
kgdb: add default generic stubs

The default kgdb functions can be implemented with common U-Boot functions,
so rather than force everyone to copy & paste these things, create a set of
weak stubs.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agonetconsole: mark local funcs with static
Mike Frysinger [Mon, 21 Dec 2009 19:19:12 +0000 (14:19 -0500)]
netconsole: mark local funcs with static

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoeasylogo: add support for 16-bit RGB565
Michael Hennerich [Sat, 19 Dec 2009 13:19:09 +0000 (08:19 -0500)]
easylogo: add support for 16-bit RGB565

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agompc5xxx/cpu_init.c: Convert to IO accessors.
Detlev Zundel [Fri, 18 Dec 2009 16:35:57 +0000 (17:35 +0100)]
mpc5xxx/cpu_init.c: Convert to IO accessors.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agompc5xxx.h: Add structure definition for XLB arbiter block.
Detlev Zundel [Fri, 18 Dec 2009 16:35:56 +0000 (17:35 +0100)]
mpc5xxx.h: Add structure definition for XLB arbiter block.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agoconfig_defaults.h: new header for common u-boot config defaults
Mike Frysinger [Thu, 3 Dec 2009 02:15:03 +0000 (21:15 -0500)]
config_defaults.h: new header for common u-boot config defaults

There are a bunch of features in U-Boot that we want to enable by default,
and it's best if we centralize them in one place rather than updating all
the board files out there.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Sun, 17 Jan 2010 22:08:42 +0000 (23:08 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin