diff options
| author | Anil Kumar <anil.kumar.k@intel.com> | 2016-10-18 12:00:44 -0700 |
|---|---|---|
| committer | Beare, Bruce J <bruce.j.beare@intel.com> | 2016-10-19 02:19:01 +0100 |
| commit | fccc36ed5ab4eb9ba3aad8d853af0a7745ac04e3 (patch) | |
| tree | de8e348de4571f35a47ebe45f1ed0d524c8f5dfb | |
| parent | 9ed51e6750b716f73a57b23c255fbb12fd6389ac (diff) | |
| download | edison-u-boot-fccc36ed5ab4eb9ba3aad8d853af0a7745ac04e3.tar.gz | |
Pass root mount partition info in bootargs
Add root= to bootargs based on slot chosen
Change-Id: I863a06fc1c6b1cbb2782e2c0dcbca3d9c8105a6d
Signed-off-by: Anil Kumar <anil.kumar.k@intel.com>
Reviewed-on: https://android.intel.com/546129
Reviewed-by: Beare, Bruce J <bruce.j.beare@intel.com>
| -rw-r--r-- | common/cmd_boot_brillo.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/common/cmd_boot_brillo.c b/common/cmd_boot_brillo.c index b5d6703dbf..07e1184bd1 100644 --- a/common/cmd_boot_brillo.c +++ b/common/cmd_boot_brillo.c @@ -72,10 +72,13 @@ #define BOOT_ARG_DEVICE_STATE_STR "androidboot.bvb.device_state=" #define BOOT_ARG_SLOT_CHOSEN_STR "androidboot.bvb.slot_chosen=" #define BOOT_ARG_FALLBACK_REASON_STR "androidboot.bvb.fallback_reason=" +#define BOOT_ARG_ROOT_STR "root=" #define BOOTCTRL_SUFFIX_A "_a" #define BOOTCTRL_SUFFIX_B "_b" #define BOOTCTRL_SUFFIX_NA "no suffix available" +#define BOOTCTRL_SUFFIX_A_PART "/dev/mmcblk0p5" +#define BOOTCTRL_SUFFIX_B_PART "/dev/mmcblk0p6" #define BOOT_CONTROL_VERSION 1 @@ -574,6 +577,7 @@ static int brillo_boot_ab(void) disk_partition_t misc_part; int ret, index, slots_by_priority[2] = {0, 1}; char *suffixes[] = { BOOTCTRL_SUFFIX_A, BOOTCTRL_SUFFIX_B }; + char *root_partitions[] = {BOOTCTRL_SUFFIX_A_PART, BOOTCTRL_SUFFIX_B_PART}; char boot_part[8]; char *old_bootargs; #ifdef CONFIG_EDISON_ENABLE_EMMC_PWR_ON_WP @@ -652,6 +656,11 @@ static int brillo_boot_ab(void) append_to_bootargs(" " BOOT_ARG_SLOT_SUFFIX_STR); append_to_bootargs(suffixes[slot_num]); + /* add "root" mount partition to cmdline \ + as per slot suffix */ + append_to_bootargs(" " BOOT_ARG_ROOT_STR); + append_to_bootargs(root_partitions[slot_num]); + fb_read_lock_state(&lock_state); append_to_bootargs(" " BOOT_ARG_DEVICE_STATE_STR); |