From: Tom Rini <trini@konsulko.com>
Date: Fri, 15 Jan 2021 12:23:50 +0000 (-0500)
Subject: Merge branch '2021.04-rc' of https://github.com/lftan/u-boot
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=83e13c3469c710af03bf43f53aede0f9b7ba2dd0;p=u-boot.git

Merge branch '2021.04-rc' of https://github.com/lftan/u-boot

- Add ATF flow for SoC64 devices
- Update socfpgaimage to support print header and update padding flow
---

83e13c3469c710af03bf43f53aede0f9b7ba2dd0
diff --cc board/altera/stratix10-socdk/MAINTAINERS
index 6192bc9174,6192bc9174..6efd0cfc05
--- a/board/altera/stratix10-socdk/MAINTAINERS
+++ b/board/altera/stratix10-socdk/MAINTAINERS
@@@ -4,4 -4,4 +4,5 @@@ M:	Dinh Nguyen <dinh.nguyen@intel.com
  S:	Maintained
  F:	board/altera/stratix10-socdk/
  F:	include/configs/socfpga_stratix10_socdk.h
++F:	configs/socfpga_stratix10_atf_defconfig
  F:	configs/socfpga_stratix10_defconfig
diff --cc board/intel/agilex-socdk/MAINTAINERS
index b8e28f0b24,b8e28f0b24..18edbdcd2f
--- a/board/intel/agilex-socdk/MAINTAINERS
+++ b/board/intel/agilex-socdk/MAINTAINERS
@@@ -4,4 -4,4 +4,5 @@@ M:	Chee Hong Ang <chee.hong.ang@intel.c
  S:	Maintained
  F:	board/intel/agilex-socdk/
  F:	include/configs/socfpga_agilex_socdk.h
++F:	configs/socfpga_agilex_atf_defconfig
  F:	configs/socfpga_agilex_defconfig