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

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

diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 894a8d7..4eb50f8 100644 (file)
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -7,6 +7,7 @@
 #define __DART_6UL_H
 
 #include <linux/sizes.h>
+#include <linux/stringify.h>
 #include "mx6_common.h"
 
 /* SPL options */
@@ -41,8 +42,6 @@
 /* Environment settings */
 
 /* Environment in SD */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                0
 #define MMC_ROOTFS_DEV                 0
 #define MMC_ROOTFS_PART                        2
 
@@ -62,8 +61,6 @@
 #endif
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_MEMTEST_START       0x80000000
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x8000000)
 
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
@@ -87,8 +84,6 @@
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
-#define CONFIG_IMX_THERMAL
-
 #define ENV_MMC \
        "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
        "mmcpart=" __stringify(MMC_ROOTFS_PART) "\0" \