From: Sam Day <[email protected]> Note that, as of this commit, j7xelte does not yet exist in U-Boot's upstream DTS tree. It was accepted into next so it should appear here eventually.
S-BOOT expects a DTBH with hw-rev == 6. Link: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Sam Day <[email protected]> --- arch/arm/dts/exynos7870-j7xelte-u-boot.dtsi | 24 ++++++++++++++++++++++++ arch/arm/dts/sdm845-oneplus-fajita-u-boot.dtsi | 2 -- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/exynos7870-j7xelte-u-boot.dtsi b/arch/arm/dts/exynos7870-j7xelte-u-boot.dtsi new file mode 100644 index 00000000000..90bf3b735d5 --- /dev/null +++ b/arch/arm/dts/exynos7870-j7xelte-u-boot.dtsi @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 + +/ { + /* These properties are required by S-BOOT. */ + model_info-chip = <7870>; + model_info-hw_rev = <6>; + model_info-hw_rev_end = <6>; + + binman { + filename = "u-boot-samsung-j7xelte.img"; + android-boot { + kernel { + u-boot-nodtb {}; + }; + vendor-dt { + dtbh { + dtb-0 { + u-boot-dtb { }; + }; + }; + }; + }; + }; +}; diff --git a/arch/arm/dts/sdm845-oneplus-fajita-u-boot.dtsi b/arch/arm/dts/sdm845-oneplus-fajita-u-boot.dtsi index b88be5a502e..d0e0f64ae16 100644 --- a/arch/arm/dts/sdm845-oneplus-fajita-u-boot.dtsi +++ b/arch/arm/dts/sdm845-oneplus-fajita-u-boot.dtsi @@ -2,7 +2,6 @@ #include <config.h> -#ifdef CONFIG_BINMAN / { binman { filename = "u-boot-oneplus-fajita.img"; @@ -24,4 +23,3 @@ }; }; }; -#endif -- 2.54.0
