diff mbox series

[V2,7/7] arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot

Message ID 20221022005837.170357-8-aford173@gmail.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show
Series arm: dts: Create common imx8mn-u-boot | expand

Commit Message

Adam Ford Oct. 22, 2022, 12:58 a.m. UTC 
Now that a unified imx8mn-u-boot is available, remove duplicated
code for generating flash.bin and other common imx8mn peripherals.

Signed-off-by: Adam Ford <aford173@gmail.com>

Comments

Stefano Babic Oct. 24, 2022, 1:56 p.m. UTC | #1 
> Now that a unified imx8mn-u-boot is available, remove duplicated
> code for generating flash.bin and other common imx8mn peripherals.
> Signed-off-by: Adam Ford <aford173@gmail.com>
> diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
> index 42e4d935cf..aea48f2d79 100644
> --- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
> @@ -3,60 +3,7 @@
>   * Copyright 2022 Gateworks Corporation
>   */
>  
> -/ {
> -	binman: binman {
> -		multiple-images;
> -	};
> -
> -	wdt-reboot {
> -		compatible = "wdt-reboot";
> -		wdt = <&wdog1>;
> -		u-boot,dm-spl;
> -	};
> -};
> -
> -&{/soc@0} {
> -	u-boot,dm-pre-reloc;
> -	u-boot,dm-spl;
> -};
> -
> -&spba1 {
> -	u-boot,dm-spl;
> -};
> -
> -&spba1 {
> -	u-boot,dm-spl;
> -};
> -
> -&clk {
> -	u-boot,dm-spl;
> -	u-boot,dm-pre-reloc;
> -	/delete-property/ assigned-clocks;
> -	/delete-property/ assigned-clock-parents;
> -	/delete-property/ assigned-clock-rates;
> -};
> -
> -&osc_24m {
> -	u-boot,dm-spl;
> -	u-boot,dm-pre-reloc;
> -};
> -
> -&aips1 {
> -	u-boot,dm-spl;
> -	u-boot,dm-pre-reloc;
> -};
> -
> -&aips2 {
> -	u-boot,dm-spl;
> -};
> -
> -&aips3 {
> -	u-boot,dm-spl;
> -};
> -
> -&iomuxc {
> -	u-boot,dm-spl;
> -};
> +#include "imx8mn-u-boot.dtsi"
>  
>  &gpio1 {
>  	u-boot,dm-spl;
> @@ -114,147 +61,6 @@
>  	u-boot,dm-spl;
>  };
>  
> -&wdog1 {
> -	u-boot,dm-spl;
> -};
> -
>  &pinctrl_wdog {
>  	u-boot,dm-spl;
>  };
> -
> -&binman {
> -	u-boot-spl-ddr {
> -		align = <4>;
> -		align-size = <4>;
> -		filename = "u-boot-spl-ddr.bin";
> -		pad-byte = <0xff>;
> -
> -		u-boot-spl {
> -			align-end = <4>;
> -			filename = "u-boot-spl.bin";
> -		};
> -
> -		ddr-1d-imem-fw {
> -			filename = "lpddr4_pmu_train_1d_imem.bin";
> -			align-end = <4>;
> -			type = "blob-ext";
> -		};
> -
> -		ddr-1d-dmem-fw {
> -			filename = "lpddr4_pmu_train_1d_dmem.bin";
> -			align-end = <4>;
> -			type = "blob-ext";
> -		};
> -
> -		ddr-2d-imem-fw {
> -			filename = "lpddr4_pmu_train_2d_imem.bin";
> -			align-end = <4>;
> -			type = "blob-ext";
> -		};
> -
> -		ddr-2d-dmem-fw {
> -			filename = "lpddr4_pmu_train_2d_dmem.bin";
> -			align-end = <4>;
> -			type = "blob-ext";
> -		};
> -	};
> -
> -	spl {
> -		filename = "spl.bin";
> -
> -		mkimage {
> -			args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
> -
> -			blob {
> -				filename = "u-boot-spl-ddr.bin";
> -			};
> -		};
> -	};
> -
> -	itb {
> -		filename = "u-boot.itb";
> -
> -		fit {
> -			description = "Configuration to load ATF before U-Boot";
> -			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
> -			fit,fdt-list = "of-list";
> -			#address-cells = <1>;
> -
> -			images {
> -				uboot {
> -					arch = "arm64";
> -					compression = "none";
> -					description = "U-Boot (64-bit)";
> -					load = <CONFIG_SYS_TEXT_BASE>;
> -					type = "standalone";
> -
> -					uboot_blob {
> -						filename = "u-boot-nodtb.bin";
> -						type = "blob-ext";
> -					};
> -				};
> -
> -				atf {
> -					arch = "arm64";
> -					compression = "none";
> -					description = "ARM Trusted Firmware";
> -					entry = <0x960000>;
> -					load = <0x960000>;
> -					type = "firmware";
> -
> -					atf_blob {
> -						filename = "bl31.bin";
> -						type = "blob-ext";
> -					};
> -				};
> -
> -				binman_fip: fip {
> -					arch = "arm64";
> -					compression = "none";
> -					description = "Trusted Firmware FIP";
> -					load = <0x40310000>;
> -					type = "firmware";
> -				};
> -
> -				@fdt-SEQ {
> -					compression = "none";
> -					description = "NAME";
> -					type = "flat_dt";
> -
> -					uboot_fdt_blob {
> -						filename = "u-boot.dtb";
> -						type = "blob-ext";
> -					};
> -				};
> -			};
> -
> -			configurations {
> -				default = "@config-DEFAULT-SEQ";
> -
> -				binman_configuration: @config-SEQ {
> -					description = "NAME";
> -					fdt = "fdt-SEQ";
> -					firmware = "uboot";
> -					loadables = "atf";
> -				};
> -			};
> -		};
> -	};
> -
> -	imx-boot {
> -		filename = "flash.bin";
> -		pad-byte = <0x00>;
> -
> -		spl {
> -			filename = "spl.bin";
> -			offset = <0x0>;
> -			type = "blob-ext";
> -		};
> -
> -		binman_uboot: uboot {
> -			filename = "u-boot.itb";
> -			offset = <0x58000>;
> -			type = "blob-ext";
> -		};
> -	};
> -};
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
index 42e4d935cf..aea48f2d79 100644
--- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
@@ -3,60 +3,7 @@ 
  * Copyright 2022 Gateworks Corporation
  */
 
