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
Merge git://git.denx.de/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
include
/
configs
/
TQM862M.h
diff --git
a/include/configs/TQM862M.h
b/include/configs/TQM862M.h
index
e06de45
..
2c0cd82
100644
(file)
--- a/
include/configs/TQM862M.h
+++ b/
include/configs/TQM862M.h
@@
-20,7
+20,6
@@
#define CONFIG_MPC860 1
#define CONFIG_MPC860T 1
#define CONFIG_MPC862 1
#define CONFIG_MPC860 1
#define CONFIG_MPC860T 1
#define CONFIG_MPC862 1
-#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_TQM862M 1 /* ...on a TQM8xxM module */
#define CONFIG_TQM862M 1 /* ...on a TQM8xxM module */
@@
-33,7
+32,6
@@
#define CONFIG_BOOTCOUNT_LIMIT
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_BOARD_TYPES 1 /* support board types */
@@
-76,8
+74,6
@@
#undef CONFIG_WATCHDOG /* watchdog disabled */
#undef CONFIG_WATCHDOG /* watchdog disabled */
-#define CONFIG_STATUS_LED 1 /* Status LED enabled */
-
#undef CONFIG_CAN_DRIVER /* CAN Driver support disabled */
/*
#undef CONFIG_CAN_DRIVER /* CAN Driver support disabled */
/*
@@
-89,28
+85,17
@@
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
-
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-
#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */
#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */
-
/*
* Command line configuration.
*/
/*
* Command line configuration.
*/
-#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_DATE
#define CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_EXT2
#define CONFIG_CMD_IDE
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_IDE
#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_SNTP
-
#define CONFIG_NETCONSOLE
#define CONFIG_NETCONSOLE
-
/*
* Miscellaneous configurable options
*/
/*
* Miscellaneous configurable options
*/