imx: mx6ul_14x14_evk: fix link issue
Since recent splash changes common code for splashscreen logo should be used instead of adding duplicated code under board directories. mx6ul_9x9_evk and mx6ul_14x14_evk configurations used old board specific logo code and do not link, fix them. Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
parent
5b20d141f2
commit
0a1a45b7d6
@ -28,10 +28,6 @@
|
||||
#include "../common/pfuze.h"
|
||||
#include <usb.h>
|
||||
#include <usb/ehci-ci.h>
|
||||
#ifdef CONFIG_DM_VIDEO
|
||||
#include <bmp_logo_data.h>
|
||||
#include <video.h>
|
||||
#endif
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
@ -449,6 +445,8 @@ static int setup_lcd(void)
|
||||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
static inline int setup_lcd(void) { return 0; }
|
||||
#endif
|
||||
|
||||
int board_early_init_f(void)
|
||||
@ -505,21 +503,8 @@ int board_late_init(void)
|
||||
env_set("board_rev", "14X14");
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_DM_VIDEO)
|
||||
struct udevice *dev;
|
||||
int ret;
|
||||
|
||||
ret = uclass_get_device(UCLASS_VIDEO, 0, &dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
setup_lcd();
|
||||
|
||||
ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, 0, 0, true);
|
||||
if (ret)
|
||||
return ret;
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -68,3 +68,4 @@ CONFIG_USB=y
|
||||
CONFIG_DM_USB=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_DM_VIDEO=y
|
||||
CONFIG_SYS_WHITE_ON_BLACK=y
|
||||
|
@ -71,3 +71,4 @@ CONFIG_USB=y
|
||||
CONFIG_DM_USB=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_DM_VIDEO=y
|
||||
CONFIG_SYS_WHITE_ON_BLACK=y
|
||||
|
@ -60,6 +60,7 @@
|
||||
"fdt_addr=0x83000000\0" \
|
||||
"boot_fdt=try\0" \
|
||||
"ip_dyn=yes\0" \
|
||||
"splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
"videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \
|
||||
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
|
||||
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
|
||||
|
Loading…
Reference in New Issue
Block a user