V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

omap5_common: Re-work mmc boot to try SD and eMMC, correct root device 

OMAP5 boards may have both eMMC (on MMC2) and an SD slot (on MMC1).  We
Update the default bootcmd to match what happens on AM335x where we try
SD first, and then eMMC.  In this case however, the hardware layout used
for powering both of these means that in the kernel eMMC shall be found
first as it is powered by a fixed regulator and SD found second as SD is
powered via the palmas which will result in deferred probing.

Tested-by: Aparna Balasubramanian <aparnab@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini 2013-10-09 10:59:33 -04:00
parent d3379e2254
commit 7406d321cc
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
include/configs/omap5_common.h
View File

@ -83,7 +83,7 @@
"partitions=" PARTS_DEFAULT "\0" \ "partitions=" PARTS_DEFAULT "\0" \
"optargs=\0" \ "optargs=\0" \
"mmcdev=0\0" \ "mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \ "mmcroot=/dev/mmcblk1p2 rw\0" \
"mmcrootfstype=ext4 rootwait\0" \ "mmcrootfstype=ext4 rootwait\0" \
"mmcargs=setenv bootargs console=${console} " \ "mmcargs=setenv bootargs console=${console} " \
"${optargs} " \ "${optargs} " \
@ -97,9 +97,24 @@
"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
"env import -t ${loadaddr} ${filesize}\0" \ "env import -t ${loadaddr} ${filesize}\0" \
"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
"mmcboot=echo Booting from mmc${mmcdev} ...; " \ "mmcboot=mmc dev ${mmcdev}; " \
"run mmcargs; " \ "if mmc rescan; then " \
"bootz ${loadaddr} - ${fdtaddr}\0" \ "echo SD/MMC found on device ${mmcdev};" \
"if run loadbootenv; then " \
"echo Loaded environment from ${bootenv};" \
"run importbootenv;" \
"fi;" \
"if test -n $uenvcmd; then " \
"echo Running uenvcmd ...;" \
"run uenvcmd;" \
"fi;" \
"if run loadimage; then " \
"run loadfdt; " \
"echo Booting from mmc${mmcdev} ...; " \
"run mmcargs; " \
"bootz ${loadaddr} - ${fdtaddr}; " \
"fi;" \
"fi;\0" \
"findfdt="\ "findfdt="\
"if test $board_name = omap5_uevm; then " \ "if test $board_name = omap5_uevm; then " \
"setenv fdtfile omap5-uevm.dtb; fi; " \ "setenv fdtfile omap5-uevm.dtb; fi; " \
@ -111,23 +126,11 @@
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"run findfdt; " \ "run findfdt; " \
"mmc dev ${mmcdev}; if mmc rescan; then " \ "run mmcboot;" \
"if run loadbootscript; then " \ "setenv mmcdev 1; " \
"run bootscript; " \ "setenv bootpart 1:2; " \
"else " \ "setenv mmcroot /dev/mmcblk0p2 rw; " \
"if run loadbootenv; then " \ "run mmcboot;" \
"run importbootenv; " \
"fi;" \
"if test -n ${uenvcmd}; then " \
"echo Running uenvcmd ...;" \
"run uenvcmd;" \
"fi;" \
"fi;" \
"if run loadimage; then " \
"run loadfdt; " \
"run mmcboot; " \
"fi; " \
"fi"
/* /*