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-fsl-qoriq
[oweals/u-boot.git]
/
include
/
configs
/
bf527-ezkit.h
diff --git
a/include/configs/bf527-ezkit.h
b/include/configs/bf527-ezkit.h
index 07e4ce86e1287c1e28c6516e2b6285c9acbdb4d9..79e440a0be4780bb05181f735c328508ae7b8dba 100644
(file)
--- a/
include/configs/bf527-ezkit.h
+++ b/
include/configs/bf527-ezkit.h
@@
-69,7
+69,6
@@
#define CONFIG_DRIVER_NAND_BFIN
#define CONFIG_SYS_NAND_BASE 0 /* not actually used */
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_DRIVER_NAND_BFIN
#define CONFIG_SYS_NAND_BASE 0 /* not actually used */
#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#define NAND_MAX_CHIPS 1
#endif
#endif
@@
-82,12
+81,11
@@
#define CONFIG_BFIN_MAC
#define CONFIG_RMII
#define CONFIG_NETCONSOLE 1
#define CONFIG_BFIN_MAC
#define CONFIG_RMII
#define CONFIG_NETCONSOLE 1
-#define CONFIG_NET_MULTI 1
#endif
#define CONFIG_HOSTNAME bf527-ezkit
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
#endif
#define CONFIG_HOSTNAME bf527-ezkit
/* 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
@@
-136,8
+134,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
/*
/*
@@
-151,15
+149,29
@@
#define CONFIG_MUSB_TIMEOUT 100000
#endif
#define CONFIG_MUSB_TIMEOUT 100000
#endif
+/* Don't waste time transferring a logo over the UART */
+#if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART)
+/*# define CONFIG_VIDEO*/
+#endif
/*
* Video Settings
*/
/*
* Video Settings
*/
-#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1
+#ifdef CONFIG_VIDEO
+#ifdef CONFIG_BF527_EZKIT_REV_2_1
# define CONFIG_LQ035Q1_SPI_BUS 0
# define CONFIG_LQ035Q1_SPI_CS 7
# 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
@@
-168,12
+180,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
*/