On 2017-04-10 22:42, Sanchayan Maity wrote: > Rename CONFIG_FSL_DCU_FB to CONFIG_VIDEO_FSL_DCU_FB > and convert it to Kconfig.
Looks good to me. Reviewed-by: Stefan Agner <stefan.ag...@toradex.com> -- Stefan > > Signed-off-by: Sanchayan Maity <maitysancha...@gmail.com> > --- > arch/arm/cpu/armv7/ls102xa/soc.c | 2 +- > board/freescale/ls1021aiot/Makefile | 2 +- > board/freescale/ls1021aqds/Makefile | 2 +- > board/freescale/ls1021atwr/Makefile | 2 +- > configs/ls1021aqds_ddr4_nor_defconfig | 1 + > configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 + > configs/ls1021aqds_nand_defconfig | 1 + > configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 1 + > configs/ls1021aqds_nor_defconfig | 1 + > configs/ls1021aqds_nor_lpuart_defconfig | 1 + > configs/ls1021aqds_qspi_defconfig | 1 + > configs/ls1021aqds_sdcard_ifc_defconfig | 1 + > configs/ls1021aqds_sdcard_qspi_defconfig | 1 + > configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 1 + > configs/ls1021atwr_nor_defconfig | 1 + > configs/ls1021atwr_nor_lpuart_defconfig | 1 + > configs/ls1021atwr_qspi_defconfig | 1 + > configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + > configs/ls1021atwr_sdcard_ifc_defconfig | 1 + > configs/ls1021atwr_sdcard_qspi_defconfig | 1 + > drivers/video/Kconfig | 7 +++++++ > drivers/video/Makefile | 2 +- > include/configs/ls1021aqds.h | 4 +--- > include/configs/ls1021atwr.h | 4 +--- > scripts/config_whitelist.txt | 1 - > 25 files changed, 30 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c > b/arch/arm/cpu/armv7/ls102xa/soc.c > index 52fb6f8d51..b84a1a686a 100644 > --- a/arch/arm/cpu/armv7/ls102xa/soc.c > +++ b/arch/arm/cpu/armv7/ls102xa/soc.c > @@ -91,7 +91,7 @@ int arch_soc_init(void) > out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL); > #endif > > -#ifdef CONFIG_FSL_DCU_FB > +#ifdef CONFIG_VIDEO_FSL_DCU_FB > out_be32(&scfg->pixclkcr, SCFG_PIXCLKCR_PXCKEN); > #endif > > diff --git a/board/freescale/ls1021aiot/Makefile > b/board/freescale/ls1021aiot/Makefile > index 05709e685c..6b960aa61c 100644 > --- a/board/freescale/ls1021aiot/Makefile > +++ b/board/freescale/ls1021aiot/Makefile > @@ -5,5 +5,5 @@ > # > > obj-y += ls1021aiot.o > -obj-$(CONFIG_FSL_DCU_FB) += dcu.o > +obj-$(CONFIG_VIDEO_FSL_DCU_FB) += dcu.o > obj-$(CONFIG_ARMV7_PSCI) += psci.o > diff --git a/board/freescale/ls1021aqds/Makefile > b/board/freescale/ls1021aqds/Makefile > index f0390c129f..1e50e468a3 100644 > --- a/board/freescale/ls1021aqds/Makefile > +++ b/board/freescale/ls1021aqds/Makefile > @@ -7,5 +7,5 @@ > obj-y += ls1021aqds.o > obj-y += ddr.o > obj-y += eth.o > -obj-$(CONFIG_FSL_DCU_FB) += dcu.o > +obj-$(CONFIG_VIDEO_FSL_DCU_FB) += dcu.o > obj-$(CONFIG_ARMV7_PSCI) += psci.o > diff --git a/board/freescale/ls1021atwr/Makefile > b/board/freescale/ls1021atwr/Makefile > index 5238b158d7..d9a2f52f2b 100644 > --- a/board/freescale/ls1021atwr/Makefile > +++ b/board/freescale/ls1021atwr/Makefile > @@ -5,5 +5,5 @@ > # > > obj-y += ls1021atwr.o > -obj-$(CONFIG_FSL_DCU_FB) += dcu.o > +obj-$(CONFIG_VIDEO_FSL_DCU_FB) += dcu.o > obj-$(CONFIG_ARMV7_PSCI) += psci.o > diff --git a/configs/ls1021aqds_ddr4_nor_defconfig > b/configs/ls1021aqds_ddr4_nor_defconfig > index 8434870af3..5566053ae9 100644 > --- a/configs/ls1021aqds_ddr4_nor_defconfig > +++ b/configs/ls1021aqds_ddr4_nor_defconfig > @@ -43,3 +43,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig > b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig > index ece220bf94..9582662e53 100644 > --- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig > +++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig > @@ -44,3 +44,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021aqds_nand_defconfig > b/configs/ls1021aqds_nand_defconfig > index dc547b5e0d..73f2fb070d 100644 > --- a/configs/ls1021aqds_nand_defconfig > +++ b/configs/ls1021aqds_nand_defconfig > @@ -57,3 +57,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig > b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig > index d1760ed742..74e1241974 100644 > --- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig > +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig > @@ -43,5 +43,6 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > CONFIG_RSA=y > CONFIG_SPL_RSA=y > diff --git a/configs/ls1021aqds_nor_defconfig > b/configs/ls1021aqds_nor_defconfig > index 8de90b0757..14a2b7f562 100644 > --- a/configs/ls1021aqds_nor_defconfig > +++ b/configs/ls1021aqds_nor_defconfig > @@ -44,3 +44,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021aqds_nor_lpuart_defconfig > b/configs/ls1021aqds_nor_lpuart_defconfig > index a9efdc56ac..9ed301cedd 100644 > --- a/configs/ls1021aqds_nor_lpuart_defconfig > +++ b/configs/ls1021aqds_nor_lpuart_defconfig > @@ -45,3 +45,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021aqds_qspi_defconfig > b/configs/ls1021aqds_qspi_defconfig > index 735f517cf9..9ec21c58a3 100644 > --- a/configs/ls1021aqds_qspi_defconfig > +++ b/configs/ls1021aqds_qspi_defconfig > @@ -50,3 +50,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig > b/configs/ls1021aqds_sdcard_ifc_defconfig > index 027d368157..492676a2c1 100644 > --- a/configs/ls1021aqds_sdcard_ifc_defconfig > +++ b/configs/ls1021aqds_sdcard_ifc_defconfig > @@ -55,3 +55,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig > b/configs/ls1021aqds_sdcard_qspi_defconfig > index f9ea99bac1..ed0b17be7c 100644 > --- a/configs/ls1021aqds_sdcard_qspi_defconfig > +++ b/configs/ls1021aqds_sdcard_qspi_defconfig > @@ -61,3 +61,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig > b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig > index 5b6ca220b3..6af8dbd928 100644 > --- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig > +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig > @@ -42,5 +42,6 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > CONFIG_RSA=y > CONFIG_SPL_RSA=y > diff --git a/configs/ls1021atwr_nor_defconfig > b/configs/ls1021atwr_nor_defconfig > index 3fb507f18c..93b646796b 100644 > --- a/configs/ls1021atwr_nor_defconfig > +++ b/configs/ls1021atwr_nor_defconfig > @@ -42,3 +42,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021atwr_nor_lpuart_defconfig > b/configs/ls1021atwr_nor_lpuart_defconfig > index 725720d3f4..c176e8377a 100644 > --- a/configs/ls1021atwr_nor_lpuart_defconfig > +++ b/configs/ls1021atwr_nor_lpuart_defconfig > @@ -43,3 +43,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021atwr_qspi_defconfig > b/configs/ls1021atwr_qspi_defconfig > index 46f7e26d8f..548d574fa0 100644 > --- a/configs/ls1021atwr_qspi_defconfig > +++ b/configs/ls1021atwr_qspi_defconfig > @@ -50,3 +50,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig > b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig > index 783787afff..bd001700a5 100644 > --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig > +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig > @@ -57,5 +57,6 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > CONFIG_RSA=y > CONFIG_SPL_RSA=y > diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig > b/configs/ls1021atwr_sdcard_ifc_defconfig > index b558e838fa..107011163c 100644 > --- a/configs/ls1021atwr_sdcard_ifc_defconfig > +++ b/configs/ls1021atwr_sdcard_ifc_defconfig > @@ -54,3 +54,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig > b/configs/ls1021atwr_sdcard_qspi_defconfig > index ef073759ba..5eddabd020 100644 > --- a/configs/ls1021atwr_sdcard_qspi_defconfig > +++ b/configs/ls1021atwr_sdcard_qspi_defconfig > @@ -61,3 +61,4 @@ CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_STORAGE=y > # CONFIG_VIDEO_SW_CURSOR is not set > +CONFIG_VIDEO_FSL_DCU_FB=y > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index 2069576958..6aab8af1b3 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -395,6 +395,13 @@ config VIDEO_IVYBRIDGE_IGD > a special tool which configures the VGA ROM, but the graphics > resolution can be selected in U-Boot. > > +config VIDEO_FSL_DCU_FB > + bool "Enable Freescale Display Control Unit" > + depends on VIDEO > + help > + This enables support for Freescale Display Control Unit (DCU4) > + module found on Freescale Vybrid and QorIQ family of SoCs. > + > config VIDEO_ROCKCHIP > bool "Enable Rockchip video support" > depends on DM_VIDEO > diff --git a/drivers/video/Makefile b/drivers/video/Makefile > index db34904a9a..7cd6d28658 100644 > --- a/drivers/video/Makefile > +++ b/drivers/video/Makefile > @@ -27,7 +27,7 @@ obj-$(CONFIG_ATMEL_HLCD) += atmel_hlcdfb.o > obj-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o > obj-$(CONFIG_CFB_CONSOLE) += cfb_console.o > obj-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o videomodes.o > -obj-$(CONFIG_FSL_DCU_FB) += fsl_dcu_fb.o videomodes.o > +obj-$(CONFIG_VIDEO_FSL_DCU_FB) += fsl_dcu_fb.o videomodes.o > obj-$(CONFIG_L5F31188) += l5f31188.o > obj-$(CONFIG_MPC8XX_LCD) += mpc8xx_lcd.o > obj-$(CONFIG_PXA_LCD) += pxa_lcd.o > diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h > index b349b367eb..97b81274b0 100644 > --- a/include/configs/ls1021aqds.h > +++ b/include/configs/ls1021aqds.h > @@ -421,9 +421,7 @@ unsigned long get_board_ddr_clk(void); > /* > * Video > */ > -#define CONFIG_FSL_DCU_FB > - > -#ifdef CONFIG_FSL_DCU_FB > +#ifdef CONFIG_VIDEO_FSL_DCU_FB > #define CONFIG_CMD_BMP > #define CONFIG_VIDEO_LOGO > #define CONFIG_VIDEO_BMP_LOGO > diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h > index fcf035b86a..a60b4b2990 100644 > --- a/include/configs/ls1021atwr.h > +++ b/include/configs/ls1021atwr.h > @@ -300,9 +300,7 @@ > /* > * Video > */ > -#define CONFIG_FSL_DCU_FB > - > -#ifdef CONFIG_FSL_DCU_FB > +#ifdef CONFIG_VIDEO_FSL_DCU_FB > #define CONFIG_CMD_BMP > #define CONFIG_VIDEO_LOGO > #define CONFIG_VIDEO_BMP_LOGO > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 330bc5897a..9d238bd443 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -1041,7 +1041,6 @@ CONFIG_FSLDMAFEC > CONFIG_FSL_CADMUS > CONFIG_FSL_CORENET > CONFIG_FSL_CPLD > -CONFIG_FSL_DCU_FB > CONFIG_FSL_DCU_SII9022A > CONFIG_FSL_DDR_BIST > CONFIG_FSL_DDR_FIRST_SLOT_QUAD_CAPABLE _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
