diff mbox

[U-Boot,v2,3/9] serial: lpuart: Move CONFIG_FSL_LPUART to Kconfig

Message ID 1452742746-31746-4-git-send-email-bmeng.cn@gmail.com
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Bin Meng Jan. 14, 2016, 3:39 a.m. UTC
LPUART is seen on Freescale VF610 and QorIQ Layerscape devices.
Create a Kconfig option and move it to defconfig for all boards
that have this serial driver.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 configs/colibri_vf_defconfig                 | 1 +
 configs/colibri_vf_dtb_defconfig             | 1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
 configs/ls1021aqds_nor_lpuart_defconfig      | 1 +
 configs/ls1021atwr_nor_lpuart_defconfig      | 1 +
 configs/pcm052_defconfig                     | 1 +
 configs/vf610twr_defconfig                   | 1 +
 configs/vf610twr_nand_defconfig              | 1 +
 drivers/serial/Kconfig                       | 6 ++++++
 include/configs/colibri_vf.h                 | 1 -
 include/configs/ls1021aqds.h                 | 1 -
 include/configs/ls1021atwr.h                 | 1 -
 include/configs/pcm052.h                     | 1 -
 include/configs/vf610twr.h                   | 1 -
 14 files changed, 14 insertions(+), 5 deletions(-)

Comments

Stefan Agner Jan. 15, 2016, 9:11 p.m. UTC | #1
Looks good to me,

Acked-by: Stefan Agner <stefan.agner@toradex.com>

