Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert CONFIG_FSL_DCU_FB to Kconfig

Browse Source 
Rename CONFIG_FSL_DCU_FB to CONFIG_VIDEO_FSL_DCU_FB
and convert it to Kconfig.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
Reviewed-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Alison Wang <alison.wang@nxp.com>
master
Sanchayan Maity 7 years ago committed by Anatolij Gustschin
parent 40a808f173
commit b215fb3f34
25 changed files with 30 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/arm/cpu/armv7/ls102xa/soc.c
  2. 2
      board/freescale/ls1021aiot/Makefile
  3. 2
      board/freescale/ls1021aqds/Makefile
  4. 2
      board/freescale/ls1021atwr/Makefile
  5. 1
      configs/ls1021aqds_ddr4_nor_defconfig
  6. 1
      configs/ls1021aqds_ddr4_nor_lpuart_defconfig
  7. 1
      configs/ls1021aqds_nand_defconfig
  8. 1
      configs/ls1021aqds_nor_SECURE_BOOT_defconfig
  9. 1
      configs/ls1021aqds_nor_defconfig
  10. 1
      configs/ls1021aqds_nor_lpuart_defconfig
  11. 1
      configs/ls1021aqds_qspi_defconfig
  12. 1
      configs/ls1021aqds_sdcard_ifc_defconfig
  13. 1
      configs/ls1021aqds_sdcard_qspi_defconfig
  14. 1
      configs/ls1021atwr_nor_SECURE_BOOT_defconfig
  15. 1
      configs/ls1021atwr_nor_defconfig
  16. 1
      configs/ls1021atwr_nor_lpuart_defconfig
  17. 1
      configs/ls1021atwr_qspi_defconfig
  18. 1
      configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
  19. 1
      configs/ls1021atwr_sdcard_ifc_defconfig
  20. 1
      configs/ls1021atwr_sdcard_qspi_defconfig
  21. 7
      drivers/video/Kconfig
  22. 2
      drivers/video/Makefile
  23. 4
      include/configs/ls1021aqds.h
  24. 4
      include/configs/ls1021atwr.h
  25. 1
      scripts/config_whitelist.txt

2
arch/arm/cpu/armv7/ls102xa/soc.c
Unescape View File

@ -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

2
board/freescale/ls1021aiot/Makefile
Unescape View File

@ -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

2
board/freescale/ls1021aqds/Makefile
Unescape View File

@ -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

2
board/freescale/ls1021atwr/Makefile
Unescape View File

@ -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

1
configs/ls1021aqds_ddr4_nor_defconfig
Unescape View File

@ -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

1
configs/ls1021aqds_ddr4_nor_lpuart_defconfig
Unescape View File

@ -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

1
configs/ls1021aqds_nand_defconfig
Unescape View File

@ -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

1
configs/ls1021aqds_nor_SECURE_BOOT_defconfig
Unescape View File

@ -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

1
configs/ls1021aqds_nor_defconfig
Unescape View File

@ -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

1
configs/ls1021aqds_nor_lpuart_defconfig
Unescape View File

@ -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

1
configs/ls1021aqds_qspi_defconfig
Unescape View File

@ -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

1
configs/ls1021aqds_sdcard_ifc_defconfig
Unescape View File

@ -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

1
configs/ls1021aqds_sdcard_qspi_defconfig
Unescape View File

@ -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

1
configs/ls1021atwr_nor_SECURE_BOOT_defconfig
Unescape View File

@ -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

1
configs/ls1021atwr_nor_defconfig
Unescape View File

@ -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

1
configs/ls1021atwr_nor_lpuart_defconfig
Unescape View File

@ -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

1
configs/ls1021atwr_qspi_defconfig
Unescape View File

@ -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

1
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
Unescape View File

@ -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

1
configs/ls1021atwr_sdcard_ifc_defconfig
Unescape View File

@ -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

1
configs/ls1021atwr_sdcard_qspi_defconfig
Unescape View File

@ -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

7
drivers/video/Kconfig
Unescape View File

@ -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

2
drivers/video/Makefile
Unescape View File

@ -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

4
include/configs/ls1021aqds.h
Unescape View File

@ -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

4
include/configs/ls1021atwr.h
Unescape View File

@ -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

1
scripts/config_whitelist.txt
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save