leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board/BuR/tseries: Rework default-environment settings.

Browse Source 
Due to several changes of the boot-process we've redesigned the default-
environment settings completly.

Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
This commit is contained in:
Hannes Petermaier 2015-02-03 13:22:37 +01:00 committed by Tom Rini
parent 11709e7af1
commit 662a47657a
1 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
include/configs/tseries.h
View File

@ -94,8 +94,8 @@
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
#endif /* CONFIG_NAND */
/* Always 128 KiB env size */
#define CONFIG_ENV_SIZE (128 << 10)
/* Always 64 KiB env size */
#define CONFIG_ENV_SIZE (64 << 10)
#ifdef CONFIG_NAND
#define NANDARGS \
@ -118,7 +118,32 @@
#ifdef CONFIG_MMC
#define MMCARGS \
"silent=1\0"
"dtbdev=mmc\0" \
"dtbpart=0:1\0" \
"logo0=ext4load mmc 0:3 ${loadaddr} /PPTLogo.bmp.gz && " \
"bmp display ${loadaddr} 0 0\0" \
"logo1=ext4load mmc 0:1 ${loadaddr} /PPTLogo.bmp.gz && " \
"bmp display ${loadaddr} 0 0\0" \
"mmcroot0=setenv bootargs ${optargs} console=${console}\0" \
"mmcroot1=setenv bootargs ${optargs} console=${console} root=/dev/mmcblk0p2 " \
"rootfstype=ext4\0" \
"mmcboot0=echo booting Updatesystem from mmc (ext4-fs) ...; " \
"ext4load mmc 0:1 ${loadaddr} /${kernel}; " \
"ext4load mmc 0:1 ${ramaddr} /${ramdisk}; " \
"run mmcroot0; bootz ${loadaddr} ${ramaddr} ${dtbaddr};\0" \
"mmcboot1=echo booting PPT-OS from mmc (ext4-fs) ...; " \
"ext4load mmc 0:2 ${loadaddr} /boot/${kernel}; " \
"run mmcroot1; bootz ${loadaddr} - ${dtbaddr};\0" \
"defboot=run logo0 || run logo1; " \
"ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \
"ext4load mmc 0:1 ${dtbaddr} /$dtb && run mmcboot0; " \
"run ramboot; run usbupdate;\0" \
"bootlimit=1\0" \
"altbootcmd=run logo0 || run logo1; " \
"run mmcboot0;\0" \
"upduboot=dhcp; " \
"tftp ${loadaddr} MLO && mmc write ${loadaddr} 100 100; " \
"tftp ${loadaddr} u-boot.img && mmc write ${loadaddr} 300 400;\0"
#else
#define MMCARGS ""
#endif /* CONFIG_MMC */
@ -126,14 +151,50 @@
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
BUR_COMMON_ENV \
"verify=no\0" \
"autoload=0\0" \
"dtb=bur-ppt-ts30.dtb\0" \
"dtbaddr=0x80100000\0" \
"loadaddr=0x80200000\0" \
"ramaddr=0x80A00000\0" \
"kernel=zImage\0" \
"ramdisk=rootfs.cpio.uboot\0" \
"console=ttyO0,115200n8\0" \
"optargs=consoleblank=0 quiet lpj=1191936 panic=2\0" \
"nfsroot=/tftpboot/tseries/rootfs-small\0" \
"nfsopts=nolock\0" \
"ramargs=setenv bootargs ${optargs} console=${console} root=/dev/ram0\0" \
"netargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=/dev/nfs " \
"nfsroot=${serverip}:${nfsroot},${nfsopts} rw " \
"ip=dhcp\0" \
"netboot=echo Booting from network ...; " \
"dhcp; " \
"tftp ${loadaddr} ${kernel}; " \
"tftp ${dtbaddr} ${dtb}; " \
"run netargs; " \
"bootz ${loadaddr} - ${dtbaddr}\0" \
"ramboot=echo Booting from network into RAM ...; "\
"if dhcp; then; " \
"tftp ${loadaddr} ${kernel}; " \
"tftp ${ramaddr} ${ramdisk}; " \
"if ext4load ${dtbdev} ${dtbpart} ${dtbaddr} /${dtb}; " \
"then; else tftp ${dtbaddr} ${dtb}; fi;" \
"run mmcroot0; " \
"bootz ${loadaddr} ${ramaddr} ${dtbaddr}; fi;\0" \
"usbupdate=echo Updating UBOOT from USB-Stick ...; " \
"usb start && fatload usb 0 0x80000000 updateubootusb.img && source\0" \
"netupdate=echo Updating UBOOT from Network (TFTP) ...; " \
"setenv autoload 0; " \
"dhcp && tftp 0x80000000 updateUBOOT.img && source;\0" \
NANDARGS \
MMCARGS
#endif /* !CONFIG_SPL_BUILD*/
#define CONFIG_BOOTCOMMAND \
"run mmcboot1;"
#define CONFIG_BOOTDELAY 1 /* TODO: für release auf 0 setzen */
"run defboot;"
#define CONFIG_BOOTDELAY 0
#ifdef CONFIG_NAND
/*