* [U-Boot] [PATCH v2 0/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs
@ 2015-08-28 8:05 Lokesh Vutla
2015-08-28 8:05 ` [U-Boot] [PATCH v2 1/3] ti_omap4_common: use ext4 fs as default Lokesh Vutla
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Lokesh Vutla @ 2015-08-28 8:05 UTC (permalink / raw)
To: u-boot
This patch series defines common mmc args for all TI platforms.
Also uses partuuid for detecting root fs.
Lokesh Vutla (3):
ti_omap4_common: use ext4 fs as default.
ti_armv7_common: env: Consolidate MMC args
ti_armv7_common: env: Use partuuid for detecting mmc root fs
include/configs/am335x_evm.h | 10 ++--------
include/configs/am43xx_evm.h | 10 ++--------
include/configs/ti_armv7_common.h | 9 +++++++++
include/configs/ti_omap4_common.h | 12 +++---------
include/configs/ti_omap5_common.h | 11 ++---------
5 files changed, 18 insertions(+), 34 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 7+ messages in thread* [U-Boot] [PATCH v2 1/3] ti_omap4_common: use ext4 fs as default. 2015-08-28 8:05 [U-Boot] [PATCH v2 0/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs Lokesh Vutla @ 2015-08-28 8:05 ` Lokesh Vutla 2015-09-12 12:47 ` [U-Boot] [U-Boot, v2, " Tom Rini 2015-08-28 8:05 ` [U-Boot] [PATCH v2 2/3] ti_armv7_common: env: Consolidate MMC args Lokesh Vutla 2015-08-28 8:05 ` [U-Boot] [PATCH v2 3/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs Lokesh Vutla 2 siblings, 1 reply; 7+ messages in thread From: Lokesh Vutla @ 2015-08-28 8:05 UTC (permalink / raw) To: u-boot All TI SoCs expect filesystem to be ext4, omap4_common is the only one with ext3. move omap4 to ext4 so that we can start consolidating MMC arguments. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- include/configs/ti_omap4_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 2eaa3b6..6139246 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -92,7 +92,7 @@ "vram=16M\0" \ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext3 rootwait\0" \ + "mmcrootfstype=ext4 rootwait\0" \ "mmcargs=setenv bootargs console=${console} " \ "vram=${vram} " \ "root=${mmcroot} " \ -- 2.1.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [U-Boot, v2, 1/3] ti_omap4_common: use ext4 fs as default. 2015-08-28 8:05 ` [U-Boot] [PATCH v2 1/3] ti_omap4_common: use ext4 fs as default Lokesh Vutla @ 2015-09-12 12:47 ` Tom Rini 0 siblings, 0 replies; 7+ messages in thread From: Tom Rini @ 2015-09-12 12:47 UTC (permalink / raw) To: u-boot On Fri, Aug 28, 2015 at 01:35:06PM +0530, Lokesh Vutla wrote: > All TI SoCs expect filesystem to be ext4, omap4_common is the only one > with ext3. move omap4 to ext4 so that we can start consolidating MMC > arguments. > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150912/d4b63f4d/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v2 2/3] ti_armv7_common: env: Consolidate MMC args 2015-08-28 8:05 [U-Boot] [PATCH v2 0/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs Lokesh Vutla 2015-08-28 8:05 ` [U-Boot] [PATCH v2 1/3] ti_omap4_common: use ext4 fs as default Lokesh Vutla @ 2015-08-28 8:05 ` Lokesh Vutla 2015-09-12 12:47 ` [U-Boot] [U-Boot, v2, " Tom Rini 2015-08-28 8:05 ` [U-Boot] [PATCH v2 3/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs Lokesh Vutla 2 siblings, 1 reply; 7+ messages in thread From: Lokesh Vutla @ 2015-08-28 8:05 UTC (permalink / raw) To: u-boot Define default mmc args in ti_armv7_common.h so that all TI platforms can reuse. Reported-by: Yan Liu <yan-liu@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- include/configs/am335x_evm.h | 10 ++-------- include/configs/am43xx_evm.h | 10 ++-------- include/configs/ti_armv7_common.h | 8 ++++++++ include/configs/ti_omap4_common.h | 12 +++--------- include/configs/ti_omap5_common.h | 11 ++--------- 5 files changed, 17 insertions(+), 34 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index e89c49e..3cf768e 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -70,6 +70,7 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ + DEFAULT_MMC_TI_ARGS \ "boot_fdt=try\0" \ "bootpart=0:2\0" \ "bootdir=/boot\0" \ @@ -80,15 +81,8 @@ "uuid_disk=${uuid_gpt_disk};" \ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ "optargs=\0" \ - "mmcdev=0\0" \ - "mmcroot=/dev/mmcblk0p2 ro\0" \ - "mmcrootfstype=ext4 rootwait\0" \ "ramroot=/dev/ram0 rw\0" \ "ramrootfstype=ext2\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ "spiroot=/dev/mtdblock4 rw\0" \ "spirootfstype=jffs2\0" \ "spisrcaddr=0xe0000\0" \ @@ -112,7 +106,7 @@ "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ - "mmcloados=run mmcargs; " \ + "mmcloados=run args_mmc; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ "bootz ${loadaddr} - ${fdtaddr}; " \ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index d148169..3077894 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -216,6 +216,7 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ + DEFAULT_MMC_TI_ARGS \ "fdtfile=undefined\0" \ "bootpart=0:2\0" \ "bootdir=/boot\0" \ @@ -225,18 +226,11 @@ "uuid_disk=${uuid_gpt_disk};" \ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ "optargs=\0" \ - "mmcdev=0\0" \ - "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext4 rootwait\0" \ "usbroot=/dev/sda2 rw\0" \ "usbrootfstype=ext4 rootwait\0" \ "usbdev=0\0" \ "ramroot=/dev/ram0 rw\0" \ "ramrootfstype=ext2\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ "usbargs=setenv bootargs console=${console} " \ "${optargs} " \ "root=${usbroot} " \ @@ -268,7 +262,7 @@ "if run loadimage; then " \ "run loadfdt; " \ "echo Booting from mmc${mmcdev} ...; " \ - "run mmcargs; " \ + "run args_mmc; " \ "bootz ${loadaddr} - ${fdtaddr}; " \ "fi;" \ "fi;\0" \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 18fca02..1a4b6d9 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -58,6 +58,14 @@ "ramdisk_addr_r=0x88080000\0" \ "bootm_size=0x10000000\0" +#define DEFAULT_MMC_TI_ARGS \ + "mmcdev=0\0" \ + "mmcrootfstype=ext4 rootwait\0" \ + "args_mmc=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=${mmcroot} " \ + "rootfstype=${mmcrootfstype}\0" + /* * Default to a quick boot delay. */ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 6139246..1cd7dae 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -83,6 +83,7 @@ */ #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ + DEFAULT_MMC_TI_ARGS \ "console=ttyO2,115200n8\0" \ "fdtfile=undefined\0" \ "bootpart=0:2\0" \ @@ -90,13 +91,6 @@ "bootfile=zImage\0" \ "usbtty=cdc_acm\0" \ "vram=16M\0" \ - "mmcdev=0\0" \ - "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext4 rootwait\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "vram=${vram} " \ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "source ${loadaddr}\0" \ @@ -106,10 +100,10 @@ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ "loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \ "mmcboot=echo Booting from mmc${mmcdev} ...; " \ - "run mmcargs; " \ + "run args_mmc; " \ "bootz ${loadaddr} - ${fdtaddr}\0" \ "uimageboot=echo Booting from mmc${mmcdev} ...; " \ - "run mmcargs; " \ + "run args_mmc; " \ "bootm ${loadaddr}\0" \ "findfdt="\ "if test $board_name = sdp4430; then " \ diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 1c1f8c0..189ea7e 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -70,6 +70,7 @@ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ + DEFAULT_MMC_TI_ARGS \ "console=" CONSOLEDEV ",115200n8\0" \ "fdtfile=undefined\0" \ "bootpart=0:2\0" \ @@ -80,14 +81,6 @@ "partitions=" PARTS_DEFAULT "\0" \ "optargs=\0" \ "dofastboot=0\0" \ - "mmcdev=0\0" \ - "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext4 rootwait\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "vram=${vram} " \ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "source ${loadaddr}\0" \ @@ -110,7 +103,7 @@ "if run loadimage; then " \ "run loadfdt; " \ "echo Booting from mmc${mmcdev} ...; " \ - "run mmcargs; " \ + "run args_mmc; " \ "bootz ${loadaddr} - ${fdtaddr}; " \ "fi;" \ "fi;\0" \ -- 2.1.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [U-Boot, v2, 2/3] ti_armv7_common: env: Consolidate MMC args 2015-08-28 8:05 ` [U-Boot] [PATCH v2 2/3] ti_armv7_common: env: Consolidate MMC args Lokesh Vutla @ 2015-09-12 12:47 ` Tom Rini 0 siblings, 0 replies; 7+ messages in thread From: Tom Rini @ 2015-09-12 12:47 UTC (permalink / raw) To: u-boot On Fri, Aug 28, 2015 at 01:35:07PM +0530, Lokesh Vutla wrote: > Define default mmc args in ti_armv7_common.h so that all > TI platforms can reuse. > > Reported-by: Yan Liu <yan-liu@ti.com> > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150912/355d6a2b/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v2 3/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs 2015-08-28 8:05 [U-Boot] [PATCH v2 0/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs Lokesh Vutla 2015-08-28 8:05 ` [U-Boot] [PATCH v2 1/3] ti_omap4_common: use ext4 fs as default Lokesh Vutla 2015-08-28 8:05 ` [U-Boot] [PATCH v2 2/3] ti_armv7_common: env: Consolidate MMC args Lokesh Vutla @ 2015-08-28 8:05 ` Lokesh Vutla 2015-09-12 12:47 ` [U-Boot] [U-Boot, v2, " Tom Rini 2 siblings, 1 reply; 7+ messages in thread From: Lokesh Vutla @ 2015-08-28 8:05 UTC (permalink / raw) To: u-boot Linux kernel can enumerate mmc sd as either mmcblk0 or mmcblk1. But u-boot default environment assumes that sd always populates as mmcblk0. With this the root fs is not being mounted when mmc sd is enumerated as mmcblk1. So use partuuid to update root= option in default environment. Reported-by: Yan Liu <yan-liu@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- include/configs/ti_armv7_common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 1a4b6d9..6dc6515 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -61,9 +61,10 @@ #define DEFAULT_MMC_TI_ARGS \ "mmcdev=0\0" \ "mmcrootfstype=ext4 rootwait\0" \ - "args_mmc=setenv bootargs console=${console} " \ + "finduuid=part uuid mmc 0:2 uuid\0" \ + "args_mmc=run finduuid;setenv bootargs console=${console} " \ "${optargs} " \ - "root=${mmcroot} " \ + "root=PARTUUID=${uuid} rw " \ "rootfstype=${mmcrootfstype}\0" /* -- 2.1.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [U-Boot, v2, 3/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs 2015-08-28 8:05 ` [U-Boot] [PATCH v2 3/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs Lokesh Vutla @ 2015-09-12 12:47 ` Tom Rini 0 siblings, 0 replies; 7+ messages in thread From: Tom Rini @ 2015-09-12 12:47 UTC (permalink / raw) To: u-boot On Fri, Aug 28, 2015 at 01:35:08PM +0530, Lokesh Vutla wrote: > Linux kernel can enumerate mmc sd as either mmcblk0 or mmcblk1. > But u-boot default environment assumes that sd always populates > as mmcblk0. With this the root fs is not being mounted when > mmc sd is enumerated as mmcblk1. > So use partuuid to update root= option in default environment. > > Reported-by: Yan Liu <yan-liu@ti.com> > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150912/947cc24f/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-09-12 12:47 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-08-28 8:05 [U-Boot] [PATCH v2 0/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs Lokesh Vutla 2015-08-28 8:05 ` [U-Boot] [PATCH v2 1/3] ti_omap4_common: use ext4 fs as default Lokesh Vutla 2015-09-12 12:47 ` [U-Boot] [U-Boot, v2, " Tom Rini 2015-08-28 8:05 ` [U-Boot] [PATCH v2 2/3] ti_armv7_common: env: Consolidate MMC args Lokesh Vutla 2015-09-12 12:47 ` [U-Boot] [U-Boot, v2, " Tom Rini 2015-08-28 8:05 ` [U-Boot] [PATCH v2 3/3] ti_armv7_common: env: Use partuuid for detecting mmc root fs Lokesh Vutla 2015-09-12 12:47 ` [U-Boot] [U-Boot, v2, " Tom Rini
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox