karo: tx6: remove redundant #ifndef CONFIG_TX6_UBOOT_MFG

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index e87efb2ad12104cd258ae343e5e7e52077d7757e..52ca7a705de4387ce0c1607f4eea0b9a6cd65ac4 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -43,7 +43,6 @@
 #define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_CMD_GPIO
 
 #define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_CMD_GPIO
 

-#ifndef CONFIG_TX6_UBOOT_MFG

 /* LCD Logo and Splash screen support */
 #ifdef CONFIG_LCD
 #define CONFIG_SPLASH_SCREEN
 /* LCD Logo and Splash screen support */
 #ifdef CONFIG_LCD
 #define CONFIG_SPLASH_SCREEN


@@ -64,7 +63,6 @@
 #define CONFIG_BMP_32BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #endif /* CONFIG_LCD */
 #define CONFIG_BMP_32BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #endif /* CONFIG_LCD */

-#endif /* CONFIG_TX6_UBOOT_MFG */

 
 /*
  * Memory configuration options
 
 /*
  * Memory configuration options


@@ -171,7 +169,7 @@
 #endif
 
 /*
 #endif
 
 /*

- * Extra Environments
+ * Extra Environment Settings

  */
 #ifdef CONFIG_TX6_UBOOT_NOENV
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
  */
 #ifdef CONFIG_TX6_UBOOT_NOENV
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \