Merge branch 'next-socfpga' of https://github.com/tienfong/uboot_mainline

diff --cc board/intel/n5x-socdk/MAINTAINERS
index 0000000000000000000000000000000000000000,c1059f092cc3ec7bdcc4441820827154d58f4c64..ca063a9f3f1dbec82a3662e1fee8c7b5f47d0a3c
mode 000000,100644..100644
--- /dev/null
--- 2/board/intel/n5x-socdk/MAINTAINERS
+++ b/board/intel/n5x-socdk/MAINTAINERS
@@@ -1,0 -1,7 +1,9 @@@
+ SOCFPGA BOARD
+ M:    Chee Tien Fong <tien.fong.chee@intel.com>
+ M:    Lim Siew Chin <elly.siew.chin.lim@intel.com>
+ S:    Maintained
+ F:    board/intel/n5x-socdk/
+ F:    include/configs/socfpga_n5x_socdk.h
++F:    configs/socfpga_n5x_defconfig
+ F:    configs/socfpga_n5x_atf_defconfig
++F:    configs/socfpga_n5x_vab_defconfig

diff --cc include/configs/socfpga_soc64_common.h
index 38fd775b5b6eeaf2c55ba8f7913675f52733663f,0b0470ebc161eaa2fd9e6717f31b028d40a72df0..a0453e562f55eb8f3adfadf497d4fcc07461fa8c
--- 1/include/configs/socfpga_soc64_common.h
--- 2/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@@ -20,7 -20,7 +20,6 @@@
  #define CONFIG_REMAKE_ELF
  /* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */
  #define CPU_RELEASE_ADDR              0xFFD12210
--#define CONFIG_SYS_CACHELINE_SIZE     64
  
  /*
   * U-Boot console configurations