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-sunxi
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx35pdk.h
diff --git
a/include/configs/mx35pdk.h
b/include/configs/mx35pdk.h
index
49d923b
..
e153dfb
100644
(file)
--- a/
include/configs/mx35pdk.h
+++ b/
include/configs/mx35pdk.h
@@
-87,8
+87,6
@@
#define IMX_FEC_BASE FEC_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x1F
#define IMX_FEC_BASE FEC_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x1F
-#define CONFIG_MII
-
#define CONFIG_ARP_TIMEOUT 200UL
/*
#define CONFIG_ARP_TIMEOUT 200UL
/*
@@
-103,7
+101,6
@@
/*
* Physical Memory Map
*/
/*
* Physical Memory Map
*/
-#define CONFIG_NR_DRAM_BANKS 2
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
#define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024)
#define PHYS_SDRAM_2 CSD1_BASE_ADDR
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
#define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024)
#define PHYS_SDRAM_2 CSD1_BASE_ADDR
@@
-120,7
+117,6
@@
/*
* MTD Command for mtdparts
*/
/*
* MTD Command for mtdparts
*/
-#define CONFIG_FLASH_CFI_MTD
/*
* FLASH and environment organization
/*
* FLASH and environment organization
@@
-149,13
+145,9
@@
/*
* CFI FLASH driver setup
*/
/*
* CFI FLASH driver setup
*/
-#define CONFIG_SYS_FLASH_CFI /* Flash memory is CFI compliant */
-#define CONFIG_FLASH_CFI_DRIVER
/* A non-standard buffered write algorithm */
#define CONFIG_FLASH_SPANSION_S29WS_N
/* A non-standard buffered write algorithm */
#define CONFIG_FLASH_SPANSION_S29WS_N
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* faster */
-#define CONFIG_SYS_FLASH_PROTECTION /* Use hardware sector protection */
/*
* NAND FLASH driver setup
/*
* NAND FLASH driver setup