[PATCH] scripts: imx/mxs remove mxs-usb-loader

[Sascha Hauer]

On Tue, Mar 07, 2017 at 12:22:49PM +0100, Oleksij Rempel wrote:
> ... and use imx-usb-loader instead
> 
> Signed-off-by: Oleksij Rempel <o.rempel at pengutronix.de>
> ---
>  arch/arm/mach-imx/Kconfig |   7 +-
>  arch/arm/mach-mxs/Kconfig |   7 +-
>  scripts/Makefile          |   7 +-
>  scripts/imx/Kconfig       |   6 ++
>  scripts/mxs-usb-loader.c  | 236 ----------------------------------------------
>  5 files changed, 11 insertions(+), 252 deletions(-)
>  create mode 100644 scripts/imx/Kconfig
>  delete mode 100644 scripts/mxs-usb-loader.c
> 
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 9dbe31c4b..420b52281 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -632,12 +632,7 @@ endmenu
>  
>  menu "i.MX specific settings"
>  
> -config ARCH_IMX_USBLOADER
> -	bool "compile imx-usb-loader"
> -	help
> -	  imx-usb-loader is a tool to upload and start imximages to an i.MX SoC
> -	  in ROM boot mode. It requires libusb, so make sure you have the libusb
> -	  devel package installed on your machine.
> +source scripts/imx/Kconfig
>  
>  config IMX_IIM
>  	tristate "IIM fusebox device"
> diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
> index facab9c25..25e2a8d04 100644
> --- a/arch/arm/mach-mxs/Kconfig
> +++ b/arch/arm/mach-mxs/Kconfig
> @@ -143,11 +143,6 @@ endif
>  
>  endmenu
>  
> -config ARCH_MXS_USBLOADER
> -	bool "compile mxs-usb-loader"
> -	help
> -	  mxs-usb-loader is a tool to upload and start mxs bootstream images to an
> -	  i.MX SoC in ROM boot mode. It requires libusb, so make sure you have the libusb
> -	  devel package installed on your machine.
> +source scripts/imx/Kconfig

Including the same file two times confuses Kconfig. Here the search
function found the menu path where it's included the first time, but in
the menu itself it is then sorted in where it's included the second
time.

I refactored a bit to include only once.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |