Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 4ed94fe33a0da58e5d8d8259fb875556eb0ddbf2..86ed4d243dd675ca9796b313dd582d6170633d3e 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() */