| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-09 23:31:45 (GMT) |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:31:45 (GMT) |
| commit | 9b3030366fc876b518214a6a3f70b4120e44e038 (patch) | |
| tree | 8860b6ab23628c9003f5a452e79ce54e98789394 | |
| parent | 115dd74699de9a51728ceb54eed93776af446ce5 (diff) | |
| parent | 9cba370641441dea0fc8b93b4fb8c132441c3341 (diff) | |
| download | common-9b3030366fc876b518214a6a3f70b4120e44e038.zip common-9b3030366fc876b518214a6a3f70b4120e44e038.tar.gz common-9b3030366fc876b518214a6a3f70b4120e44e038.tar.bz2 | |
Merge "gadget: update usb configfs to version 2 for sc2 [1/1]" into r-tv-dev am: 9cba370641
Original change: undetermined
Change-Id: I159434451a5155516eee088fec31622ebaef5ac1
| -rw-r--r-- | products/mbox/sc2/device.mk | 1 | ||||
| -rw-r--r-- | products/mbox/sc2/init.amlogic.usb.rc | 29 | ||||
| -rw-r--r-- | products/mbox/sc2/vendor_prop.mk | 4 |
3 files changed, 4 insertions, 30 deletions
diff --git a/products/mbox/sc2/device.mk b/products/mbox/sc2/device.mk index 50b238b..7838aca 100644 --- a/products/mbox/sc2/device.mk +++ b/products/mbox/sc2/device.mk @@ -68,7 +68,6 @@ PRODUCT_COPY_FILES += \ ######################################################################### PRODUCT_COPY_FILES += \ device/amlogic/common/products/mbox/init.amlogic.system.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.rc \ - $(CHIP_DIR)/init.amlogic.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.usb.rc \ $(CHIP_DIR)/recovery/init.recovery.amlogic.rc:root/init.recovery.amlogic.rc ######################################################################### diff --git a/products/mbox/sc2/init.amlogic.usb.rc b/products/mbox/sc2/init.amlogic.usb.rc deleted file mode 100644 index 0ae745a..0000000 --- a/products/mbox/sc2/init.amlogic.usb.rc +++ b/dev/null @@ -1,29 +0,0 @@ -on boot - mkdir /dev/usb-ffs 0770 shell shell - mkdir /dev/usb-ffs/adb 0770 shell shell - mkdir /config/usb_gadget/g1 0770 shell shell - write /config/usb_gadget/g1/idVendor 0x18d1 - write /config/usb_gadget/g1/bcdDevice 0x0223 - write /config/usb_gadget/g1/bcdUSB 0x0200 - mkdir /config/usb_gadget/g1/strings/0x409 0770 - write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno} - write /config/usb_gadget/g1/strings/0x409/manufacturer droidlogic - write /config/usb_gadget/g1/strings/0x409/product ${ro.product.name} - mkdir /config/usb_gadget/g1/functions/ffs.adb - mkdir /config/usb_gadget/g1/functions/mtp.gs0 - mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell - mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell - write /config/usb_gadget/g1/configs/b.1/MaxPower 500 - symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1 - mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000 - setprop sys.usb.configfs 1 - setprop sys.usb.controller "fdd00000.dwc2_a" - -on property:sys.usb.config=mtp && property:sys.usb.configfs=1 - write /config/usb_gadget/g1/idProduct 0x4e41 - -on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1 - write /config/usb_gadget/g1/idProduct 0x4e12 - -on property:sys.usb.config=adb && property:sys.usb.configfs=1 - write /config/usb_gadget/g1/idProduct 0x4e40 diff --git a/products/mbox/sc2/vendor_prop.mk b/products/mbox/sc2/vendor_prop.mk index 15a7e19..1119a64 100644 --- a/products/mbox/sc2/vendor_prop.mk +++ b/products/mbox/sc2/vendor_prop.mk @@ -215,3 +215,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ #support hardware av1 decoder PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.platform.support.av1=true + +#usb controller +PRODUCT_PROPERTY_OVERRIDES += \ + vendor.usb.controller=fdd00000.dwc2_a |