Add USB commands. Rename autoscript to bootscript. Add automatic bootscript image generation to makefile.

Signed-off-by: Andre Schwarz andre.schwarz@matrix-vision.de --- board/matrix_vision/mvblm7/Makefile | 1 + board/matrix_vision/mvblm7/bootscript | 43 ++++++++++++++++++++++++++ board/matrix_vision/mvblm7/mvblm7_autoscript | 43 -------------------------- include/configs/MVBLM7.h | 6 +++ 4 files changed, 50 insertions(+), 43 deletions(-) create mode 100644 board/matrix_vision/mvblm7/bootscript delete mode 100644 board/matrix_vision/mvblm7/mvblm7_autoscript

diff --git a/board/matrix_vision/mvblm7/Makefile b/board/matrix_vision/mvblm7/Makefile index 504935f..b3e3e0b 100644 --- a/board/matrix_vision/mvblm7/Makefile +++ b/board/matrix_vision/mvblm7/Makefile @@ -32,6 +32,7 @@ SOBJS := $(addprefix $(obj),$(SOBJS))

$(LIB): $(obj).depend $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS) + @mkimage -T script -C none -n M7_script -d bootscript bootscript.img

clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/matrix_vision/mvblm7/bootscript b/board/matrix_vision/mvblm7/bootscript new file mode 100644 index 0000000..dc385fd --- /dev/null +++ b/board/matrix_vision/mvblm7/bootscript @@ -0,0 +1,43 @@ +echo +echo "==== running autoscript ====" +echo +setenv bootdtb bootm ${kernel_boot} ${mv_initrd_addr_ram} ${mv_dtb_addr_ram} +setenv ramkernel setenv kernel_boot ${loadaddr} +setenv flashkernel setenv kernel_boot ${mv_kernel_addr} +setenv cpird cp ${mv_initrd_addr} ${mv_initrd_addr_ram} ${mv_initrd_length} +setenv bootfromflash run flashkernel cpird ramparam addcons bootdtb +setenv getdtb tftp ${mv_dtb_addr_ram} ${dtb_name} +setenv cpdtb cp ${mv_dtb_addr} ${mv_dtb_addr_ram} 0x2000 +setenv rundtb fdt addr ${mv_dtb_addr_ram};fdt boardsetup +setenv bootfromnet tftp ${mv_initrd_addr_ram} ${initrd_name};run ramkernel +if test ${console} = yes; +then +setenv addcons setenv bootargs ${bootargs} console=ttyS${console_nr},${baudrate}N8 +else +setenv addcons setenv bootargs ${bootargs} console=tty0 +fi +setenv set_static_ip setenv ipaddr ${static_ipaddr} +setenv set_static_nm setenv netmask ${static_netmask} +setenv set_static_gw setenv gatewayip ${static_gateway} +setenv set_ip setenv ip ${ipaddr}::${gatewayip}:${netmask} +setenv ramparam setenv bootargs root=/dev/ram0 ro rootfstype=squashfs +if test ${autoscript_boot} != no; +then + if test ${netboot} = yes; + then + bootp + if test $? = 0; + then + echo "=== bootp succeeded -> netboot ===" + run set_ip + run getdtb rundtb bootfromnet ramparam addcons bootdtb + else + echo "=== netboot failed ===" + fi + fi + run set_static_ip set_static_nm set_static_gw set_ip + echo "=== bootfromflash ===" + run cpdtb rundtb bootfromflash +else + echo "=== boot stopped with autoscript_boot no ===" +fi diff --git a/board/matrix_vision/mvblm7/mvblm7_autoscript b/board/matrix_vision/mvblm7/mvblm7_autoscript deleted file mode 100644 index dc385fd..0000000 --- a/board/matrix_vision/mvblm7/mvblm7_autoscript +++ /dev/null @@ -1,43 +0,0 @@ -echo -echo "==== running autoscript ====" -echo -setenv bootdtb bootm ${kernel_boot} ${mv_initrd_addr_ram} ${mv_dtb_addr_ram} -setenv ramkernel setenv kernel_boot ${loadaddr} -setenv flashkernel setenv kernel_boot ${mv_kernel_addr} -setenv cpird cp ${mv_initrd_addr} ${mv_initrd_addr_ram} ${mv_initrd_length} -setenv bootfromflash run flashkernel cpird ramparam addcons bootdtb -setenv getdtb tftp ${mv_dtb_addr_ram} ${dtb_name} -setenv cpdtb cp ${mv_dtb_addr} ${mv_dtb_addr_ram} 0x2000 -setenv rundtb fdt addr ${mv_dtb_addr_ram};fdt boardsetup -setenv bootfromnet tftp ${mv_initrd_addr_ram} ${initrd_name};run ramkernel -if test ${console} = yes; -then -setenv addcons setenv bootargs ${bootargs} console=ttyS${console_nr},${baudrate}N8 -else -setenv addcons setenv bootargs ${bootargs} console=tty0 -fi -setenv set_static_ip setenv ipaddr ${static_ipaddr} -setenv set_static_nm setenv netmask ${static_netmask} -setenv set_static_gw setenv gatewayip ${static_gateway} -setenv set_ip setenv ip ${ipaddr}::${gatewayip}:${netmask} -setenv ramparam setenv bootargs root=/dev/ram0 ro rootfstype=squashfs -if test ${autoscript_boot} != no; -then - if test ${netboot} = yes; - then - bootp - if test $? = 0; - then - echo "=== bootp succeeded -> netboot ===" - run set_ip - run getdtb rundtb bootfromnet ramparam addcons bootdtb - else - echo "=== netboot failed ===" - fi - fi - run set_static_ip set_static_nm set_static_gw set_ip - echo "=== bootfromflash ===" - run cpdtb rundtb bootfromflash -else - echo "=== boot stopped with autoscript_boot no ===" -fi diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h index f8b016f..b66807f 100644 --- a/include/configs/MVBLM7.h +++ b/include/configs/MVBLM7.h @@ -234,7 +234,11 @@ #define CONFIG_BOOTP_SEND_HOSTNAME

/* USB */ +#define CONFIG_SYS_USB_HOST +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_FSL #define CONFIG_HAS_FSL_DR_USB +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET

/* * Environment @@ -267,6 +271,8 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_I2C #define CONFIG_CMD_FPGA +#define CONFIG_CMD_USB +#define CONFIG_DOS_PARTITION

#undef CONFIG_WATCHDOG