diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-02 07:32:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-02 07:32:30 -0400 |
| commit | 7351bf2b5b35819104d7c84ba8fd7d72eea544ee (patch) | |
| tree | 90c39e6e925052aeb9f9f564eb49214346697459 /arch | |
| parent | dbc39699d0f70c88da8d19c506e73d6709143bed (diff) | |
| parent | 28559d4c93de5039f851eea6d1404305d3ad0825 (diff) | |
| download | u-boot-imx-7351bf2b5b35819104d7c84ba8fd7d72eea544ee.zip u-boot-imx-7351bf2b5b35819104d7c84ba8fd7d72eea544ee.tar.gz u-boot-imx-7351bf2b5b35819104d7c84ba8fd7d72eea544ee.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
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 |
3 files changed, 2 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 { |