s5pc110: aquila: add CONFIG_SYS_CONSOLE_IS_IN_ENV define

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: p1p2: Corrected AMOLED panel setting

Merge branch 'master' of dh09.lee@10.89.8.158:/pub/git/u-boot-s5pc1xx

s5pc1xx: p1p2: Change AMOLED panel driver to auto sequence

s5pc110: No need to change at Universal board

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

s5pc110: Fix J1B2 Memory configuration

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

s5pc110: Set correct memory size

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

s5pc110: aquila: fsa9480: remove unused operation

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc110: aquila: clear device_info structure after display on LCD

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc110: Geminus detection support

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

s5pc110: another omitted file

s5pc110: support sleep: added an omitted file

s5pc110: support sleep

Merge branch 'master' of mj.ham@party:/pub/git/u-boot-s5pc1xx

s5pc110: suspend/resume support

KNOWN ISSUES:
- unstable resume (freezes occasionally)
- unnecessary wake-up routines (needs to be cleaned)
- current mismatch between before-suspend and after-suspend
- current not low enough (will follow kernel suspend/resume)
- HW Revision number corruption (probably GPIO related issue)

s5pc1xx: aquila: remove fat command

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: j1b2: add j1b2 board detection & fix lcd config

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc110: fb: corrected samsung logo.

Signed-off-by: daeinki <inki.dae@samsung.com>

s5pc110: fb: code clean.

Signed-off-by: daeinki <inki.dae@samsung.com>

s5pc110: fb: changed samsung logo.

Signed-off-by: daeinki <inki.dae@samsung.com>

s5pc110: p1p2: Add ams701ka AMOLED Driver

Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:

cpu/arm_cortexa8/start.S

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

s5pc110: fb: bug fix.

Signed-off-by: daeinki <inki.dae@samsung.com>

s5pc11x: cache: remove unused file & build fix

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: serial: driver update

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: aquila: lcd off when usb is stopped

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

sf: fix stmicro offset setup while erasing

Reported-by: Peter Gombos <gombos@protecta.hu>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

sf: new driver for Winbond W25X16/32/64 devices

Signed-off-by: Jason McMullan <jason.mcmullan@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

mpc8260: move FDT memory node fixup into common CPU code.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
Tested-by: Heiko Schocher <hs@denx.de>

Add driver for FTRTC010 real time clock

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
Edited commit message.
Signed-off-by: Wolfgang Denk <wd@denx.de>

MIMC200: set default fbmem value

This patch adds a default bootargs "fbmem" value to the
CONFIG_BOOTARGS string for the MIMC200 board.

Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>

usbd: add progress bar protocol

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

fbutil: add to draw progress bar

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

usbd: fix the comments

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

5pc1xx: aquila: workaround: fix revision check (default is Rev0.4)

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: aquila: workaround: fix revision check

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

usbd: fix typo

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

usbd: fix environment erase

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc110: lcd: added env value for dual lcd.

Signed-off-by: daeinki <inki.dae@samsung.com>

s5pc110: aquila: fix ifdef condition

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

usbd: bugfix: get correct part id

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

ppc4xx: Initialize magnetic coupler on VOM405 boards

This patch fixes an ugly behavior of the IL712 magnetic coupler
as used on VOM405. These parts will remember their last state
over a power cycle which might cause unwanted behavior.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>

ppc4xx: Initialize magnetic couplers in PLU405

This patch fixes an ugly behavior of the IL712 magnetic couplers
as used on PLU405. These parts will remember their last state
over a power cycle which might cause unwanted behavior.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>

Add minimal SJA1000 header for basic CAN mode

This patch is in preparation for the upcoming PLU405 board fix.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>

s5pc110: aquila: Add fota and log partitions

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

s5pc11x: aquila: use hwrevision function

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: aquila: kill warnings

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: remove SZ_ defines

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: aquila: fix the dram init

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

Merge branch 'master' of git://git.denx.de/u-boot-net

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

ppc/85xx: Fix how we determine the number of CAM entries

We were incorrectly use the max CAM size as the number of entries in
the array for setting up the addrmap.  We should be using the NENTRY
field which is the low 12-bits of TLB1CFG.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

s5pc1xx: aquila: remove duplicated printf

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: aquila: show device info on LCD, if volume down key is pressed

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

