diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/dts/zynqmp-clk.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/dts/zynqmp-ep108-clk.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/lib/bootm-fdt.c | 2 | ||||
-rw-r--r-- | arch/arm/lib/bootm.c | 2 | ||||
-rw-r--r-- | arch/mips/lib/bootm.c | 2 |
6 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6de734f..a0a866e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -675,9 +675,6 @@ config ARCH_ZYNQMP select CLK select SPL_CLK select DM_USB if USB - select DM_MMC - select DM_MMC_OPS - select BLK config TEGRA bool "NVIDIA Tegra" diff --git a/arch/arm/dts/zynqmp-clk.dtsi b/arch/arm/dts/zynqmp-clk.dtsi index 3418909..0918c68 100644 --- a/arch/arm/dts/zynqmp-clk.dtsi +++ b/arch/arm/dts/zynqmp-clk.dtsi @@ -13,6 +13,7 @@ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <100000000>; + u-boot,dm-pre-reloc; }; clk125: clk125 { diff --git a/arch/arm/dts/zynqmp-ep108-clk.dtsi b/arch/arm/dts/zynqmp-ep108-clk.dtsi index 48bb426..b3ce0de 100644 --- a/arch/arm/dts/zynqmp-ep108-clk.dtsi +++ b/arch/arm/dts/zynqmp-ep108-clk.dtsi @@ -13,6 +13,7 @@ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <25000000>; + u-boot,dm-pre-reloc; }; i2c_clk: i2c_clk { diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index 4481f9e..a517550 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -25,6 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_ARCH_FIXUP_FDT int arch_fixup_fdt(void *blob) { bd_t *bd = gd->bd; @@ -60,3 +61,4 @@ int arch_fixup_fdt(void *blob) return 0; } +#endif diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index c20ef22..f9ed7fe 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -367,8 +367,10 @@ void boot_prep_vxworks(bootm_headers_t *images) if (images->ft_addr) { off = fdt_path_offset(images->ft_addr, "/memory"); if (off < 0) { +#ifdef CONFIG_ARCH_FIXUP_FDT if (arch_fixup_fdt(images->ft_addr)) puts("## WARNING: fixup memory failed!\n"); +#endif } } #endif diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index aa0475a..0c6a4ab 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -253,6 +253,7 @@ static int boot_reloc_fdt(bootm_headers_t *images) #endif } +#ifdef CONFIG_ARCH_FIXUP_FDT int arch_fixup_fdt(void *blob) { #if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT) @@ -264,6 +265,7 @@ int arch_fixup_fdt(void *blob) return 0; #endif } +#endif static int boot_setup_fdt(bootm_headers_t *images) { |