mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
Convert CONFIG_LPUART et al to Kconfig
This converts the following to Kconfig: CONFIG_LPUART CONFIG_LPUART_32B_REG And note that CONFIG_LPUART_32B_REG is unused in code. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
e9ce70eff0
commit
db48e52584
12 changed files with 12 additions and 19 deletions
|
@ -20,7 +20,6 @@ CONFIG_FIT=y
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="LPUART"
|
||||
CONFIG_DYNAMIC_SYS_CLK_FREQ=y
|
||||
CONFIG_BOOTDELAY=3
|
||||
CONFIG_SILENT_CONSOLE=y
|
||||
|
@ -88,6 +87,7 @@ CONFIG_SYS_QE_FW_ADDR=0x60940000
|
|||
CONFIG_DM_SCSI=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
CONFIG_FSL_LPUART=y
|
||||
CONFIG_LPUART=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_XHCI_HCD=y
|
||||
CONFIG_USB_XHCI_DWC3=y
|
||||
|
|
|
@ -20,7 +20,6 @@ CONFIG_FIT=y
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="LPUART"
|
||||
CONFIG_DYNAMIC_SYS_CLK_FREQ=y
|
||||
CONFIG_BOOTDELAY=3
|
||||
CONFIG_SILENT_CONSOLE=y
|
||||
|
@ -89,6 +88,7 @@ CONFIG_SYS_QE_FW_ADDR=0x60940000
|
|||
CONFIG_DM_SCSI=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
CONFIG_FSL_LPUART=y
|
||||
CONFIG_LPUART=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_XHCI_HCD=y
|
||||
CONFIG_USB_XHCI_DWC3=y
|
||||
|
|
|
@ -20,7 +20,6 @@ CONFIG_FIT=y
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="LPUART"
|
||||
CONFIG_BOOTDELAY=3
|
||||
CONFIG_USE_BOOTARGS=y
|
||||
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0"
|
||||
|
@ -76,6 +75,7 @@ CONFIG_SYS_QE_FW_ADDR=0x60940000
|
|||
CONFIG_DM_SCSI=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
CONFIG_FSL_LPUART=y
|
||||
CONFIG_LPUART=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_XHCI_HCD=y
|
||||
CONFIG_USB_XHCI_DWC3=y
|
||||
|
|
|
@ -22,7 +22,6 @@ CONFIG_MP=y
|
|||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="LPUART"
|
||||
CONFIG_BOOTDELAY=10
|
||||
CONFIG_USE_BOOTARGS=y
|
||||
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256 video=1920x1080-32@60 cma=256M"
|
||||
|
@ -90,6 +89,7 @@ CONFIG_DM_SCSI=y
|
|||
CONFIG_SPECIFY_CONSOLE_INDEX=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
CONFIG_FSL_LPUART=y
|
||||
CONFIG_LPUART=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_DM_SPI=y
|
||||
CONFIG_FSL_DSPI=y
|
||||
|
|
|
@ -25,7 +25,6 @@ CONFIG_REMAKE_ELF=y
|
|||
CONFIG_MP=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="LPUART"
|
||||
CONFIG_DYNAMIC_SYS_CLK_FREQ=y
|
||||
CONFIG_BOOTDELAY=10
|
||||
CONFIG_USE_BOOTARGS=y
|
||||
|
@ -92,6 +91,7 @@ CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
|
|||
CONFIG_DM_SCSI=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
CONFIG_FSL_LPUART=y
|
||||
CONFIG_LPUART=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_DM_SPI=y
|
||||
CONFIG_USB=y
|
||||
|
|
|
@ -25,7 +25,6 @@ CONFIG_REMAKE_ELF=y
|
|||
CONFIG_MP=y
|
||||
CONFIG_FIT_VERBOSE=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="LPUART"
|
||||
CONFIG_DYNAMIC_SYS_CLK_FREQ=y
|
||||
CONFIG_BOOTDELAY=10
|
||||
CONFIG_USE_BOOTARGS=y
|
||||
|
@ -93,6 +92,7 @@ CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
|
|||
CONFIG_DM_SCSI=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
CONFIG_FSL_LPUART=y
|
||||
CONFIG_LPUART=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_DM_SPI=y
|
||||
CONFIG_FSL_DSPI=y
|
||||
|
|
|
@ -647,6 +647,10 @@ config FSL_LPUART
|
|||
Select this to enable a Low Power UART for Freescale VF610 and
|
||||
QorIQ Layerscape devices.
|
||||
|
||||
config LPUART
|
||||
bool "Use the LPUART as console"
|
||||
depends on FSL_LPUART
|
||||
|
||||
config MVEBU_A3700_UART
|
||||
bool "UART support for Armada 3700"
|
||||
help
|
||||
|
|
|
@ -268,9 +268,7 @@
|
|||
/*
|
||||
* Serial Port
|
||||
*/
|
||||
#ifdef CONFIG_LPUART
|
||||
#define CONFIG_LPUART_32B_REG
|
||||
#else
|
||||
#ifndef CONFIG_LPUART
|
||||
#define CONFIG_SYS_NS16550_SERIAL
|
||||
#ifndef CONFIG_DM_SERIAL
|
||||
#define CONFIG_SYS_NS16550_REG_SIZE 1
|
||||
|
|
|
@ -165,9 +165,7 @@
|
|||
/*
|
||||
* Serial Port
|
||||
*/
|
||||
#ifdef CONFIG_LPUART
|
||||
#define CONFIG_LPUART_32B_REG
|
||||
#else
|
||||
#ifndef CONFIG_LPUART
|
||||
#define CONFIG_SYS_NS16550_SERIAL
|
||||
#ifndef CONFIG_DM_SERIAL
|
||||
#define CONFIG_SYS_NS16550_REG_SIZE 1
|
||||
|
|
|
@ -66,7 +66,6 @@
|
|||
|
||||
/* LPUART */
|
||||
#ifdef CONFIG_LPUART
|
||||
#define CONFIG_LPUART_32B_REG
|
||||
#define CFG_LPUART_MUX_MASK 0xf0
|
||||
#define CFG_LPUART_EN 0xf0
|
||||
#endif
|
||||
|
|
|
@ -39,11 +39,6 @@
|
|||
#define QSGMII_CARD_PORT4_PHY_ADDR_S2 0xB
|
||||
#endif
|
||||
|
||||
/* LPUART */
|
||||
#ifdef CONFIG_LPUART
|
||||
#define CONFIG_LPUART_32B_REG
|
||||
#endif
|
||||
|
||||
/* SATA */
|
||||
|
||||
/* EEPROM */
|
||||
|
|
|
@ -54,7 +54,6 @@
|
|||
|
||||
/* LPUART */
|
||||
#ifdef CONFIG_LPUART
|
||||
#define CONFIG_LPUART_32B_REG
|
||||
#define CFG_UART_MUX_MASK 0x6
|
||||
#define CFG_UART_MUX_SHIFT 1
|
||||
#define CFG_LPUART_EN 0x2
|
||||
|
|
Loading…
Reference in a new issue