Merge git://git.denx.de/u-boot-socfpga

[platform/kernel/u-boot.git] / include / configs / socfpga_sockit.h

diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
index 747e988..5bcee05 100644 (file)
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_TERASIC_SOCKIT_H__
 #define __CONFIG_TERASIC_SOCKIT_H__
 
-#include <asm/arch/socfpga_base_addrs.h>
+#include <asm/arch/base_addr_ac5.h>
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
@@ -23,7 +23,6 @@
 #define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_GPIO
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
@@ -59,6 +58,10 @@
 
 #endif
 
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV         0       /* device 0 */
+#define CONFIG_ENV_OFFSET              512     /* just after the MBR */
+
 /* USB */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2_REG_ADDR       SOCFPGA_USB1_ADDRESS
@@ -76,7 +79,6 @@
        "bootimage=zImage\0" \
        "fdt_addr=100\0" \
        "fdtimage=socfpga.dtb\0" \
-               "fsloadcmd=ext2load\0" \
        "bootm ${loadaddr} - ${fdt_addr}\0" \
        "mmcroot=/dev/mmcblk0p2\0" \
        "mmcboot=setenv bootargs " CONFIG_BOOTARGS \