Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 675ffb92 authored by Bharath's avatar Bharath
Browse files

FP3: Drop changes related to retrofit dynamic partition 

Since we currently don't require this.

Change-Id: I9e06c581e578f0e56e6a10aa4ca3ee2d22eeed4e
parent d4ab9185

arch/arm64/boot/dts/qcom/msm8953.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -44,6 +44,19 @@ 
				compatible = "android,vbmeta";

				parts = "vbmeta,boot,system,vendor,dtbo";

			};



			fstab {

				compatible = "android,fstab";

				vendor {

					compatible = "android,vendor";

					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/vendor";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait,slotselect,avb";

					status = "ok";

				};



			};

		};

	};

fs/proc/cmdline.c

+1 −26
Original line number Diff line number Diff line
@@ -2,13 +2,10 @@ 
#include <linux/init.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <asm/setup.h>



static char new_command_line[COMMAND_LINE_SIZE];



static int cmdline_proc_show(struct seq_file *m, void *v)

{

	seq_printf(m, "%s\n", new_command_line);

	seq_printf(m, "%s\n", saved_command_line);

	return 0;

}
@@ -24,30 +21,8 @@ static const struct file_operations cmdline_proc_fops = { 
	.release	= single_release,

};



#define DYN_PART_CMDLINE_FIND "skip_initramfs"

#define DYN_PART_CMDLINE_REPLACE "androidboot.force_normal_boot=1"



static int __init proc_cmdline_init(void)

{

	size_t tail_len;

	char *offset_addr;

	char *cmd = new_command_line;



	strcpy(cmd, saved_command_line);



	// Find offset of find string

	offset_addr = strstr(cmd, DYN_PART_CMDLINE_FIND);

	if (offset_addr) {

		tail_len = strlen(offset_addr + strlen(DYN_PART_CMDLINE_FIND));



		// Move tail back so we have space for replace string

		memmove(offset_addr + strlen(DYN_PART_CMDLINE_REPLACE),

				offset_addr + strlen(DYN_PART_CMDLINE_FIND),

				tail_len + 1);

		// Copy replacement into the newly empty space

		memcpy(offset_addr, DYN_PART_CMDLINE_REPLACE, strlen(DYN_PART_CMDLINE_REPLACE));

	}



	proc_create("cmdline", 0, NULL, &cmdline_proc_fops);

	return 0;

}

init/do_mounts.c

+0 −2
Original line number Diff line number Diff line
@@ -290,7 +290,6 @@ dev_t name_to_dev_t(const char *name) 
}

EXPORT_SYMBOL_GPL(name_to_dev_t);



#if 0

static int __init root_dev_setup(char *line)

{

	strlcpy(saved_root_name, line, sizeof(saved_root_name));
@@ -308,7 +307,6 @@ static int __init rootwait_setup(char *str) 
}



__setup("rootwait", rootwait_setup);

#endif



static char * __initdata root_mount_data;

static int __init root_data_setup(char *str)

init/initramfs.c

+0 −2
Original line number Diff line number Diff line
@@ -609,7 +609,6 @@ static void __init clean_rootfs(void) 


static int __initdata do_skip_initramfs;



#if 0

static int __init skip_initramfs_param(char *str)

{

	if (*str)
@@ -618,7 +617,6 @@ static int __init skip_initramfs_param(char *str) 
	return 1;

}

__setup("skip_initramfs", skip_initramfs_param);

#endif



static int __init populate_rootfs(void)

{