diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/armv7/omap-common/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl.c | 5 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_usb.c | 55 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/start.S | 23 | ||||
-rw-r--r-- | arch/arm/include/asm/omap_common.h | 5 |
5 files changed, 91 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile index 447fcd5ef..3c6ec3af8 100644 --- a/arch/arm/cpu/armv7/omap-common/Makefile +++ b/arch/arm/cpu/armv7/omap-common/Makefile @@ -55,6 +55,9 @@ endif ifdef CONFIG_SPL_YMODEM_SUPPORT COBJS += spl_ymodem.o endif +ifdef CONFIG_SPL_USB_SUPPORT +COBJS += spl_usb.o +endif endif ifndef CONFIG_SPL_BUILD diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c index 0f2e0a2d2..dc6802134 100644 --- a/arch/arm/cpu/armv7/omap-common/spl.c +++ b/arch/arm/cpu/armv7/omap-common/spl.c @@ -175,6 +175,11 @@ void board_init_r(gd_t *id, ulong dummy) spl_ymodem_load_image(); break; #endif +#ifdef CONFIG_SPL_DSU_SUPPORT + case BOOT_DEVICE_USB: + spl_dsu_load_image(); + break; +#endif default: printf("SPL: Un-supported Boot Device - %d!!!\n", boot_device); hang(); diff --git a/arch/arm/cpu/armv7/omap-common/spl_usb.c b/arch/arm/cpu/armv7/omap-common/spl_usb.c new file mode 100644 index 000000000..363590889 --- /dev/null +++ b/arch/arm/cpu/armv7/omap-common/spl_usb.c @@ -0,0 +1,55 @@ +/* + * (C) Copyright 2010 + * Texas Instruments, <www.ti.com> + * + * Aneesh V <aneesh@ti.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ +#include <common.h> +#include <asm/u-boot.h> +#include <asm/utils.h> +#include <asm/arch/sys_proto.h> +#include <version.h> +#include <asm/omap_common.h> +#include <asm/arch/mmc_host_def.h> + +DECLARE_GLOBAL_DATA_PTR; + +#ifdef CONFIG_SPL_DSU_SUPPORT +void spl_dsu_load_image(void) +{ + u32 loadaddr; + u32 size; + int err; + struct image_header *header; + + err = dsudownload(&loadaddr, &size); + + if (err) { + serial_printf("usb download failed"); + hang(); + } + header = (struct image_header *)loadaddr; + spl_parse_image_header(header); + memcpy((void *)spl_image.load_addr, (void *)loadaddr, spl_image.size); +} +#endif + + diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index ef08a55ab..ab05e3b15 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -123,6 +123,29 @@ IRQ_STACK_START_IN: */ reset: +#if defined CONFIG_SPL_BUILD && defined CONFIG_SPL_USB +/* + * When loaded over USB the code lands at the base + * of SRAM so we need to copy to our actual link + * address. The destination overlaps with the source + * so copy backwards. + */ + ldr sp, =(CONFIG_SYS_INIT_SP_ADDR) + bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ + ldr r8, =_start /* linked here */ + adr r7, _start /* loaded here */ + subs r6, r8, r7 /* offset */ + beq done /* nothing todo */ + ldr r9, =__image_copy_end /* dest = end of linked code */ + sub r7, r9, r6 /* source = dest - offset */ +2: ldr r6, [r7], #-4 + str r6, [r9], #-4 + cmp r9, r8 + bne 2b + ldr lr, =done + mov pc, lr +done: +#endif bl save_boot_params /* * set the cpu to SVC32 mode diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 6f25948e2..675d16698 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -54,6 +54,7 @@ void preloader_console_init(void); #define BOOT_DEVICE_ONE_NAND 4 #define BOOT_DEVICE_MMC1 5 #define BOOT_DEVICE_MMC2 6 +#define BOOT_DEVICE_USB 69 /* usb peripheral that is */ #elif defined(CONFIG_OMAP34XX) /* OMAP3 */ #define BOOT_DEVICE_NONE 0 #define BOOT_DEVICE_XIP 1 @@ -104,6 +105,10 @@ void spl_mmc_load_image(void); /* YMODEM SPL functions */ void spl_ymodem_load_image(void); +/* USB SPL functions */ +void spl_dsu_load_image(void); +int dsudownload(u32 *, u32 *); + #ifdef CONFIG_SPL_BOARD_INIT void spl_board_init(void); #endif |