diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-26 12:15:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-26 12:15:26 -0400 |
| commit | 9c7335e4e68355a96bd5a411b2a5f85866823c58 (patch) | |
| tree | cbe17eb256a5e8078a1bd7793592ebd2de1470a5 /arch/x86/dts/u-boot.dtsi | |
| parent | 4be994b0e1f006c271e0791a60b6363137542090 (diff) | |
| parent | fcae6682a7929abf88d9f0b756f9d5f9725e4d14 (diff) | |
| download | u-boot-9c7335e4e68355a96bd5a411b2a5f85866823c58.tar.gz u-boot-9c7335e4e68355a96bd5a411b2a5f85866823c58.tar.xz u-boot-9c7335e4e68355a96bd5a411b2a5f85866823c58.zip | |
Merge tag 'dm-pull-26mar21-take2' of git://git.denx.de/u-boot-dm into next
dtoc support for of-platdata-inst
driver model support for of-platdata-inst
support of-platdata-inst on x86 / coral
binman support for exapanded entries
binman convert docs to reST
ti-sysc fix for duplicate uclass driver
patman minor improvements
pylibfdt build only if needed
correct obscure CI error with OF_PLATDATA_INST
Diffstat (limited to 'arch/x86/dts/u-boot.dtsi')
| -rw-r--r-- | arch/x86/dts/u-boot.dtsi | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index bf92f45f2d..ca84d18ad9 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -38,20 +38,11 @@ }; #endif spl { - type = "section"; + type = "u-boot-spl"; offset = <CONFIG_X86_OFFSET_SPL>; - u-boot-spl { - }; - u-boot-spl-dtb { - }; }; u-boot { - type = "section"; offset = <CONFIG_X86_OFFSET_U_BOOT>; - u-boot-nodtb { - }; - u-boot-dtb { - }; }; #elif defined(CONFIG_SPL) u-boot-spl-with-ucode-ptr { @@ -64,11 +55,7 @@ offset = <CONFIG_X86_OFFSET_U_BOOT>; }; #else -# ifdef CONFIG_SPL - u-boot { - offset = <CONFIG_SYS_TEXT_BASE>; - }; -# elif defined(CONFIG_HAVE_MICROCODE) +# ifdef CONFIG_HAVE_MICROCODE /* If there is no SPL then we need to put microcode in U-Boot */ u-boot-with-ucode-ptr { offset = <CONFIG_X86_OFFSET_U_BOOT>; |