On 13.01.2016 19:39, Bin Meng wrote:
> LPUART is seen on Freescale VF610 and QorIQ Layerscape devices.
> Create a Kconfig option and move it to defconfig for all boards
> that have this serial driver.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
>  configs/colibri_vf_defconfig                 | 1 +
>  configs/colibri_vf_dtb_defconfig             | 1 +
>  configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
>  configs/ls1021aqds_nor_lpuart_defconfig      | 1 +
>  configs/ls1021atwr_nor_lpuart_defconfig      | 1 +
>  configs/pcm052_defconfig                     | 1 +
>  configs/vf610twr_defconfig                   | 1 +
>  configs/vf610twr_nand_defconfig              | 1 +
>  drivers/serial/Kconfig                       | 6 ++++++
>  include/configs/colibri_vf.h                 | 1 -
>  include/configs/ls1021aqds.h                 | 1 -
>  include/configs/ls1021atwr.h                 | 1 -
>  include/configs/pcm052.h                     | 1 -
>  include/configs/vf610twr.h                   | 1 -
>  14 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
> index f8441e3..45917c8 100644
> --- a/configs/colibri_vf_defconfig
> +++ b/configs/colibri_vf_defconfig
> @@ -8,3 +8,4 @@ CONFIG_CMD_GPIO=y
>  CONFIG_DM=y
>  CONFIG_NAND_VF610_NFC=y
>  CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
> +CONFIG_FSL_LPUART=y
> diff --git a/configs/colibri_vf_dtb_defconfig b/configs/colibri_vf_dtb_defconfig
> index 3596cec..b1a843a 100644
> --- a/configs/colibri_vf_dtb_defconfig
> +++ b/configs/colibri_vf_dtb_defconfig
> @@ -11,3 +11,4 @@ CONFIG_OF_CONTROL=y
>  CONFIG_DM=y
>  CONFIG_NAND_VF610_NFC=y
>  CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
> +CONFIG_FSL_LPUART=y
> diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
> index 68bd117..44b2a0d 100644
> --- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
> +++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART"
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
> +CONFIG_FSL_LPUART=y
> diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
> index b2f6832..1186af2 100644
> --- a/configs/ls1021aqds_nor_lpuart_defconfig
> +++ b/configs/ls1021aqds_nor_lpuart_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="LPUART"
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
> +CONFIG_FSL_LPUART=y
> diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
> index d7afca9..58cd61f 100644
> --- a/configs/ls1021atwr_nor_lpuart_defconfig
> +++ b/configs/ls1021atwr_nor_lpuart_defconfig
> @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="LPUART"
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
> +CONFIG_FSL_LPUART=y
> diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig
> index 9125645..26ab733 100644
> --- a/configs/pcm052_defconfig
> +++ b/configs/pcm052_defconfig
> @@ -3,3 +3,4 @@ CONFIG_TARGET_PCM052=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg,ENV_IS_IN_NAND"
>  CONFIG_NAND_VF610_NFC=y
>  CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
> +CONFIG_FSL_LPUART=y
> diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig
> index dc8df5c..d51c93b 100644
> --- a/configs/vf610twr_defconfig
> +++ b/configs/vf610twr_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_I
>  CONFIG_NAND_VF610_NFC=y
>  CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
>  CONFIG_SPI_FLASH=y
> +CONFIG_FSL_LPUART=y
> diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig
> index 98880f3..299fa8f 100644
> --- a/configs/vf610twr_nand_defconfig
> +++ b/configs/vf610twr_nand_defconfig
> @@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_I
>  CONFIG_NAND_VF610_NFC=y
>  CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
>  CONFIG_SPI_FLASH=y
> +CONFIG_FSL_LPUART=y
> diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
> index 1fc287e..3b54511 100644
> --- a/drivers/serial/Kconfig
> +++ b/drivers/serial/Kconfig
> @@ -186,6 +186,12 @@ config ALTERA_UART
>  	  Select this to enable an UART for Altera devices. Please find
>  	  details on the "Embedded Peripherals IP User Guide" of Altera.
>  
> +config FSL_LPUART
> +	bool "Freescale LPUART support"
> +	help
> +	  Select this to enable a Low Power UART for Freescale VF610 and
> +	  QorIQ Layerscape devices.
> +
>  config SYS_NS16550
>  	bool "NS16550 UART or compatible"
>  	help
> diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
> index 708c79a..5aed3a5 100644
> --- a/include/configs/colibri_vf.h
> +++ b/include/configs/colibri_vf.h
> @@ -36,7 +36,6 @@
>  
>  #define CONFIG_BOARD_EARLY_INIT_F
>  
> -#define CONFIG_FSL_LPUART
>  #define LPUART_BASE			UART0_BASE
>  
>  /* Allow to overwrite serial and ethaddr */
> diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
> index 2e8dbc7..e8b1eca 100644
> --- a/include/configs/ls1021aqds.h
> +++ b/include/configs/ls1021aqds.h
> @@ -371,7 +371,6 @@ unsigned long get_board_ddr_clk(void);
>   * Serial Port
>   */
>  #ifdef CONFIG_LPUART
> -#define CONFIG_FSL_LPUART
>  #define CONFIG_LPUART_32B_REG
>  #else
>  #define CONFIG_CONS_INDEX		1
> diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
> index bbef2a7..317ba62 100644
> --- a/include/configs/ls1021atwr.h
> +++ b/include/configs/ls1021atwr.h
> @@ -266,7 +266,6 @@
>   * Serial Port
>   */
>  #ifdef CONFIG_LPUART
> -#define CONFIG_FSL_LPUART
>  #define CONFIG_LPUART_32B_REG
>  #else
>  #define CONFIG_CONS_INDEX		1
> diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
> index b851bba..891bdb0 100644
> --- a/include/configs/pcm052.h
> +++ b/include/configs/pcm052.h
> @@ -27,7 +27,6 @@
>  
>  #define CONFIG_BOARD_EARLY_INIT_F
>  
> -#define CONFIG_FSL_LPUART
>  #define LPUART_BASE			UART1_BASE
>  
>  /* Allow to overwrite serial and ethaddr */
> diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
> index 34df6f0..dcfafaf 100644
> --- a/include/configs/vf610twr.h
> +++ b/include/configs/vf610twr.h
> @@ -34,7 +34,6 @@
>  
>  #define CONFIG_BOARD_EARLY_INIT_F
>  
> -#define CONFIG_FSL_LPUART
>  #define LPUART_BASE			UART1_BASE
>  
>  /* Allow to overwrite serial and ethaddr */
Simon Glass Jan. 20, 2016, 8:26 p.m. UTC | #2
On 15 January 2016 at 14:11, Stefan Agner <stefan.agner@toradex.com> wrote:
> Looks good to me,
>
> Acked-by: Stefan Agner <stefan.agner@toradex.com>
>
> On 13.01.2016 19:39, Bin Meng wrote:
>> LPUART is seen on Freescale VF610 and QorIQ Layerscape devices.
>> Create a Kconfig option and move it to defconfig for all boards
>> that have this serial driver.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> Reviewed-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> Changes in v2: None
>>
>>  configs/colibri_vf_defconfig                 | 1 +
>>  configs/colibri_vf_dtb_defconfig             | 1 +
>>  configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
>>  configs/ls1021aqds_nor_lpuart_defconfig      | 1 +
>>  configs/ls1021atwr_nor_lpuart_defconfig      | 1 +
>>  configs/pcm052_defconfig                     | 1 +
>>  configs/vf610twr_defconfig                   | 1 +
>>  configs/vf610twr_nand_defconfig              | 1 +
>>  drivers/serial/Kconfig                       | 6 ++++++
>>  include/configs/colibri_vf.h                 | 1 -
>>  include/configs/ls1021aqds.h                 | 1 -
>>  include/configs/ls1021atwr.h                 | 1 -
>>  include/configs/pcm052.h                     | 1 -
>>  include/configs/vf610twr.h                   | 1 -
>>  14 files changed, 14 insertions(+), 5 deletions(-)
>>

