From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Mon, 23 Feb 2009 09:34:39 +0000 (+0100)
Subject: Merge branch 'mimc200' into next
X-Git-Tag: v2009.06-rc1~145^2~1^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=156feb90d200f186cdfd856d7f6f1878bb1bec1e;p=u-boot

Merge branch 'mimc200' into next

Conflicts:

	board/mimc/mimc200/mimc200.c
	include/configs/mimc200.h
---

156feb90d200f186cdfd856d7f6f1878bb1bec1e
diff --cc board/mimc/mimc200/mimc200.c
index 1092cd036d,fd497b2520..ec83b9d4a9
--- a/board/mimc/mimc200/mimc200.c
+++ b/board/mimc/mimc200/mimc200.c
@@@ -65,23 -71,23 +65,23 @@@ int board_early_init_f(void
  
  	/* init custom i/o */
  	/* cpu type inputs */
 -	gpio_select_pio(GPIO_PIN_PE19, 0);
 -	gpio_select_pio(GPIO_PIN_PE20, 0);
 -	gpio_select_pio(GPIO_PIN_PE23, 0);
 +	portmux_select_gpio(PORTMUX_PORT_E, (1 << 19) | (1 << 20) | (1 << 23),
 +			PORTMUX_DIR_INPUT);
  	/* main board type inputs */
 -	gpio_select_pio(GPIO_PIN_PB19, 0);
 -	gpio_select_pio(GPIO_PIN_PB29, 0);
 +	portmux_select_gpio(PORTMUX_PORT_B, (1 << 19) | (1 << 29),
 +			PORTMUX_DIR_INPUT);
  	/* DEBUG input (use weak pullup) */
 -	gpio_select_pio(GPIO_PIN_PE21, GPIOF_PULLUP);
 +	portmux_select_gpio(PORTMUX_PORT_E, 1 << 21,
 +			PORTMUX_DIR_INPUT | PORTMUX_PULL_UP);
  
  	/* are we suppressing the console ? */
 -	if (gpio_get_value(GPIO_PIN_PE21) == 1)
 +	if (gpio_get_value(GPIO_PIN_PE(21)) == 1)
- 		gd->flags |= GD_FLG_SILENT;
+ 		gd->flags |= (GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE);
  
  	/* reset phys */
 -	gpio_select_pio(GPIO_PIN_PE24, 0);
 -	gpio_set_value(GPIO_PIN_PC18, 1);	/* PHY RESET	*/
 -	gpio_select_pio(GPIO_PIN_PC18, GPIOF_OUTPUT);
 +	portmux_select_gpio(PORTMUX_PORT_E, 1 << 24, PORTMUX_DIR_INPUT);
 +	portmux_select_gpio(PORTMUX_PORT_C, 1 << 18,
 +			PORTMUX_DIR_OUTPUT | PORTMUX_INIT_HIGH);
  
  	/* GCLK0 - 10MHz clock */
  	writel(0x00000004, (void *)SM_BASE + SM_PM_GCCTRL);
diff --cc include/configs/mimc200.h
index 2eb9ebc290,0345b4af05..8ff2f8a21e
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@@ -74,13 -74,13 +74,13 @@@
  
  #define CONFIG_BAUDRATE			115200
  #define CONFIG_BOOTARGS							\
- 	"console=ttyS0 root=/dev/mtdblock1 fbmem=600k rootfstype=jffs2"
+ 	"root=/dev/mtdblock1 rootfstype=jffs2 console=ttyS1"
  #define CONFIG_BOOTCOMMAND						\
- 	"fsload; bootm"
+ 	"fsload boot/uImage; bootm"
  
  #define CONFIG_SILENT_CONSOLE		1	/* enable silent startup */
- #define CONFIG_SILENT_CONSOLE_INPUT	1	/* disable console inputs */
+ #define CONFIG_DISABLE_CONSOLE		1	/* disable console */
 -#define CFG_DEVICE_NULLDEV		1	/* include nulldev device */
 +#define CONFIG_SYS_DEVICE_NULLDEV		1	/* include nulldev device */
  
  /*
   * Only interrupt autoboot if <space> is pressed. Otherwise, garbage