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 branch 'master' of git://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
include
/
configs
/
titanium.h
diff --git
a/include/configs/titanium.h
b/include/configs/titanium.h
index
2470855
..
c24d657
100644
(file)
--- a/
include/configs/titanium.h
+++ b/
include/configs/titanium.h
@@
-22,8
+22,6
@@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024)
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024)
-#define CONFIG_MISC_INIT_R
-
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
@@
-40,7
+38,6
@@
#define CONFIG_SYS_FSL_USDHC_NUM 1
#define CONFIG_FEC_MXC
#define CONFIG_SYS_FSL_USDHC_NUM 1
#define CONFIG_FEC_MXC
-#define CONFIG_MII
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_FEC_MXC_PHYADDR 4
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_FEC_MXC_PHYADDR 4
@@
-124,7
+121,6
@@
#define CONFIG_BOOTCOMMAND "run nand_ubifs"
/* Physical Memory Map */
#define CONFIG_BOOTCOMMAND "run nand_ubifs"
/* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
#define PHYS_SDRAM_SIZE (512 << 20)
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
#define PHYS_SDRAM_SIZE (512 << 20)
@@
-165,7
+161,5
@@
#endif /* CONFIG_CMD_NAND */
/* UBI/UBIFS config options */
#endif /* CONFIG_CMD_NAND */
/* UBI/UBIFS config options */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */