From 227ec97f5173df008f85bf4743e00fe16f991204 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Fri, 26 Sep 2014 20:51:40 -0600 Subject: [PATCH] ARM: rpi_b: enable USB/DHCP/PXE in bootcmd USB support must be enabled before config_distro_bootcmd.h is included for bootcmd to include USB-related functionality. Signed-off-by: Stephen Warren --- include/configs/rpi_b.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h index 3c3ba9a0b7..6d01b61718 100644 --- a/include/configs/rpi_b.h +++ b/include/configs/rpi_b.h @@ -77,6 +77,16 @@ #define CONFIG_MMC_SDHCI_IO_ACCESSORS #define CONFIG_BCM2835_SDHCI +#define CONFIG_CMD_USB +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_DWC2 +#define CONFIG_USB_DWC2_REG_ADDR 0x20980000 +#define CONFIG_USB_STORAGE +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_SMSC95XX +#define CONFIG_MISC_INIT_R +#endif + /* Console UART */ #define CONFIG_PL011_SERIAL #define CONFIG_PL011_CLOCK 3000000 @@ -165,7 +175,10 @@ "ramdisk_addr_r=0x02100000\0" \ #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) #include #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -175,14 +188,4 @@ #define CONFIG_BOOTDELAY 2 -#define CONFIG_CMD_USB -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_DWC2 -#define CONFIG_USB_DWC2_REG_ADDR 0x20980000 -#define CONFIG_USB_STORAGE -#define CONFIG_USB_HOST_ETHER -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_MISC_INIT_R -#endif - #endif -- 2.39.5