GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-16 19:51:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change mvBL-M7 default env and move to vendor subdir

Browse source 
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>
This commit is contained in:
Andre Schwarz 2008-08-20 11:11:52 +02:00 • committed by Kim Phillips
parent 002d27caf2
commit 1a9eeb78b8
10 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -2180,7 +2180,7 @@ MPC837XERDB_config: unconfig
@$(MKCONFIG) -a MPC837XERDB ppc mpc83xx mpc837xerdb freescale @$(MKCONFIG) -a MPC837XERDB ppc mpc83xx mpc837xerdb freescale
MVBLM7_config: unconfig MVBLM7_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc mpc83xx mvblm7 @$(MKCONFIG) $(@:_config=) ppc mpc83xx mvblm7 matrix_vision
sbc8349_config: unconfig sbc8349_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349 @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349

0
board/mvblm7/Makefile → board/matrix_vision/mvblm7/Makefile
View file

0
board/mvblm7/config.mk → board/matrix_vision/mvblm7/config.mk
View file

0
board/mvblm7/fpga.c → board/matrix_vision/mvblm7/fpga.c
View file

0
board/mvblm7/fpga.h → board/matrix_vision/mvblm7/fpga.h
View file

0
board/mvblm7/mvblm7.c → board/matrix_vision/mvblm7/mvblm7.c
View file

0
board/mvblm7/mvblm7.h → board/matrix_vision/mvblm7/mvblm7.h
View file

10
board/mvblm7/mvblm7_autoscript → board/matrix_vision/mvblm7/mvblm7_autoscript
View file

@ -5,11 +5,17 @@ setenv bootdtb bootm \${kernel_boot} \${mv_initrd_addr_ram} \${mv_dtb_addr_ram}
setenv ramkernel setenv kernel_boot \${loadaddr} setenv ramkernel setenv kernel_boot \${loadaddr}
setenv flashkernel setenv kernel_boot \${mv_kernel_addr} setenv flashkernel setenv kernel_boot \${mv_kernel_addr}
setenv cpird cp \${mv_initrd_addr} \${mv_initrd_addr_ram} \${mv_initrd_length} 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 getdtb tftp \${mv_dtb_addr_ram} \${dtb_name}
setenv cpdtb cp \${mv_dtb_addr} \${mv_dtb_addr_ram} 0x2000 setenv cpdtb cp \${mv_dtb_addr} \${mv_dtb_addr_ram} 0x2000
setenv rundtb fdt addr \${mv_dtb_addr_ram}\;fdt boardsetup setenv rundtb fdt addr \${mv_dtb_addr_ram}\;fdt boardsetup
setenv bootfromnet tftp \${mv_initrd_addr_ram} \${initrd_name}\;run ramkernel 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_ip setenv ipaddr \${static_ipaddr}
setenv set_static_nm setenv netmask \${static_netmask} setenv set_static_nm setenv netmask \${static_netmask}
setenv set_static_gw setenv gatewayip \${static_gateway} setenv set_static_gw setenv gatewayip \${static_gateway}
@ -24,7 +30,7 @@ then
then then
echo "=== bootp succeeded -> netboot ===" echo "=== bootp succeeded -> netboot ==="
run set_ip run set_ip
run getdtb rundtb bootfromnet ramparam bootdtb run getdtb rundtb bootfromnet ramparam addcons bootdtb
else else
echo "=== netboot failed ===" echo "=== netboot failed ==="
fi fi

0
board/mvblm7/pci.c → board/matrix_vision/mvblm7/pci.c
View file

56
include/configs/MVBLM7.h
View file

@ -406,22 +406,22 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_RESET_TO_RETRY 1000 #define CONFIG_RESET_TO_RETRY 1000
#define MV_CI "mvBL-M7" #define MV_CI mvBL-M7
#define MV_VCI "mvBL-M7" #define MV_VCI mvBL-M7
#define MV_FPGA_DATA "0xfff80000" #define MV_FPGA_DATA 0xfff80000
#define MV_FPGA_SIZE "0x76ca2" #define MV_FPGA_SIZE 0x00076ca2
#define MV_KERNEL_ADDR "0xff810000" #define MV_KERNEL_ADDR 0xff810000
#define MV_INITRD_ADDR "0xffc00000" #define MV_INITRD_ADDR 0xffb00000
#define MV_AUTOSCR_ADDR "0xff804000" #define MV_AUTOSCR_ADDR 0xff804000
#define MV_AUTOSCR_ADDR2 "0xff806000" #define MV_AUTOSCR_ADDR2 0xff806000
#define MV_DTB_ADDR "0xff808000" #define MV_DTB_ADDR 0xff808000
#define MV_INITRD_LENGTH "0x00300000" #define MV_INITRD_LENGTH 0x00400000
#define CONFIG_SHOW_BOOT_PROGRESS 1 #define CONFIG_SHOW_BOOT_PROGRESS 1
#define MV_KERNEL_ADDR_RAM "0x00100000" #define MV_KERNEL_ADDR_RAM 0x00100000
#define MV_DTB_ADDR_RAM "0x00600000" #define MV_DTB_ADDR_RAM 0x00600000
#define MV_INITRD_ADDR_RAM "0x01000000" #define MV_INITRD_ADDR_RAM 0x01000000
#define CONFIG_BOOTCOMMAND "if imi ${autoscr_addr}; \ #define CONFIG_BOOTCOMMAND "if imi ${autoscr_addr}; \
then autoscr ${autoscr_addr}; \ then autoscr ${autoscr_addr}; \
@ -431,25 +431,26 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console_nr=0\0" \ "console_nr=0\0" \
"baudrate=" MK_STR(CONFIG_BAUDRATE) "\0" \
"stdin=serial\0" \ "stdin=serial\0" \
"stdout=serial\0" \ "stdout=serial\0" \
"stderr=serial\0" \ "stderr=serial\0" \
"fpga=0\0" \ "fpga=0\0" \
"fpgadata=" MV_FPGA_DATA "\0" \ "fpgadata=" MK_STR(MV_FPGA_DATA) "\0" \
"fpgadatasize=" MV_FPGA_SIZE "\0" \ "fpgadatasize=" MK_STR(MV_FPGA_SIZE) "\0" \
"autoscr_addr=" MV_AUTOSCR_ADDR "\0" \ "autoscr_addr=" MK_STR(MV_AUTOSCR_ADDR) "\0" \
"autoscr_addr2=" MV_AUTOSCR_ADDR2 "\0" \ "autoscr_addr2=" MK_STR(MV_AUTOSCR_ADDR2) "\0" \
"mv_kernel_addr=" MV_KERNEL_ADDR "\0" \ "mv_kernel_addr=" MK_STR(MV_KERNEL_ADDR) "\0" \
"mv_kernel_addr_ram=" MV_KERNEL_ADDR_RAM "\0" \ "mv_kernel_addr_ram=" MK_STR(MV_KERNEL_ADDR_RAM) "\0" \
"mv_initrd_addr=" MV_INITRD_ADDR "\0" \ "mv_initrd_addr=" MK_STR(MV_INITRD_ADDR) "\0" \
"mv_initrd_addr_ram=" MV_INITRD_ADDR_RAM "\0" \ "mv_initrd_addr_ram=" MK_STR(MV_INITRD_ADDR_RAM) "\0" \
"mv_initrd_length=" MV_INITRD_LENGTH "\0" \ "mv_initrd_length=" MK_STR(MV_INITRD_LENGTH) "\0" \
"mv_dtb_addr=" MV_DTB_ADDR "\0" \ "mv_dtb_addr=" MK_STR(MV_DTB_ADDR) "\0" \
"mv_dtb_addr_ram=" MV_DTB_ADDR_RAM "\0" \ "mv_dtb_addr_ram=" MK_STR(MV_DTB_ADDR_RAM) "\0" \
"dtb_name=" MV_DTB_NAME "\0" \ "dtb_name=" MK_STR(MV_DTB_NAME) "\0" \
"mv_version=" U_BOOT_VERSION "\0" \ "mv_version=" U_BOOT_VERSION "\0" \
"dhcp_client_id=" MV_CI "\0" \ "dhcp_client_id=" MK_STR(MV_CI) "\0" \
"dhcp_vendor-class-identifier=" MV_VCI "\0" \ "dhcp_vendor-class-identifier=" MK_STR(MV_VCI) "\0" \
"netretry=no\0" \ "netretry=no\0" \
"use_static_ipaddr=no\0" \ "use_static_ipaddr=no\0" \
"static_ipaddr=192.168.90.10\0" \ "static_ipaddr=192.168.90.10\0" \
@ -470,6 +471,7 @@
"gevss_debug=0\0" \ "gevss_debug=0\0" \
"watchdog=0\0" \ "watchdog=0\0" \
"usb_dr_mode=host\0" \ "usb_dr_mode=host\0" \
"sensor_cnt=2\0" \
"" ""
#define CONFIG_FPGA_COUNT 1 #define CONFIG_FPGA_COUNT 1