Merge tag 'uniphier-v2019.10' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[oweals/u-boot.git] / include / configs / hikey.h

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 1376d6155deca5cc0b84d924900acdbfd8c774eb..60c6bde16ea98d6a746910cdefeeb55c153e7598 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -18,6 +18,8 @@
 
 #define CONFIG_REMAKE_ELF
 
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
+
 /* Physical Memory Map */
 
 /* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */
@@ -53,9 +55,6 @@
 
 #define CONFIG_HIKEY_GPIO
 
-/* SD/MMC configuration */
-#define CONFIG_BOUNCE_BUFFER
-
 /* Command line configuration */
 
 /* BOOTP options */
@@ -82,8 +81,10 @@
                                "initrd_high=0xffffffffffffffff\0" \
                                BOOTENV
 
-/* Preserve environment on sd card */
+/* Preserve environment on eMMC */
 #define CONFIG_ENV_SIZE                        0x1000
+#define CONFIG_SYS_MMC_ENV_DEV         0       /* Use eMMC */
+#define CONFIG_SYS_MMC_ENV_PART                2       /* Use Boot1 partition */
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */