diff options
| author | Simon Glass <sjg@chromium.org> | 2011-06-16 16:27:32 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:39:31 -0700 |
| commit | da9447019e300d754a20072b7f17e28eaf6ddcee (patch) | |
| tree | 0816830db45e37d57da22378b77157f9dba911d7 /include/configs/tegra2-common.h | |
| parent | 14abc271e655fa3e9d6ea9e9d196a458547e9975 (diff) | |
config: Tidy up formating of config options
BUG=chromium-os:11623
TEST=build and boot on Seaboard
Change-Id: I5ed3a4cb01d36a7e6bda597549817c79d9ca5d8c
Reviewed-on: http://gerrit.chromium.org/gerrit/2810
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/configs/tegra2-common.h')
| -rw-r--r-- | include/configs/tegra2-common.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index 4f1bf9eade..0aa7f6e419 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -215,16 +215,19 @@ "platform_extras=" TEGRA2_SYSMEM"\0" \ "videospec=tegrafb\0" \ "lp0_args=" TEGRA_LP0_VEC "\0" \ + "mmcdev=" TEGRA2_MMC_DEFAULT_DEVICE "\0" \ + \ "regen_all="\ "setenv common_bootargs console=${console} " \ - "${lp0_args} " \ - "video=${videospec} ${platform_extras} noinitrd; " \ + "${lp0_args} video=${videospec} ${platform_extras} " \ + "noinitrd; " \ "setenv bootargs ${common_bootargs} ${extra_bootargs} " \ "${bootdev_bootargs}\0" \ "regen_net_bootargs=setenv bootdev_bootargs " \ "dev=/dev/nfs4 rw nfsroot=${nfsserverip}:${rootpath} " \ "ip=dhcp; " \ "run regen_all\0" \ + \ "dhcp_setup=setenv tftppath " CONFIG_TFTPPATH "; " \ "setenv rootpath " CONFIG_ROOTPATH "; " \ "setenv autoload n; " \ @@ -232,7 +235,7 @@ "dhcp_boot=run dhcp_setup; " \ "bootp; tftpboot ${loadaddr} ${tftpserverip}:${tftppath}; " \ "bootm ${loadaddr}\0" \ - "mmcdev=" TEGRA2_MMC_DEFAULT_DEVICE "\0" \ + \ "mmc_setup=setenv bootdev_bootargs " \ "root=/dev/mmcblk${mmcdev}p3 rw rootwait; " \ "run regen_all\0" \ @@ -240,6 +243,7 @@ "mmc rescan ${mmcdev}; " \ "ext2load mmc ${mmcdev}:3 ${loadaddr} /boot/${bootfile}; " \ "bootm ${loadaddr}\0" \ + \ "usb_setup=setenv bootdev_bootargs root=/dev/sda3 rw rootwait; " \ "run regen_all\0" \ "usb_boot=run usb_setup; " \ @@ -251,7 +255,8 @@ "if test ${ethact} != \"\"; then "\ "run dhcp_boot ; " \ "fi ; " \ - "run usb_boot ; " + "run usb_boot ; " \ + "run mmc_boot ; " #define CONFIG_LOADADDR 0x408000 /* def. location for kernel */ #define CONFIG_BOOTDELAY 0 /* -1 to disable auto boot */ |