Merge branch 'master' of /home/stefan/git/u-boot/u-boot

Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

mpc83xx: add h/w flash protection to board configs

the operating system may leave flash in a h/w locked state after writing.
This allows u-boot to continue to write flash by enabling h/w unlocking
b

mpc83xx: add h/w flash protection to board configs

the operating system may leave flash in a h/w locked state after writing.
This allows u-boot to continue to write flash by enabling h/w unlocking
by default.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

show more ...

Merge branch 'master' of /home/wd/git/u-boot/custodians

Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

rename CFG_ENV macros to CONFIG_ENV

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

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

Merge branch 'next'

Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

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

drivers/mtd: Move conditional compilation to Makefile

rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

83xx: mpc8315erdb: add support for switching between ULPI/UTMI USB PHYs

Freescale ships MPC8315E-RDB boards either with TSEC1 and USB UTMI
support, or without TSEC1 but with USB ULPI PHY support in

83xx: mpc8315erdb: add support for switching between ULPI/UTMI USB PHYs

Freescale ships MPC8315E-RDB boards either with TSEC1 and USB UTMI
support, or without TSEC1 but with USB ULPI PHY support in addition.
With this patch user can specify desired USB PHY.

Also, it seems that we can't distinguish the two boards in software, so
user have to set `mpc8315erdb' environment variable to either 'tsec1'
(TSEC1 enabled) or `ulpi' (board with ULPI PHY, TSEC1 disabled), so that
Linux will not probe for TSEC1.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

show more ...

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

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

83xx/85xx: further localbus cleanups

Merge mpc85xx.h's LBC defines to fsl_lbc.h. Also, adopt ACS names
from mpc85xx.h, so ACS_0b10 renamed to ACS_DIV4, ACS_0b11 to ACS_DIV2.

Signed-off-by: Anton Vo

83xx/85xx: further localbus cleanups

Merge mpc85xx.h's LBC defines to fsl_lbc.h. Also, adopt ACS names
from mpc85xx.h, so ACS_0b10 renamed to ACS_DIV4, ACS_0b11 to ACS_DIV2.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

show more ...

83xx/85xx: further localbus cleanups

move the BRx_* and ORx_* left behind in mpc85xx.h

The same is needed for mpc8xx.h and mpc8260.h (defines are almost
the same, just few differences which needs

83xx/85xx: further localbus cleanups

move the BRx_* and ORx_* left behind in mpc85xx.h

The same is needed for mpc8xx.h and mpc8260.h (defines are almost
the same, just few differences which needs some attention though).

But the bad news for mpc8xx and mpc8260 is that there are a lot of users
of these defines. So this cleanup I'll leave for the "better times".

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

show more ...

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

Merge commit 'wd/master'

Merge branch 'master' of ssh://mercury/home/wd/git/u-boot/master

PPC: Create and use CONFIG_HIGH_BATS

Change all code that conditionally operates on high bat
registers (that is, BATs 4-7) to look at CONFIG_HIGH_BATS
instead of the myriad ways this is done now. D

PPC: Create and use CONFIG_HIGH_BATS

Change all code that conditionally operates on high bat
registers (that is, BATs 4-7) to look at CONFIG_HIGH_BATS
instead of the myriad ways this is done now. Define the option
for every config for which high bats are supported (and
enabled by early boot, on parts where they're not always
enabled)

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>

show more ...

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

mpc83xx: bump loadaddr over fdtaddr to 0x500000

this seems as a good compromise between human memory, typing,
and last but not least, to accommodate for current and future kernel bloat.

Signed-off-

mpc83xx: bump loadaddr over fdtaddr to 0x500000

this seems as a good compromise between human memory, typing,
and last but not least, to accommodate for current and future kernel bloat.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Dave Liu <daveliu@freescale.com>

show more ...

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

Conflicts:

lib_ppc/board.c

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