change mvBL-M7 default env and move to vendor subdir
fix mvBL-M7 config and move to matrix_vision subdir
Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
diff --git a/board/mvblm7/Makefile b/board/matrix_vision/mvblm7/Makefile
similarity index 100%
rename from board/mvblm7/Makefile
rename to board/matrix_vision/mvblm7/Makefile
diff --git a/board/mvblm7/config.mk b/board/matrix_vision/mvblm7/config.mk
similarity index 100%
rename from board/mvblm7/config.mk
rename to board/matrix_vision/mvblm7/config.mk
diff --git a/board/mvblm7/fpga.c b/board/matrix_vision/mvblm7/fpga.c
similarity index 100%
rename from board/mvblm7/fpga.c
rename to board/matrix_vision/mvblm7/fpga.c
diff --git a/board/mvblm7/fpga.h b/board/matrix_vision/mvblm7/fpga.h
similarity index 100%
rename from board/mvblm7/fpga.h
rename to board/matrix_vision/mvblm7/fpga.h
diff --git a/board/mvblm7/mvblm7.c b/board/matrix_vision/mvblm7/mvblm7.c
similarity index 100%
rename from board/mvblm7/mvblm7.c
rename to board/matrix_vision/mvblm7/mvblm7.c
diff --git a/board/mvblm7/mvblm7.h b/board/matrix_vision/mvblm7/mvblm7.h
similarity index 100%
rename from board/mvblm7/mvblm7.h
rename to board/matrix_vision/mvblm7/mvblm7.h
diff --git a/board/mvblm7/mvblm7_autoscript b/board/matrix_vision/mvblm7/mvblm7_autoscript
similarity index 80%
rename from board/mvblm7/mvblm7_autoscript
rename to 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 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
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
similarity index 100%
rename from board/mvblm7/pci.c
rename to board/matrix_vision/mvblm7/pci.c