diff mbox series

[U-Boot,3/5] mx6sl: Select MX6SL option via Kconfig

Message ID 1511823961-21258-1-git-send-email-brenomatheus@gmail.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show
Series [U-Boot,1/5] mx6slevk: imximage.cfg: Handle the CONFIG_SECURE_BOOT case | expand

Commit Message

Breno Matheus Lima Nov. 27, 2017, 11:06 p.m. UTC 
From: Breno Lima <breno.lima@nxp.com>

Currently the MX6SL option is selected via CONFIG_SYS_EXTRA_OPTIONS,
but it is better to select it directly via Kconfig.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
---
 arch/arm/mach-imx/mx6/Kconfig     | 2 ++
 configs/mx6slevk_defconfig        | 2 +-
 configs/mx6slevk_spinor_defconfig | 2 +-
 configs/mx6slevk_spl_defconfig    | 2 +-
 configs/warp_defconfig            | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

Comments

Fabio Estevam Nov. 28, 2017, 12:03 a.m. UTC | #1 
On Mon, Nov 27, 2017 at 9:06 PM, Breno Lima <brenomatheus@gmail.com> wrote:
> From: Breno Lima <breno.lima@nxp.com>
>
> Currently the MX6SL option is selected via CONFIG_SYS_EXTRA_OPTIONS,
> but it is better to select it directly via Kconfig.
>
> Signed-off-by: Breno Lima <breno.lima@nxp.com>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Peng Fan Nov. 28, 2017, 1:34 a.m. UTC | #2 
> -----Original Message-----
> From: Breno Lima [mailto:brenomatheus@gmail.com]
> Sent: Tuesday, November 28, 2017 7:06 AM
> To: Fabio Estevam <fabio.estevam@nxp.com>; sbabic@denx.de
> Cc: otavio@ossystems.com.br; Peng Fan <peng.fan@nxp.com>; u-
> boot@lists.denx.de; Breno Matheus Lima <breno.lima@nxp.com>
> Subject: [PATCH 3/5] mx6sl: Select MX6SL option via Kconfig
> 
> From: Breno Lima <breno.lima@nxp.com>
> 
> Currently the MX6SL option is selected via CONFIG_SYS_EXTRA_OPTIONS, but
> it is better to select it directly via Kconfig.
> 
> Signed-off-by: Breno Lima <breno.lima@nxp.com>
> ---
>  arch/arm/mach-imx/mx6/Kconfig     | 2 ++
>  configs/mx6slevk_defconfig        | 2 +-
>  configs/mx6slevk_spinor_defconfig | 2 +-
>  configs/mx6slevk_spl_defconfig    | 2 +-
>  configs/warp_defconfig            | 2 +-
>  5 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-
> imx/mx6/Kconfig index bee7eab..4f8bb8f 100644
> --- a/arch/arm/mach-imx/mx6/Kconfig
> +++ b/arch/arm/mach-imx/mx6/Kconfig
> @@ -244,6 +244,7 @@ config TARGET_MX6SABRESD
> 
>  config TARGET_MX6SLEVK
>  	bool "mx6slevk"
> +	select MX6SL
>  	select SUPPORT_SPL
> 
>  config TARGET_MX6SLLEVK
> @@ -395,6 +396,7 @@ config TARGET_WANDBOARD
> 
>  config TARGET_WARP
>  	bool "WaRP"
> +	select MX6SL
>  	select BOARD_LATE_INIT
> 
>  config TARGET_XPRESS
> diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index
> 7b1ddac..aafddfa 100644
> --- a/configs/mx6slevk_defconfig
> +++ b/configs/mx6slevk_defconfig
> @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_MX6SLEVK=y
>  # CONFIG_CMD_BMODE is not set
>  CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
> -
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imx
> image.cfg,MX6SL"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/im
> ximage.cfg"
>  CONFIG_BOOTDELAY=3
>  CONFIG_BOARD_EARLY_INIT_F=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/mx6slevk_spinor_defconfig
> b/configs/mx6slevk_spinor_defconfig
> index 4b9c04e..0d3cb59 100644
> --- a/configs/mx6slevk_spinor_defconfig
> +++ b/configs/mx6slevk_spinor_defconfig
> @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_MX6SLEVK=y
>  # CONFIG_CMD_BMODE is not set
>  CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
> -
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imx
> image.cfg,MX6SL"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/im
> ximage.cfg"
>  CONFIG_SPI_BOOT=y
>  CONFIG_BOOTDELAY=3
>  CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig
> index 05a5c9e..0dbd308 100644
> --- a/configs/mx6slevk_spl_defconfig
> +++ b/configs/mx6slevk_spl_defconfig
> @@ -10,7 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SPL_WATCHDOG_SUPPORT=y  # CONFIG_CMD_BMODE is not set
> CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-
> imx/spl_sd.cfg,MX6SL"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-
> imx/spl_sd.cfg"
>  CONFIG_BOOTDELAY=3
>  CONFIG_BOARD_EARLY_INIT_F=y
>  CONFIG_SPL=y
> diff --git a/configs/warp_defconfig b/configs/warp_defconfig index
> 5e7eef0..2ac1c6c 100644
> --- a/configs/warp_defconfig
> +++ b/configs/warp_defconfig
> @@ -2,7 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_WARP=y
>  # CONFIG_CMD_BMODE is not set
> -
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg,MX
> 6SL"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg"

Reviewed-by: Peng Fan <peng.fan@nxp.com>

>  CONFIG_BOOTDELAY=3
>  CONFIG_BOARD_EARLY_INIT_F=y
>  CONFIG_HUSH_PARSER=y
> --
> 2.7.4
Stefano Babic Dec. 17, 2017, 10:31 a.m. UTC | #3 
On 28/11/2017 00:06, Breno Lima wrote:
> From: Breno Lima <breno.lima@nxp.com>
> 
> Currently the MX6SL option is selected via CONFIG_SYS_EXTRA_OPTIONS,
> but it is better to select it directly via Kconfig.
> 
> Signed-off-by: Breno Lima <breno.lima@nxp.com>
> ---
>  arch/arm/mach-imx/mx6/Kconfig     | 2 ++
>  configs/mx6slevk_defconfig        | 2 +-
>  configs/mx6slevk_spinor_defconfig | 2 +-
>  configs/mx6slevk_spl_defconfig    | 2 +-
>  configs/warp_defconfig            | 2 +-
>  5 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
> index bee7eab..4f8bb8f 100644
> --- a/arch/arm/mach-imx/mx6/Kconfig
> +++ b/arch/arm/mach-imx/mx6/Kconfig
> @@ -244,6 +244,7 @@ config TARGET_MX6SABRESD
>  
>  config TARGET_MX6SLEVK
>  	bool "mx6slevk"
> +	select MX6SL
>  	select SUPPORT_SPL
>  
>  config TARGET_MX6SLLEVK
> @@ -395,6 +396,7 @@ config TARGET_WANDBOARD
>  
>  config TARGET_WARP
>  	bool "WaRP"
> +	select MX6SL
>  	select BOARD_LATE_INIT
>  
>  config TARGET_XPRESS
> diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
> index 7b1ddac..aafddfa 100644
> --- a/configs/mx6slevk_defconfig
> +++ b/configs/mx6slevk_defconfig
> @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_MX6SLEVK=y
>  # CONFIG_CMD_BMODE is not set
>  CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg"
>  CONFIG_BOOTDELAY=3
>  CONFIG_BOARD_EARLY_INIT_F=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig
> index 4b9c04e..0d3cb59 100644
> --- a/configs/mx6slevk_spinor_defconfig
> +++ b/configs/mx6slevk_spinor_defconfig
> @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_MX6SLEVK=y
>  # CONFIG_CMD_BMODE is not set
>  CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg"
>  CONFIG_SPI_BOOT=y
>  CONFIG_BOOTDELAY=3
>  CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig
> index 05a5c9e..0dbd308 100644
> --- a/configs/mx6slevk_spl_defconfig
> +++ b/configs/mx6slevk_spl_defconfig
> @@ -10,7 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
>  CONFIG_SPL_WATCHDOG_SUPPORT=y
>  # CONFIG_CMD_BMODE is not set
>  CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6SL"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>  CONFIG_BOOTDELAY=3
>  CONFIG_BOARD_EARLY_INIT_F=y
>  CONFIG_SPL=y
> diff --git a/configs/warp_defconfig b/configs/warp_defconfig
> index 5e7eef0..2ac1c6c 100644
> --- a/configs/warp_defconfig
> +++ b/configs/warp_defconfig
> @@ -2,7 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_WARP=y
>  # CONFIG_CMD_BMODE is not set
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg,MX6SL"
> +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg"
>  CONFIG_BOOTDELAY=3
>  CONFIG_BOARD_EARLY_INIT_F=y
>  CONFIG_HUSH_PARSER=y
> 
Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index bee7eab..4f8bb8f 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -244,6 +244,7 @@  config TARGET_MX6SABRESD
 
 config TARGET_MX6SLEVK
 	bool "mx6slevk"
+	select MX6SL
 	select SUPPORT_SPL
 
 config TARGET_MX6SLLEVK
@@ -395,6 +396,7 @@  config TARGET_WANDBOARD
 
 config TARGET_WARP
 	bool "WaRP"
+	select MX6SL
 	select BOARD_LATE_INIT
 
 config TARGET_XPRESS
diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
index 7b1ddac..aafddfa 100644
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -3,7 +3,7 @@  CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SLEVK=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig
index 4b9c04e..0d3cb59 100644
--- a/configs/mx6slevk_spinor_defconfig
+++ b/configs/mx6slevk_spinor_defconfig
@@ -3,7 +3,7 @@  CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SLEVK=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg"
 CONFIG_SPI_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig
index 05a5c9e..0dbd308 100644
--- a/configs/mx6slevk_spl_defconfig
+++ b/configs/mx6slevk_spl_defconfig
@@ -10,7 +10,7 @@  CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6SL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index 5e7eef0..2ac1c6c 100644
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -2,7 +2,7 @@  CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_WARP=y
 # CONFIG_CMD_BMODE is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg,MX6SL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y