fbutil: fb_printf: support horizontal tab

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc110: aquila: Display HW Rev again

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

s5pc110: check 3 touchkey firmware

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

smc911x: make smc911x_initialize return correct value

Make smc911x_initialize return -1 on error and number of interfaces
detected otherwise.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

smc911x_eeprom: fix building after smc911x overhaul

When the smc911x driver was converted to NET_MULTI, the smc911x eeprom was
missed.  The config option needed updating as well as overhauling of the
rergister read/write functions.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

s5pc1xx: aquila: work around for rev 0.4 (rev 0.3 + CP ES3.1)

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

Revert "s5pc1xx: aquila: work around for rev 0.4 (rev 0.3 + CP ES3.1)"

This reverts commit 82aa2f09fe0d2b4ec73d048fbeafdd0fd5bfc2ae.

s5pc1xx: aquila: work around for rev 0.4 (rev 0.3 + CP ES3.1)

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: aquila: set direction to input when hw rev check

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

build: add prom's setting

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc110: aquila: Workaround for Rev 0.3 + CP ES3.1

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

s5pc110: aquila: Add XCLKOUT set to XUSBXTI

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>

s5pc110: aquila: fsa9480 doesn't work at rev00 and rev01

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

fsl-ddr: Fix the chip-select interleaving issue

commit 1542fbdeec0d1e2a6df13189df8dcb1ce8802be3
introduced one new bug to chip-select interleaving.

Single DDR controller also can do the chip-select
interleaving if there is dual-rank or qual-rank DIMMs.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

s5pc110: Remove XCLKOUT set for audio

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>

Merge branch 'master' of git://git.denx.de/u-boot-net

Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

mxc_fec: avoid free() calls to already freed pointers.

Sometimes, inside NetLoop, eth_halt() is called before eth_init() has
been called. This is harmless except for free() calls to pointers
which have not been allocated yet.

This patch initializes those pointers to NULL and allocates them only
the first time. This way we can get rid of free calls in halt callback.

This has been tested in i.MX27 Litekit board and eldk-4.2 toolchains.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

mxc_fec: fix some erroneous PHY accesses.

This patch fixes erroneous access to the ethernet PHY which broke the driver.
1. Selector field in the auto-negotiation register must be 0x00001 for
using 802.3, not 0x00000 which is reseved.
2. Access to the PHY address specified by CONFIG_FEC_MXC_PHYADDR, not
0x0 fixed address.

This has been tested in i.MX27 Litekit board and eldk-4.2 toolchains.

Now using proper defines for auto-negotiation register.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

ARM Don't inline weak symbols

------------------------------------------------------------------------

GCC 4.4 complains about this now.

Signed-off-by: Ron Lee <ron@debian.org>

Fix SMC91111 regression: lpd7a40x build failures

Both lpd7a400 and lpd7a404 failed to compile because they had
CONFIG_SMC_USE_IOFUNCS defined:

