karo: fdt: fix panel-dpi support

[karo-tx-uboot.git] / board / sunxi / Kconfig

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index a6bbf6e78636887794032feecd4c7d953ef01132..55906b5b76046b701997b6df50372ea636a94336 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -35,8 +35,11 @@ config MACH_SUN5I
 config MACH_SUN6I
        bool "sun6i (Allwinner A31)"
        select CPU_V7
+       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_VIRT
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
+       select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
 
 config MACH_SUN7I
        bool "sun7i (Allwinner A20)"
@@ -50,14 +53,25 @@ config MACH_SUN7I
 config MACH_SUN8I_A23
        bool "sun8i (Allwinner A23)"
        select CPU_V7
+       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_VIRT
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
+       select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
 
 config MACH_SUN8I_A33
        bool "sun8i (Allwinner A33)"
        select CPU_V7
+       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_VIRT
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
+       select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
+
+config MACH_SUN9I
+       bool "sun9i (Allwinner A80)"
+       select CPU_V7
+       select SUNXI_GEN_SUN6I
 
 endchoice
 
@@ -187,6 +201,7 @@ config SYS_CONFIG_NAME
        default "sun6i" if MACH_SUN6I
        default "sun7i" if MACH_SUN7I
        default "sun8i" if MACH_SUN8I
+       default "sun9i" if MACH_SUN9I
 
 config SYS_BOARD
        default "sunxi"
@@ -194,24 +209,8 @@ config SYS_BOARD
 config SYS_SOC
        default "sunxi"
 
-config SPL_FEL
-       bool "SPL/FEL mode support"
-       depends on SPL
-       default n
-       help
-         This enables support for Fast Early Loader (FEL) mode. This
-         allows U-Boot to be loaded to the board over USB by the on-chip
-         boot rom. U-Boot should be sent in two parts: SPL first, with
-         'fel write 0x2000 u-boot-spl.bin; fel exe 0x2000' then U-Boot with
-         'fel write 0x4a000000 u-boot.bin; fel exe 0x4a000000'. This option
-         shrinks the amount of SRAM available to SPL, so only enable it if
-         you need FEL. Note that enabling this option only allows FEL to be
-         used; it is still possible to boot U-Boot from boot media. U-Boot
-         SPL detects when it is being loaded using FEL.
-
 config UART0_PORT_F
        bool "UART0 on MicroSD breakout board"
-       depends on SPL_FEL
        default n
        ---help---
        Repurpose the SD card slot for getting access to the UART0 serial
@@ -295,6 +294,13 @@ config USB0_VBUS_DET
        Set the Vbus detect pin for usb0 (otg). This takes a string in the
        format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H.
 
+config USB0_ID_DET
+       string "ID detect pin for usb0 (otg)"
+       default ""
+       ---help---
+       Set the ID detect pin for usb0 (otg). This takes a string in the
+       format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H.
+
 config USB1_VBUS_PIN
        string "Vbus enable pin for usb1 (ehci0)"
        default "PH6" if MACH_SUN4I || MACH_SUN7I
@@ -404,6 +410,13 @@ config VIDEO_VGA_EXTERNAL_DAC_EN
        Set the enable pin for the external VGA DAC. This takes a string in the
        format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H.
 
+config VIDEO_COMPOSITE
+       boolean "Composite video output support"
+       depends on VIDEO && (MACH_SUN4I || MACH_SUN5I || MACH_SUN7I)
+       default n
+       ---help---
+       Say Y here to add support for outputting composite video.
+
 config VIDEO_LCD_MODE
        string "LCD panel timing details"
        depends on VIDEO
@@ -412,6 +425,7 @@ config VIDEO_LCD_MODE
        LCD panel timing details string, leave empty if there is no LCD panel.
        This is in drivers/video/videomodes.c: video_get_params() format, e.g.
        x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:0,vmode:0
+       Also see: http://linux-sunxi.org/LCD
 
 config VIDEO_LCD_DCLK_PHASE
        int "LCD panel display clock phase"
@@ -513,7 +527,16 @@ config VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828
        select VIDEO_LCD_SSD2828
        select VIDEO_LCD_IF_PARALLEL
        ---help---
-        7.85" 768x1024 LCD panels, such as LG LP079X01 or AUO B079XAN01.0
+       7.85" 768x1024 LCD panels, such as LG LP079X01 or AUO B079XAN01.0
+
+config VIDEO_LCD_PANEL_EDP_4_LANE_1620M_VIA_ANX9804
+       bool "eDP 4-lane, 1.62G LCD panel via ANX9804 bridge chip"
+       select VIDEO_LCD_ANX9804
+       select VIDEO_LCD_IF_PARALLEL
+       select VIDEO_LCD_PANEL_I2C
+       ---help---
+       Select this for eDP LCD panels with 4 lanes running at 1.62G,
+       connected via an ANX9804 bridge chip.
 
 config VIDEO_LCD_PANEL_HITACHI_TX18D42VM
        bool "Hitachi tx18d42vm LCD panel"
@@ -533,44 +556,10 @@ config VIDEO_LCD_TL059WV5C0
 endchoice
 
 
-config USB_MUSB_SUNXI
-       bool "Enable sunxi OTG / DRC USB controller in host mode"
-       default n
-       ---help---
-       Say y here to enable support for the sunxi OTG / DRC USB controller
-       used on almost all sunxi boards. Note currently u-boot can only have
-       one usb host controller enabled at a time, so enabling this on boards
-       which also use the ehci host controller will result in build errors.
-
-config USB_KEYBOARD
-       boolean "Enable USB keyboard support"
-       default y
-       ---help---
-       Say Y here to add support for using a USB keyboard (typically used
-       in combination with a graphical console).
-
 config GMAC_TX_DELAY
        int "GMAC Transmit Clock Delay Chain"
        default 0
        ---help---
        Set the GMAC Transmit Clock Delay Chain value.
 
-config SYS_MALLOC_CLEAR_ON_INIT
-       default n
-
-config NET
-       default y
-
-config NETDEVICES
-       default y
-
-config DM_ETH
-       default y
-
-config DM_SERIAL
-       default y
-
-config DM_USB
-       default y if !USB_MUSB_SUNXI
-
 endif