From: Patrice CHOTARD <patrice.chotard@st.com>
To: u-boot@lists.denx.de
Subject: [Uboot-stm32] [PATCH 02/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in g_dnl_board_usb_cable_connected
Date: Thu, 13 Aug 2020 07:22:03 +0000 [thread overview]
Message-ID: <927cd46b-e896-abf8-9fab-3655501cc623@st.com> (raw)
In-Reply-To: <20200731143152.8812-2-patrick.delaunay@st.com>
Hi Patrick
On 7/31/20 4:31 PM, Patrick Delaunay wrote:
> Use IS_ENABLED to prevent ifdef in g_dnl_board_usb_cable_connected
> and in g_dnl_bind_fixup
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> ---
>
> board/st/stm32mp1/stm32mp1.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
> index 1ad41796fb..5c84b09c3e 100644
> --- a/board/st/stm32mp1/stm32mp1.c
> +++ b/board/st/stm32mp1/stm32mp1.c
> @@ -182,13 +182,14 @@ static void board_key_check(void)
> }
> }
>
> -#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG)
> -#include <usb/dwc2_udc.h>
> int g_dnl_board_usb_cable_connected(void)
> {
> struct udevice *dwc2_udc_otg;
> int ret;
>
> + if (!IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG))
> + return -ENODEV;
> +
> /* if typec stusb160x is present, means DK1 or DK2 board */
> ret = stusb160x_cable_connected();
> if (ret >= 0)
> @@ -203,14 +204,17 @@ int g_dnl_board_usb_cable_connected(void)
> return dwc2_udc_B_session_valid(dwc2_udc_otg);
> }
>
> +#ifdef CONFIG_USB_GADGET_DOWNLOAD
> #define STM32MP1_G_DNL_DFU_PRODUCT_NUM 0xdf11
> #define STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM 0x0afb
>
> int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
> {
> - if (!strcmp(name, "usb_dnl_dfu"))
> + if (IS_ENABLED(CONFIG_DFU_OVER_USB) &&
> + !strcmp(name, "usb_dnl_dfu"))
> put_unaligned(STM32MP1_G_DNL_DFU_PRODUCT_NUM, &dev->idProduct);
> - else if (!strcmp(name, "usb_dnl_fastboot"))
> + else if (IS_ENABLED(CONFIG_FASTBOOT) &&
> + !strcmp(name, "usb_dnl_fastboot"))
> put_unaligned(STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM,
> &dev->idProduct);
> else
> @@ -218,8 +222,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
>
> return 0;
> }
> -
> -#endif /* CONFIG_USB_GADGET */
> +#endif /* CONFIG_USB_GADGET_DOWNLOAD */
>
> static int get_led(struct udevice **dev, char *led_string)
> {
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
Thanks
Patrice
next prev parent reply other threads:[~2020-08-13 7:22 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 14:31 [PATCH 01/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in board_key_check Patrick Delaunay
2020-07-31 14:31 ` [PATCH 02/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in g_dnl_board_usb_cable_connected Patrick Delaunay
2020-08-13 7:22 ` Patrice CHOTARD [this message]
2020-08-13 9:49 ` [Uboot-stm32] " Patrice CHOTARD
2020-07-31 14:31 ` [PATCH 03/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in board_check_usb_power Patrick Delaunay
2020-08-13 7:22 ` [Uboot-stm32] " Patrice CHOTARD
2020-08-13 7:22 ` Patrice CHOTARD
2020-08-13 9:49 ` Patrice CHOTARD
2020-07-31 14:31 ` [PATCH 04/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in sysconf_init Patrick Delaunay
2020-08-13 7:23 ` [Uboot-stm32] " Patrice CHOTARD
2020-08-13 9:50 ` Patrice CHOTARD
2020-07-31 14:31 ` [PATCH 05/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in set_dfu_alt_inf Patrick Delaunay
2020-08-13 7:23 ` [Uboot-stm32] " Patrice CHOTARD
2020-08-13 9:51 ` Patrice CHOTARD
2020-07-31 14:31 ` [PATCH 06/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in dk2_i2c1_fix Patrick Delaunay
2020-08-13 7:23 ` [Uboot-stm32] " Patrice CHOTARD
2020-08-13 9:51 ` Patrice CHOTARD
2020-07-31 14:31 ` [PATCH 07/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in board_late_init Patrick Delaunay
2020-08-13 7:24 ` [Uboot-stm32] " Patrice CHOTARD
2020-08-13 9:52 ` Patrice CHOTARD
2020-07-31 14:31 ` [PATCH 08/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in env functions Patrick Delaunay
2020-08-13 7:24 ` [Uboot-stm32] " Patrice CHOTARD
2020-08-13 9:53 ` Patrice CHOTARD
2020-07-31 14:31 ` [PATCH 09/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in ft_board_setup Patrick Delaunay
2020-08-13 7:24 ` [Uboot-stm32] " Patrice CHOTARD
2020-08-13 9:53 ` Patrice CHOTARD
2020-07-31 14:31 ` [PATCH 10/11] arm: stm32mp: bsec: use IS_ENABLED to prevent ifdef Patrick Delaunay
2020-08-13 7:24 ` Patrice CHOTARD
2020-08-13 9:54 ` [Uboot-stm32] " Patrice CHOTARD
2020-07-31 14:31 ` [PATCH 11/11] arm: stm32mp: stm32prog: " Patrick Delaunay
2020-08-13 7:25 ` Patrice CHOTARD
2020-08-13 9:55 ` [Uboot-stm32] " Patrice CHOTARD
2020-08-13 7:51 ` [Uboot-stm32] [PATCH 01/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in board_key_check Patrice CHOTARD
2020-08-13 9:49 ` Patrice CHOTARD
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=927cd46b-e896-abf8-9fab-3655501cc623@st.com \
--to=patrice.chotard@st.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox