From f2d020044f1972658049f74df169f99e6347bedd Mon Sep 17 00:00:00 2001
From: Wilson Sung <wilsonsung@google.com>
Date: Thu, 8 Aug 2019 15:29:17 +0800
Subject: [PATCH] Revert "Move first stage fstab to ramdisk instead of device
 tree"

Bug: 139107810
Change-Id: I65510b99558bef1a74ce70862d9be67f3c86abf6
---
 BoardConfig-common.mk | 1 -
 device.mk             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index c199a98..c486c13 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -44,7 +44,6 @@ BOARD_KERNEL_CMDLINE += lpm_levels.sleep_disabled=1 # STOPSHIP b/113233473
 BOARD_KERNEL_CMDLINE += usbcore.autosuspend=7
 BOARD_KERNEL_CMDLINE += androidboot.usbcontroller=a600000.dwc3 swiotlb=2048
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive # STOPSHIP b/113232677
-BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/1d84000.ufshc
 
 BOARD_KERNEL_BASE        := 0x00000000
 BOARD_KERNEL_PAGESIZE    := 4096
diff --git a/device.mk b/device.mk
index a49e7e5..07f2b39 100644
--- a/device.mk
+++ b/device.mk
@@ -79,7 +79,6 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 #
 PRODUCT_COPY_FILES += \
     $(LOCAL_KERNEL):kernel \
-    $(LOCAL_PATH)/fstab.hardware:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.$(PRODUCT_PLATFORM) \
     $(LOCAL_PATH)/fstab.hardware:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.$(PRODUCT_PLATFORM) \
     $(LOCAL_PATH)/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
     $(LOCAL_PATH)/init.hardware.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).rc \