sunxi: Fix reset hang on sun5i

[u-boot] / include / configs / ti_omap5_common.h

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 7b10fbd28acf8b2c127cb8997f6af0d304bce2a2..a582fa4041274fa4c3e51dae68f9ac64e9209447 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -46,8 +46,6 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/omap.h>
 
-#define CONFIG_ENV_SIZE                        (128 << 10)
-
 #include <configs/ti_armv7_common.h>
 
 /*
@@ -70,10 +68,7 @@
 #endif
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "loadaddr=0x80200000\0" \
-       "fdtaddr=0x80F80000\0" \
-       "fdt_high=0xffffffff\0" \
-       "rdaddr=0x81000000\0" \
+       DEFAULT_LINUX_BOOT_ENV \
        "console=" CONSOLEDEV ",115200n8\0" \
        "fdtfile=undefined\0" \
        "bootpart=0:2\0" \
@@ -145,6 +140,8 @@
 #define CONFIG_SPL_MAX_SIZE            (0x4031E000 - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_DISPLAY_PRINT
 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
+                                        (128 << 20))
 
 #ifdef CONFIG_NAND
 #define CONFIG_SPL_NAND_AM33XX_BCH     /* ELM support */