[PATCH 1/2] sunxi: binman: Respect the default FIT configuration

binman can fill in the default FIT configuration index as selected by the "default-dt" argument, which is set to CONFIG_DEFAULT_DEVICE_TREE. Let's respect the user's configuration by taking advantage of this feature, instead of always defaulting to the first device tree in CONFIG_OF_LIST.
Signed-off-by: Samuel Holland samuel@sholland.org --- arch/arm/dts/sunxi-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index abe629c55e5..a9062316f1d 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -86,7 +86,7 @@ };
configurations { - default = "config-1"; + default = "@config-DEFAULT-SEQ";
@config-SEQ { description = "NAME";

The FIT description has access to the configuration variables. Use the appropriate variable instead of hardcoding the address.
Signed-off-by: Samuel Holland samuel@sholland.org --- arch/arm/dts/sunxi-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index a9062316f1d..bb644d6378e 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -42,7 +42,7 @@ os = "u-boot"; arch = "arm64"; compression = "none"; - load = <0x4a000000>; + load = <CONFIG_SYS_TEXT_BASE>;
u-boot-nodtb { };

On Sun, 7 Feb 2021 at 23:03, Samuel Holland samuel@sholland.org wrote:
The FIT description has access to the configuration variables. Use the appropriate variable instead of hardcoding the address.
Signed-off-by: Samuel Holland samuel@sholland.org
arch/arm/dts/sunxi-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org

On Mon, 8 Feb 2021 00:03:17 -0600 Samuel Holland samuel@sholland.org wrote:
The FIT description has access to the configuration variables. Use the appropriate variable instead of hardcoding the address.
Signed-off-by: Samuel Holland samuel@sholland.org
Thanks, both patches queued for -next.
Cheers, Andre
arch/arm/dts/sunxi-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index a9062316f1d..bb644d6378e 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -42,7 +42,7 @@ os = "u-boot"; arch = "arm64"; compression = "none";
load = <0x4a000000>;
load = <CONFIG_SYS_TEXT_BASE>; u-boot-nodtb { };

On Sun, 7 Feb 2021 at 23:03, Samuel Holland samuel@sholland.org wrote:
binman can fill in the default FIT configuration index as selected by the "default-dt" argument, which is set to CONFIG_DEFAULT_DEVICE_TREE. Let's respect the user's configuration by taking advantage of this feature, instead of always defaulting to the first device tree in CONFIG_OF_LIST.
Signed-off-by: Samuel Holland samuel@sholland.org
arch/arm/dts/sunxi-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
participants (3)
-
Andre Przywara
-
Samuel Holland
-
Simon Glass