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://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
bf537-srv1.h
diff --git
a/include/configs/bf537-srv1.h
b/include/configs/bf537-srv1.h
index
89d2604
..
6ad5682
100644
(file)
--- a/
include/configs/bf537-srv1.h
+++ b/
include/configs/bf537-srv1.h
@@
-1,5
+1,5
@@
/*
/*
- * U-
b
oot - Configuration file for CSP Minotaur board
+ * U-
B
oot - Configuration file for CSP Minotaur board
*
* Thu Oct 25 15:30:44 CEST 2007 <hackfin@section5.ch>
* Minotaur config, brushed up for official uClinux dist.
*
* Thu Oct 25 15:30:44 CEST 2007 <hackfin@section5.ch>
* Minotaur config, brushed up for official uClinux dist.
@@
-20,14
+20,12
@@
#include <asm/config-pre.h>
#include <asm/config-pre.h>
-
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
-
/*
* Clock Settings
* CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
/*
* Clock Settings
* CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@
-51,7
+49,6
@@
/* Values can range from 1-15 */
#define CONFIG_SCLK_DIV 5
/* Values can range from 1-15 */
#define CONFIG_SCLK_DIV 5
-
/*
* Memory Settings
*/
/*
* Memory Settings
*/
@@
-68,7
+65,6
@@
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
#define CONFIG_SYS_MALLOC_LEN (384 << 10)
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
#define CONFIG_SYS_MALLOC_LEN (384 << 10)
-
/*
* Network Settings
*/
/*
* Network Settings
*/
@@
-93,7
+89,6
@@
/* We don't have a parallel flash chip there */
#define CONFIG_SYS_NO_FLASH
/* We don't have a parallel flash chip there */
#define CONFIG_SYS_NO_FLASH
-
/*
* SPI Settings
*/
/*
* SPI Settings
*/
@@
-101,7
+96,6
@@
#define CONFIG_ENV_SPI_MAX_HZ 30000000
#define CONFIG_SF_DEFAULT_SPEED 30000000
#define CONFIG_ENV_SPI_MAX_HZ 30000000
#define CONFIG_SF_DEFAULT_SPEED 30000000
-
/*
* Env Storage Settings
*/
/*
* Env Storage Settings
*/
@@
-111,7
+105,6
@@
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
-
/*
* I2C settings
*/
/*
* I2C settings
*/
@@
-120,7
+113,6
@@
#define CONFIG_SYS_I2C_SPEED 50000
#define CONFIG_SYS_I2C_SLAVE 0
#define CONFIG_SYS_I2C_SPEED 50000
#define CONFIG_SYS_I2C_SLAVE 0
-
/*
* Misc Settings
*/
/*
* Misc Settings
*/
@@
-137,22
+129,8
@@
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_LOADS_ECHO 1
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_LOADS_ECHO 1
-#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART)
-# define CONFIG_BOOTDELAY -1
-#else
-# define CONFIG_BOOTDELAY 5
-#endif
-
-#ifdef CONFIG_BFIN_MAC
-# define CONFIG_CMD_DHCP
-# define CONFIG_CMD_PING
-#endif
-
#define CONFIG_CMD_BOOTLDR
#define CONFIG_CMD_BOOTLDR
-#define CONFIG_CMD_CACHE
#define CONFIG_CMD_DATE
#define CONFIG_CMD_DATE
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_SF
#define CONFIG_BOOTCOMMAND "run flashboot"
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw"
#define CONFIG_BOOTCOMMAND "run flashboot"
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw"