Przeglądaj źródła

fixes for ext sd

PlayfulGod 12 lat temu
rodzic
commit
f90b702acb
9 zmienionych plików z 11 dodań i 23 usunięć
  1. 2 0
      BoardConfig.mk
  2. 0 15
      custombootimg.mk
  3. 2 2
      device.mk
  4. 1 1
      fstab.qcom
  5. BIN
      mkbootimg_dtb
  6. 0 1
      pack.sh
  7. 3 3
      recovery.fstab
  8. 3 0
      recovery/init.recovery.qcom.rc
  9. 0 1
      runatboot.sh

+ 2 - 0
BoardConfig.mk

@@ -43,6 +43,8 @@ BOARD_HAS_LARGE_FILESYSTEM := true
 TARGET_USERIMAGES_USE_EXT4 := true
 #BOARD_CUSTOM_BOOTIMG_MK :=  device/samsung/klte/custombootimg.mk
 
+TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/msm_hsusb/gadget/lun%d/file
+
 #TWRP specific build flags
 DEVICE_RESOLUTION := 1080x1920
 RECOVERY_SDCARD_ON_DATA := true

+ 0 - 15
custombootimg.mk

@@ -1,15 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-DTBTOOL := device/samsung/klte/mkbootimg_dtb
-KERNEL := device/samsung/klte/kernel
-DTB := device/samsung/klte/dtb
-
-INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img
-$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) \
-	$(recovery_ramdisk) \
-	$(recovery_kernel)
-	@echo ----- Making recovery image ------
-	$(hide) mkbootimg --kernel $(PRODUCT_OUT)/kernel --ramdisk $(PRODUCT_OUT)/ramdisk-recovery.img --cmdline "$(BOARD_KERNEL_CMDLINE)" --base $(BOARD_KERNEL_BASE) --pagesize $(BOARD_KERNEL_PAGESIZE) $(BOARD_MKBOOTIMG_ARGS) -o $(INSTALLED_RECOVERYIMAGE_TARGET)
-	@echo ----- Made recovery image -------- $@
-	$(hide) $(DTBTOOL) --kernel $(KERNEL) --ramdisk $(PRODUCT_OUT)/ramdisk-recovery.img --cmdline "console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F" --base 0x00000000 --offset 0x02000000 --dt $(DTB) --pagesize 2048 --tags-addr 0x01e00000 -o $(PRODUCT_OUT)/recovery.img
-	@echo ----- Added DTB ------------------ $@

+ 2 - 2
device.mk

@@ -24,8 +24,8 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/recovery/libkeyutils.so:recovery/root/sbin/libkeyutils.so \
     $(LOCAL_PATH)/recovery/libsec_ecryptfs.so:recovery/root/sbin/libsec_ecryptfs.so \
     $(LOCAL_PATH)/recovery/libsec_km.so:recovery/root/sbin/libsec_km.so \
-	$(LOCAL_PATH)/selinux/file_contexts:recovery/root/prebuilt_file_contexts \
-	$(LOCAL_PATH)/runatboot.sh:recovery/root/sbin/runatboot.sh
+	$(LOCAL_PATH)/recovery/init.recovery.qcom.rc:recovery/root/init.recovery.qcom.rc \
+	$(LOCAL_PATH)/selinux/file_contexts:recovery/root/prebuilt_file_contexts
 
 $(call inherit-product, build/target/product/full.mk)
 

+ 1 - 1
fstab.qcom

@@ -16,4 +16,4 @@
 /devices/platform/xhci-hcd/usb2,/devices/platform/xhci-hcd/usb1			/storage/UsbDriveC		vfat	default		voldmanaged=sdc:auto
 /devices/platform/xhci-hcd/usb2,/devices/platform/xhci-hcd/usb1		    /storage/UsbDriveD		vfat	default		voldmanaged=sdd:auto
 /devices/platform/xhci-hcd/usb2,/devices/platform/xhci-hcd/usb1			/storage/UsbDriveE		vfat	default		voldmanaged=sde:auto
-/devices/platform/xhci-hcd/usb2,/devices/platform/xhci-hcd/usb1			/storage/UsbDriveF		vfat	default		voldmanaged=sdf:auto
+/devices/platform/xhci-hcd/usb2,/devices/platform/xhci-hcd/usb1			/storage/UsbDriveF		vfat	default		voldmanaged=sdf:auto

BIN
mkbootimg_dtb


+ 0 - 1
pack.sh

@@ -1 +0,0 @@
-./mkbootimg_dtb --kernel kernAl --ramdisk ../../../out/target/product/klte/ramdisk-recovery.img --cmdline "console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F" --base 0x00000000 --offset 0x02000000 --dt ./dtb --pagesize 2048 --tags-addr 0x01e00000 -o ../../../out/target/product/klte/recovery.img

+ 3 - 3
recovery.fstab

@@ -1,11 +1,11 @@
 /boot          emmc      /dev/block/platform/msm_sdcc.1/by-name/boot
-/recovery      emmc      /dev/block/platform/msm_sdcc.1/by-name/recovery	flags=backup=1
+/recovery      emmc      /dev/block/platform/msm_sdcc.1/by-name/recovery      flags=backup=1
 /system        ext4      /dev/block/platform/msm_sdcc.1/by-name/system
 /data          ext4      /dev/block/platform/msm_sdcc.1/by-name/userdata      length=-16384
 /cache         ext4      /dev/block/platform/msm_sdcc.1/by-name/cache
 /efs1          emmc      /dev/block/platform/msm_sdcc.1/by-name/efs		      flags=backup=1;display=EFS
 /efs2          emmc      /dev/block/platform/msm_sdcc.1/by-name/modemst1      flags=backup=1;subpartitionof=/efs1
-/efs3           emmc      /dev/block/platform/msm_sdcc.1/by-name/modemst2      flags=backup=1;subpartitionof=/efs1
+/efs3          emmc      /dev/block/platform/msm_sdcc.1/by-name/modemst2      flags=backup=1;subpartitionof=/efs1
 /external_sd   vfat      /dev/block/mmcblk1p1 /dev/block/mmcblk1              flags=display="Micro SDcard";storage;wipeingui;removable
 /modem         emmc      /dev/block/platform/msm_sdcc.1/by-name/modem		  flags=backup=1;display="Modem"
-/usbstorage	   vfat		 /dev/block/sda1									  flags=display="USB Storage";storage
+/usbstorage    vfat     /dev/block/sda1  /dev/block/sda                       flags=display="USB Storage";storage;removable;wipeingui

+ 3 - 0
recovery/init.recovery.qcom.rc

@@ -0,0 +1,3 @@
+on early-init
+    toolbox setenforce permissive
+

+ 0 - 1
runatboot.sh

@@ -1 +0,0 @@
-toolbox setenforce permissive