Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index 3684f4d..3cc3b8c 100644 (file)
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -33,14 +33,8 @@
 #define CONFIG_SYS_LOAD_ADDR           0x82000000
 
 /*
- * This board might be of different versions so handle it
- */
-#define CONFIG_BOARD_TYPES
-
-/*
  * UART configuration
  */
-#define CONFIG_DW_SERIAL
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK         33330000
 #define CONFIG_SYS_NS16550_MEM32
@@ -48,7 +42,6 @@
 /*
  * Ethernet PHY configuration
  */
-#define CONFIG_MII
 
 /*
  * USB 1.1 configuration
@@ -59,9 +52,13 @@
 /*
  * Environment settings
  */
-#define CONFIG_ENV_SIZE                        SZ_16K
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "upgrade=if mmc rescan && " \
+               "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \
+               "iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \
+               "\"Fail to upgrade.\n" \
+               "Do you have u-boot-update.scr and u-boot.head on first (FAT) SD card partition?\"" \
+               "; fi\0" \
        "core_dccm_0=0x10\0" \
        "core_dccm_1=0x6\0" \
        "core_dccm_2=0x10\0" \
@@ -111,17 +108,11 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0"
 #define CONFIG_BOOTFILE                        "uImage"
 #define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
-/*
- * Misc utility configuration
- */
-#define CONFIG_BOUNCE_BUFFER
-
 /* Cli configuration */
 #define CONFIG_SYS_CBSIZE              SZ_2K
 
 /*
  * Callback configuration
  */
-#define CONFIG_BOARD_LATE_INIT
 
 #endif /* _CONFIG_HSDK_H_ */