karo: tx6: remove redundant #ifndef CONFIG_TX6_UBOOT_MFG
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 18 Mar 2016 09:35:26 +0000 (10:35 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 24 Mar 2016 11:24:51 +0000 (12:24 +0100)
include/configs/tx6.h

index e87efb2..52ca7a7 100644 (file)
@@ -43,7 +43,6 @@
 #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
@@ -64,7 +63,6 @@
 #define CONFIG_BMP_32BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #endif /* CONFIG_LCD */
-#endif /* CONFIG_TX6_UBOOT_MFG */
 
 /*
  * Memory configuration options
 #endif
 
 /*
- * Extra Environments
+ * Extra Environment Settings
  */
 #ifdef CONFIG_TX6_UBOOT_NOENV
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \