diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-28 13:15:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-28 13:15:41 -0400 |
| commit | 87ef76568c95b8d5e5f02b6f8628745a967dfc24 (patch) | |
| tree | 7b877cb9ddf02c3bb8a6dbc1759e0e523b0e0fe9 | |
| parent | 2489a7e9f3055da15a8a8a0e54babf29ff5f6f14 (diff) | |
| parent | ad14166426ab8ca40424ede741d27fdcfb4fc2c6 (diff) | |
| download | u-boot-imx-87ef76568c95b8d5e5f02b6f8628745a967dfc24.zip u-boot-imx-87ef76568c95b8d5e5f02b6f8628745a967dfc24.tar.gz u-boot-imx-87ef76568c95b8d5e5f02b6f8628745a967dfc24.tar.bz2 | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
| -rw-r--r-- | arch/arm/mach-sunxi/dram_helpers.c | 2 | ||||
| -rw-r--r-- | configs/A13-OLinuXino_defconfig | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c index 50318d2..e0c823a 100644 --- a/arch/arm/mach-sunxi/dram_helpers.c +++ b/arch/arm/mach-sunxi/dram_helpers.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <asm/armv7.h> #include <asm/io.h> #include <asm/arch/dram.h> @@ -31,6 +32,7 @@ bool mctl_mem_matches(u32 offset) /* Try to write different values to RAM at two addresses */ writel(0, CONFIG_SYS_SDRAM_BASE); writel(0xaa55aa55, (ulong)CONFIG_SYS_SDRAM_BASE + offset); + DSB; /* Check if the same value is actually observed when reading back */ return readl(CONFIG_SYS_SDRAM_BASE) == readl((ulong)CONFIG_SYS_SDRAM_BASE + offset); diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index d2d0cbd..30ea836 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_AXP_ALDO3_VOLT=3300 CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y |