projects
/
oweals
/
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-samsung
[oweals/u-boot.git]
/
include
/
configs
/
bf538f-ezkit.h
diff --git
a/include/configs/bf538f-ezkit.h
b/include/configs/bf538f-ezkit.h
index 91622e37a6ccc23784900fd2bcf33d3b4a4b8b10..2469c6a0f2228a4e38e988c21614134200ff5765 100644
(file)
--- a/
include/configs/bf538f-ezkit.h
+++ b/
include/configs/bf538f-ezkit.h
@@
-11,7
+11,6
@@
/*
* Processor Settings
*/
/*
* Processor Settings
*/
-#define CONFIG_BFIN_CPU bf538-0.4
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
@@
-60,7
+59,8
@@
* Network Settings
*/
#define ADI_CMDS_NETWORK 1
* Network Settings
*/
#define ADI_CMDS_NETWORK 1
-#define CONFIG_DRIVER_SMC91111 1
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC91111 1
#define CONFIG_SMC91111_BASE 0x20310300
#define CONFIG_HOSTNAME bf538f-ezkit
/* Uncomment next line to use fixed MAC address */
#define CONFIG_SMC91111_BASE 0x20310300
#define CONFIG_HOSTNAME bf538f-ezkit
/* Uncomment next line to use fixed MAC address */
@@
-83,12
+83,9
@@
*/
#define CONFIG_BFIN_SPI
#define CONFIG_ENV_SPI_MAX_HZ 30000000
*/
#define CONFIG_BFIN_SPI
#define CONFIG_ENV_SPI_MAX_HZ 30000000
-#define CONFIG_SF_DEFAULT_
HZ
30000000
+#define CONFIG_SF_DEFAULT_
SPEED
30000000
#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_ATMEL
-#define CONFIG_SPI_FLASH_SPANSION
-#define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_SPI_FLASH_WINBOND
+#define CONFIG_SPI_FLASH_ALL
/*
/*
@@
-109,7
+106,7
@@
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
#define ENV_IS_EMBEDDED
#else
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
#define ENV_IS_EMBEDDED
#else
-#define
ENV_IS_EMBEDDED_CUSTOM
+#define
CONFIG_ENV_IS_EMBEDDED_IN_LDR
#endif
#ifdef ENV_IS_EMBEDDED
/* WARNING - the following is hand-optimized to fit within
#endif
#ifdef ENV_IS_EMBEDDED
/* WARNING - the following is hand-optimized to fit within
@@
-118,13
+115,10
@@
* it linked after the configuration sector.
*/
# define LDS_BOARD_TEXT \
* it linked after the configuration sector.
*/
# define LDS_BOARD_TEXT \
- cpu/blackfin/traps.o (.text .text.*); \
- cpu/blackfin/interrupt.o (.text .text.*); \
- cpu/blackfin/serial.o (.text .text.*); \
- common/dlmalloc.o (.text .text.*); \
- lib_generic/crc32.o (.text .text.*); \
+ arch/blackfin/lib/libblackfin.o (.text*); \
+ arch/blackfin/cpu/libblackfin.o (.text*); \
. = DEFINED(env_offset) ? env_offset : .; \
. = DEFINED(env_offset) ? env_offset : .; \
- common/env_embedded.o
(.text .text.
*);
+ common/env_embedded.o
(.text
*);
#endif
#endif
@@
-133,8
+127,6
@@
*/
#define CONFIG_BFIN_TWI_I2C 1
#define CONFIG_HARD_I2C 1
*/
#define CONFIG_BFIN_TWI_I2C 1
#define CONFIG_HARD_I2C 1
-#define CONFIG_SYS_I2C_SPEED 50000
-#define CONFIG_SYS_I2C_SLAVE 0
/*
/*