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

diff --combined arch/arm/cpu/armv7/zynq/spl.c
index 0936bdd393bee8398e8ab246b4d1db82379b6c7f,3fb876d07ab8bc6e3265b34ea20f8c37da7071e8..b80c35794a90797801cd0989da783d30376fcf2f
--- 1/arch/arm/cpu/armv7/zynq/spl.c
--- 2/arch/arm/cpu/armv7/zynq/spl.c
+++ b/arch/arm/cpu/armv7/zynq/spl.c
@@@ -20,6 -20,9 +20,6 @@@ void board_init_f(ulong dummy
        /* Clear the BSS. */
        memset(__bss_start, 0, __bss_end - __bss_start);
  
 -      /* Set global data pointer. */
 -      gd = &gdata;
 -
        preloader_console_init();
        arch_cpu_init();
        board_init_r(NULL, 0);
@@@ -43,12 -46,21 +43,21 @@@ u32 spl_boot_device(void
                mode = BOOT_DEVICE_SPI;
                break;
  #endif
+       case ZYNQ_BM_NAND:
+               mode = BOOT_DEVICE_NAND;
+               break;
+       case ZYNQ_BM_NOR:
+               mode = BOOT_DEVICE_NOR;
+               break;
  #ifdef CONFIG_SPL_MMC_SUPPORT
        case ZYNQ_BM_SD:
                puts("mmc boot\n");
                mode = BOOT_DEVICE_MMC1;
                break;
  #endif
+       case ZYNQ_BM_JTAG:
+               mode = BOOT_DEVICE_RAM;
+               break;
        default:
                puts("Unsupported boot mode selected\n");
                hang();

diff --combined board/xilinx/zynq/board.c
index 3a2198f8e830824c2bd9d752cfa97664f838dad6,47f85c7fb42a930a0b010247373090fa24fabc36..738c31c6ee1f568cc95a6dd47ce34579f2853b64
--- 1/board/xilinx/zynq/board.c
--- 2/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@@ -24,7 -24,6 +24,7 @@@ static xilinx_desc fpga010 = XILINX_XC7
  static xilinx_desc fpga015 = XILINX_XC7Z015_DESC(0x15);
  static xilinx_desc fpga020 = XILINX_XC7Z020_DESC(0x20);
  static xilinx_desc fpga030 = XILINX_XC7Z030_DESC(0x30);
 +static xilinx_desc fpga035 = XILINX_XC7Z035_DESC(0x35);
  static xilinx_desc fpga045 = XILINX_XC7Z045_DESC(0x45);
  static xilinx_desc fpga100 = XILINX_XC7Z100_DESC(0x100);
  #endif
@@@ -50,9 -49,6 +50,9 @@@ int board_init(void
        case XILINX_ZYNQ_7030:
                fpga = fpga030;
                break;
 +      case XILINX_ZYNQ_7035:
 +              fpga = fpga035;
 +              break;
        case XILINX_ZYNQ_7045:
                fpga = fpga045;
                break;
@@@ -91,6 -87,14 +91,14 @@@ int board_late_init(void
        return 0;
  }
  
+ #ifdef CONFIG_DISPLAY_BOARDINFO
+ int checkboard(void)
+ {
+       puts("Board:\tXilinx Zynq\n");
+       return 0;
+ }
+ #endif
+ 
  int board_eth_init(bd_t *bis)
  {
        u32 ret = 0;
@@@ -115,11 -119,13 +123,13 @@@
  #if defined(CONFIG_ZYNQ_GEM)
  # if defined(CONFIG_ZYNQ_GEM0)
        ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR0,
-                                               CONFIG_ZYNQ_GEM_PHY_ADDR0, 0);
+                                  CONFIG_ZYNQ_GEM_PHY_ADDR0,
+                                  CONFIG_ZYNQ_GEM_EMIO0);
  # endif
  # if defined(CONFIG_ZYNQ_GEM1)
        ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR1,
-                                               CONFIG_ZYNQ_GEM_PHY_ADDR1, 0);
+                                  CONFIG_ZYNQ_GEM_PHY_ADDR1,
+                                  CONFIG_ZYNQ_GEM_EMIO1);
  # endif
  #endif
        return ret;