serial: move CFG_SCIF_CONSOLE to CONFIG_SCIF_CONSOLE

move also conditional compilation to Makefile

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

Merge commit 'wd/master'

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

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

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

sh: Update Renesas R2DPlus board

New NOR Flash board support and remove old type flash board config.
And Remove network setting from config file.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro

sh: Update Renesas R2DPlus board

New NOR Flash board support and remove old type flash board config.
And Remove network setting from config file.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

show more ...

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

sh: Add support Renesas Solutions R2D plus board

R2D plus is SH reference board used with SH7751R.
This board has 266Mhz CPU, 64MB SDRAM, Cardbus, CF interface,
one PCI bus, VGA, and two Ethernet co

sh: Add support Renesas Solutions R2D plus board

R2D plus is SH reference board used with SH7751R.
This board has 266Mhz CPU, 64MB SDRAM, Cardbus, CF interface,
one PCI bus, VGA, and two Ethernet controller.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

show more ...