summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorAndre Schwarz <andre.schwarz@matrix-vision.de>2008-08-20 11:11:52 +0200
committerKim Phillips <kim.phillips@freescale.com>2008-08-25 17:11:20 -0500
commit1a9eeb78b825bfade31d7606a2fe3b9eca9e35be (patch)
treedd357f88f3f45602808be9c1f9565f4271e66a3d /board
parent002d27caf26e7eb913d474d3a91f67d56c8c31d5 (diff)
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>
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 cfbecfbe8f9..cfbecfbe8f9 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 1d85f4fd0e6..1d85f4fd0e6 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 a60af019a72..a60af019a72 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 19277eb05f5..19277eb05f5 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 b07f91393c2..b07f91393c2 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 03e9f4170a5..03e9f4170a5 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 ec6e34ef05a..6f9357fd0db 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 ef34a6b453e..ef34a6b453e 100644
--- a/board/mvblm7/pci.c
+++ b/board/matrix_vision/mvblm7/pci.c