summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Nold <dannynold@freescale.com>2012-06-04 10:02:26 -0500
committerDanny Nold <dannynold@freescale.com>2012-06-04 10:30:44 -0500
commit6f0a281d42fad88c75389869b4d1738b3c69999e (patch)
tree83b5c548cc5af86561a02b968c0855ae125353e4
parent41e9b04376a74ee74133368d9f5b18ee033efa55 (diff)
downloadu-boot-imx-6f0a281d42fad88c75389869b4d1738b3c69999e.zip
u-boot-imx-6f0a281d42fad88c75389869b4d1738b3c69999e.tar.gz
u-boot-imx-6f0a281d42fad88c75389869b4d1738b3c69999e.tar.bz2
ENGR00212287 - U-Boot EPDC splash screen: Disable EPDC splash by default
- EPDC splash screen changed to be disabled by default in the config file for MX6DL_SABRESD and MX6DL_ARM2. If left enabled, the U-Boot image will not boot correctly (hang), since some additional content on the boot device (waveform file) is required for EPDC splash to work correctly. - Fixes U-Boot break introduced with commit for ENGR00212287 Signed-off-by: Danny Nold <dannynold@freescale.com>
-rw-r--r--include/configs/mx6dl_arm2.h4
-rw-r--r--include/configs/mx6dl_sabresd.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/mx6dl_arm2.h b/include/configs/mx6dl_arm2.h
index 72fd980..4c53e48 100644
--- a/include/configs/mx6dl_arm2.h
+++ b/include/configs/mx6dl_arm2.h
@@ -299,8 +299,8 @@
#define CONFIG_ENV_IS_NOWHERE 1
#endif
-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_MXC_EPDC
+/* #define CONFIG_SPLASH_SCREEN */
+/* #define CONFIG_MXC_EPDC */
/*
* SPLASH SCREEN Configs
diff --git a/include/configs/mx6dl_sabresd.h b/include/configs/mx6dl_sabresd.h
index 060c94a..ea0a23f 100644
--- a/include/configs/mx6dl_sabresd.h
+++ b/include/configs/mx6dl_sabresd.h
@@ -303,8 +303,8 @@
#define CONFIG_ENV_IS_NOWHERE 1
#endif
-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_MXC_EPDC
+/* #define CONFIG_SPLASH_SCREEN */
+/* #define CONFIG_MXC_EPDC */
/*
* SPLASH SCREEN Configs