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

diff --combined common/board_r.c
index 1ef79cede0a5b74103dc40024c1c81f559b0341b,6e597127a2b2e2076f1dc74b682c58374304add8..4eb7a023d4eaf5e2c1bdfee9c48bf65b49fb7c9e
--- 1/common/board_r.c
--- 2/common/board_r.c
+++ b/common/board_r.c
@@@ -291,26 -291,14 +291,14 @@@ static int initr_flash(void
  {
        ulong flash_size = 0;
        bd_t *bd = gd->bd;
-       int ok;
  
        puts("Flash: ");
  
-       if (board_flash_wp_on()) {
+       if (board_flash_wp_on())
                printf("Uninitialized - Write Protect On\n");
-               /* Since WP is on, we can't find real size.  Set to 0 */
-               ok = 1;
-       } else {
+       else
                flash_size = flash_init();
-               ok = flash_size > 0;
-       }
-       if (!ok) {
-               puts("*** failed ***\n");
- #ifdef CONFIG_PPC
-               /* Why does PPC do this? */
-               hang();
- #endif
-               return -1;
-       }
+ 
        print_size(flash_size, "");
  #ifdef CONFIG_SYS_FLASH_CHECKSUM
        /*
@@@ -454,6 -442,24 +442,6 @@@ static int initr_env(void
        return 0;
  }
  
 -#ifdef        CONFIG_HERMES
 -static int initr_hermes(void)
 -{
 -      if ((gd->board_type >> 16) == 2)
 -              gd->bd->bi_ethspeed = gd->board_type & 0xFFFF;
 -      else
 -              gd->bd->bi_ethspeed = 0xFFFF;
 -      return 0;
 -}
 -
 -static int initr_hermes_start(void)
 -{
 -      if (gd->bd->bi_ethspeed != 0xFFFF)
 -              hermes_start_lxt980((int) gd->bd->bi_ethspeed);
 -      return 0;
 -}
 -#endif
 -
  #ifdef CONFIG_SC3
  /* TODO: with new initcalls, move this into the driver */
  extern void sc3_read_eeprom(void);
@@@ -785,6 -791,9 +773,6 @@@ init_fnc_t init_sequence_r[] = 
  #ifdef CONFIG_SC3
        initr_sc3_read_eeprom,
  #endif
 -#ifdef        CONFIG_HERMES
 -      initr_hermes,
 -#endif
  #if defined(CONFIG_ID_EEPROM) || defined(CONFIG_SYS_I2C_MAC_OFFSET)
        mac_read_from_eeprom,
  #endif
@@@ -809,6 -818,9 +797,6 @@@
  #endif
  #ifdef CONFIG_MISC_INIT_R
        misc_init_r,            /* miscellaneous platform-dependent init */
 -#endif
 -#ifdef CONFIG_HERMES
 -      initr_hermes_start,
  #endif
        INIT_FUNC_WATCHDOG_RESET
  #ifdef CONFIG_CMD_KGDB