examples/standalone/smc91111_eeprom.c:388: undefined reference to `SMC_outw'

Also removed an orphaned paren in lpd7a404.h

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

SMC91111: Clean up SMC_inx macros on xsengine and xaeniax

This patch fixes the following warnings:

Configuring for xaeniax board...
smc91111_eeprom.c: In function 'print_macaddr':
smc91111_eeprom.c:278: warning: suggest parentheses around + or - in operand of &
smc91111_eeprom.c:281: warning: suggest parentheses around + or - in operand of &
...
Configuring for xsengine board...
smc91111_eeprom.c: In function 'print_macaddr':
smc91111_eeprom.c:278: warning: suggest parentheses around + or - inside shift
smc91111_eeprom.c:281: warning: suggest parentheses around + or - inside shift

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

Merge branch 'master' of prom@party:/pub/git/u-boot-s5pc1xx

s5pc1xx: universal: remove unused defines

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

Fix CS8900 regression on impa7 board

The following error was seen on impa7 board, due to its use of a 32-bit bus
on CS8900.
cs8900.c:137:37: error: macro "get_reg_init_bus" passed 2 arguments, but takes just 1

This patch gives the macro the correct number of arguments

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

clarify eth driver halt/recv steps

The dev->halt() func can be called at any time, and the dev->recv() func
does not need to use NetRxPackets[] when calling NetReceive().

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

Fix cs8900 dev->priv not init issue

Ensure all CS8900 data structures are assigned before accessing device

Signed-off-by: Hui.Tang <zetalabs@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

ppc4xx: 44x_spd_ddr2.c: Fix register macro ECCCR -> ECCES (SDRAM_ECCES)

This error only appears when DEBUG is enabled in this driver. That's why
it went unnoticed till now.

Signed-off-by: Stefan Roese <sr@denx.de>

ppc4xx: Canyonlands: Change EBC bus config to drive always (no high-z)

This patch fixes a problem only seen very occasionally on Canyonlands.
The NOR flash interface (CFI driver) doesn't work reliably in all cases.
Erasing and/or programming sometimes doesn't work. Sometimes with
an error message, like "flash not erased" when trying to program an
area that should have just been erased. And sometimes without any error
messages. As mentioned above, this problem was only seen rarely and with
some PLL configuration (CPU speed, EBC speed).

Now I spotted this problem a few times, when running my Canyonlands with
the following setup (chip_config):

1000-nor         - NOR  CPU:1000 PLB: 200 OPB: 100 EBC: 100

Changing the EBC configuration to not release the bus into high
impedance state inbetween the transfers (ATC, DTC and CTC bits set to 1
in EBC0_CFG) seems to fix this problem. I haven't seen any failure
anymore with this patch applied.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: David Mitchell <dmitchell@amcc.com>
Cc: Jeff Mann <MannJ@embeddedplanet.com>

s5pc110: aquila: code clean

Signed-off-by: Heungjun Kim <riverful.kim@samsung.com>

s5pc110: aquila: enable 3 touchkey even J1B2 setting

Signed-off-by: Heungjun Kim <riverful.kim@samsung.com>

s5pc110: aquila: enable 3 touchkey on booting

Signed-off-by: Heungjun Kim <riverful.kim@samsung.com>

ARM: Use Linux version for unaligned access code

The asm-arm/unaligned.h includes linux/unaligned/access_ok.h
This file is unsafe to be used on ARM, since it does an unaligned memory
accesses which fails on ARM.

Lookin at Linux the basic difference seems to be the header
"include/asm-arm/unaligned.h". The Linux version of "unaligned.h"
does *not* include "access_ok.h" at all. It includes "le_byteshift.h"
and "be_byteshift.h" instead.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Stefan Roese <sr@denx.de>
--
 include/asm-arm/unaligned.h            |    3 -
 include/linux/unaligned/be_byteshift.h |   70 +++++++++++++++++++++++++++++++++
 include/linux/unaligned/le_byteshift.h |   70 +++++++++++++++++++++++++++++++++
 3 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 include/linux/unaligned/be_byteshift.h
 create mode 100644 include/linux/unaligned/le_byteshift.h

s5pc1xx: aquila: fix the comment

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: aquila: If Factory Mode is Boot ON-USB, go to download mode automatically

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

usbd: move download msg to up

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: serial: code clean

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc1xx: tickertape: fix the usb switching

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc110: fb: remove unused header file

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

s5pc110: fb: fix the clock setting

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

ppc/85xx: Fix inclusion of 83xx immap in 85xx builds

The nand_boot_fsl_elbc.c is shared between 83xx & 85xx however we should
not be including the immap_83xx.h when building 85xx.  We can just get
this all from common.h

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

86xx: Remove redundant code in initdram

The same code exists both inside an #ifdef and outside of it.
Remove the extra code for all the 86xx boards.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

fsl_pci_init_port end-point initialization is broken

commit 70ed869e broke fsl pcie end-point initialization.
Returning 0 is not correct.  The function must return the first free
bus number for the next controller.

fsl_pci_init() must still be called and a bus allocated even if the
controller is an end-point.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Revert "ppc/85xx/pci: fsl_pci_init: pcie agent mode support"

This reverts commit 70ed869ea5f6b1d13d7b140c83ec0dcd8a127ddc.

There isn't any need to modify the API for fsl_pci_init_port to pass the
status of host/agent(end-point) status.  We can determine that
internally to fsl_pci_init_port.  Revert the patch that makes the API
change.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>