leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

toradex: imx6: Move g_dnl_bind_fixup() into common SPL code

Browse Source 
Instead of having every board file to add its own g_dnl_bind_fixup()
implementation, move it to the common imx6 SPL code.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
This commit is contained in:
Fabio Estevam 2017-09-05 20:46:39 -03:00 committed by Stefano Babic
parent be2808c3b0
commit 511db3bf5a
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-imx/spl.c
View File

@ -14,6 +14,7 @@
#include <asm/spl.h> #include <asm/spl.h>
#include <spl.h> #include <spl.h>
#include <asm/mach-imx/hab.h> #include <asm/mach-imx/hab.h>
#include <g_dnl.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -94,6 +95,15 @@ u32 spl_boot_device(void)
} }
return BOOT_DEVICE_NONE; return BOOT_DEVICE_NONE;
} }
#ifdef CONFIG_SPL_USB_GADGET_SUPPORT
int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
{
put_unaligned(CONFIG_G_DNL_PRODUCT_NUM + 0xfff, &dev->idProduct);
return 0;
}
#endif
#endif #endif
#if defined(CONFIG_SPL_MMC_SUPPORT) #if defined(CONFIG_SPL_MMC_SUPPORT)

13
board/toradex/apalis_imx6/apalis_imx6.c
View File

@ -29,7 +29,6 @@
#include <dm/platform_data/serial_mxc.h> #include <dm/platform_data/serial_mxc.h>
#include <dm/platdata.h> #include <dm/platdata.h>
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
#include <g_dnl.h>
#include <i2c.h> #include <i2c.h>
#include <imx_thermal.h> #include <imx_thermal.h>
#include <linux/errno.h> #include <linux/errno.h>
@ -1224,18 +1223,6 @@ void reset_cpu(ulong addr)
{ {
} }
#ifdef CONFIG_SPL_USB_GADGET_SUPPORT
int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
{
unsigned short usb_pid;
usb_pid = TORADEX_USB_PRODUCT_NUM_OFFSET + 0xfff;
put_unaligned(usb_pid, &dev->idProduct);
return 0;
}
#endif
#endif #endif
static struct mxc_serial_platdata mxc_serial_plat = { static struct mxc_serial_platdata mxc_serial_plat = {

13
board/toradex/colibri_imx6/colibri_imx6.c
View File

@ -28,7 +28,6 @@
#include <dm/platform_data/serial_mxc.h> #include <dm/platform_data/serial_mxc.h>
#include <dm/platdata.h> #include <dm/platdata.h>
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
#include <g_dnl.h>
#include <i2c.h> #include <i2c.h>
#include <imx_thermal.h> #include <imx_thermal.h>
#include <linux/errno.h> #include <linux/errno.h>
@ -1108,18 +1107,6 @@ void reset_cpu(ulong addr)
{ {
} }
#ifdef CONFIG_SPL_USB_GADGET_SUPPORT
int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
{
unsigned short usb_pid;
usb_pid = TORADEX_USB_PRODUCT_NUM_OFFSET + 0xfff;
put_unaligned(usb_pid, &dev->idProduct);
return 0;
}
#endif
#endif #endif
static struct mxc_serial_platdata mxc_serial_plat = { static struct mxc_serial_platdata mxc_serial_plat = {