diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/matrix_vision/mvblm7/Makefile (renamed from board/mvblm7/Makefile) | 0 | ||||
| -rw-r--r-- | board/matrix_vision/mvblm7/config.mk (renamed from board/mvblm7/config.mk) | 0 | ||||
| -rw-r--r-- | board/matrix_vision/mvblm7/fpga.c (renamed from board/mvblm7/fpga.c) | 0 | ||||
| -rw-r--r-- | board/matrix_vision/mvblm7/fpga.h (renamed from board/mvblm7/fpga.h) | 0 | ||||
| -rw-r--r-- | board/matrix_vision/mvblm7/mvblm7.c (renamed from board/mvblm7/mvblm7.c) | 0 | ||||
| -rw-r--r-- | board/matrix_vision/mvblm7/mvblm7.h (renamed from board/mvblm7/mvblm7.h) | 0 | ||||
| -rw-r--r-- | board/matrix_vision/mvblm7/mvblm7_autoscript (renamed from board/mvblm7/mvblm7_autoscript) | 10 | ||||
| -rw-r--r-- | board/matrix_vision/mvblm7/pci.c (renamed from board/mvblm7/pci.c) | 0 |
8 files changed, 8 insertions, 2 deletions
diff --git a/board/mvblm7/Makefile b/board/matrix_vision/mvblm7/Makefile index cfbecfb..cfbecfb 100644 --- a/board/mvblm7/Makefile +++ b/board/matrix_vision/mvblm7/Makefile diff --git a/board/mvblm7/config.mk b/board/matrix_vision/mvblm7/config.mk index 1d85f4f..1d85f4f 100644 --- a/board/mvblm7/config.mk +++ b/board/matrix_vision/mvblm7/config.mk diff --git a/board/mvblm7/fpga.c b/board/matrix_vision/mvblm7/fpga.c index a60af01..a60af01 100644 --- a/board/mvblm7/fpga.c +++ b/board/matrix_vision/mvblm7/fpga.c diff --git a/board/mvblm7/fpga.h b/board/matrix_vision/mvblm7/fpga.h index 19277eb..19277eb 100644 --- a/board/mvblm7/fpga.h +++ b/board/matrix_vision/mvblm7/fpga.h diff --git a/board/mvblm7/mvblm7.c b/board/matrix_vision/mvblm7/mvblm7.c index b07f913..b07f913 100644 --- a/board/mvblm7/mvblm7.c +++ b/board/matrix_vision/mvblm7/mvblm7.c diff --git a/board/mvblm7/mvblm7.h b/board/matrix_vision/mvblm7/mvblm7.h index 03e9f41..03e9f41 100644 --- a/board/mvblm7/mvblm7.h +++ b/board/matrix_vision/mvblm7/mvblm7.h diff --git a/board/mvblm7/mvblm7_autoscript b/board/matrix_vision/mvblm7/mvblm7_autoscript index ec6e34e..6f9357f 100644 --- a/board/mvblm7/mvblm7_autoscript +++ b/board/matrix_vision/mvblm7/mvblm7_autoscript @@ -5,11 +5,17 @@ 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 bootdtb +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} @@ -24,7 +30,7 @@ then then echo "=== bootp succeeded -> netboot ===" run set_ip - run getdtb rundtb bootfromnet ramparam bootdtb + run getdtb rundtb bootfromnet ramparam addcons bootdtb else echo "=== netboot failed ===" fi diff --git a/board/mvblm7/pci.c b/board/matrix_vision/mvblm7/pci.c index ef34a6b..ef34a6b 100644 --- a/board/mvblm7/pci.c +++ b/board/matrix_vision/mvblm7/pci.c |