Merge branch 'next'

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc Makefile
Simple merge

diff --cc arch/arm/dts/k3-j721e-sk-u-boot.dtsi
index f529e7032a1b70fa0219287a25e2de8eb1c4ff1d,0949caa129601f5e2b107c0a951a5b6e352a291c..31f979f3bb8124e6bd23ed93c845f750bbfc5e37
--- 1/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
--- 2/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
@@@ -31,10 -31,10 +31,10 @@@
  };
  
  &cbass_main{
-       u-boot,dm-spl;
+       bootph-pre-ram;
  
 -      main_navss {
 +      main_navss: bus@30000000 {
-               u-boot,dm-spl;
+               bootph-pre-ram;
        };
  };
  
@@@ -46,11 -46,11 +46,11 @@@
                reg = <0x0 0x40400000 0x0 0x80>;
                ti,timer-alwon;
                clock-frequency = <25000000>;
-               u-boot,dm-spl;
+               bootph-pre-ram;
        };
  
 -      mcu-navss {
 +      mcu_navss: bus@28380000 {
-               u-boot,dm-spl;
+               bootph-pre-ram;
  
                ringacc@2b800000 {
                        reg =   <0x0 0x2b800000 0x0 0x400000>,
@@@ -234,18 -234,14 +234,18 @@@
  };
  
  &fss {
-       u-boot,dm-spl;
+       bootph-pre-ram;
  };
  
 +&hbmc {
 +      status = "disabled";
 +};
 +
  &ospi0 {
-       u-boot,dm-spl;
+       bootph-pre-ram;
  
        flash@0 {
-               u-boot,dm-spl;
+               bootph-pre-ram;
  
                partition@3fc0000 {
                        label = "ospi.phypattern";

diff --cc include/efi_api.h
Simple merge

diff --cc lib/efi_loader/efi_device_path.c
Simple merge

diff --cc tools/buildman/toolchain.py
Simple merge