Merge git://git.denx.de/u-boot-socfpga

diff --combined include/configs/socfpga_is1.h
index 883ffb76f3eccc5a0ecf63fbff4e6346493f3285,dc318e50dc9b2f7b1c2a2aad4fd1f56f193a29f9..f2c3f405549ad5b3cb8532f0572a9d33c7bf6012
--- 1/include/configs/socfpga_is1.h
--- 2/include/configs/socfpga_is1.h
+++ b/include/configs/socfpga_is1.h
@@@ -9,8 -9,6 +9,6 @@@
  
  #include <asm/arch/base_addr_ac5.h>
  
- #define CONFIG_HW_WATCHDOG
- 
  /* Memory configurations */
  #define PHYS_SDRAM_1_SIZE             0x10000000
  
@@@ -32,6 -30,7 +30,6 @@@
  /*
   * Bootcounter
   */
 -#define CONFIG_BOOTCOUNT_LIMIT
  /* last 2 lwords in OCRAM */
  #define CONFIG_SYS_BOOTCOUNT_ADDR       0xfffffff8
  #define CONFIG_SYS_BOOTCOUNT_BE

diff --combined include/configs/socfpga_sr1500.h
index 8c9069c923ded146e344d20fb39a296ed8dc001a,871f587d458337b13d0decf4b5180d057b496447..8879817b3020ed503eac0f5ab4ee6d2d178b9524
--- 1/include/configs/socfpga_sr1500.h
--- 2/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@@ -8,8 -8,6 +8,6 @@@
  
  #include <asm/arch/base_addr_ac5.h>
  
- #define CONFIG_HW_WATCHDOG
- 
  /* Memory configurations */
  #define PHYS_SDRAM_1_SIZE             0x40000000      /* 1GiB on SR1500 */
  
@@@ -31,6 -29,7 +29,6 @@@
  /*
   * Bootcounter
   */
 -#define CONFIG_BOOTCOUNT_LIMIT
  /* last 2 lwords in OCRAM */
  #define CONFIG_SYS_BOOTCOUNT_ADDR     0xfffffff8
  #define CONFIG_SYS_BOOTCOUNT_BE