From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 12 Apr 2013 20:07:57 +0000 (+0200)
Subject: Merge branch 'u-boot/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.04-rc3~1^2~12
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=18122019972ca639ee3b581257e3a63ff7c8efeb

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
	drivers/video/exynos_fb.c
---

18122019972ca639ee3b581257e3a63ff7c8efeb
diff --cc drivers/video/exynos_fb.c
index dfe329fbc6,c0f1830dc9..ed0823bf97
--- a/drivers/video/exynos_fb.c
+++ b/drivers/video/exynos_fb.c
@@@ -38,32 -35,8 +38,22 @@@
  
  DECLARE_GLOBAL_DATA_PTR;
  
- int lcd_line_length;
- int lcd_color_fg;
- int lcd_color_bg;
- 
- void *lcd_base;
- void *lcd_console_address;
- 
- short console_col;
- short console_row;
- 
  static unsigned int panel_width, panel_height;
  
 +/*
 + * board_init_f(arch/arm/lib/board.c) calls lcd_setmem() which needs
 + * panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix to reserve
 + * FB memory at a very early stage, i.e even before exynos_fimd_parse_dt()
 + * is called. So, we are forced to statically assign it.
 + */
 +#ifdef CONFIG_OF_CONTROL
 +vidinfo_t panel_info  = {
 +	.vl_col = LCD_XRES,
 +	.vl_row = LCD_YRES,
 +	.vl_bpix = LCD_COLOR16,
 +};
 +#endif
 +
  static void exynos_lcd_init_mem(void *lcdbase, vidinfo_t *vid)
  {
  	unsigned long palette_size;
diff --cc include/configs/am335x_evm.h
index dbd5ef327b,f7f6d25336..ef00306a55
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@@ -352,8 -392,8 +392,9 @@@
  #define CONFIG_ARCH_MISC_INIT
  #define CONFIG_MUSB_GADGET
  #define CONFIG_MUSB_PIO_ONLY
 +#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
  #define CONFIG_USB_GADGET_DUALSPEED
+ #define CONFIG_USB_GADGET_VBUS_DRAW	2
  #define CONFIG_MUSB_HOST
  #define CONFIG_AM335X_USB0
  #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL