Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: omap3_logic: Refactor Boot Environmental variables

Browse source 
Some scripts are calling the same functions, so these changes consolidate
common scripts together to reduce redundancy and shrink size a bit.  This
also keeps the 'bootargs' variable from growing if manually called more
than one time. This also adds NAND booting scripts based on newly consolidated
scripts.

Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
Adam Ford 2017-01-04 11:51:24 -06:00 committed by Tom Rini
parent c2e7e72bb9
commit 476e16e87e
1 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
include/configs/omap3_logic.h
View file

@ -148,62 +148,61 @@
"omapfb.rotate=${rotation}; " \ "omapfb.rotate=${rotation}; " \
"fi\0" \ "fi\0" \
"optargs=ignore_loglevel early_printk no_console_suspend\0" \ "optargs=ignore_loglevel early_printk no_console_suspend\0" \
"addmtdparts=setenv bootargs ${bootargs} ${mtdparts}\0" \ "common_bootargs=run setconsole; setenv bootargs " \
"common_bootargs=setenv bootargs ${bootargs} " \ "${bootargs} "\
"${optargs};" \ "console=${console} " \
"run addmtdparts; " \ "${mtdparts} "\
"${optargs}; " \
"run vrfb_arg\0" \ "run vrfb_arg\0" \
"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
"bootscript=echo 'Running bootscript from mmc ...'; " \ "bootscript=echo 'Running bootscript from mmc ...'; " \
"source ${loadaddr}\0" \ "source ${loadaddr}\0" \
"loaduimage=mmc rescan; " \ "loadimage=mmc rescan; " \
"load mmc ${mmcdev} ${loadaddr} uImage\0" \ "load mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \
"loadzimage=mmc rescan; " \
"load mmc ${mmcdev} ${loadaddr} zImage\0" \
"ramdisksize=64000\0" \ "ramdisksize=64000\0" \
"ramdiskimage=rootfs.ext2.gz.uboot\0" \ "ramdiskimage=rootfs.ext2.gz.uboot\0" \
"loadramdisk=mmc rescan; " \ "loadramdisk=mmc rescan; " \
"load mmc ${mmcdev} ${rdaddr} ${ramdiskimage}\0" \ "load mmc ${mmcdev} ${rdaddr} ${ramdiskimage}\0" \
"ramargs=run setconsole; setenv bootargs console=${console} " \ "ramargs=setenv bootargs "\
"root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \ "root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \
"mmcargs=run setconsole; setenv bootargs console=${console} " \ "mmcargs=setenv bootargs "\
"${optargs} " \ "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
"root=${mmcroot} " \ "nandargs=setenv bootargs "\
"rootfstype=${mmcrootfstype}\0" \
"nandargs=run setconsole; setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \ "root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \ "rootfstype=${nandrootfstype}\0" \
"nfsargs=run setconsole; setenv serverip ${tftpserver}; " \ "nfsargs=setenv serverip ${tftpserver}; " \
"setenv bootargs console=${console} root=/dev/nfs " \ "setenv bootargs root=/dev/nfs " \
"nfsroot=${nfsrootpath} " \ "nfsroot=${nfsrootpath} " \
"ip=${ipaddr}:${tftpserver}:${gatewayip}:${netmask}::eth0:off\0" \ "ip=${ipaddr}:${tftpserver}:${gatewayip}:${netmask}::eth0:off\0" \
"nfsrootpath=/opt/nfs-exports/omap\0" \ "nfsrootpath=/opt/nfs-exports/omap\0" \
"autoload=no\0" \ "autoload=no\0" \
"loadfdt=mmc rescan; " \ "loadfdt=mmc rescan; " \
"load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \ "load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \
"mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \ "mmcbootcommon=echo Booting with DT from mmc${mmcdev} ...; " \
"run mmcargs; " \ "run mmcargs; " \
"run common_bootargs; " \ "run common_bootargs; " \
"run dump_bootargs; " \ "run dump_bootargs; " \
"run loadzimage; " \ "run loadimage; " \
"run loadfdt; " \ "run loadfdt;\0 " \
"mmcbootz=setenv bootfile zImage; " \
"run mmcbootcommon; "\
"bootz ${loadaddr} - ${fdtaddr}\0" \ "bootz ${loadaddr} - ${fdtaddr}\0" \
"mmcramboot=echo 'Booting uImage kernel from mmc w/ramdisk...'; " \ "mmcboot=setenv bootfile uImage; "\
"run mmcbootcommon; "\
"bootm ${loadaddr} - ${fdtaddr}\0" \
"mmcrambootcommon=echo 'Booting kernel from MMC w/ramdisk...'; " \
"run ramargs; " \ "run ramargs; " \
"run common_bootargs; " \ "run common_bootargs; " \
"run dump_bootargs; " \ "run dump_bootargs; " \
"run loaduimage; " \ "run loadimage; " \
"run loadramdisk; " \
"bootm ${loadaddr} ${rdaddr}\0" \
"mmcrambootz=echo 'Booting zImage kernel from mmc w/ramdisk...'; " \
"run ramargs; " \
"run common_bootargs; " \
"run dump_bootargs; " \
"run loadzimage; " \
"run loadramdisk; " \
"run loadfdt; " \ "run loadfdt; " \
"bootz ${loadaddr} ${rdaddr} ${fdtaddr};\0" \ "run loadramdisk\0" \
"mmcramboot=setenv bootfile uImage; " \
"run mmcrambootcommon; " \
"bootm ${loadaddr} ${rdaddr} ${fdtimage}\0" \
"mmcrambootz=setenv bootfile zImage; " \
"run mmcrambootcommon; " \
"bootz ${loadaddr} ${rdaddr} ${fdtimage}\0" \
"tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \ "tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \
"run ramargs; " \ "run ramargs; " \
"run common_bootargs; " \ "run common_bootargs; " \
@ -217,7 +216,18 @@
"run common_bootargs;" \ "run common_bootargs;" \
"run dump_bootargs;" \ "run dump_bootargs;" \
"tftpboot $loadaddr zImage;" \ "tftpboot $loadaddr zImage;" \
"bootz $loadaddr\0" "bootz $loadaddr\0" \
"nandbootcommon=echo 'Booting kernel from NAND...';" \
"nand unlock;" \
"run nandargs;" \
"run common_bootargs;" \
"run dump_bootargs;" \
"nand read ${loadaddr} kernel;" \
"nand read ${fdtaddr} spl-os;\0" \
"nandbootz=run nandbootcommon; "\
"bootz ${loadaddr} - ${fdtaddr}\0"\
"nandboot=run nandbootcommon; "\
"bootm ${loadaddr} - ${fdtaddr}\0"\
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"run autoboot" "run autoboot"