-/ {
-	binman: binman {
-		multiple-images;
-	};
-
-	wdt-reboot {
-		compatible = "wdt-reboot";
-		wdt = <&wdog1>;
-		u-boot,dm-spl;
-	};
-};
-
-&{/soc@0} {
-	u-boot,dm-pre-reloc;
-	u-boot,dm-spl;
-};
-
-&spba1 {
-	u-boot,dm-spl;
-};
-
-&spba1 {
-	u-boot,dm-spl;
-};
-
-&clk {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-	/delete-property/ assigned-clocks;
-	/delete-property/ assigned-clock-parents;
-	/delete-property/ assigned-clock-rates;
-};
-
-&osc_24m {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-};
-
-&aips1 {
-	u-boot,dm-spl;
-	u-boot,dm-pre-reloc;
-};
-
-&aips2 {
-	u-boot,dm-spl;
-};
-
-&aips3 {
-	u-boot,dm-spl;
-};
-
-&iomuxc {
-	u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
 
 &gpio1 {
 	u-boot,dm-spl;
@@ -114,147 +61,6 @@ 
 	u-boot,dm-spl;
 };
 
-&wdog1 {
-	u-boot,dm-spl;
-};
-
 &pinctrl_wdog {
 	u-boot,dm-spl;
 };
-
-&binman {
-	u-boot-spl-ddr {
-		align = <4>;
-		align-size = <4>;
-		filename = "u-boot-spl-ddr.bin";
-		pad-byte = <0xff>;
-
-		u-boot-spl {
-			align-end = <4>;
-			filename = "u-boot-spl.bin";
-		};
-
-		ddr-1d-imem-fw {
-			filename = "lpddr4_pmu_train_1d_imem.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-1d-dmem-fw {
-			filename = "lpddr4_pmu_train_1d_dmem.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-2d-imem-fw {
-			filename = "lpddr4_pmu_train_2d_imem.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-
-		ddr-2d-dmem-fw {
-			filename = "lpddr4_pmu_train_2d_dmem.bin";
-			align-end = <4>;
-			type = "blob-ext";
-		};
-	};
-
-	spl {
-		filename = "spl.bin";
-
-		mkimage {
-			args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
-
-			blob {
-				filename = "u-boot-spl-ddr.bin";
-			};
-		};
-	};
-
-	itb {
-		filename = "u-boot.itb";
-
-		fit {
-			description = "Configuration to load ATF before U-Boot";
-			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
-			fit,fdt-list = "of-list";
-			#address-cells = <1>;
-
-			images {
-				uboot {
-					arch = "arm64";
-					compression = "none";
-					description = "U-Boot (64-bit)";
-					load = <CONFIG_SYS_TEXT_BASE>;
-					type = "standalone";
-
-					uboot_blob {
-						filename = "u-boot-nodtb.bin";
-						type = "blob-ext";
-					};
-				};
-
-				atf {
-					arch = "arm64";
-					compression = "none";
-					description = "ARM Trusted Firmware";
-					entry = <0x960000>;
-					load = <0x960000>;
-					type = "firmware";
-
-					atf_blob {
-						filename = "bl31.bin";
-						type = "blob-ext";
-					};
-				};
-
-				binman_fip: fip {
-					arch = "arm64";
-					compression = "none";
-					description = "Trusted Firmware FIP";
-					load = <0x40310000>;
-					type = "firmware";
-				};
-
-				@fdt-SEQ {
-					compression = "none";
-					description = "NAME";
-					type = "flat_dt";
-
-					uboot_fdt_blob {
-						filename = "u-boot.dtb";
-						type = "blob-ext";
-					};
-				};
-			};
-
-			configurations {
-				default = "@config-DEFAULT-SEQ";
-
-				binman_configuration: @config-SEQ {
-					description = "NAME";
-					fdt = "fdt-SEQ";
-					firmware = "uboot";
-					loadables = "atf";
-				};
-			};
-		};
-	};
-
-	imx-boot {
-		filename = "flash.bin";
-		pad-byte = <0x00>;
-
-		spl {
-			filename = "spl.bin";
-			offset = <0x0>;
-			type = "blob-ext";
-		};
-
-		binman_uboot: uboot {
-			filename = "u-boot.itb";
-			offset = <0x58000>;
-			type = "blob-ext";
-		};
-	};
-};