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 git://git.denx.de/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
include
/
configs
/
bf527-ezkit.h
diff --git
a/include/configs/bf527-ezkit.h
b/include/configs/bf527-ezkit.h
index
d80eac2
..
d945b8d
100644
(file)
--- a/
include/configs/bf527-ezkit.h
+++ b/
include/configs/bf527-ezkit.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_BF527_EZKIT_H__
*/
#ifndef __CONFIG_BF527_EZKIT_H__
@@
-7,14
+7,12
@@
#include <asm/config-pre.h>
#include <asm/config-pre.h>
-
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf527-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf527-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
*/
@@
-55,7
+52,6
@@
#define CONFIG_SYS_MONITOR_LEN (768 * 1024)
#define CONFIG_SYS_MALLOC_LEN (640 * 1024)
#define CONFIG_SYS_MONITOR_LEN (768 * 1024)
#define CONFIG_SYS_MALLOC_LEN (640 * 1024)
-
/*
* NAND Settings
* (can't be used same time as ethernet)
/*
* NAND Settings
* (can't be used same time as ethernet)
@@
-71,7
+67,6
@@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#endif
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#endif
-
/*
* Network Settings
*/
/*
* Network Settings
*/
@@
-83,9
+78,6
@@
#define CONFIG_NETCONSOLE 1
#endif
#define CONFIG_HOSTNAME bf527-ezkit
#define CONFIG_NETCONSOLE 1
#endif
#define CONFIG_HOSTNAME bf527-ezkit
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
-
/*
* Flash Settings
/*
* Flash Settings
@@
-97,16
+89,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
@@
-130,34
+118,41
@@
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#endif
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#endif
-
/*
* I2C Settings
*/
/*
* I2C Settings
*/
-#define CONFIG_BFIN_TWI_I2C 1
-#define CONFIG_HARD_I2C 1
-
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADI
/*
* USB Settings
*/
#if !defined(__ADSPBF522__) && !defined(__ADSPBF523__)
/*
* USB Settings
*/
#if !defined(__ADSPBF522__) && !defined(__ADSPBF523__)
-#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
+/* Don't waste time transferring a logo over the UART */
/*
* Video Settings
*/
/*
* Video Settings
*/
+#ifdef CONFIG_VIDEO
#ifdef CONFIG_BF527_EZKIT_REV_2_1
# define CONFIG_LQ035Q1_SPI_BUS 0
# define CONFIG_LQ035Q1_SPI_CS 7
#ifdef CONFIG_BF527_EZKIT_REV_2_1
# define CONFIG_LQ035Q1_SPI_BUS 0
# define CONFIG_LQ035Q1_SPI_CS 7
+# define CONFIG_LQ035Q1_USE_RGB565_8_BIT_PPI
+#else
+# define CONFIG_LQ035Q1_USE_RGB888_8_BIT_PPI
#endif
#endif
+#ifdef CONFIG_LQ035Q1_USE_RGB565_8_BIT_PPI
+# define EASYLOGO_HEADER <asm/bfin_logo_rgb565_230x230_lzma.h>
+#else
+# define EASYLOGO_HEADER <asm/bfin_logo_230x230_lzma.h>
+#endif
+#endif /* CONFIG_VIDEO */
/*
* Misc Settings
/*
* Misc Settings
@@
-166,12
+161,6
@@
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 1
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 1
-/* Don't waste time transferring a logo over the UART */
-#if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART)
-# define CONFIG_VIDEO
-#endif
-
-
/*
* Pull in common ADI header for remaining command/environment setup
*/
/*
* Pull in common ADI header for remaining command/environment setup
*/