Merge git://git.denx.de/u-boot-dm

[u-boot] / include / configs / ge_bx50v3.h

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index f10ff26bb99d5c36836ded066160218307727507..fef41a8a18877c8c7e9860054aa51f3687cf6e0b 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -14,16 +14,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#if defined(CONFIG_TARGET_GE_B450V3)
-#define CONFIG_BOARD_NAME      "General Electric B450v3"
-#elif defined(CONFIG_TARGET_GE_B650V3)
-#define CONFIG_BOARD_NAME      "General Electric B650v3"
-#elif defined(CONFIG_TARGET_GE_B850V3)
-#define CONFIG_BOARD_NAME      "General Electric B850v3"
-#undef BX50V3_BOOTARGS_EXTRA
-#else
-#define CONFIG_BOARD_NAME      "General Electric BA16 Generic"
-#endif
+#define CONFIG_BOARD_NAME      "General Electric Bx50v3"
 
 #define CONFIG_MXC_UART_BASE   UART3_BASE
 #define CONSOLE_DEV    "ttymxc2"
@@ -59,7 +50,6 @@
 /* MMC Configs */
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_BOUNCE_BUFFER
 
 /* USB Configs */
 #ifdef CONFIG_USB
@@ -198,9 +188,6 @@
 #define CONFIG_ENV_SPI_MODE            CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 
-#ifndef CONFIG_SYS_DCACHE_OFF
-#endif
-
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
 /* Framebuffer */