[PATCH v2 1/2] rockchip: Fix TPL link error

[Quentin Schulz]

Hi Naoki,

On 2/11/25 5:33 AM, FUKAUMI Naoki wrote:
> Rockchip RK3399 targets build TPL. If CONFIG_SPL_USB_DWC3_GENERIC and
> CONFIG_SPL_USB_GADGET are enabled, linking u-boot-tpl will fail.
> 
>    LD      tpl/u-boot-tpl
> ld.bfd: drivers/usb/dwc3/dwc3-generic.o: in function `dwc3_glue_bind_common':
> /home/radxa/u-boot/drivers/usb/dwc3/dwc3-generic.c:527:(.text.dwc3_glue_bind_common+0x20): undefined reference to `usb_get_dr_mode'
> /home/radxa/u-boot/drivers/usb/dwc3/dwc3-generic.c:527:(.text.dwc3_glue_bind_common+0x20): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_get_dr_mode'
> ld.bfd: /home/radxa/u-boot/drivers/usb/dwc3/dwc3-generic.c:529:(.text.dwc3_glue_bind_common+0x2c): undefined reference to `usb_get_dr_mode'
> /home/radxa/u-boot/drivers/usb/dwc3/dwc3-generic.c:529:(.text.dwc3_glue_bind_common+0x2c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_get_dr_mode'
> ld.bfd: drivers/usb/dwc3/dwc3-generic.o: in function `dwc3_glue_probe':
> /home/radxa/u-boot/drivers/usb/dwc3/dwc3-generic.c:683:(.text.dwc3_glue_probe+0xb0): undefined reference to `usb_get_dr_mode'
> /home/radxa/u-boot/drivers/usb/dwc3/dwc3-generic.c:683:(.text.dwc3_glue_probe+0xb0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_get_dr_mode'
> 
> Do not compile drivers/usb/ for TPL.
> 

You should provide more info here because we do not get this information 
from the diff in this patch. Indeed it is compiled only for SPL, because 
the rules are added in a

ifndef CONFIG_TPL_BUILD
ifndef CONFIG_VPL_BUILD
ifdef CONFIG_XPL_BUILD

block which is essentially if stage == SPL.

> Signed-off-by: FUKAUMI Naoki <naoki at radxa.com>
> ---
> Changes in v2:
> - Move drivers/usb/{dwc,cdns}3 from scripts/Makefeile.xpl to drivers/Makefile
> - Suppress unused warnings
> ---
>   drivers/Makefile                | 2 ++
>   drivers/usb/dwc3/dwc3-generic.c | 2 ++
>   scripts/Makefile.xpl            | 2 --
>   3 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 0e1f58c515b..3ec05b942de 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -62,6 +62,8 @@ obj-$(CONFIG_ARCH_IMX9) += ddr/imx/imx9/
>   obj-$(CONFIG_DRAM_SUN20I_D1) += ram/
>   obj-$(CONFIG_SPL_DM_RESET) += reset/
>   obj-$(CONFIG_SPL_MUSB_NEW) += usb/musb-new/
> +obj-$(CONFIG_SPL_USB_GADGET) += usb/dwc3/
> +obj-$(CONFIG_SPL_USB_GADGET) += usb/cdns3/

Please have a separate patch for moving the rule from 
scripts/Makefile.xpl to drivers/Makefile.

>   obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/
>   obj-$(CONFIG_SPL_USB_GADGET) += usb/common/
>   obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/
> diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
> index 55e62b35c61..8c2545bc2ec 100644
> --- a/drivers/usb/dwc3/dwc3-generic.c
> +++ b/drivers/usb/dwc3/dwc3-generic.c
> @@ -50,6 +50,7 @@ struct dwc3_generic_host_priv {
>   	struct udevice *vbus_supply;
>   };
>   
> +#if !CONFIG_IS_ENABLED(SPL_BUILD) || CONFIG_IS_ENABLED(SPL_USB_DWC3_GENERIC)

It's not entirely clear what this should be fixing...

The users of that function are actually ifdef'ed by

CONFIG_IS_ENABLED(DM_USB_GADGET)

and

CONFIG_IS_ENABLED(USB_HOST)

so maybe just replace this with

#if CONFIG_IS_ENABLED(DM_USB_GADGET) || CONFIG_IS_ENABLED(USB_HOST)

instead? But please explain why this is needed?

Cheers,
Quentin