am57xevm: code cleanup

misc code cleanup and remove unapplicable services after syncing with
jacinto6evm project

Change-Id: Ie447de97a03d5a93a5995a02b904bceb327ee65c
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

5 files changed, 21 insertions, 40 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index f450443..d569606 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -33,8 +33,8 @@ TARGET_CPU_VARIANT := cortex-a15
 
 ENABLE_CPUSETS := true
 
-#BOARD_HAVE_BLUETOOTH := false
-#BOARD_HAVE_BLUETOOTH_TI := false
+#BOARD_HAVE_BLUETOOTH := true
+#BOARD_HAVE_BLUETOOTH_TI := true
 #BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/ti/am57xevm/bluetooth
 TARGET_NO_BOOTLOADER := true
 
@@ -90,8 +90,8 @@ VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000
 
 BOARD_VENDOR_KERNEL_MODULES := \
-        $(KERNELDIR)/drivers/scsi/scsi_mod.ko\
-        $(KERNELDIR)/drivers/scsi/sd_mod.ko\
+        $(KERNELDIR)/drivers/scsi/scsi_mod.ko \
+        $(KERNELDIR)/drivers/scsi/sd_mod.ko \
         $(KERNELDIR)/drivers/usb/storage/usb-storage.ko
 #       $(KERNELDIR)/drivers/net/wireless/ti/wl18xx/wl18xx.ko \
 #       $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore.ko \
diff --git a/device.mk b/device.mk
index 82f7112..6bdbb29 100644
--- a/device.mk
+++ b/device.mk
@@ -21,20 +21,20 @@ LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 endif
 
 PRODUCT_PACKAGES += \
-        android.hardware.wifi@1.0-service \
-        android.hardware.graphics.allocator@2.0-impl \
-        android.hardware.graphics.allocator@2.0-service \
-        android.hardware.graphics.mapper@2.0-impl \
-        android.hardware.memtrack@1.0-impl \
-        android.hardware.usb@1.0-service \
-        android.hardware.power@1.0-impl \
-        android.hardware.audio@2.0-impl \
-        android.hardware.audio@2.0-service \
-        android.hardware.audio.effect@2.0-impl \
-        android.hardware.broadcastradio@1.0-impl \
-        android.hardware.soundtrigger@2.0-impl \
-        android.hardware.keymaster@3.0-impl \
-        android.hardware.keymaster@3.0-service
+   android.hardware.wifi@1.0-service \
+   android.hardware.graphics.allocator@2.0-impl \
+   android.hardware.graphics.allocator@2.0-service \
+   android.hardware.graphics.mapper@2.0-impl \
+   android.hardware.memtrack@1.0-impl \
+   android.hardware.usb@1.0-service \
+   android.hardware.power@1.0-impl \
+   android.hardware.audio@2.0-impl \
+   android.hardware.audio@2.0-service \
+   android.hardware.audio.effect@2.0-impl \
+   android.hardware.broadcastradio@1.0-impl \
+   android.hardware.soundtrigger@2.0-impl \
+   android.hardware.keymaster@3.0-impl \
+   android.hardware.keymaster@3.0-service
 
 PRODUCT_COPY_FILES := \
         $(LOCAL_KERNEL):kernel \
diff --git a/full_am57xevm.mk b/full_am57xevm.mk
index debc8f3..e8f44a9 100644
--- a/full_am57xevm.mk
+++ b/full_am57xevm.mk
@@ -23,9 +23,6 @@
 
 # Inherit from those products. Most specific first.
 
-PRODUCT_COPY_FILES += \
-        device/generic/car/common/bootanimations/bootanimation-832.zip:system/media/bootanimation.zip
-
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, device/ti/am57xevm/device.mk)
 
diff --git a/init.am57xevmboard.rc b/init.am57xevmboard.rc
index a2cebd6..71f2291 100644
--- a/init.am57xevmboard.rc
+++ b/init.am57xevmboard.rc
@@ -47,9 +47,7 @@ on fs
 on late-init
 # Load modules
     exec u:r:modprobe:s0 -- /system/bin/modprobe -a -d \
-        /vendor/lib/modules scsi_mod.ko usb-storage.ko sd_mod.ko \
-
-#       /vendor/lib/modules wl18xx.ko wlcore.ko wlcore_sdio.ko \
+         /vendor/lib/modules scsi_mod.ko usb-storage.ko sd_mod.ko
 
 service pvrsrvinit /vendor/bin/pvrsrvinit
     class core
@@ -118,18 +116,3 @@ service hostapd_bin /system/bin/hostapd -d /data/misc/wifi/hostapd.conf
     class main
     disabled
     oneshot
-
-service lad_dra7xx /system/bin/lad_dra7xx -g
-    class main
-    user media
-    group system
-    disabled
-    oneshot
-
-# service radio_app /system/bin/RadioApp -h eth
-#    class main
-#    user media
-#    group system inet
-#    disabled
-#    oneshot
-
diff --git a/sepolicy/init.te b/sepolicy/init.te
index ace2106..06da5fe 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -2,7 +2,8 @@
 allow init self:capability sys_module;
 #Create symlinks for storage
 allow init tmpfs:lnk_file create_file_perms;
-
+# Allow module insertion
+allow init system_file:system module_load;
 # Configfs
 allow init configfs:file write;
 allow init configfs:lnk_file { create unlink } ;