Acked-by: Simon Glass <sjg@chromium.org>
Simon Glass Jan. 21, 2016, 3:18 p.m. UTC | #3
On 20 January 2016 at 13:26, Simon Glass <sjg@chromium.org> wrote:
> On 15 January 2016 at 14:11, Stefan Agner <stefan.agner@toradex.com> wrote:
>> Looks good to me,
>>
>> Acked-by: Stefan Agner <stefan.agner@toradex.com>
>>
>> On 13.01.2016 19:39, Bin Meng wrote:
>>> LPUART is seen on Freescale VF610 and QorIQ Layerscape devices.
>>> Create a Kconfig option and move it to defconfig for all boards
>>> that have this serial driver.
>>>
>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>> Reviewed-by: Simon Glass <sjg@chromium.org>
>>> ---
>>>
>>> Changes in v2: None
>>>
>>>  configs/colibri_vf_defconfig                 | 1 +
>>>  configs/colibri_vf_dtb_defconfig             | 1 +
>>>  configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
>>>  configs/ls1021aqds_nor_lpuart_defconfig      | 1 +
>>>  configs/ls1021atwr_nor_lpuart_defconfig      | 1 +
>>>  configs/pcm052_defconfig                     | 1 +
>>>  configs/vf610twr_defconfig                   | 1 +
>>>  configs/vf610twr_nand_defconfig              | 1 +
>>>  drivers/serial/Kconfig                       | 6 ++++++
>>>  include/configs/colibri_vf.h                 | 1 -
>>>  include/configs/ls1021aqds.h                 | 1 -
>>>  include/configs/ls1021atwr.h                 | 1 -
>>>  include/configs/pcm052.h                     | 1 -
>>>  include/configs/vf610twr.h                   | 1 -
>>>  14 files changed, 14 insertions(+), 5 deletions(-)
>>>
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm, thanks!
diff mbox

Patch

diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index f8441e3..45917c8 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -8,3 +8,4 @@  CONFIG_CMD_GPIO=y
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
+CONFIG_FSL_LPUART=y
diff --git a/configs/colibri_vf_dtb_defconfig b/configs/colibri_vf_dtb_defconfig
index 3596cec..b1a843a 100644
--- a/configs/colibri_vf_dtb_defconfig
+++ b/configs/colibri_vf_dtb_defconfig
@@ -11,3 +11,4 @@  CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
+CONFIG_FSL_LPUART=y
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index 68bd117..44b2a0d 100644
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -4,3 +4,4 @@  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_LPUART=y
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index b2f6832..1186af2 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -4,3 +4,4 @@  CONFIG_SYS_EXTRA_OPTIONS="LPUART"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_LPUART=y
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
index d7afca9..58cd61f 100644
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -4,3 +4,4 @@  CONFIG_SYS_EXTRA_OPTIONS="LPUART"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_LPUART=y
diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig
index 9125645..26ab733 100644
--- a/configs/pcm052_defconfig
+++ b/configs/pcm052_defconfig
@@ -3,3 +3,4 @@  CONFIG_TARGET_PCM052=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg,ENV_IS_IN_NAND"
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
+CONFIG_FSL_LPUART=y
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig
index dc8df5c..d51c93b 100644
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -6,3 +6,4 @@  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_I
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
+CONFIG_FSL_LPUART=y
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig
index 98880f3..299fa8f 100644
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -6,3 +6,4 @@  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_I
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
+CONFIG_FSL_LPUART=y
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 1fc287e..3b54511 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -186,6 +186,12 @@  config ALTERA_UART
 	  Select this to enable an UART for Altera devices. Please find
 	  details on the "Embedded Peripherals IP User Guide" of Altera.
 
+config FSL_LPUART
+	bool "Freescale LPUART support"
+	help
+	  Select this to enable a Low Power UART for Freescale VF610 and
+	  QorIQ Layerscape devices.
+
 config SYS_NS16550
 	bool "NS16550 UART or compatible"
 	help
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 708c79a..5aed3a5 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -36,7 +36,6 @@ 
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_FSL_LPUART
 #define LPUART_BASE			UART0_BASE
 
 /* Allow to overwrite serial and ethaddr */
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 2e8dbc7..e8b1eca 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -371,7 +371,6 @@  unsigned long get_board_ddr_clk(void);
  * Serial Port
  */
 #ifdef CONFIG_LPUART
-#define CONFIG_FSL_LPUART
 #define CONFIG_LPUART_32B_REG
 #else
 #define CONFIG_CONS_INDEX		1
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index bbef2a7..317ba62 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -266,7 +266,6 @@ 
  * Serial Port
  */
 #ifdef CONFIG_LPUART
-#define CONFIG_FSL_LPUART
 #define CONFIG_LPUART_32B_REG
 #else
 #define CONFIG_CONS_INDEX		1
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index b851bba..891bdb0 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -27,7 +27,6 @@ 
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_FSL_LPUART
 #define LPUART_BASE			UART1_BASE
 
 /* Allow to overwrite serial and ethaddr */
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 34df6f0..dcfafaf 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -34,7 +34,6 @@ 
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_FSL_LPUART
 #define LPUART_BASE			UART1_BASE
 
 /* Allow to overwrite serial and ethaddr */