diff options
author | Tom Rini <trini@ti.com> | 2013-05-14 11:45:41 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-05-14 11:45:41 -0400 |
commit | 805fa87f6d2366e2193f3d9eb1f793ad41ae1430 (patch) | |
tree | 743278b9e271dc84670680a466ef2ebaabcbbce9 /include/configs/bf548-ezkit.h | |
parent | a661b99dbc35e725f229a7b8e189ca21304ba026 (diff) | |
parent | da34aae5fba36c1f1989fdd41fffa723f300eaad (diff) | |
download | blackbird-obmc-uboot-805fa87f6d2366e2193f3d9eb1f793ad41ae1430.tar.gz blackbird-obmc-uboot-805fa87f6d2366e2193f3d9eb1f793ad41ae1430.zip |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin into powerpc-eldk53-warning-fixes
Diffstat (limited to 'include/configs/bf548-ezkit.h')
-rw-r--r-- | include/configs/bf548-ezkit.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index e6b05db09d..da5f029435 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -120,18 +120,16 @@ #define CONFIG_ENV_SECT_SIZE 0x8000 #endif - /* * NAND Settings */ -#define CONFIG_BFIN_NFC_CTL_VAL 0x0033 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND) -# define CONFIG_BFIN_NFC_BOOTROM_ECC -#endif +#define CONFIG_BFIN_NFC_CTL_VAL 0x0033 +#define CONFIG_BFIN_NFC_BOOTROM_ECC #define CONFIG_DRIVER_NAND_BFIN -#define CONFIG_SYS_NAND_BASE 0 /* not actually used */ -#define CONFIG_SYS_MAX_NAND_DEVICE 1 - +#define CONFIG_SYS_NAND_BASE 0 /* not actually used */ +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#endif /* * I2C Settings @@ -184,13 +182,12 @@ #define CONFIG_UART_CONSOLE 1 #define CONFIG_BFIN_SPI_IMG_SIZE 0x50000 -#ifndef __ADSPBF542__ -/* Don't waste time transferring a logo over the UART */ -# if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART) -# define CONFIG_VIDEO -# define EASYLOGO_HEADER <asm/bfin_logo_230x230_gzip.h> -# endif -# define CONFIG_DEB_DMA_URGENT +#define CONFIG_ADI_GPIO2 + +#undef CONFIG_VIDEO +#ifdef CONFIG_VIDEO +#define EASYLOGO_HEADER < asm/bfin_logo_230x230_gzip.h > +#define CONFIG_DEB_DMA_URGENT #endif /* Define if want to do post memory test */ |