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

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

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 4ed94fe..c4765eb 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -11,11 +11,6 @@
 
 #include "mx6_common.h"
 #define CONFIG_SYS_THUMB_BUILD
-/* These are not provided in SPL and result in a linker error */
-#if !defined(CONFIG_SPL_BUILD)
-#define CONFIG_USE_ARCH_MEMCPY
-#define CONFIG_USE_ARCH_MEMSET
-#endif
 
 #undef CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_DISPLAY_BOARDINFO_LATE  /* Calls show_board_info() */
@@ -39,8 +34,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * 1024 * 1024)
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_MXC_UART
@@ -72,11 +65,8 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
 #define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 #define CONFIG_FAT_WRITE
-#define CONFIG_DOS_PARTITION
 
 /* Network */
 #define CONFIG_FEC_MXC