summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuslan Trofymenko2018-10-25 13:48:34 -0500
committerPraneeth Bajjuri2018-10-30 22:30:27 -0500
commit06bd5e082d7b7d1b47a07128db4c4b2165dcb5db (patch)
treed692cdf36fa1e71021a4873e7027e2c7afdee9f4
parentb2dcfff7c6442f6bf9775ebe747100dc378ccde2 (diff)
downloaddevice-ti-am57xevm-06bd5e082d7b7d1b47a07128db4c4b2165dcb5db.tar.gz
device-ti-am57xevm-06bd5e082d7b7d1b47a07128db4c4b2165dcb5db.tar.xz
device-ti-am57xevm-06bd5e082d7b7d1b47a07128db4c4b2165dcb5db.zip
Revert "Revert "Remove unneeded explicit module loading""
This reverts commit 1f229f1307e374b2d7e2a6041b5ffdf4441ff305. Now that we have proper sepolicy rule in place and touchscreen works fine, let's enable dynamic kernel module loading again (instead of loading the modules on init). Signed-off-by: Ruslan Trofymenko <ruslan.trofymenko@linaro.org> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--BoardConfig.mk52
-rw-r--r--init.am57xevmboard.rc21
2 files changed, 3 insertions, 70 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 579dc5a..fe0d142 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -73,54 +73,8 @@ BOARD_SEPOLICY_DIRS += \
73 73
74BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true 74BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
75 75
76BOARD_VENDOR_KERNEL_MODULES += \ 76BOARD_ALL_MODULES := $(shell find $(KERNELDIR) -type f -iname '*.ko')
77 $(KERNELDIR)/drivers/input/touchscreen/edt-ft5x06.ko \ 77
78 $(KERNELDIR)/drivers/input/touchscreen/pixcir_i2c_ts.ko \ 78BOARD_VENDOR_KERNEL_MODULES += $(BOARD_ALL_MODULES)
79 $(KERNELDIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
80 $(KERNELDIR)/sound/soc/generic/snd-soc-simple-card.ko \
81 $(KERNELDIR)/sound/soc/generic/snd-soc-simple-card-utils.ko \
82 $(KERNELDIR)/drivers/remoteproc/pruss_intc.ko \
83 $(KERNELDIR)/drivers/remoteproc/pruss.ko \
84 $(KERNELDIR)/drivers/remoteproc/pruss_soc_bus.ko \
85 $(KERNELDIR)/drivers/remoteproc/pru_rproc.ko \
86 $(KERNELDIR)/drivers/rpmsg/rpmsg_pru.ko \
87 $(KERNELDIR)/drivers/net/ethernet/ti/prueth.ko \
88# $(KERNELDIR)/drivers/net/wireless/ti/wl18xx/wl18xx.ko \
89 $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore.ko \
90 $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore_sdio.ko\
91 $(KERNELDIR)/drivers/scsi/scsi_mod.ko \
92 $(KERNELDIR)/drivers/scsi/sd_mod.ko \
93 $(KERNELDIR)/drivers/usb/storage/usb-storage.ko \
94 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/connector-hdmi.ko \
95 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.ko \
96 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tc358768.ko \
97 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.ko \
98 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/panel-dpi.ko \
99 $(KERNELDIR)/drivers/video/serdes/ti-fpd3-serdes.ko \
100 $(KERNELDIR)/drivers/leds/leds-tlc591xx.ko \
101 $(KERNELDIR)/drivers/video/backlight/gpio_backlight.ko \
102 $(KERNELDIR)/drivers/video/backlight/led_bl.ko \
103 $(KERNELDIR)/drivers/video/backlight/pwm_bl.ko \
104 $(KERNELDIR)/drivers/input/input-polldev.ko \
105 $(KERNELDIR)/drivers/input/touchscreen/goodix.ko \
106 $(KERNELDIR)/drivers/input/touchscreen/ldc3001_ts.ko \
107 $(KERNELDIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
108 $(KERNELDIR)/drivers/gpio/gpio-pca953x.ko \
109 $(KERNELDIR)/drivers/media/i2c/ov1063x.ko \
110 $(KERNELDIR)/drivers/media/i2c/ov490.ko \
111 $(KERNELDIR)/drivers/media/i2c/tvp5158.ko \
112 79
113BOARD_RECOVERY_KERNEL_MODULES += \ 80BOARD_RECOVERY_KERNEL_MODULES += \
114# $(KERNELDIR)/drivers/scsi/scsi_mod.ko \
115 $(KERNELDIR)/drivers/scsi/sd_mod.ko \
116 $(KERNELDIR)/drivers/usb/storage/usb-storage.ko \
117 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/connector-hdmi.ko \
118 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.ko \
119 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tc358768.ko \
120 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.ko \
121 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/panel-dpi.ko \
122 $(KERNELDIR)/drivers/video/serdes/ti-fpd3-serdes.ko \
123 $(KERNELDIR)/drivers/leds/leds-tlc591xx.ko \
124 $(KERNELDIR)/drivers/video/backlight/gpio_backlight.ko \
125 $(KERNELDIR)/drivers/video/backlight/led_bl.ko \
126 $(KERNELDIR)/drivers/video/backlight/pwm_bl.ko \
diff --git a/init.am57xevmboard.rc b/init.am57xevmboard.rc
index fd8fcdc..8ff6fd5 100644
--- a/init.am57xevmboard.rc
+++ b/init.am57xevmboard.rc
@@ -28,27 +28,6 @@ on boot
28on fs 28on fs
29 mount_all /vendor/etc/fstab.am57xevmboard 29 mount_all /vendor/etc/fstab.am57xevmboard
30 30
31on late-init
32 # Load modules
33 exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d \
34 /vendor/lib/modules snd-soc-simple-card.ko snd-soc-simple-card-utils.ko snd-soc-tlv320aic3x.ko
35
36on property:sys.boot_completed=1
37 exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d \
38 /vendor/lib/modules edt-ft5x06.ko pixcir_i2c_ts.ko \
39 pruss_intc.ko pruss.ko rpmsg_pru.ko pru_rproc.ko pruss_soc_bus.ko prueth.ko
40
41# /vendor/lib/modules wl18xx.ko wlcore.ko wlcore_sdio.ko \
42# scsi_mod.ko usb-storage.ko sd_mod.ko \
43# dra7-evm-encoder-tpd12s015.ko encoder-tc358768.ko encoder-tpd12s015.ko \
44# ti-fpd3-serdes.ko \
45# connector-hdmi.ko \
46# panel-dpi.ko leds-tlc591xx.ko gpio_backlight.ko led_bl.ko pwm_bl.ko \
47# edt-ft5x06.ko goodix.ko input-polldev.ko ldc3001_ts.ko pixcir_i2c_ts.ko \
48# ov1063x.ko ov490.ko tvp5158.ko \
49# gpio-pca953x.ko \
50# snd-soc-tlv320aic3x.ko \
51
52service pvrsrvinit /vendor/bin/pvrsrvctl --start 31service pvrsrvinit /vendor/bin/pvrsrvctl --start
53 class core 32 class core
54 user root 33 user root