mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-01 00:50:43 +09:00
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
This commit is contained in:
commit
87ef76568c
@ -7,6 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/armv7.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/arch/dram.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 */
|
/* Try to write different values to RAM at two addresses */
|
||||||
writel(0, CONFIG_SYS_SDRAM_BASE);
|
writel(0, CONFIG_SYS_SDRAM_BASE);
|
||||||
writel(0xaa55aa55, (ulong)CONFIG_SYS_SDRAM_BASE + offset);
|
writel(0xaa55aa55, (ulong)CONFIG_SYS_SDRAM_BASE + offset);
|
||||||
|
DSB;
|
||||||
/* Check if the same value is actually observed when reading back */
|
/* Check if the same value is actually observed when reading back */
|
||||||
return readl(CONFIG_SYS_SDRAM_BASE) ==
|
return readl(CONFIG_SYS_SDRAM_BASE) ==
|
||||||
readl((ulong)CONFIG_SYS_SDRAM_BASE + offset);
|
readl((ulong)CONFIG_SYS_SDRAM_BASE + offset);
|
||||||
|
@ -32,6 +32,7 @@ CONFIG_CMD_EXT2=y
|
|||||||
CONFIG_CMD_EXT4=y
|
CONFIG_CMD_EXT4=y
|
||||||
CONFIG_CMD_FAT=y
|
CONFIG_CMD_FAT=y
|
||||||
CONFIG_CMD_FS_GENERIC=y
|
CONFIG_CMD_FS_GENERIC=y
|
||||||
|
CONFIG_AXP_ALDO3_VOLT=3300
|
||||||
CONFIG_USB_EHCI_HCD=y
|
CONFIG_USB_EHCI_HCD=y
|
||||||
CONFIG_USB_MUSB_GADGET=y
|
CONFIG_USB_MUSB_GADGET=y
|
||||||
CONFIG_USB_GADGET=y
|
CONFIG_USB_GADGET=y
|
||||||
|
Loading…
Reference in New Issue
Block a user