[U-Boot] [PATCH] p1022ds: add video support

Anatolij Gustschin
2010-09-21T21:56:28Z

Hi Timur,

On Thu, 2 Sep 2010 15:35:19 -0500
Timur Tabi <timur@freescale.com> wrote:
...
> +#include <common.h>
> +#include <command.h>
> +#include <asm/io.h>
> +
> +#ifdef CONFIG_FSL_DIU_FB

Please drop the #ifdef above. Conditional compilation is
already handled by Makefile.

...
> +#define PX_BRDCFG1_DDCEN 0x10

This one is not used, please drop.

...
> +#define AD_BYTE_F 0x10000000
> +#define AD_ALPHA_C_MASK 0x0E000000
> +#define AD_ALPHA_C_SHIFT 25
> +#define AD_BLUE_C_MASK 0x01800000
> +#define AD_BLUE_C_SHIFT 23
> +#define AD_GREEN_C_MASK 0x00600000
> +#define AD_GREEN_C_SHIFT 21
> +#define AD_RED_C_MASK 0x00180000
> +#define AD_RED_C_SHIFT 19
> +#define AD_PALETTE 0x00040000
> +#define AD_PIXEL_S_MASK 0x00030000
> +#define AD_PIXEL_S_SHIFT 16
> +#define AD_COMP_3_MASK 0x0000F000
> +#define AD_COMP_3_SHIFT 12
> +#define AD_COMP_2_MASK 0x00000F00
> +#define AD_COMP_2_SHIFT 8
> +#define AD_COMP_1_MASK 0x000000F0
> +#define AD_COMP_1_SHIFT 4
> +#define AD_COMP_0_MASK 0x0000000F
> +#define AD_COMP_0_SHIFT 0
> +
> +#define AD_DEFAULT

Some of the defines above are not used (*_MASK, AD_PALETTE,
AD_DEFAULT), please drop them, too.

...
> diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
> index dcaca2b..d518c69 100644
> --- a/include/configs/P1022DS.h
> +++ b/include/configs/P1022DS.h
> @@ -31,6 +31,7 @@
> #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */
> #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
> #define CONFIG_SYS_HAS_SERDES /* has SERDES */
> +#define CONFIG_FSL_DIU_FB /* Has a DIU video controller */

Drop this CONFIG_FSL_DIU_FB define, too. It is already present
in the board config file.

> #define CONFIG_PHYS_64BIT
> #define CONFIG_ENABLE_36BIT_PHYS
> @@ -181,10 +182,14 @@
> #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000)
>
> /* Video */
> -/* #define CONFIG_VIDEO */
> +#undef CONFIG_VIDEO
> +
> #ifdef CONFIG_VIDEO
> +#define CONFIG_CMD_BMP
> #define CONFIG_CFB_CONSOLE
> #define CONFIG_VGA_AS_SINGLE_DEVICE
> +#define CONFIG_VIDEO_LOGO
> +#define CONFIG_VIDEO_BMP_LOGO
> #endif

CONFIG_VIDEO definition should depend on CONFIG_FSL_DIU_FB,
I think. Otherwise the building won't succeed if CONFIG_FSL_DIU_FB
is not defined (due to absence of video_hw_init()).

Thanks,
Anatolij