summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPraneeth Bajjuri <praneeth@ti.com>2017-10-02 16:19:34 -0500
committerPraneeth Bajjuri <praneeth@ti.com>2017-10-02 17:35:19 -0500
commit64424441ab46abfc53daa8a327d2e0f7f3be84ea (patch)
treea8627de1f78f1865ce3d51faaf472761a718f531
parent33973c13f82372fd2b9c1dc76e9bd374dfd4f147 (diff)
downloadam57xevm-64424441ab46abfc53daa8a327d2e0f7f3be84ea.tar.gz
Revert "am57xevm: move soc specific init files to vendor partition"
This reverts commit 0c09a0783488d23ddc63437f35d608c623f6a597. Change-Id: I9cfae262e91adbf1008bc93061546e97d30d19c0 Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--device.mk8
-rw-r--r--init.am57xevmboard.rc4
-rw-r--r--sepolicy/file_contexts2
3 files changed, 7 insertions, 7 deletions
diff --git a/device.mk b/device.mk
index 6bdbb29..599f6e6 100644
--- a/device.mk
+++ b/device.mk
@@ -40,9 +40,9 @@ PRODUCT_COPY_FILES := \
$(LOCAL_KERNEL):kernel \
device/ti/am57xevm/tablet_core_hardware_am57xevm.xml:system/etc/permissions/tablet_core_hardware_am57xevm.xml \
device/ti/am57xevm/manifest.xml:vendor/manifest.xml \
- device/ti/am57xevm/init.am57xevmboard.rc:vendor/etc/init/hw/init.am57xevmboard.rc \
- device/ti/am57xevm/init.am57xevmboard.usb.rc:vendor/etc/init/hw/init.am57xevmboard.usb.rc \
- device/ti/am57xevm/ueventd.am57xevmboard.rc:vendor/ueventd.rc \
+ device/ti/am57xevm/init.am57xevmboard.rc:root/init.am57xevmboard.rc \
+ device/ti/am57xevm/init.am57xevmboard.usb.rc:root/init.am57xevmboard.usb.rc \
+ device/ti/am57xevm/ueventd.am57xevmboard.rc:root/ueventd.am57xevmboard.rc \
device/ti/am57xevm/fstab.am57xevmboard:root/fstab.am57xevmboard \
device/ti/am57xevm/media_profiles.xml:system/etc/media_profiles.xml \
device/ti/am57xevm/media_codecs.xml:system/etc/media_codecs.xml \
@@ -68,7 +68,7 @@ PRODUCT_COPY_FILES += \
# cpuset configuration
PRODUCT_COPY_FILES += \
- device/ti/am57xevm/init.am57xevmboard.cpuset.sh:vendor/bin/init.am57xevmboard.cpuset.sh
+ device/ti/am57xevm/init.am57xevmboard.cpuset.sh:system/bin/init.am57xevmboard.cpuset.sh
PRODUCT_PROPERTY_OVERRIDES := \
diff --git a/init.am57xevmboard.rc b/init.am57xevmboard.rc
index 71f2291..641e721 100644
--- a/init.am57xevmboard.rc
+++ b/init.am57xevmboard.rc
@@ -1,4 +1,4 @@
-import /vendor/etc/init/hw/init.am57xevmboard.usb.rc
+import /init.am57xevmboard.usb.rc
on early-init
mount debugfs /sys/kernel/debug /sys/kernel/debug mode=755
@@ -23,7 +23,7 @@ on post-fs-data
on boot
# execute script to set cpuset configuration
- exec - root root system -- /vendor/bin/init.am57xevmboard.cpuset.sh
+ exec - root root system -- /system/bin/init.am57xevmboard.cpuset.sh
# wi-fi
mkdir /data/misc/wifi/sockets 0770 wifi wifi
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index a27e9a3..c46e517 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -23,7 +23,7 @@
/dev/rtc0 u:object_r:rtc:s0
#cpuset script
-/vendor/bin/init.am57xevmboard.cpuset.sh u:object_r:init-cpuset-sh_exec:s0
+/system/bin/init.am57xevmboard.cpuset.sh u:object_r:init-cpuset-sh_exec:s0
#Block devices
/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/system u:object_r:system_block_device:s0
/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/recovery u:object_r:recovery_block_device:s0