* [U-Boot] [PATCH 1/5] colibri_imx7: use UUID for rootfs
@ 2019-05-13 9:15 Igor Opaniuk
2019-05-13 9:15 ` [U-Boot] [PATCH 2/5] colibri-imx6ull: " Igor Opaniuk
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Igor Opaniuk @ 2019-05-13 9:15 UTC (permalink / raw)
To: u-boot
Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
partition. This fixes the issue, when MMC controllers are probed in
a different order in U-boot and Linux kernel.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
include/configs/colibri_imx7.h | 47 ++++++++++++++++++++--------------
1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 5a4b9801cb..8bc75aba59 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -51,14 +51,22 @@
#define CONFIG_SERVERIP 192.168.10.1
#define EMMC_BOOTCMD \
- "emmcargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext4 rootwait\0" \
- "emmcboot=run setup; " \
+ "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} ro " \
+ "rootfstype=ext4 rootwait\0" \
+ "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
"setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \
"${vidargs}; echo Booting from internal eMMC chip...; " \
"run m4boot && " \
- "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \
- "load mmc 0:1 ${kernel_addr_r} ${boot_file} && " \
- "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
+ "load mmc ${emmcdev}:${emmcbootpart} ${fdt_addr_r} " \
+ "${soc}-colibri-emmc-${fdt_board}.dtb && " \
+ "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \
+ "${boot_file} && run fdt_fixup && " \
+ "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "emmcbootpart=1\0" \
+ "emmcdev=0\0" \
+ "emmcfinduuid=part uuid mmc ${emmcdev}:${emmcrootpart} uuid\0" \
+ "emmcrootpart=2\0"
+
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x10000000\0" \
@@ -69,24 +77,25 @@
"ramdisk_addr_r=0x82100000\0"
#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
-#define SD_BOOTCMD \
- "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
- "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
- "run m4boot && " \
- "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
- "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
- "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
+#define SD_BOOTDEV 0
#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
+#define SD_BOOTDEV 1
+#endif
+
#define SD_BOOTCMD \
- "sdargs=root=/dev/mmcblk1p2 ro rootwait\0" \
- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
+ "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \
+ "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
+ "setenv bootargs ${defargs} ${sdargs} " \
"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
"run m4boot && " \
- "load mmc 1:1 ${kernel_addr_r} ${kernel_file} && " \
- "load mmc 1:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
- "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
-#endif
+ "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \
+ "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \
+ "${soc}-colibri-${fdt_board}.dtb && " \
+ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "sdbootpart=1\0" \
+ "sddev=" __stringify(SD_BOOTDEV) "\0" \
+ "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
+ "sdrootpart=2\0"
#define NFS_BOOTCMD \
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 2/5] colibri-imx6ull: use UUID for rootfs
2019-05-13 9:15 [U-Boot] [PATCH 1/5] colibri_imx7: use UUID for rootfs Igor Opaniuk
@ 2019-05-13 9:15 ` Igor Opaniuk
2019-05-24 7:46 ` Marcel Ziswiler
2019-05-13 9:15 ` [U-Boot] [PATCH 3/5] colibri_vf: " Igor Opaniuk
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Igor Opaniuk @ 2019-05-13 9:15 UTC (permalink / raw)
To: u-boot
Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
partition. This fixes the issue, when MMC controllers are probed in
a different order in U-boot and Linux kernel.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
include/configs/colibri-imx6ull.h | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 7cf550cf9e..2ba0ce5b79 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -66,12 +66,17 @@
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
#define SD_BOOTCMD \
- "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
+ "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \
+ "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
+ "setenv bootargs ${defargs} ${sdargs} " \
"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
- "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
- "load mmc 0:1 ${fdt_addr_r} " FDT_FILE " && " \
+ "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \
+ "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " FDT_FILE " && " \
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "sdbootpart=1\0" \
+ "sddev=0\0" \
+ "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
+ "sdrootpart=2\0"
#define UBI_BOOTCMD \
"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/5] colibri_vf: use UUID for rootfs
2019-05-13 9:15 [U-Boot] [PATCH 1/5] colibri_imx7: use UUID for rootfs Igor Opaniuk
2019-05-13 9:15 ` [U-Boot] [PATCH 2/5] colibri-imx6ull: " Igor Opaniuk
@ 2019-05-13 9:15 ` Igor Opaniuk
2019-05-24 7:47 ` Marcel Ziswiler
2019-05-13 9:15 ` [U-Boot] [PATCH 4/5] apalis_imx6: " Igor Opaniuk
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Igor Opaniuk @ 2019-05-13 9:15 UTC (permalink / raw)
To: u-boot
Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
partition. This fixes the issue, when MMC controllers are probed in
a different order in U-boot and Linux kernel.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
include/configs/colibri_vf.h | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 0d57e303a1..da9a8426ec 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -68,12 +68,19 @@
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
#define SD_BOOTCMD \
- "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \
+ "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \
+ "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
+ "setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \
"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
- "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
- "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
+ "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \
+ "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \
+ "${soc}-colibri-${fdt_board}.dtb && " \
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "sdbootpart=1\0" \
+ "sddev=0\0" \
+ "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
+ "sdrootpart=2\0"
+
#define UBI_BOOTCMD \
"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 4/5] apalis_imx6: use UUID for rootfs
2019-05-13 9:15 [U-Boot] [PATCH 1/5] colibri_imx7: use UUID for rootfs Igor Opaniuk
2019-05-13 9:15 ` [U-Boot] [PATCH 2/5] colibri-imx6ull: " Igor Opaniuk
2019-05-13 9:15 ` [U-Boot] [PATCH 3/5] colibri_vf: " Igor Opaniuk
@ 2019-05-13 9:15 ` Igor Opaniuk
2019-05-24 7:51 ` Marcel Ziswiler
2019-05-13 9:15 ` [U-Boot] [PATCH 5/5] apalis-tk1: " Igor Opaniuk
2019-05-24 7:46 ` [U-Boot] [PATCH 1/5] colibri_imx7: " Marcel Ziswiler
4 siblings, 1 reply; 11+ messages in thread
From: Igor Opaniuk @ 2019-05-13 9:15 UTC (permalink / raw)
To: u-boot
1. Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
partition. This fixes the issue, when MMC controllers are probed in
a different order in U-boot and Linux kernel.
2. Fix legacy USB command (both sdboot and usbboot can be used now).
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
include/configs/apalis_imx6.h | 62 ++++++++++++++++++++++++-----------
1 file changed, 42 insertions(+), 20 deletions(-)
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 96169f55f0..04b21a3128 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -125,16 +125,21 @@
"imx6q-apalis-cam-eval.dtb fat 0 1"
#define EMMC_BOOTCMD \
- "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime rootfstype=ext4 " \
- "rootwait\0" \
- "emmcboot=run setup; " \
+ "set_emmcargs emmcargs ip=off root=PARTUUID=${uuid} rw,noatime " \
+ "rootfstype=ext4 rootwait\0" \
+ "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
"setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \
"${vidargs}; echo Booting from internal eMMC chip...; " \
- "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \
- "${boot_file} && run fdt_fixup && " \
+ "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} " \
+ "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
"bootz ${kernel_addr_r} ${dtbparam}\0" \
- "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
- "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+ "emmcbootpart=1\0" \
+ "emmcdev=0\0" \
+ "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \
+ "${fdt_addr_r} ${fdt_file} && " \
+ "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \
+ "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
+ "emmcrootpart=2\0"
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x20000000\0" \
@@ -157,27 +162,43 @@
"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
#define SD_BOOTCMD \
- "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext4 " \
- "rootwait\0" \
- "sdboot=run setup; " \
+ "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} rw,noatime " \
+ "rootfstype=ext4 rootwait\0" \
+ "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
"setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
"${vidargs}; echo Booting from SD card; " \
- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
- "${boot_file} && run fdt_fixup && " \
+ "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
+ "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
"bootz ${kernel_addr_r} ${dtbparam}\0" \
- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
- "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+ "sdbootpart=1\0" \
+ "sddev=1\0" \
+ "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
+ "${fdt_addr_r} " \
+ "${fdt_file} && setenv dtbparam \" - " \
+ "${fdt_addr_r}\" && true\0" \
+ "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
+ "sdrootpart=2\0"
+
#define USB_BOOTCMD \
- "usbargs=ip=off root=/dev/sda2 rw,noatime rootfstype=ext4 " \
- "rootwait\0" \
- "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
+ "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} rw,noatime " \
+ "rootfstype=ext4 rootwait\0" \
+ "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
+ "setenv bootargs ${defargs} ${setupargs} " \
"${usbargs} ${vidargs}; echo Booting from USB stick...; " \
- "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \
+ "run usbdtbload; load usb " \
+ "${usbdev}:${usbbootpart} ${kernel_addr_r} " \
"${boot_file} && run fdt_fixup && " \
"bootz ${kernel_addr_r} ${dtbparam}\0" \
- "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
- "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+ "usbbootpart=1\0" \
+ "usbdev=0\0" \
+ "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} "\
+ "${fdt_addr_r} " \
+ "${fdt_file} && setenv dtbparam \" - " \
+ "${fdt_addr_r}\" && true\0" \
+ "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
+ "usbrootpart=2\0"
+
#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
#define FDT_FILE "imx6q-apalis-eval.dtb"
@@ -201,6 +222,7 @@
MEM_LAYOUT_ENV_SETTINGS \
NFS_BOOTCMD \
SD_BOOTCMD \
+ USB_BOOTCMD \
"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
"flash_eth.img && source ${loadaddr}\0" \
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 5/5] apalis-tk1: use UUID for rootfs
2019-05-13 9:15 [U-Boot] [PATCH 1/5] colibri_imx7: use UUID for rootfs Igor Opaniuk
` (2 preceding siblings ...)
2019-05-13 9:15 ` [U-Boot] [PATCH 4/5] apalis_imx6: " Igor Opaniuk
@ 2019-05-13 9:15 ` Igor Opaniuk
2019-05-24 8:01 ` Marcel Ziswiler
2019-05-24 7:46 ` [U-Boot] [PATCH 1/5] colibri_imx7: " Marcel Ziswiler
4 siblings, 1 reply; 11+ messages in thread
From: Igor Opaniuk @ 2019-05-13 9:15 UTC (permalink / raw)
To: u-boot
1. Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
partition. This fixes the issue, when MMC controllers are probed in
a different order in U-boot and Linux kernel.
2. Fix legacy USB command (both sdboot and usbboot can be used now).
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
include/configs/apalis-tk1.h | 62 ++++++++++++++++++++++++------------
1 file changed, 41 insertions(+), 21 deletions(-)
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 1d296ba51a..ff6c5e425d 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -51,15 +51,22 @@
"tegra124-apalis-eval.dtb fat 0 1 mmcpart 0"
#define EMMC_BOOTCMD \
- "emmcargs=ip=off root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait\0" \
- "emmcboot=run setup; setenv bootargs ${defargs} ${emmcargs} " \
- "${setupargs} ${vidargs}; echo Booting from internal eMMC " \
- "chip...; run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \
+ "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \
+ "rw rootfstype=ext3 rootwait\0" \
+ "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
+ "setenv bootargs ${defargs} ${emmcargs} " \
+ "${setupargs} ${vidargs}; echo Booting from internal eMMC; " \
+ "run emmcdtbload; " \
+ "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \
"${boot_file} && run fdt_fixup && " \
"bootm ${kernel_addr_r} - ${dtbparam}\0" \
- "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
- "${soc}-apalis-${fdt_board}.dtb && " \
- "setenv dtbparam ${fdt_addr_r}\0"
+ "emmcbootpart=1\0" \
+ "emmcdev=0\0" \
+ "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \
+ "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb && " \
+ "setenv dtbparam ${fdt_addr_r}\0" \
+ "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
+ "emmcrootpart=2\0"
#define NFS_BOOTCMD \
"nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
@@ -72,26 +79,38 @@
"&& setenv dtbparam ${fdt_addr_r}\0"
#define SD_BOOTCMD \
- "sdargs=ip=off root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait\0" \
- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+ "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} rw " \
+ "rootfstype=ext4 rootwait\0" \
+ "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
+ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
"${vidargs}; echo Booting from SD card in 8bit slot...; " \
- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
- "${boot_file} && run fdt_fixup && " \
+ "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
+ "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
"bootm ${kernel_addr_r} - ${dtbparam}\0" \
- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
- "${soc}-apalis-${fdt_board}.dtb " \
- "&& setenv dtbparam ${fdt_addr_r}\0"
+ "sdbootpart=1\0" \
+ "sddev=1\0" \
+ "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
+ "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \
+ "&& setenv dtbparam ${fdt_addr_r}\0" \
+ "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
+ "sdrootpart=2\0"
#define USB_BOOTCMD \
- "usbargs=ip=off root=/dev/sda2 rw rootfstype=ext4 rootwait\0" \
- "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
+ "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} rw " \
+ "rootfstype=ext4 rootwait\0" \
+ "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
+ "setenv bootargs ${defargs} ${setupargs} " \
"${usbargs} ${vidargs}; echo Booting from USB stick...; " \
- "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \
- "${boot_file} && run fdt_fixup && " \
+ "run usbdtbload; load usb ${usbdev}:${usbbootpart} " \
+ "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
"bootm ${kernel_addr_r} - ${dtbparam}\0" \
- "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
- "${soc}-apalis-${fdt_board}.dtb " \
- "&& setenv dtbparam ${fdt_addr_r}\0"
+ "usbbootpart=1\0" \
+ "usbdev=0\0" \
+ "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \
+ "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \
+ "&& setenv dtbparam ${fdt_addr_r}\0" \
+ "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
+ "usbrootpart=2\0"
#define BOARD_EXTRA_ENV_SETTINGS \
"boot_file=uImage\0" \
@@ -104,6 +123,7 @@
"fdt_fixup=;\0" \
NFS_BOOTCMD \
SD_BOOTCMD \
+ USB_BOOTCMD \
"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
"00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \
"flash_eth.img && source ${loadaddr}\0" \
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 1/5] colibri_imx7: use UUID for rootfs
2019-05-13 9:15 [U-Boot] [PATCH 1/5] colibri_imx7: use UUID for rootfs Igor Opaniuk
` (3 preceding siblings ...)
2019-05-13 9:15 ` [U-Boot] [PATCH 5/5] apalis-tk1: " Igor Opaniuk
@ 2019-05-24 7:46 ` Marcel Ziswiler
4 siblings, 0 replies; 11+ messages in thread
From: Marcel Ziswiler @ 2019-05-24 7:46 UTC (permalink / raw)
To: u-boot
On Mon, 2019-05-13 at 12:15 +0300, Igor Opaniuk wrote:
> Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
> partition. This fixes the issue, when MMC controllers are probed in
> a different order in U-boot and Linux kernel.
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
> include/configs/colibri_imx7.h | 47 ++++++++++++++++++++----------
> ----
> 1 file changed, 28 insertions(+), 19 deletions(-)
>
> diff --git a/include/configs/colibri_imx7.h
> b/include/configs/colibri_imx7.h
> index 5a4b9801cb..8bc75aba59 100644
> --- a/include/configs/colibri_imx7.h
> +++ b/include/configs/colibri_imx7.h
> @@ -51,14 +51,22 @@
> #define CONFIG_SERVERIP 192.168.10.1
>
> #define EMMC_BOOTCMD \
> - "emmcargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext4
> rootwait\0" \
> - "emmcboot=run setup; " \
> + "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} ro "
> \
> + "rootfstype=ext4 rootwait\0" \
> + "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
> "setenv bootargs ${defargs} ${emmcargs} ${setupargs} "
> \
> "${vidargs}; echo Booting from internal eMMC chip...; "
> \
> "run m4boot && " \
> - "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-emmc-
> ${fdt_board}.dtb && " \
> - "load mmc 0:1 ${kernel_addr_r} ${boot_file} && " \
> - "run fdt_fixup && bootz ${kernel_addr_r} -
> ${fdt_addr_r}\0"
> + "load mmc ${emmcdev}:${emmcbootpart} ${fdt_addr_r} " \
> + "${soc}-colibri-emmc-${fdt_board}.dtb && " \
> + "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} "
> \
> + "${boot_file} && run fdt_fixup && " \
> + "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
> + "emmcbootpart=1\0" \
> + "emmcdev=0\0" \
> + "emmcfinduuid=part uuid mmc ${emmcdev}:${emmcrootpart} uuid\0"
> \
> + "emmcrootpart=2\0"
> +
>
> #define MEM_LAYOUT_ENV_SETTINGS \
> "bootm_size=0x10000000\0" \
> @@ -69,24 +77,25 @@
> "ramdisk_addr_r=0x82100000\0"
>
> #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
> -#define SD_BOOTCMD \
> - "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
> - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
> - "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
> - "run m4boot && " \
> - "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
> - "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb &&
> " \
> - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
> +#define SD_BOOTDEV 0
> #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
> +#define SD_BOOTDEV 1
> +#endif
> +
> #define SD_BOOTCMD \
> - "sdargs=root=/dev/mmcblk1p2 ro rootwait\0" \
> - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
> + "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0"
> \
> + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
> + "setenv bootargs ${defargs} ${sdargs} " \
> "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
> "run m4boot && " \
> - "load mmc 1:1 ${kernel_addr_r} ${kernel_file} && " \
> - "load mmc 1:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb &&
> " \
> - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
> -#endif
> + "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r}
> ${kernel_file} && " \
> + "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \
> + "${soc}-colibri-${fdt_board}.dtb && " \
> + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
> + "sdbootpart=1\0" \
> + "sddev=" __stringify(SD_BOOTDEV) "\0" \
> + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
> + "sdrootpart=2\0"
>
>
> #define NFS_BOOTCMD \
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 2/5] colibri-imx6ull: use UUID for rootfs
2019-05-13 9:15 ` [U-Boot] [PATCH 2/5] colibri-imx6ull: " Igor Opaniuk
@ 2019-05-24 7:46 ` Marcel Ziswiler
0 siblings, 0 replies; 11+ messages in thread
From: Marcel Ziswiler @ 2019-05-24 7:46 UTC (permalink / raw)
To: u-boot
On Mon, 2019-05-13 at 12:15 +0300, Igor Opaniuk wrote:
> Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
> partition. This fixes the issue, when MMC controllers are probed in
> a different order in U-boot and Linux kernel.
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
> include/configs/colibri-imx6ull.h | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/include/configs/colibri-imx6ull.h
> b/include/configs/colibri-imx6ull.h
> index 7cf550cf9e..2ba0ce5b79 100644
> --- a/include/configs/colibri-imx6ull.h
> +++ b/include/configs/colibri-imx6ull.h
> @@ -66,12 +66,17 @@
> "run fdt_fixup && bootz ${kernel_addr_r} -
> ${fdt_addr_r}\0" \
>
> #define SD_BOOTCMD \
> - "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
> - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
> + "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0"
> \
> + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
> + "setenv bootargs ${defargs} ${sdargs} " \
> "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
> - "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
> - "load mmc 0:1 ${fdt_addr_r} " FDT_FILE " && " \
> + "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r}
> ${kernel_file} && " \
> + "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " FDT_FILE " &&
> " \
> "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
> + "sdbootpart=1\0" \
> + "sddev=0\0" \
> + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
> + "sdrootpart=2\0"
>
> #define UBI_BOOTCMD \
> "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/5] colibri_vf: use UUID for rootfs
2019-05-13 9:15 ` [U-Boot] [PATCH 3/5] colibri_vf: " Igor Opaniuk
@ 2019-05-24 7:47 ` Marcel Ziswiler
0 siblings, 0 replies; 11+ messages in thread
From: Marcel Ziswiler @ 2019-05-24 7:47 UTC (permalink / raw)
To: u-boot
On Mon, 2019-05-13 at 12:15 +0300, Igor Opaniuk wrote:
> Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
> partition. This fixes the issue, when MMC controllers are probed in
> a different order in U-boot and Linux kernel.
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
> include/configs/colibri_vf.h | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/include/configs/colibri_vf.h
> b/include/configs/colibri_vf.h
> index 0d57e303a1..da9a8426ec 100644
> --- a/include/configs/colibri_vf.h
> +++ b/include/configs/colibri_vf.h
> @@ -68,12 +68,19 @@
> "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
>
> #define SD_BOOTCMD \
> - "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
> - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs}
> ${mtdparts} " \
> + "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0"
> \
> + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
> + "setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \
> "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
> - "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
> - "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb &&
> " \
> + "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r}
> ${kernel_file} && " \
> + "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \
> + "${soc}-colibri-${fdt_board}.dtb && " \
> "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
> + "sdbootpart=1\0" \
> + "sddev=0\0" \
> + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
> + "sdrootpart=2\0"
> +
>
> #define UBI_BOOTCMD \
> "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 4/5] apalis_imx6: use UUID for rootfs
2019-05-13 9:15 ` [U-Boot] [PATCH 4/5] apalis_imx6: " Igor Opaniuk
@ 2019-05-24 7:51 ` Marcel Ziswiler
2019-05-24 8:04 ` Marcel Ziswiler
0 siblings, 1 reply; 11+ messages in thread
From: Marcel Ziswiler @ 2019-05-24 7:51 UTC (permalink / raw)
To: u-boot
On Mon, 2019-05-13 at 12:15 +0300, Igor Opaniuk wrote:
> 1. Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
> partition. This fixes the issue, when MMC controllers are probed in
> a different order in U-boot and Linux kernel.
> 2. Fix legacy USB command (both sdboot and usbboot can be used now).
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> ---
> include/configs/apalis_imx6.h | 62 ++++++++++++++++++++++++---------
> --
> 1 file changed, 42 insertions(+), 20 deletions(-)
>
> diff --git a/include/configs/apalis_imx6.h
> b/include/configs/apalis_imx6.h
> index 96169f55f0..04b21a3128 100644
> --- a/include/configs/apalis_imx6.h
> +++ b/include/configs/apalis_imx6.h
> @@ -125,16 +125,21 @@
> "imx6q-apalis-cam-eval.dtb fat 0 1"
>
> #define EMMC_BOOTCMD \
> - "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime
Here we should probably also transition to ro instead as e.g. systemd
will re-mount rw,whatever later.
> rootfstype=ext4 " \
> - "rootwait\0" \
> - "emmcboot=run setup; " \
> + "set_emmcargs emmcargs ip=off root=PARTUUID=${uuid} rw,noatime
> " \
> + "rootfstype=ext4 rootwait\0" \
> + "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
> "setenv bootargs ${defargs} ${emmcargs} ${setupargs} "
> \
> "${vidargs}; echo Booting from internal eMMC chip...; "
> \
> - "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \
> - "${boot_file} && run fdt_fixup && " \
> + "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} "
> \
> + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
> "bootz ${kernel_addr_r} ${dtbparam}\0" \
> - "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
> - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" &&
> true\0"
> + "emmcbootpart=1\0" \
> + "emmcdev=0\0" \
> + "emmcdtbload=setenv dtbparam; load mmc
> ${emmcdev}:${emmcbootpart} " \
> + "${fdt_addr_r} ${fdt_file} && " \
> + "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \
> + "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
> + "emmcrootpart=2\0"
>
> #define MEM_LAYOUT_ENV_SETTINGS \
> "bootm_size=0x20000000\0" \
> @@ -157,27 +162,43 @@
> "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
>
> #define SD_BOOTCMD \
> - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime
Same here.
> rootfstype=ext4 " \
> - "rootwait\0" \
> - "sdboot=run setup; " \
> + "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid}
> rw,noatime " \
> + "rootfstype=ext4 rootwait\0" \
> + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
> "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
> "${vidargs}; echo Booting from SD card; " \
> - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
> - "${boot_file} && run fdt_fixup && " \
> + "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
> + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
> "bootz ${kernel_addr_r} ${dtbparam}\0" \
> - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
> - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" &&
> true\0"
> + "sdbootpart=1\0" \
> + "sddev=1\0" \
> + "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
> + "${fdt_addr_r} " \
> + "${fdt_file} && setenv dtbparam \" - " \
> + "${fdt_addr_r}\" && true\0" \
> + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
> + "sdrootpart=2\0"
> +
>
> #define USB_BOOTCMD \
> - "usbargs=ip=off root=/dev/sda2 rw,noatime
And here.
> rootfstype=ext4 " \
> - "rootwait\0" \
> - "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
> + "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid}
> rw,noatime " \
> + "rootfstype=ext4 rootwait\0" \
> + "usbboot=run setup; usb start; run usbfinduuid; run
> set_usbargs; " \
> + "setenv bootargs ${defargs} ${setupargs} " \
> "${usbargs} ${vidargs}; echo Booting from USB stick...;
> " \
> - "usb start && run usbdtbload; load usb 0:1
> ${kernel_addr_r} " \
> + "run usbdtbload; load usb " \
> + "${usbdev}:${usbbootpart} ${kernel_addr_r} " \
> "${boot_file} && run fdt_fixup && " \
> "bootz ${kernel_addr_r} ${dtbparam}\0" \
> - "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
> - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" &&
> true\0"
> + "usbbootpart=1\0" \
> + "usbdev=0\0" \
> + "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart}
> "\
> + "${fdt_addr_r} " \
> + "${fdt_file} && setenv dtbparam \" - " \
> + "${fdt_addr_r}\" && true\0" \
> + "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
> + "usbrootpart=2\0"
> +
>
> #ifndef CONFIG_TDX_APALIS_IMX6_V1_0
> #define FDT_FILE "imx6q-apalis-eval.dtb"
> @@ -201,6 +222,7 @@
> MEM_LAYOUT_ENV_SETTINGS \
> NFS_BOOTCMD \
> SD_BOOTCMD \
> + USB_BOOTCMD \
> "setethupdate=if env exists ethaddr; then; else setenv ethaddr
> " \
> "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
> "flash_eth.img && source ${loadaddr}\0" \
With the above fixed:
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 5/5] apalis-tk1: use UUID for rootfs
2019-05-13 9:15 ` [U-Boot] [PATCH 5/5] apalis-tk1: " Igor Opaniuk
@ 2019-05-24 8:01 ` Marcel Ziswiler
0 siblings, 0 replies; 11+ messages in thread
From: Marcel Ziswiler @ 2019-05-24 8:01 UTC (permalink / raw)
To: u-boot
On Mon, 2019-05-13 at 12:15 +0300, Igor Opaniuk wrote:
> 1. Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
> partition. This fixes the issue, when MMC controllers are probed in
> a different order in U-boot and Linux kernel.
> 2. Fix legacy USB command (both sdboot and usbboot can be used now).
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> ---
> include/configs/apalis-tk1.h | 62 ++++++++++++++++++++++++--------
> ----
> 1 file changed, 41 insertions(+), 21 deletions(-)
>
> diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-
> tk1.h
> index 1d296ba51a..ff6c5e425d 100644
> --- a/include/configs/apalis-tk1.h
> +++ b/include/configs/apalis-tk1.h
> @@ -51,15 +51,22 @@
> "tegra124-apalis-eval.dtb fat 0 1
> mmcpart 0"
>
> #define EMMC_BOOTCMD \
> - "emmcargs=ip=off root=/dev/mmcblk0p2 rw rootfstype=ext3
> rootwait\0" \
> - "emmcboot=run setup; setenv bootargs ${defargs} ${emmcargs} " \
> - "${setupargs} ${vidargs}; echo Booting from internal
> eMMC " \
> - "chip...; run emmcdtbload; load mmc 0:1
> ${kernel_addr_r} " \
> + "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \
> + "rw
Same using of ro recommended instead as pointed out in previous patch.
> rootfstype=ext3
Here we should also transition to using ext4 as we already did anywhere
else and in downstream.
> rootwait\0" \
> + "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
> + "setenv bootargs ${defargs} ${emmcargs} " \
> + "${setupargs} ${vidargs}; echo Booting from internal
> eMMC; " \
> + "run emmcdtbload; " \
> + "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} "
> \
> "${boot_file} && run fdt_fixup && " \
> "bootm ${kernel_addr_r} - ${dtbparam}\0" \
> - "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
> - "${soc}-apalis-${fdt_board}.dtb && " \
> - "setenv dtbparam ${fdt_addr_r}\0"
> + "emmcbootpart=1\0" \
> + "emmcdev=0\0" \
> + "emmcdtbload=setenv dtbparam; load mmc
> ${emmcdev}:${emmcbootpart} " \
> + "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb && " \
> + "setenv dtbparam ${fdt_addr_r}\0" \
> + "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
> + "emmcrootpart=2\0"
>
> #define NFS_BOOTCMD \
> "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
> @@ -72,26 +79,38 @@
> "&& setenv dtbparam ${fdt_addr_r}\0"
>
> #define SD_BOOTCMD \
> - "sdargs=ip=off root=/dev/mmcblk1p2 rw rootfstype=ext4
> rootwait\0" \
> - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs}
> ${setupargs} " \
> + "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} rw
Same here.
> " \
> + "rootfstype=ext4 rootwait\0" \
> + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
> + "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
> "${vidargs}; echo Booting from SD card in 8bit slot...;
> " \
> - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
> - "${boot_file} && run fdt_fixup && " \
> + "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
> + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
> "bootm ${kernel_addr_r} - ${dtbparam}\0" \
> - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
> - "${soc}-apalis-${fdt_board}.dtb " \
> - "&& setenv dtbparam ${fdt_addr_r}\0"
> + "sdbootpart=1\0" \
> + "sddev=1\0" \
> + "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
> + "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \
> + "&& setenv dtbparam ${fdt_addr_r}\0" \
> + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
> + "sdrootpart=2\0"
>
> #define USB_BOOTCMD \
> - "usbargs=ip=off root=/dev/sda2 rw rootfstype=ext4 rootwait\0" \
> - "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
> + "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} rw " \
And here.
> + "rootfstype=ext4 rootwait\0" \
> + "usbboot=run setup; usb start; run usbfinduuid; run
> set_usbargs; " \
> + "setenv bootargs ${defargs} ${setupargs} " \
> "${usbargs} ${vidargs}; echo Booting from USB stick...;
> " \
> - "usb start && run usbdtbload; load usb 0:1
> ${kernel_addr_r} " \
> - "${boot_file} && run fdt_fixup && " \
> + "run usbdtbload; load usb ${usbdev}:${usbbootpart} " \
> + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
> "bootm ${kernel_addr_r} - ${dtbparam}\0" \
> - "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
> - "${soc}-apalis-${fdt_board}.dtb " \
> - "&& setenv dtbparam ${fdt_addr_r}\0"
> + "usbbootpart=1\0" \
> + "usbdev=0\0" \
> + "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart}
> " \
> + "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \
> + "&& setenv dtbparam ${fdt_addr_r}\0" \
> + "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
> + "usbrootpart=2\0"
>
> #define BOARD_EXTRA_ENV_SETTINGS \
> "boot_file=uImage\0" \
> @@ -104,6 +123,7 @@
> "fdt_fixup=;\0" \
> NFS_BOOTCMD \
> SD_BOOTCMD \
> + USB_BOOTCMD \
> "setethupdate=if env exists ethaddr; then; else setenv ethaddr
> " \
> "00:14:2d:00:00:00; fi; pci enum && tftpboot
> ${loadaddr} " \
> "flash_eth.img && source ${loadaddr}\0" \
With the above fixed:
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 4/5] apalis_imx6: use UUID for rootfs
2019-05-24 7:51 ` Marcel Ziswiler
@ 2019-05-24 8:04 ` Marcel Ziswiler
0 siblings, 0 replies; 11+ messages in thread
From: Marcel Ziswiler @ 2019-05-24 8:04 UTC (permalink / raw)
To: u-boot
On Fri, 2019-05-24 at 09:51 +0200, Marcel Ziswiler wrote:
> On Mon, 2019-05-13 at 12:15 +0300, Igor Opaniuk wrote:
> > 1. Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
> > partition. This fixes the issue, when MMC controllers are probed in
> > a different order in U-boot and Linux kernel.
> > 2. Fix legacy USB command (both sdboot and usbboot can be used
> > now).
> >
> > Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> > ---
> > include/configs/apalis_imx6.h | 62 ++++++++++++++++++++++++-------
> > --
> > --
> > 1 file changed, 42 insertions(+), 20 deletions(-)
> >
> > diff --git a/include/configs/apalis_imx6.h
> > b/include/configs/apalis_imx6.h
> > index 96169f55f0..04b21a3128 100644
> > --- a/include/configs/apalis_imx6.h
> > +++ b/include/configs/apalis_imx6.h
> > @@ -125,16 +125,21 @@
> > "imx6q-apalis-cam-eval.dtb fat 0 1"
> >
> > #define EMMC_BOOTCMD \
> > - "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime
>
> Here we should probably also transition to ro instead as e.g. systemd
> will re-mount rw,whatever later.
>
> > rootfstype=ext4 " \
> > - "rootwait\0" \
> > - "emmcboot=run setup; " \
> > + "set_emmcargs emmcargs ip=off root=PARTUUID=${uuid} rw,noatime
Sorry, above comment was meant to go here (;-p).
> > " \
> > + "rootfstype=ext4 rootwait\0" \
> > + "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
> > "setenv bootargs ${defargs} ${emmcargs} ${setupargs} "
> > \
> > "${vidargs}; echo Booting from internal eMMC chip...; "
> > \
> > - "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \
> > - "${boot_file} && run fdt_fixup && " \
> > + "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} "
> > \
> > + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
> > "bootz ${kernel_addr_r} ${dtbparam}\0" \
> > - "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
> > - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" &&
> > true\0"
> > + "emmcbootpart=1\0" \
> > + "emmcdev=0\0" \
> > + "emmcdtbload=setenv dtbparam; load mmc
> > ${emmcdev}:${emmcbootpart} " \
> > + "${fdt_addr_r} ${fdt_file} && " \
> > + "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \
> > + "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
> > + "emmcrootpart=2\0"
> >
> > #define MEM_LAYOUT_ENV_SETTINGS \
> > "bootm_size=0x20000000\0" \
> > @@ -157,27 +162,43 @@
> > "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
> >
> > #define SD_BOOTCMD \
> > - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime
>
> Same here.
>
> > rootfstype=ext4 " \
> > - "rootwait\0" \
> > - "sdboot=run setup; " \
> > + "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid}
> > rw,noatime
And here (;-p).
> > " \
> > + "rootfstype=ext4 rootwait\0" \
> > + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
> > "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
> > "${vidargs}; echo Booting from SD card; " \
> > - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
> > - "${boot_file} && run fdt_fixup && " \
> > + "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
> > + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
> > "bootz ${kernel_addr_r} ${dtbparam}\0" \
> > - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
> > - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" &&
> > true\0"
> > + "sdbootpart=1\0" \
> > + "sddev=1\0" \
> > + "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
> > + "${fdt_addr_r} " \
> > + "${fdt_file} && setenv dtbparam \" - " \
> > + "${fdt_addr_r}\" && true\0" \
> > + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
> > + "sdrootpart=2\0"
> > +
> >
> > #define USB_BOOTCMD \
> > - "usbargs=ip=off root=/dev/sda2 rw,noatime
>
> And here.
>
> > rootfstype=ext4 " \
> > - "rootwait\0" \
> > - "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
> > + "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid}
> > rw,noatime
And here (;-p).
> > " \
> > + "rootfstype=ext4 rootwait\0" \
> > + "usbboot=run setup; usb start; run usbfinduuid; run
> > set_usbargs; " \
> > + "setenv bootargs ${defargs} ${setupargs} " \
> > "${usbargs} ${vidargs}; echo Booting from USB stick...;
> > " \
> > - "usb start && run usbdtbload; load usb 0:1
> > ${kernel_addr_r} " \
> > + "run usbdtbload; load usb " \
> > + "${usbdev}:${usbbootpart} ${kernel_addr_r} " \
> > "${boot_file} && run fdt_fixup && " \
> > "bootz ${kernel_addr_r} ${dtbparam}\0" \
> > - "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
> > - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" &&
> > true\0"
> > + "usbbootpart=1\0" \
> > + "usbdev=0\0" \
> > + "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart}
> > "\
> > + "${fdt_addr_r} " \
> > + "${fdt_file} && setenv dtbparam \" - " \
> > + "${fdt_addr_r}\" && true\0" \
> > + "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
> > + "usbrootpart=2\0"
> > +
> >
> > #ifndef CONFIG_TDX_APALIS_IMX6_V1_0
> > #define FDT_FILE "imx6q-apalis-eval.dtb"
> > @@ -201,6 +222,7 @@
> > MEM_LAYOUT_ENV_SETTINGS \
> > NFS_BOOTCMD \
> > SD_BOOTCMD \
> > + USB_BOOTCMD \
> > "setethupdate=if env exists ethaddr; then; else setenv ethaddr
> > " \
> > "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
> > "flash_eth.img && source ${loadaddr}\0" \
>
> With the above fixed:
>
> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-05-24 8:04 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-13 9:15 [U-Boot] [PATCH 1/5] colibri_imx7: use UUID for rootfs Igor Opaniuk
2019-05-13 9:15 ` [U-Boot] [PATCH 2/5] colibri-imx6ull: " Igor Opaniuk
2019-05-24 7:46 ` Marcel Ziswiler
2019-05-13 9:15 ` [U-Boot] [PATCH 3/5] colibri_vf: " Igor Opaniuk
2019-05-24 7:47 ` Marcel Ziswiler
2019-05-13 9:15 ` [U-Boot] [PATCH 4/5] apalis_imx6: " Igor Opaniuk
2019-05-24 7:51 ` Marcel Ziswiler
2019-05-24 8:04 ` Marcel Ziswiler
2019-05-13 9:15 ` [U-Boot] [PATCH 5/5] apalis-tk1: " Igor Opaniuk
2019-05-24 8:01 ` Marcel Ziswiler
2019-05-24 7:46 ` [U-Boot] [PATCH 1/5] colibri_imx7: " Marcel Ziswiler
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.