From 991a0c6314e45242401584be007ed7010ed1ed3a Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 14 Aug 2016 19:01:33 +0300 Subject: [PATCH] try to reduce boot vs root partition confusion --- include/configs/ti_armv7_common.h | 2 +- include/configs/ti_omap5_common.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index ba7cf15242f..eabce6a608e 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -59,7 +59,7 @@ #define DEFAULT_MMC_TI_ARGS \ "mmcdev=0\0" \ "mmcrootfstype=ext4 rootwait\0" \ - "finduuid=part uuid mmc ${bootpart} uuid\0" \ + "finduuid=part uuid mmc ${rootpart} uuid\0" \ "args_mmc=run finduuid;setenv bootargs console=${console} " \ "${optargs} " \ "root=PARTUUID=${uuid} rw " \ diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 5386a5b62b1..d114c5fb1b0 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -74,6 +74,7 @@ "console=" CONSOLEDEV ",115200n8\0" \ "fdtfile=undefined\0" \ "bootpart=0:2\0" \ + "rootpart=0:2\0" \ "bootdir=/boot\0" \ "bootfile=zImage\0" \ "bootfilecmd=bootz\0" \ @@ -136,11 +137,13 @@ "fi;" \ "run findfdt; " \ "setenv mmcdev 0; " \ - "setenv bootpart 0:2; " \ + "setenv bootpart 0:1; " \ + "setenv rootpart 0:2; " \ "run envboot; " \ "run mmcboot;" \ "setenv mmcdev 1; " \ - "setenv bootpart 1:2; " \ + "setenv bootpart 1:1; " \ + "setenv rootpart 1:2; " \ "run mmcboot;" \ "" #endif -- 2.39.5