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-stamp.h
diff --git
a/include/configs/bf537-stamp.h
b/include/configs/bf537-stamp.h
index
7ab644f
..
6858153
100644
(file)
--- a/
include/configs/bf537-stamp.h
+++ b/
include/configs/bf537-stamp.h
@@
-1,5
+1,5
@@
/*
/*
- * U-
b
oot - Configuration file for BF537 STAMP board
+ * U-
B
oot - Configuration file for BF537 STAMP board
*/
#ifndef __CONFIG_BF537_STAMP_H__
*/
#ifndef __CONFIG_BF537_STAMP_H__
@@
-7,14
+7,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_BYPASS
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
-
/*
* Clock Settings
* CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
/*
* Clock Settings
* CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@
-38,7
+36,6
@@
/* Values can range from 1-15 */
#define CONFIG_SCLK_DIV 4
/* Values can range from 1-15 */
#define CONFIG_SCLK_DIV 4
-
/*
* Memory Settings
*/
/*
* Memory Settings
*/
@@
-55,7
+52,6
@@
#define CONFIG_SYS_MONITOR_LEN (768 * 1024)
#define CONFIG_SYS_MALLOC_LEN (384 * 1024)
#define CONFIG_SYS_MONITOR_LEN (768 * 1024)
#define CONFIG_SYS_MALLOC_LEN (384 * 1024)
-
/*
* Network Settings
*/
/*
* Network Settings
*/
@@
-65,9
+61,6
@@
#define CONFIG_NETCONSOLE 1
#endif
#define CONFIG_HOSTNAME bf537-stamp
#define CONFIG_NETCONSOLE 1
#endif
#define CONFIG_HOSTNAME bf537-stamp
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
-#define CONFIG_LIB_RAND
/*
* Flash Settings
/*
* Flash Settings
@@
-80,17
+73,14
@@
/* some have 67 sectors (M29W320DB), but newer have 71 (M29W320EB) */
#define CONFIG_SYS_MAX_FLASH_SECT 71
/* some have 67 sectors (M29W320DB), but newer have 71 (M29W320EB) */
#define CONFIG_SYS_MAX_FLASH_SECT 71
-
/*
* SPI Settings
*/
#define CONFIG_BFIN_SPI
#define CONFIG_ENV_SPI_MAX_HZ 30000000
#define CONFIG_SF_DEFAULT_SPEED 30000000
/*
* SPI Settings
*/
#define CONFIG_BFIN_SPI
#define CONFIG_ENV_SPI_MAX_HZ 30000000
#define CONFIG_SF_DEFAULT_SPEED 30000000
-#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_ALL
#define CONFIG_SPI_FLASH_ALL
-
/*
* Env Storage Settings
*/
/*
* Env Storage Settings
*/
@@
-124,22
+114,16
@@
common/env_embedded.o (.text*);
#endif
common/env_embedded.o (.text*);
#endif
-
/*
* I2C Settings
*/
/*
* I2C Settings
*/
+#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_ADI
#define CONFIG_SYS_I2C_ADI
-#define CONFIG_HARD_I2C 1
-
/*
* SPI_MMC Settings
*/
#define CONFIG_MMC_SPI
/*
* SPI_MMC Settings
*/
#define CONFIG_MMC_SPI
-#ifdef CONFIG_MMC_SPI
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#endif
/*
* NAND Settings
/*
* NAND Settings
@@
-197,7
+181,6
@@
#if defined(CONFIG_BFIN_IDE)
#if defined(CONFIG_BFIN_IDE)
-#define CONFIG_DOS_PARTITION 1
/*
* IDE/ATA stuff
*/
/*
* IDE/ATA stuff
*/
@@
-247,7
+230,6
@@
#endif
#endif
-
/*
* Misc Settings
*/
/*
* Misc Settings
*/
@@
-272,13
+254,8
@@
/* These are for board tests */
#if 0
#define CONFIG_BOOTCOMMAND "bootldr 0x203f0100"
/* These are for board tests */
#if 0
#define CONFIG_BOOTCOMMAND "bootldr 0x203f0100"
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT \
- "autoboot in %d seconds: press space to stop\n", bootdelay
-#define CONFIG_AUTOBOOT_STOP_STR " "
#endif
#endif
-
/*
* Pull in common ADI header for remaining command/environment setup
*/
/*
* Pull in common ADI header for remaining command/environment setup
*/