linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

sunxi: Cut down line lengths in default environment a bit (Basic-Allwinner-A10..)

Browse Source
This commit is contained in:
Henrik Nordstrom
2013-06-17 03:10:44 +02:00
parent c8ade80a55
commit e0a08ab96e
1 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
include/configs/sunxi-common.h
View File

@ -157,16 +157,16 @@
#define CONFIG_BOOTCOMMAND \
"run boot_ram;" \
"if run loadbootenv; then " \
"echo Loaded environment from ${bootenv};" \
"env import -t ${scriptaddr} ${filesize};" \
"echo Loaded environment from ${bootenv};" \
"env import -t ${scriptaddr} ${filesize};" \
"fi;" \
"if test -n \\\"${uenvcmd}\\\"; then " \
"echo Running uenvcmd ...;" \
"run uenvcmd;" \
"echo Running uenvcmd ...;" \
"run uenvcmd;" \
"fi;" \
"if run loadbootscr; then "\
"echo Jumping to ${bootscr};" \
"source ${scriptaddr};" \
"echo Jumping to ${bootscr};" \
"source ${scriptaddr};" \
"fi;" \
"run autoboot;" \
""
@ -186,74 +186,75 @@
"device=mmc\0" \
"partition=0:1\0" \
"setargs=" \
"if test -z \\\"$root\\\"; then"\
" if test \\\"$bootpath\\\" = \"boot/\"; then"\
" root=\"/dev/mmcblk0p1 rootwait\";"\
" else" \
" root=\"/dev/mmcblk0p2 rootwait\";"\
" fi;"\
" fi;"\
" setenv bootargs console=${console} root=${root}" \
" loglevel=${loglevel} ${panicarg} ${extraargs}\0" \
"if test -z \\\"$root\\\"; then"\
" if test \\\"$bootpath\\\" = \"boot/\"; then"\
" root=\"/dev/mmcblk0p1 rootwait\";"\
" else" \
" root=\"/dev/mmcblk0p2 rootwait\";"\
" fi;"\
" fi;"\
" setenv bootargs console=${console} root=${root}" \
" loglevel=${loglevel} ${panicarg} ${extraargs}" \
"\0" \
"kernel=uImage\0" \
"bootenv=uEnv.txt\0" \
"bootscr=boot.scr\0" \
"loadbootscr=" \
"fatload $device $partition $scriptaddr ${bootscr}" \
" || " \
"ext2load $device $partition $scriptaddr boot/${bootscr}" \
" ||" \
"ext2load $device $partition $scriptaddr ${bootscr}" \
"\0" \
"fatload $device $partition $scriptaddr ${bootscr}" \
" || " \
"ext2load $device $partition $scriptaddr boot/${bootscr}" \
" ||" \
"ext2load $device $partition $scriptaddr ${bootscr}" \
"\0" \
"loadbootenv=" \
"fatload $device $partition $scriptaddr ${bootenv}" \
" || " \
"ext2load $device $partition $scriptaddr boot/${bootenv}" \
" || " \
"ext2load $device $partition $scriptaddr ${bootenv}" \
"\0" \
"fatload $device $partition $scriptaddr ${bootenv}" \
" || " \
"ext2load $device $partition $scriptaddr boot/${bootenv}" \
" || " \
"ext2load $device $partition $scriptaddr ${bootenv}" \
"\0" \
"loadkernel=" \
"if "\
"bootpath=/boot/" \
" && " \
"ext2load $device $partition 0x43000000 ${bootpath}script.bin" \
" && " \
"ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
";then true; elif " \
"bootpath=/" \
" && " \
"fatload $device $partition 0x43000000 script.bin" \
" && " \
"fatload $device $partition 0x48000000 ${kernel}" \
";then true; elif " \
"bootpath=/" \
" && " \
"ext2load $device $partition 0x43000000 ${bootpath}script.bin" \
" && " \
"ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
";then true; else "\
"false" \
";fi" \
"\0" \
"if "\
"bootpath=/boot/" \
" && " \
"ext2load $device $partition 0x43000000 ${bootpath}script.bin" \
" && " \
"ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
";then true; elif " \
"bootpath=/" \
" && " \
"fatload $device $partition 0x43000000 script.bin" \
" && " \
"fatload $device $partition 0x48000000 ${kernel}" \
";then true; elif " \
"bootpath=/" \
" && " \
"ext2load $device $partition 0x43000000 ${bootpath}script.bin" \
" && " \
"ext2load $device $partition 0x48000000 ${bootpath}${kernel}" \
";then true; else "\
"false" \
";fi" \
"\0" \
"autoboot=" \
"run loadkernel" \
" && " \
"run setargs" \
" && " \
RESET_WATCHDOG \
" && " \
"bootm 0x48000000" \
"\0" \
"run loadkernel" \
" && " \
"run setargs" \
" && " \
RESET_WATCHDOG \
" && " \
"bootm 0x48000000" \
"\0" \
"boot_ram=" \
"saved_stdout=$stdout;setenv stdout nc;"\
"if iminfo 0x41000000; then" \
" " RESET_WATCHDOG ";"\
" setenv stdout $saved_stdout;" \
" source 0x41000000;" \
"else" \
" setenv stdout $saved_stdout;" \
"fi" \
"\0" \
"saved_stdout=$stdout;setenv stdout nc;"\
"if iminfo 0x41000000; then" \
" " RESET_WATCHDOG ";"\
" setenv stdout $saved_stdout;" \
" source 0x41000000;" \
"else" \
" setenv stdout $saved_stdout;" \
"fi" \
"\0" \
""
#define CONFIG_BOOTDELAY 3
@ -419,7 +420,10 @@
#define CONFIG_BOOTP_DHCP_REQUEST_DELAY 50000
#endif
#if !defined CONFIG_ENV_IS_IN_MMC && !defined CONFIG_ENV_IS_IN_NAND && !defined CONFIG_ENV_IS_IN_FAT && !defined CONFIG_ENV_IS_IN_SPI_FLASH
#if !defined CONFIG_ENV_IS_IN_MMC && \
!defined CONFIG_ENV_IS_IN_NAND && \
!defined CONFIG_ENV_IS_IN_FAT && \
!defined CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_IS_NOWHERE
#endif