From: Tom Rini <trini@konsulko.com>
Date: Wed, 25 Aug 2021 11:48:06 +0000 (-0400)
Subject: Merge branch 'next-socfpga' of https://github.com/tienfong/uboot_mainline
X-Git-Tag: v2021.10~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7bfa565453ec5f63668a3464da21629055c3053f;p=platform%2Fkernel%2Fu-boot.git

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

7bfa565453ec5f63668a3464da21629055c3053f
diff --cc board/intel/n5x-socdk/MAINTAINERS
index 0000000,c1059f0..ca063a9
mode 000000,100644..100644
--- a/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 38fd775,0b0470e..a0453e5
--- a/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