diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-30 12:24:32 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-30 12:24:32 -0500 |
| commit | 552452f80caf1e1069e547b6605987427e93111b (patch) | |
| tree | 2411445059fb8750ad6439be089399840cc3ba95 /arch | |
| parent | 748ad078eefea2ee5a3c8e53ca46e9e93c2fc7f1 (diff) | |
| parent | a7cca5793774ee139b75a704d6efaa4d29f09f93 (diff) | |
| download | u-boot-552452f80caf1e1069e547b6605987427e93111b.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- Enable DM_MMC support
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/sunxi-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/Kconfig | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cefa8f40d0..f0edb10003 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -851,6 +851,7 @@ config ARCH_SUNXI select DM_ETH select DM_GPIO select DM_KEYBOARD + select DM_MMC if MMC select DM_SERIAL select DM_USB if DISTRO_DEFAULTS select OF_BOARD_SETUP diff --git a/arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi b/arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi index a99b7171d0..650ab97ec9 100644 --- a/arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi +++ b/arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi @@ -4,6 +4,8 @@ * */ +#include "sunxi-u-boot.dtsi" + /* The ANX6345 eDP-bridge is on r_i2c */ &r_i2c { anx6345: edp-bridge@38 { diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 8a9f2a6417..fdd4c80aa4 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -1,6 +1,10 @@ #include <config.h> / { + aliases { + mmc1 = &mmc2; + }; + binman { filename = "u-boot-sunxi-with-spl.bin"; pad-byte = <0xff>; diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 3c54f5106d..74e234cded 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -154,7 +154,6 @@ config MACH_SUN4I bool "sun4i (Allwinner A10)" select CPU_V7A select ARM_CORTEX_CPU_IS_UP - select DM_MMC if MMC select DM_SCSI if SCSI select PHY_SUN4I_USB select DRAM_SUN4I |