projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR
[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
..
79b0cd7
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>
#define __DART_6UL_H
#include <linux/sizes.h>
+#include <linux/stringify.h>
#include "mx6_common.h"
/* SPL options */
#include "mx6_common.h"
/* SPL options */
@@
-21,16
+22,9
@@
#ifdef CONFIG_CMD_NET
#define CONFIG_FEC_ENET_DEV 0
#ifdef CONFIG_CMD_NET
#define CONFIG_FEC_ENET_DEV 0
-
#if (CONFIG_FEC_ENET_DEV == 0)
#if (CONFIG_FEC_ENET_DEV == 0)
-#define IMX_FEC_BASE ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x1
-#define CONFIG_FEC_XCV_TYPE RMII
#define CONFIG_ETHPRIME "eth0"
#elif (CONFIG_FEC_ENET_DEV == 1)
#define CONFIG_ETHPRIME "eth0"
#elif (CONFIG_FEC_ENET_DEV == 1)
-#define IMX_FEC_BASE ENET2_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR 0x3
-#define CONFIG_FEC_XCV_TYPE RMII
#define CONFIG_ETHPRIME "eth1"
#endif
#endif
#define CONFIG_ETHPRIME "eth1"
#endif
#endif
@@
-41,8
+35,6
@@
/* Environment settings */
/* Environment in SD */
/* 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
#define MMC_ROOTFS_DEV 0
#define MMC_ROOTFS_PART 2
@@
-55,17
+47,9
@@
#define CONFIG_SUPPORT_EMMC_BOOT
/* I2C configs */
#define CONFIG_SUPPORT_EMMC_BOOT
/* I2C configs */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_SPEED 100000
-#endif
/* Miscellaneous configurable options */
/* 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
/* Physical Memory Map */
#define CONFIG_SYS_HZ 1000
/* Physical Memory Map */
@@
-87,8
+71,6
@@
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#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" \
#define ENV_MMC \
"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
"mmcpart=" __stringify(MMC_ROOTFS_PART) "\0" \