s5pc110: aquila: env code cleanup

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

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

Revert "s5pc110: Aquila: Fix mtdparts parsing problem"

This reverts commit 3506471e1c1cb6953222a520f2d1480c3fa5bd15.

s5pc110: aquila: support clock & power gating

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

s5pc110: Aquila: Fix mtdparts parsing problem

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

s5pc110: Pass DMC1 CS1 memory configuration (not yet finished)

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

s5pc110: fb: bug fix.

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

s5pc110: cypress: add support i2c gpio 7

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

s5pc110: fb: code clean.

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

s5pc110: fb: updated framebuffer driver.

1. changed framebuffer driver framework.
2. set default layer to 3.
3. added Geminus lcd panel support.

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

s5pc110: cypress: support i2c gpio6 for cypress

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

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

s5pc110: Do NOT turn off LDO6.

s5pc110: fsa9480: need some time after resume? (workaround)

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

s5pc110: geminus: use the fuel-gauge

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

s5pc110: aquila: revision6 doesn't support MHL chip

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

s5pc110: aquila: Fix Rev0.6 memory detection

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

s5pc110: aquila: Don't use DMC1 CS1 memory at Rev0.5

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

s5pc110: Fix DMC1 CS1 memory configuration

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

s5pc110: aquila: Fix Rev 0.4 detection

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

s5pc110: 4G3G1G support (not yet verified)

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

universal: max8998: do not turn VICHG off for sleep

s5pc110: Prepare memory configuration for 3G/4G

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

s5pc110: fsa9480: clear interrupt when charge mode

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

s5pc110: aqulia: Rev 0.6 correct DRAM configuration

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

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

s5pc110: workaround: Aquila Rev0.6 detection

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

s5pc110: cypress: Fix board detection

This fixes P1P2 is detected to Cypress.

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

s5pc110: aquila: Remove Rev0.4 pseudo dection code

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

s5pc110: code cleanup

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

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

s5pc110: fb: bug fix.

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

s5pc1xx: cypress: Modify cypress board detection

Revert "s5pc110: Memory Init: LSI update applied."

This reverts commit 703cfecc81aa2239645007c8312d62f6c4c8e320.

s5pc110: Memory Init: LSI update applied.

s5pc110: cypress: Add cypress board detection

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

s5pc110: lcd: Correct gamma value to 260 cd

s5pc110: lcd: Change default gamma value

mpc83xx: boot time regression, move LCRR setup back to cpu_init_f

Commit c7190f02 (retain POR values of non-configured ACR, SPCR, SCCR,
and LCRR bitfields) moved the LCRR assignment to after relocation
to RAM because of the potential problem with changing the local bus
clock while executing from flash.

This change unfortunately adversely affects the boot time, as running
all code up to cpu_init_r can cause significant slowdown.

E.G. on a 8347 board a bootup time increase of ~600ms has been observed:

   0.020 CPU:   e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
   0.168 RS:    232
   0.172 I2C:   ready
   0.176 DRAM:  64 MB
   1.236 FLASH: 32 MB

Versus:

   0.016 CPU:   e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
   0.092 RS:    232
   0.092 I2C:   ready
   0.096 DRAM:  64 MB
   0.644 FLASH: 32 MB

So far no boards have needed the late LCRR setup, so simply revert it
for now - If it is needed at a later time, those boards can either do
their own final LCRR setup in board code (E.G. in board_early_init_r),
or we can introduce a CONFIG_SYS_LCRR_LATE config option to only do
the setup in cpu_init_r.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

s5pc110: fs: code refactoring and code clean.

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

s5pc110: usbd: code clean

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

s5pc110: sleep: use sleep 1

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

s5pc1xx: p2: Code clean and bug fix

s5pc1xx: p2: Remove unused defines

s5pc1xx: p2: Set KEY_RIGHT for auto_download purpose

s5pc110: fs: read ext2 filesystem from onenand device directly instead of DRAM.

also added file read command.

this code should be cleaned and needs code refactoring.

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

microblaze: Correct ffs regression for Microblaze

We are using generic implementation of ffs. This should
be part of Simon's commit 0413cfecea350000eab5e591a0965c3e3ee0ff00

Here is warning message which this patch removes.

In file included from /tmp/u-boot-microblaze/include/common.h:38,
                 from cmd_mtdparts.c:87:
/tmp/u-boot-microblaze/include/linux/bitops.h:123:1: warning: "ffs" redefined
In file included from /tmp/u-boot-microblaze/include/linux/bitops.h:110,
                 from /tmp/u-boot-microblaze/include/common.h:38,
                 from cmd_mtdparts.c:87:
/tmp/u-boot-microblaze/include/asm/bitops.h:269:1:
warning: this is the location of the previous definition

Signed-off-by: Michal Simek <monstr@monstr.eu>

microblaze: Stop stack clobbering in microblaze-generic.

A typo caused the stack and malloc regions to overlap, which prevented
mem_malloc_init() from returning. This commit makes the memory layout match
the example described in include/configs/microblaze-generic.h

