diff options
| -rw-r--r-- | boards.cfg | 3 | ||||
| -rw-r--r-- | common/spl/spl.c | 7 | ||||
| -rw-r--r-- | include/configs/am335x_evm.h | 10 |
3 files changed, 20 insertions, 0 deletions
diff --git a/boards.cfg b/boards.cfg index 4080e6db3ef..7461464a6ae 100644 --- a/boards.cfg +++ b/boards.cfg @@ -238,7 +238,10 @@ am335x_evm_uart3 arm armv7 am335x ti am335x_evm_uart4 arm armv7 am335x ti am33xx am335x_evm:SERIAL5,CONS_INDEX=5 am335x_evm_uart5 arm armv7 am335x ti am33xx am335x_evm:SERIAL6,CONS_INDEX=6 am335x_evm_usbspl arm armv7 am335x ti am33xx am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT +am335x_evm_restore_flash arm armv7 am335x ti am33xx am335x_evm:SERIAL1,CONS_INDEX=1,RESTORE_FLASH am335x_evm_restore_flash_usbspl arm armv7 am335x ti am33xx am335x_evm:SERIAL1,CONS_INDEX=1,RESTORE_FLASH,SPL_USBETH_SUPPORT +am335x_evm_uart_usbspl arm armv7 am335x ti am33xx am335x_evm:SERIAL1,CONS_INDEX=1,UART_THEN_USB_SPL,SPL_USBETH_SUPPORT +am335x_evm_restore_flash_uart_usbspl arm armv7 am335x ti am33xx am335x_evm:SERIAL1,CONS_INDEX=1,RESTORE_FLASH,UART_THEN_USB_SPL,SPL_USBETH_SUPPORT highbank arm armv7 highbank - highbank mx51_efikamx arm armv7 mx51_efikamx genesi mx5 mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg mx51_efikasb arm armv7 mx51_efikamx genesi mx5 mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg diff --git a/common/spl/spl.c b/common/spl/spl.c index 4765e41d9c4..005912655b8 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -180,6 +180,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2) boot_device = spl_boot_device(); debug("boot device - %d\n", boot_device); + +#ifdef CONFIG_UART_THEN_USB_SPL + /* Hack: load SPL via UART, then use USB */ + if (boot_device == BOOT_DEVICE_UART) + boot_device = BOOT_DEVICE_USBETH; +#endif + switch (boot_device) { #ifdef CONFIG_SPL_RAM_DEVICE case BOOT_DEVICE_RAM: diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7752ca99939..311765d9343 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -176,6 +176,7 @@ #undef CONFIG_BOOTDELAY #define CONFIG_BOOTDELAY 0 +#ifdef CONFIG_SPL_USBETH_SUPPORT #define CONFIG_BOOTCOMMAND \ "setenv autoload no; " \ "setenv ethact usb_ether; " \ @@ -183,6 +184,15 @@ "if tftp 80000000 debrick.scr; then " \ "source 80000000; " \ "fi" +#else +#define CONFIG_BOOTCOMMAND \ + "setenv autoload no; " \ + "setenv ethact cpsw; " \ + "dhcp; " \ + "if tftp 80000000 debrick.scr; then " \ + "source 80000000; " \ + "fi" +#endif #endif /* Clock Defines */ |