From 731157c764ff62c5946e60ea38381f3e2ffdbb4a Mon Sep 17 00:00:00 2001 From: Vlad Ungureanu Date: Thu, 7 Aug 2014 10:54:23 +0200 Subject: [PATCH 1/2] Modified VID for SPL and U-Boot --- drivers/usb/gadget/ether.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index cc6cc1f..02be384 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -96,7 +96,7 @@ static const char driver_desc[] = DRIVER_DESC; |USB_CDC_PACKET_TYPE_PROMISCUOUS \ |USB_CDC_PACKET_TYPE_DIRECTED) -#define USB_CONNECT_TIMEOUT (3 * CONFIG_SYS_HZ) +#define USB_CONNECT_TIMEOUT (15 * CONFIG_SYS_HZ) /*-------------------------------------------------------------------------*/ @@ -241,9 +241,17 @@ static inline int BITRATE(struct usb_gadget *g) * used with CDC Ethernet, Linux 2.4 hosts will need updates to choose * the non-RNDIS configuration. */ +#ifdef CONFIG_SPL_BUILD + #define RNDIS_VENDOR_NUM 0x0525 /* NetChip */ #define RNDIS_PRODUCT_NUM 0xa4a2 /* Ethernet/RNDIS Gadget */ +#else + +#define RNDIS_VENDOR_NUM 0x0525 +#define RNDIS_PRODUCT_NUM 0xa4a5 +#endif + /* * Some systems will want different product identifers published in the * device descriptor, either numbers or strings or both. These string -- 1.7.9.5 From 3954caf09865fe76930d98488bfad22d8e1abdde Mon Sep 17 00:00:00 2001 From: Vlad Ungureanu Date: Thu, 7 Aug 2014 10:54:52 +0200 Subject: [PATCH 2/2] Modified bootcmd and load addresses for FIT and dtb --- include/configs/am335x_evm.h | 12 ++++++------ include/configs/ti_armv7_common.h | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 35ae0e6..f5b57e2 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -20,6 +20,7 @@ #ifndef CONFIG_SPL_BUILD # define CONFIG_FIT +# define CONFIG_FIT_VERBOSE # define CONFIG_TIMESTAMP # define CONFIG_LZO # ifdef CONFIG_ENABLE_VBOOT @@ -185,12 +186,11 @@ #endif #define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ - "run mmcboot;" \ - "setenv mmcdev 1; " \ - "setenv bootpart 1:2; " \ - "run mmcboot;" \ - "run nandboot;" + "setenv ethact usb_ether;" \ + "setenv serverip 192.168.1.9;" \ + "setenv ipaddr 192.168.1.3;" \ + "tftp 0x82000000 itb;" \ + "run ramargs; bootm;" /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 26ac251..44757e2 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -54,16 +54,16 @@ #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0x82000000\0" \ "kernel_addr_r=0x82000000\0" \ - "fdtaddr=0x88000000\0" \ + "fdtaddr=0x80F80000\0" \ "fdt_addr_r=0x88000000\0" \ - "rdaddr=0x88080000\0" \ + "rdaddr=0x81000000\0" \ "ramdisk_addr_r=0x88080000\0" \ "bootm_size=0x10000000\0" /* * Default to a quick boot delay. */ -#define CONFIG_BOOTDELAY 1 +#define CONFIG_BOOTDELAY 0 /* * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, @@ -127,9 +127,9 @@ * we are on so we do not need to rely on the command prompt. We set a * console baudrate of 115200 and use the default baud rate table. */ -#define CONFIG_SYS_MALLOC_LEN (16 << 20) +#define CONFIG_SYS_MALLOC_LEN (1024 << 10) #define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT "U-Boot# " +#define CONFIG_SYS_PROMPT "USB-Flash#" #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_BAUDRATE 115200 #define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */ @@ -140,6 +140,7 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_VERSION_VARIABLE +#define CONFIG_SUPPORT_RAW_INITRD /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 -- 1.7.9.5