Merge branch 'dev/11/fp3/revert-dynamic-partition' into rel/11/fp3/8901.4.A.0019
* dev/11/fp3/revert-dynamic-partition:
Revert "arm64: dts: qcom: Nuke early mount"
Revert "init: adjustments for retrofitted dynamic partitions"
Revert "proc: Replace skip_initramfs to androidboot.force_normal_boot"
Issue: FP3-A11#430
Issue: FP3-A11#438
Change-Id: I3e434a1986ddf62ef13b3a4e784319241be94d73
diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index 36e4609..5f11113 100755
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -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";
+ };
+
+ };
};
};
diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
index 53f10ec..cbd82df 100644
--- a/fs/proc/cmdline.c
+++ b/fs/proc/cmdline.c
@@ -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 @@
.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;
}
diff --git a/init/do_mounts.c b/init/do_mounts.c
index d3d318f..1902a1c8 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -290,7 +290,6 @@
}
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 @@
}
__setup("rootwait", rootwait_setup);
-#endif
static char * __initdata root_mount_data;
static int __init root_data_setup(char *str)
diff --git a/init/initramfs.c b/init/initramfs.c
index 2577280..bf3af10 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -609,7 +609,6 @@
static int __initdata do_skip_initramfs;
-#if 0
static int __init skip_initramfs_param(char *str)
{
if (*str)
@@ -618,7 +617,6 @@
return 1;
}
__setup("skip_initramfs", skip_initramfs_param);
-#endif
static int __init populate_rootfs(void)
{