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
mmc: complete unfinished move of CONFIG_MMC
[platform/kernel/u-boot.git]
/
include
/
configs
/
bf548-ezkit.h
diff --git
a/include/configs/bf548-ezkit.h
b/include/configs/bf548-ezkit.h
index
da5f029
..
b79aa2b
100644
(file)
--- a/
include/configs/bf548-ezkit.h
+++ b/
include/configs/bf548-ezkit.h
@@
-1,5
+1,5
@@
/*
/*
- * U-
b
oot - Configuration file for BF548 STAMP board
+ * U-
B
oot - Configuration file for BF548 STAMP board
*/
#ifndef __CONFIG_BF548_EZKIT_H__
*/
#ifndef __CONFIG_BF548_EZKIT_H__
@@
-7,14
+7,12
@@
#include <asm/config-pre.h>
#include <asm/config-pre.h>
-
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf548-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf548-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
-
/*
* 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
*/
@@
-64,7
+61,6
@@
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
#define CONFIG_SYS_MALLOC_LEN (768 * 1024)
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
#define CONFIG_SYS_MALLOC_LEN (768 * 1024)
-
/*
* Network Settings
*/
/*
* Network Settings
*/
@@
-73,9
+69,6
@@
#define CONFIG_SMC911X_BASE 0x24000000
#define CONFIG_SMC911X_16_BIT
#define CONFIG_HOSTNAME bf548-ezkit
#define CONFIG_SMC911X_BASE 0x24000000
#define CONFIG_SMC911X_16_BIT
#define CONFIG_HOSTNAME bf548-ezkit
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
-
/*
* Flash Settings
/*
* Flash Settings
@@
-87,16
+80,12
@@
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 259
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 259
-
/*
* 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_STMICRO
-
/*
* Env Storage Settings
/*
* Env Storage Settings
@@
-134,9
+123,8
@@
/*
* I2C Settings
*/
/*
* I2C Settings
*/
-#define CONFIG_BFIN_TWI_I2C 1
-#define CONFIG_HARD_I2C 1
-
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADI
/*
* SATA
/*
* SATA
@@
-150,29
+138,23
@@
#define CONFIG_BFIN_ATA_MODE XFER_PIO_4
#endif
#define CONFIG_BFIN_ATA_MODE XFER_PIO_4
#endif
-
/*
* SDH Settings
*/
#if !defined(__ADSPBF544__)
#define CONFIG_GENERIC_MMC
/*
* SDH Settings
*/
#if !defined(__ADSPBF544__)
#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
#define CONFIG_BFIN_SDH
#endif
#define CONFIG_BFIN_SDH
#endif
-
/*
* USB Settings
*/
#if !defined(__ADSPBF544__)
/*
* USB Settings
*/
#if !defined(__ADSPBF544__)
-#define CONFIG_USB
-#define CONFIG_MUSB_HCD
+#define CONFIG_USB_MUSB_HCD
#define CONFIG_USB_BLACKFIN
#define CONFIG_USB_BLACKFIN
-#define CONFIG_USB_STORAGE
-#define CONFIG_MUSB_TIMEOUT 100000
+#define CONFIG_USB_MUSB_TIMEOUT 100000
#endif
#endif
-
/*
* Misc Settings
*/
/*
* Misc Settings
*/
@@
-184,7
+166,6
@@
#define CONFIG_ADI_GPIO2
#define CONFIG_ADI_GPIO2
-#undef CONFIG_VIDEO
#ifdef CONFIG_VIDEO
#define EASYLOGO_HEADER < asm/bfin_logo_230x230_gzip.h >
#define CONFIG_DEB_DMA_URGENT
#ifdef CONFIG_VIDEO
#define EASYLOGO_HEADER < asm/bfin_logo_230x230_gzip.h >
#define CONFIG_DEB_DMA_URGENT
@@
-203,7
+184,6
@@
#define CONFIG_SYS_POST_FLASH_END 127
#endif
#define CONFIG_SYS_POST_FLASH_END 127
#endif
-
/*
* Pull in common ADI header for remaining command/environment setup
*/
/*
* Pull in common ADI header for remaining command/environment setup
*/