Patchwork [U-Boot,v3,2/3] am335x_evm: Enable CMD_EXT4 and CMD_FS_GENERIC, add bootpart to env

login
register
mail settings
Submitter Tom Rini
Date March 14, 2013, 3:55 p.m.
Message ID <1363276521-11283-3-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/227724/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - March 14, 2013, 3:55 p.m.
From: Koen Kooi <koen@dominion.thruhere.net>

The kernel is loaded from some form of ext[234] or FAT, depending on the
distribution used.  We add a bootpart variable to the environment so
that we can load from the correct mmc partition as well.  We leave
CONFIG_CMD_EXT2 for existing scripts that use ext2load.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Tom Rini <trini@ti.com>
---
 include/configs/am335x_evm.h |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Peter Korsgaard - March 14, 2013, 4:01 p.m.
>>>>> "Tom" == Tom Rini <trini@ti.com> writes:

 Tom> From: Koen Kooi <koen@dominion.thruhere.net>
 Tom> The kernel is loaded from some form of ext[234] or FAT, depending on the
 Tom> distribution used.  We add a bootpart variable to the environment so
 Tom> that we can load from the correct mmc partition as well.  We leave
 Tom> CONFIG_CMD_EXT2 for existing scripts that use ext2load.

 Tom> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 Tom> Signed-off-by: Tom Rini <trini@ti.com>

Acked-by: Peter Korsgaard <jacmet@sunsite.dk>

Patch

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 377a3c5..c0e4724 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -61,6 +61,7 @@ 
 	"mmcdev=0\0" \
 	"mmcroot=/dev/mmcblk0p2 ro\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
+	"bootpart=0:2\0" \
 	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
 	"ramrootfstype=ext2\0" \
 	"mmcargs=setenv bootargs console=${console} " \
@@ -68,16 +69,15 @@ 
 		"root=${mmcroot} " \
 		"rootfstype=${mmcrootfstype}\0" \
 	"bootenv=uEnv.txt\0" \
-	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
 	"importbootenv=echo Importing environment from mmc ...; " \
 		"env import -t $loadaddr $filesize\0" \
 	"ramargs=setenv bootargs console=${console} " \
 		"${optargs} " \
 		"root=${ramroot} " \
 		"rootfstype=${ramrootfstype}\0" \
-	"loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-	"loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \
-	"loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} ${bootfile}\0" \
+	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
+	"loaduimage=load mmc ${bootpart} ${loadaddr} ${bootfile}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"bootm ${loadaddr}\0" \
@@ -147,6 +147,8 @@ 
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_FS_GENERIC
 
 #define CONFIG_SPI
 #define CONFIG_OMAP3_SPI