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

diff --combined arch/arm/Kconfig
index 2a83f26,5cfca1b..1f1ccad
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -236,12 -236,10 +236,12 @@@ config KIRKWOO
  config TARGET_DB_MV784MP_GP
        bool "Support db-mv784mp-gp"
        select CPU_V7
 +      select SUPPORT_SPL
  
  config TARGET_MAXBCM
        bool "Support maxbcm"
        select CPU_V7
 +      select SUPPORT_SPL
  
  config TARGET_DEVKIT3250
        bool "Support devkit3250"
@@@ -527,10 -525,12 +527,12 @@@ config TARGET_SAMA5D3XE
  config TARGET_SAMA5D4_XPLAINED
        bool "Support sama5d4_xplained"
        select CPU_V7
+       select SUPPORT_SPL
  
  config TARGET_SAMA5D4EK
        bool "Support sama5d4ek"
        select CPU_V7
+       select SUPPORT_SPL
  
  config TARGET_BCM28155_AP
        bool "Support bcm28155_ap"
@@@ -646,7 -646,6 +648,7 @@@ config TARGET_MX6SLEV
  config TARGET_MX6SXSABRESD
        bool "Support mx6sxsabresd"
        select CPU_V7
 +      select SUPPORT_SPL
  
  config TARGET_GW_VENTANA
        bool "Support gw_ventana"
@@@ -673,17 -672,6 +675,17 @@@ config TARGET_TQMA
  config TARGET_OT1200
        bool "Bachmann OT1200"
        select CPU_V7
 +      select SUPPORT_SPL
 +
 +config TARGET_PLATINUM_PICON
 +      bool "Support platinum-picon"
 +      select CPU_V7
 +      select SUPPORT_SPL
 +
 +config TARGET_PLATINUM_TITANIUM
 +      bool "Support platinum-titanium"
 +      select CPU_V7
 +      select SUPPORT_SPL
  
  config OMAP34XX
        bool "OMAP34XX SoC"
@@@ -899,7 -887,6 +901,7 @@@ source "board/atmel/sama5d4_xplained/Kc
  source "board/atmel/sama5d4ek/Kconfig"
  source "board/bachmann/ot1200/Kconfig"
  source "board/balloon3/Kconfig"
 +source "board/barco/platinum/Kconfig"
  source "board/barco/titanium/Kconfig"
  source "board/bluegiga/apx4devkit/Kconfig"
  source "board/bluewater/snapper9260/Kconfig"

diff --combined common/board_f.c
index d25329a,6c44dee..bdad36b
--- 1/common/board_f.c
--- 2/common/board_f.c
+++ b/common/board_f.c
@@@ -111,7 -111,7 +111,7 @@@ static int init_func_watchdog_init(void
  {
  # if defined(CONFIG_HW_WATCHDOG) && (defined(CONFIG_BLACKFIN) || \
        defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \
-       defined(CONFIG_SH))
+       defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG))
        hw_watchdog_init();
  # endif
        puts("       Watchdog enabled\n");
@@@ -262,7 -262,7 +262,7 @@@ static int zero_global_data(void
  
  static int setup_mon_len(void)
  {
 -#ifdef __ARM__
 +#if defined(__ARM__) || defined(__MICROBLAZE__)
        gd->mon_len = (ulong)&__bss_end - (ulong)_start;
  #elif defined(CONFIG_SANDBOX)
        gd->mon_len = (ulong)&_end - (ulong)_init;
@@@ -909,7 -909,7 +909,7 @@@ static init_fnc_t init_sequence_f[] = 
  #endif
        announce_dram_init,
        /* TODO: unify all these dram functions? */
 -#if defined(CONFIG_ARM) || defined(CONFIG_X86)
 +#if defined(CONFIG_ARM) || defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE)
        dram_init,              /* configure available RAM banks */
  #endif
  #if defined(CONFIG_MIPS) || defined(CONFIG_PPC)

diff --combined drivers/video/atmel_lcdfb.c
index 5add136,712d745..4ed3a49
--- 1/drivers/video/atmel_lcdfb.c
--- 2/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@@ -11,7 -11,6 +11,7 @@@
  #include <asm/arch/gpio.h>
  #include <asm/arch/clk.h>
  #include <lcd.h>
 +#include <bmp_layout.h>
  #include <atmel_lcdc.h>
  
  /* configurable parameters */
@@@ -21,7 -20,7 +21,7 @@@
  #define ATMEL_LCDC_GUARD_TIME         1
  #endif
  
- #if defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91CAP9)
+ #if defined(CONFIG_AT91SAM9263)
  #define ATMEL_LCDC_FIFO_SIZE          2048
  #else
  #define ATMEL_LCDC_FIFO_SIZE          512
@@@ -30,46 -29,6 +30,46 @@@
  #define lcdc_readl(mmio, reg)         __raw_readl((mmio)+(reg))
  #define lcdc_writel(mmio, reg, val)   __raw_writel((val), (mmio)+(reg))
  
 +ushort *configuration_get_cmap(void)
 +{
 +      return (ushort *)(panel_info.mmio + ATMEL_LCDC_LUT(0));
 +}
 +
 +#if defined(CONFIG_BMP_16BPP) && defined(CONFIG_ATMEL_LCD_BGR555)
 +void fb_put_word(uchar **fb, uchar **from)
 +{
 +      *(*fb)++ = (((*from)[0] & 0x1f) << 2) | ((*from)[1] & 0x03);
 +      *(*fb)++ = ((*from)[0] & 0xe0) | (((*from)[1] & 0x7c) >> 2);
 +      *from += 2;
 +}
 +#endif
 +
 +#ifdef CONFIG_LCD_LOGO
 +#include <bmp_logo.h>
 +void lcd_logo_set_cmap(void)
 +{
 +      int i;
 +      uint lut_entry;
 +      ushort colreg;
 +      uint *cmap = (uint *)configuration_get_cmap();
 +
 +      for (i = 0; i < BMP_LOGO_COLORS; ++i) {
 +              colreg = bmp_logo_palette[i];
 +#ifdef CONFIG_ATMEL_LCD_BGR555
 +              lut_entry = ((colreg & 0x000F) << 11) |
 +                              ((colreg & 0x00F0) <<  2) |
 +                              ((colreg & 0x0F00) >>  7);
 +#else
 +              lut_entry = ((colreg & 0x000F) << 1) |
 +                              ((colreg & 0x00F0) << 3) |
 +                              ((colreg & 0x0F00) << 4);
 +#endif
 +              *(cmap + BMP_LOGO_OFFSET) = lut_entry;
 +              cmap++;
 +      }
 +}
 +#endif
 +
  void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue)
  {
  #if defined(CONFIG_ATMEL_LCD_BGR555)
@@@ -81,16 -40,6 +81,16 @@@
  #endif
  }
  
 +void lcd_set_cmap(bmp_image_t *bmp, unsigned colors)
 +{
 +      int i;
 +
 +      for (i = 0; i < colors; ++i) {
 +              bmp_color_table_entry_t cte = bmp->color_table[i];
 +              lcd_setcolreg(i, cte.red, cte.green, cte.blue);
 +      }
 +}
 +
  void lcd_ctrl_init(void *lcdbase)
  {
        unsigned long value;