Signed-off-by: Graeme Smecher <graeme.smecher@mail.mcgill.ca>
Signed-off-by: Michal Simek <monstr@monstr.eu>

s5pc110: lcd: kill warnings

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

s5pc110: sleep: kill warnings

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

s5pc110: sleep: move the show_hw_revision function

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

Update CHANGELOG, prepare -rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>

MAKEALL: Fix return value

Previously MAKEALL would always return a value of 0, even if 1 or more
boards did not compile.  This change causes MAKEALL to return 0 if all
boards were able to build, otherwise 1.

This change also requires changing the script interpreter from sh to
bash to support bash's PIPESTATUS variable.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

tools/mkimage: Remove duplicate line of code

Recent commits 1a99de2cb4d08eb3bf9fb3f60a9d533150de8c0e and
6a590c5f5fd12cdd27f3153522acfac3854590e7 both fixed the same bug in the
same manner.  Unfortunately git was "smart" enough to merge both changes
which resulted in some duplicate code.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Reordered code and comment a bit.

Signed-off-by: Wolfgang Denk <wd@denx.de>

i2c: fix dangling comment in do_i2c_mw()

commit bd3784df94bfeca43fbf34094df9cb1bd3ecca3b deleted some unused
code in do_i2c_mw(), but missed to also remove the respective
commment. This patch fixes this.

Signed-off-by: Heiko Schocher <hs@denx.de>

52xx, manroland: add fdt_fixup_memory() in ft_board_setup()

To update the real memory size in the memory node on the
uc101 and mucmc52 boards call fdt_fixup_memory() in
ft_board_setup().

Signed-off-by: Heiko Schocher <hs@denx.de>

Fix computation in nand_util.c:get_len_incl_bad

Depending on offset, flash size and the number of bad blocks,
get_len_incl_bad may return a too small value which may lead to:

1) If there are no bad blocks, nand_{read,write}_skip_bad chooses the
bad block aware read/write code. This may hurt performance, but does
not have any adverse effects.

2) If there are bad blocks, the nand_{read,write}_skip_bad may choose
the bad block unaware read/write code (if len_incl_bad == *length)
which leads to corrupted data.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>

nfs: NfsTimeout() updates

- NfsTimeout() does not correctly update the NFS timeout value which
  results in NfsTimeout() only being called once in certain situations.
  This can result in the 'nfs' command hanging indefinetly.  For
  example, the command:

    nfs 192.168.0.1:/home/user/file

  will not exit until ctrl-c is pressed if 192.168.0.1 does not have an
  NFS server running.

  This issue is resolved by reinitializting the NFS timeout value inside
  NfsTimeout() when a timeout occurs.

- Make the 'nfs' command print the 'T' character when a timeout occurs.
  Previously there was no indication that timeouts were occuring.

- Mimic the 'tftpboot' command and when a download fails print "Retry
  count exceeded; starting again", and restart the download taking the
  'netretry' environment variable into account.

Signed-off-by: Evan Samanas <esamanas@xes-inc.com>
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested on TQM8xxL.

Tested by: Wolfgang Denk <wd@denx.de>

Tested on MPC8527DS.

Tested by: Ed Swarthout <Ed.Swarthout@freescale.com>

bootm: Fix help message's sub-command ordering

The help message for the 'bootm' command listed the 'cmdline' and 'bdt'
sub-commands in the wrong order which resulted in the error below when
following the 'help' command's instructions:

  "Trying to execute a command out of order"

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

help: Correct syntax of nandecc help output.

"nandecc" help output should not reproduce the command name, nor have
a trailing newline.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

smc911x: update SMC911X related configuration description

Since commit 736fead8fdbf8a8407048bebc373cd551d01ec98 "Convert SMC911X
Ethernet driver to CONFIG_NET_MULTI API" SMC911X configration options
are called CONFIG_SMC911X rather than CONFIG_DRIVER_SMC911X. Update
README to reflect that change.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>

smc911x: fix typo in smc911x_handle_mac_address name

Signed-off-by: Mike Rapoport <mike@compulab.co.il>

fix nfs symlink name corruption

An off by one error may cause nfs readlink lookup fail if
nfs_path_buff has non-zero data from a previous use.

Loading: *** ERROR: File lookup fail

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>

at91sam9261ek.c: fix minor coding style issue.

Signed-off-by: Wolfgang Denk <wd@denx.de>

trab: fix warning: implicit declaration of function 'disable_vfd'

Signed-off-by: Wolfgang Denk <wd@denx.de>

zlib.c: avoid build conflicts for cradle board

Commit dce3d79710 updated the zlib code to v0.95; this caused
conflicts when building for the "cradle" board, because the (pretty
generic) preprocessor variable "OFF" was used in multiple files.
Make sure to avoid further conflicts by #undef'ing it in zlib.c
before redefining it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
cc: Giuseppe Condorelli <giuseppe.condorelli@st.com>
cc: Angelo Castello <angelo.castello@st.com>
cc: Alessandro Rubini <rubini-list@gnudd.com>

s5pc110: fs: added change directory command and bug fix.

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

s5pc110: fs: updated ext2 filesystem for onenand device.

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

s5pc110: aquila: kill warning

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

Fix out-of-tree building of "apollon" board.

Signed-off-by: Wolfgang Denk <wd@denx.de>

s5pc110: fs: code clean.

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

s5pc110: fs: updated ls command.

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

s5pc110: corrected board detection.

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

fbutil: disable unused functions

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

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

s5pc110: check u-boot-onenand.bin size

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

s5pc110: aquila: disable features (size issue)

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

Add check user
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

s5pc110: fixed bug on board detection.

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

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

s5pc100: support s5pc100 mmc

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

lzma: ignore unset filesizes

The Linux kernel build system changed how it compresses things with LZMA
such that the header no longer contains the filesize (it is instead set to
all F's).  So if we get a LZMA image that has -1 for the 64bit field,
let's just assume that the decompressed size is unknown and continue on.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

README: Rearrange paragraphs to regain linear arrangement.

Two later additions to the Configuration Option section unfortunately
split the description of Show boot progress and the list of its call outs.

Signed-off-by: Detlev Zundel <dzu@denx.de>

tools/mkimage: Print FIT image contents after creation

Previously, there was no indication to the user that a FIT image was
successfully created after executing mkimage.  For example:

  $ mkimage -f uImage.its uImage.itb
  DTC: dts->dtb  on file "uImage.its"

Adding some additional output after creating a FIT image lets the user
know exactly what is contained in their image, eg:

  $ mkimage -f uImage.its uImage.itb
  DTC: dts->dtb  on file "uImage.its"
  FIT description: Linux kernel 2.6.32-rc7-00201-g7550d6f-dirty
  Created:         Tue Nov 24 15:43:01 2009
   Image 0 (kernel@1)
    Description:  Linux Kernel 2.6.32-rc7-00201-g7550d6f-dirty
    Type:         Kernel Image
    Compression:  gzip compressed
    Data Size:    2707311 Bytes = 2643.86 kB = 2.58 MB
    Architecture: PowerPC
    OS:           Linux
    Load Address: 0x00000000
    Entry Point:  0x00000000
    Hash algo:    crc32
    Hash value:   efe0798b
    Hash algo:    sha1
    Hash value:   ecafba8c95684f2c8fec67e33c41ec88df1534d7
   Image 1 (fdt@1)
    Description:  Flattened Device Tree blob
    Type:         Flat Device Tree
    Compression:  uncompressed
    Data Size:    12288 Bytes = 12.00 kB = 0.01 MB
    Architecture: PowerPC
    Hash algo:    crc32
    Hash value:   a5cab676
    Hash algo:    sha1
    Hash value:   168722b13e305283cfd6603dfe8248cc329adea6
   Default Configuration: 'config@1'
   Configuration 0 (config@1)
    Description:  Default Linux kernel
    Kernel:       kernel@1
    FDT:          fdt@1

This brings the behavior of creating a FIT image in line with creating a
standard uImage, which also prints out the uImage contents after
creation.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

tools/fit_image.c: Remove unused fit_set_header()

The FIT fit_set_header() function was copied from the standard uImage's
image_set_header() function during mkimage reorganization.  However, the
fit_set_header() function is not used since FIT images use a standard
device tree blob header.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

tools/mkimage: Assume FDT image type for FIT images

When building a Flattened Image Tree (FIT) the image type needs to be
"flat_dt".  Commit 89a4d6b12fd6394898b8a454cbabeaf1cd59bae5 introduced a
regression which caused the user to need to specify the "-T flat_dt"
parameter on the command line when building a FIT image.  The "-T
flat_dt" parameter should not be needed and is at odds with the current
FIT image documentation.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

EXT2FS: fix inode size for ext2fs rev#0

extfs.c assumes that there is always a valid inode_size field in the
superblock. But this is not true for ext2fs rev 0. Such ext2fs images
are for instance generated by genext2fs. Symptoms on ARM machines are
messages like: "raise: Signal # 8 caught"; on PowerPC "ext2ls" will
print nothing.
This fix checks for rev 0 and uses then 128 bytes as inode size.

Signed-off-by: Michael Brandt <Michael.Brandt@emsyso.de>
Tested on: TQM5200S
Tested-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Wolfgang Denk <wd@denx.de>

s5pc110: Update gatewayip parameter change

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

s5pc110: Check u-boot-onenand.bin size

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

s5pc110: Add mmcboot option

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

s5pc110: lcd: code clean.

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

s5pc110: added env value for Geminus and code clean.

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

s5pc110: sleep: remove warnings
sleep.c:347: warning: implicit declaration of function 'l2_cache_disable'
sleep.c:348: warning: implicit declaration of function 'invalidate_dcache'
sleep.c:348: warning: implicit declaration of function 'get_device_type'

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

s5pc110: i2c: use API function

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

s5pc110: p2: add board detect function & keypad function

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

s5pc110: add i2c2 bus

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

s5pc110: aquila: remove duplicated codes

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

s5pc1xx: proper make for sleep

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

s5pc1xx: i2c: support i2c multi bus

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

s5pc110: git conflict that caused build error resolved