mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
Revert "Merge git://git.denx.de/u-boot-video"
This reverts commit1d20170467
, reversing changes made to6aee2ab68c
. The mxc_ipuv3_fb.c changes introduce build failures on some targets. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
0b6e5b2c48
commit
9493d05a41
@ -317,11 +317,6 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr)
|
|||||||
return res;
|
return res;
|
||||||
|
|
||||||
img_header = (struct image_header *)bmp_load_addr;
|
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);
|
fit_size = fdt_totalsize(img_header);
|
||||||
|
|
||||||
/* Read in entire FIT */
|
/* Read in entire FIT */
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <asm/arch/crm_regs.h>
|
|
||||||
#include <asm/global_data.h>
|
#include <asm/global_data.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
@ -569,18 +568,8 @@ err0:
|
|||||||
|
|
||||||
void ipuv3_fb_shutdown(void)
|
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;
|
int i;
|
||||||
|
struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT;
|
||||||
/*
|
|
||||||
* 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;
|
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) {
|
for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) {
|
||||||
struct fb_info *fbi = mxcfb_info[i];
|
struct fb_info *fbi = mxcfb_info[i];
|
||||||
|
Loading…
Reference in New Issue
Block a user