From: Lukasz Majewski <lukma@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 1/7] spl: Kconfig: Drop the _SUPPORT postfix from SPL_DFU
Date: Tue, 22 Jan 2019 23:40:17 +0100 [thread overview]
Message-ID: <20190122234017.07a80527@jawa> (raw)
In-Reply-To: <20190117194308.29644-2-afd@ti.com>
On Thu, 17 Jan 2019 13:43:02 -0600
"Andrew F. Davis" <afd@ti.com> wrote:
> The symbol CONFIG_SPL_DFU_SUPPORT in SPL build has the same
> meaning as CONFIG_DFU in regular U-Boot. Drop the _SUPPORT
> to allow for cleaner use in code.
>
Acked-by: Lukasz Majewski <lukma@denx.de>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
> arch/arm/cpu/armv8/zynqmp/spl.c | 2 +-
> arch/arm/mach-omap2/boot-common.c | 2 +-
> common/Makefile | 4 ++--
> common/spl/Kconfig | 6 +++---
> common/spl/Makefile | 2 +-
> common/spl/spl_ram.c | 4 ++--
> drivers/Makefile | 2 +-
> drivers/usb/gadget/Makefile | 2 +-
> include/configs/dra7xx_evm.h | 2 +-
> include/configs/xilinx_zynqmp.h | 4 ++--
> 10 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm/cpu/armv8/zynqmp/spl.c
> b/arch/arm/cpu/armv8/zynqmp/spl.c index 01f31d0f0e..fb3955c93f 100644
> --- a/arch/arm/cpu/armv8/zynqmp/spl.c
> +++ b/arch/arm/cpu/armv8/zynqmp/spl.c
> @@ -93,7 +93,7 @@ u32 spl_boot_device(void)
> case EMMC_MODE:
> return BOOT_DEVICE_MMC1;
> #endif
> -#ifdef CONFIG_SPL_DFU_SUPPORT
> +#ifdef CONFIG_SPL_DFU
> case USB_MODE:
> return BOOT_DEVICE_DFU;
> #endif
> diff --git a/arch/arm/mach-omap2/boot-common.c
> b/arch/arm/mach-omap2/boot-common.c index 176d4f67cb..2db19227b9
> 100644 --- a/arch/arm/mach-omap2/boot-common.c
> +++ b/arch/arm/mach-omap2/boot-common.c
> @@ -108,7 +108,7 @@ void save_omap_boot_params(void)
> sys_boot_device = 1;
> break;
> #endif
> -#if defined(BOOT_DEVICE_DFU) && !defined(CONFIG_SPL_DFU_SUPPORT)
> +#if defined(BOOT_DEVICE_DFU) && !defined(CONFIG_SPL_DFU)
> case BOOT_DEVICE_DFU:
> sys_boot_device = 1;
> break;
> diff --git a/common/Makefile b/common/Makefile
> index 0de60b3ced..3711016505 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -64,10 +64,10 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTAGE) += bootstage.o
> obj-$(CONFIG_$(SPL_TPL_)BLOBLIST) += bloblist.o
>
> ifdef CONFIG_SPL_BUILD
> -ifdef CONFIG_SPL_DFU_SUPPORT
> +ifdef CONFIG_SPL_DFU
> obj-$(CONFIG_DFU_OVER_USB) += dfu.o
> endif
> -obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o
> +obj-$(CONFIG_SPL_DFU) += cli_hush.o
> obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o
> obj-$(CONFIG_TPL_HASH_SUPPORT) += hash.o
> obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index 37ecbc6b1c..ce76dcfe2f 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -794,7 +794,7 @@ config SPL_USB_ETHER
> since the network stack uses a number of environment
> variables. See also SPL_NET_SUPPORT and SPL_ETH_SUPPORT.
>
> -config SPL_DFU_SUPPORT
> +config SPL_DFU
> bool "Support DFU (Device Firmware Upgrade)"
> select SPL_HASH_SUPPORT
> select SPL_DFU_NO_RESET
> @@ -809,11 +809,11 @@ config SPL_DFU_SUPPORT
>
> choice
> bool "DFU device selection"
> - depends on SPL_DFU_SUPPORT
> + depends on SPL_DFU
>
> config SPL_DFU_RAM
> bool "RAM device"
> - depends on SPL_DFU_SUPPORT && SPL_RAM_SUPPORT
> + depends on SPL_DFU && SPL_RAM_SUPPORT
> help
> select RAM/DDR memory device for loading binary images
> (u-boot/kernel) to the selected device partition using
> diff --git a/common/spl/Makefile b/common/spl/Makefile
> index a130a5be4b..6f8d7599ae 100644
> --- a/common/spl/Makefile
> +++ b/common/spl/Makefile
> @@ -26,7 +26,7 @@ obj-$(CONFIG_$(SPL_TPL_)USB_SUPPORT) += spl_usb.o
> obj-$(CONFIG_$(SPL_TPL_)FAT_SUPPORT) += spl_fat.o
> obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o
> obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o
> -obj-$(CONFIG_$(SPL_TPL_)DFU_SUPPORT) += spl_dfu.o
> +obj-$(CONFIG_$(SPL_TPL_)DFU) += spl_dfu.o
> obj-$(CONFIG_$(SPL_TPL_)SPI_LOAD) += spl_spi.o
> obj-$(CONFIG_$(SPL_TPL_)RAM_SUPPORT) += spl_ram.o
> obj-$(CONFIG_$(SPL_TPL_)USB_SDP_SUPPORT) += spl_sdp.o
> diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
> index 5fcc3b1504..954e91a004 100644
> --- a/common/spl/spl_ram.c
> +++ b/common/spl/spl_ram.c
> @@ -35,7 +35,7 @@ static int spl_ram_load_image(struct spl_image_info
> *spl_image,
> header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS;
>
> -#if CONFIG_IS_ENABLED(DFU_SUPPORT)
> +#if CONFIG_IS_ENABLED(DFU)
> if (bootdev->boot_device == BOOT_DEVICE_DFU)
> spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
> #endif
> @@ -76,7 +76,7 @@ static int spl_ram_load_image(struct spl_image_info
> *spl_image, #if CONFIG_IS_ENABLED(RAM_DEVICE)
> SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image);
> #endif
> -#if CONFIG_IS_ENABLED(DFU_SUPPORT)
> +#if CONFIG_IS_ENABLED(DFU)
> SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image);
> #endif
>
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 4105864e2b..14543c7d6c 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -50,7 +50,7 @@ obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/
> obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/
> obj-$(CONFIG_SPL_USB_GADGET) += usb/common/
> obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/
> -obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu/
> +obj-$(CONFIG_SPL_DFU) += dfu/
> obj-$(CONFIG_SPL_WATCHDOG_SUPPORT) += watchdog/
> obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += usb/host/
> obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/
> diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
> index 01e2b3abf2..70f3bf43e7 100644
> --- a/drivers/usb/gadget/Makefile
> +++ b/drivers/usb/gadget/Makefile
> @@ -8,7 +8,7 @@ obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o
> usbstring.o
> ifdef CONFIG_SPL_BUILD
> obj-$(CONFIG_SPL_USB_GADGET) += g_dnl.o
> -obj-$(CONFIG_SPL_DFU_SUPPORT) += f_dfu.o
> +obj-$(CONFIG_SPL_DFU) += f_dfu.o
> obj-$(CONFIG_SPL_USB_SDP_SUPPORT) += f_sdp.o
> endif
>
> diff --git a/include/configs/dra7xx_evm.h
> b/include/configs/dra7xx_evm.h index 2d8758db75..f36a9c3e08 100644
> --- a/include/configs/dra7xx_evm.h
> +++ b/include/configs/dra7xx_evm.h
> @@ -53,7 +53,7 @@
>
> #ifdef CONFIG_SPL_BUILD
> #undef CONFIG_CMD_BOOTD
> -#ifdef CONFIG_SPL_DFU_SUPPORT
> +#ifdef CONFIG_SPL_DFU
> #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000
> #define DFUARGS \
> "dfu_bufsiz=0x10000\0" \
> diff --git a/include/configs/xilinx_zynqmp.h
> b/include/configs/xilinx_zynqmp.h index 0ab32611ce..7a9b06ec4c 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -183,7 +183,7 @@
> #endif
>
> /* SPL can't handle all huge variables - define just DFU */
> -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU_SUPPORT)
> +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
> #undef CONFIG_EXTRA_ENV_SETTINGS
> # define CONFIG_EXTRA_ENV_SETTINGS \
> "dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \
> @@ -228,7 +228,7 @@
> # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
> #endif
>
> -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU_SUPPORT)
> +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
> # undef CONFIG_CMD_BOOTD
> # define CONFIG_SPL_ENV_SUPPORT
> # define CONFIG_SPL_HASH_SUPPORT
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190122/6247e8e4/attachment.sig>
next prev parent reply other threads:[~2019-01-22 22:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-17 19:43 [U-Boot] [PATCH v3 0/7] Add USB boot to HS DRA7xx/AM57xx Andrew F. Davis
2019-01-17 19:43 ` [U-Boot] [PATCH v3 1/7] spl: Kconfig: Drop the _SUPPORT postfix from SPL_DFU Andrew F. Davis
2019-01-22 22:40 ` Lukasz Majewski [this message]
2019-01-27 3:52 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-01-17 19:43 ` [U-Boot] [PATCH v3 2/7] dfu: Make DFU support more SPL friendly Andrew F. Davis
2019-01-22 22:41 ` Lukasz Majewski
2019-01-27 3:52 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-01-17 19:43 ` [U-Boot] [PATCH v3 3/7] dfu: Remove dependency on HUSH parser in SPL Andrew F. Davis
2019-01-22 22:43 ` Lukasz Majewski
2019-01-22 23:41 ` Tom Rini
2019-01-23 6:54 ` Lukasz Majewski
2019-01-23 14:13 ` Andrew F. Davis
2019-01-27 3:52 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-01-17 19:43 ` [U-Boot] [PATCH v3 4/7] ARM: mach-omap2: Kconfig: Allow OMAP5 devices to set entry point Andrew F. Davis
2019-01-27 3:52 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-01-17 19:43 ` [U-Boot] [PATCH v3 5/7] defconfigs: Add config for DRA7xx High Security EVM with USB Boot support Andrew F. Davis
2019-01-27 3:51 ` [U-Boot] [U-Boot, v3, " Tom Rini
2019-01-28 17:43 ` Andrew F. Davis
2019-01-17 19:43 ` [U-Boot] [PATCH v3 6/7] defconfigs: Add config for AM57xx High Security EVM with USB/UART " Andrew F. Davis
2019-01-17 19:43 ` [U-Boot] [PATCH v3 7/7] doc: ti-secure: Add ULO info for AM57xx/DRA7xx secure devices from TI Andrew F. Davis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190122234017.07a80527@jawa \
--to=lukma@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.