Revert "Merge git://git.denx.de/u-boot-video"
This reverts commit 1d20170467b079642be96996dcd71db64c3c365c, reversing
changes made to 6aee2ab68c362ace5a59f89a63abed82e0bf19e5.
The mxc_ipuv3_fb.c changes introduce build failures on some targets.
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/common/splash_source.c b/common/splash_source.c
index e0defde..a21ad62 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -317,11 +317,6 @@
return res;
img_header = (struct image_header *)bmp_load_addr;
- if (image_get_magic(img_header) != FDT_MAGIC) {
- printf("Could not find FDT magic\n");
- return -EINVAL;
- }
-
fit_size = fdt_totalsize(img_header);
/* Read in entire FIT */
diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c
index 8836229..0d0a0a9 100644
--- a/drivers/video/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc_ipuv3_fb.c
@@ -13,7 +13,6 @@
#include <common.h>
#include <linux/errno.h>
-#include <asm/arch/crm_regs.h>
#include <asm/global_data.h>
#include <linux/string.h>
#include <linux/list.h>
@@ -569,18 +568,8 @@
void ipuv3_fb_shutdown(void)
{
- struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
- struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT;
- u32 reg;
int i;
-
- /*
- * Check if IPU clock was enabled before. Won't access
- * IPU registers if clock is not enabled.
- */
- reg = readl(&mxc_ccm->CCGR3);
- if ((reg & MXC_CCM_CCGR3_IPU1_IPU_MASK) == 0)
- return;
+ struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT;
for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) {
struct fb_info *fbi = mxcfb_info[i];