summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Trofymenko <ruslan.trofymenko@linaro.org>2018-10-25 18:48:34 +0000
committerPraneeth Bajjuri <praneeth@ti.com>2018-10-30 22:30:27 -0500
commit06bd5e082d7b7d1b47a07128db4c4b2165dcb5db (patch)
treed692cdf36fa1e71021a4873e7027e2c7afdee9f4
parentb2dcfff7c6442f6bf9775ebe747100dc378ccde2 (diff)
downloadam57xevm-06bd5e082d7b7d1b47a07128db4c4b2165dcb5db.tar.gz
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 += \
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-BOARD_VENDOR_KERNEL_MODULES += \
- $(KERNELDIR)/drivers/input/touchscreen/edt-ft5x06.ko \
- $(KERNELDIR)/drivers/input/touchscreen/pixcir_i2c_ts.ko \
- $(KERNELDIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
- $(KERNELDIR)/sound/soc/generic/snd-soc-simple-card.ko \
- $(KERNELDIR)/sound/soc/generic/snd-soc-simple-card-utils.ko \
- $(KERNELDIR)/drivers/remoteproc/pruss_intc.ko \
- $(KERNELDIR)/drivers/remoteproc/pruss.ko \
- $(KERNELDIR)/drivers/remoteproc/pruss_soc_bus.ko \
- $(KERNELDIR)/drivers/remoteproc/pru_rproc.ko \
- $(KERNELDIR)/drivers/rpmsg/rpmsg_pru.ko \
- $(KERNELDIR)/drivers/net/ethernet/ti/prueth.ko \
-# $(KERNELDIR)/drivers/net/wireless/ti/wl18xx/wl18xx.ko \
- $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore.ko \
- $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore_sdio.ko\
- $(KERNELDIR)/drivers/scsi/scsi_mod.ko \
- $(KERNELDIR)/drivers/scsi/sd_mod.ko \
- $(KERNELDIR)/drivers/usb/storage/usb-storage.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/connector-hdmi.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tc358768.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/panel-dpi.ko \
- $(KERNELDIR)/drivers/video/serdes/ti-fpd3-serdes.ko \
- $(KERNELDIR)/drivers/leds/leds-tlc591xx.ko \
- $(KERNELDIR)/drivers/video/backlight/gpio_backlight.ko \
- $(KERNELDIR)/drivers/video/backlight/led_bl.ko \
- $(KERNELDIR)/drivers/video/backlight/pwm_bl.ko \
- $(KERNELDIR)/drivers/input/input-polldev.ko \
- $(KERNELDIR)/drivers/input/touchscreen/goodix.ko \
- $(KERNELDIR)/drivers/input/touchscreen/ldc3001_ts.ko \
- $(KERNELDIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
- $(KERNELDIR)/drivers/gpio/gpio-pca953x.ko \
- $(KERNELDIR)/drivers/media/i2c/ov1063x.ko \
- $(KERNELDIR)/drivers/media/i2c/ov490.ko \
- $(KERNELDIR)/drivers/media/i2c/tvp5158.ko \
+BOARD_ALL_MODULES := $(shell find $(KERNELDIR) -type f -iname '*.ko')
+
+BOARD_VENDOR_KERNEL_MODULES += $(BOARD_ALL_MODULES)
BOARD_RECOVERY_KERNEL_MODULES += \
-# $(KERNELDIR)/drivers/scsi/scsi_mod.ko \
- $(KERNELDIR)/drivers/scsi/sd_mod.ko \
- $(KERNELDIR)/drivers/usb/storage/usb-storage.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/connector-hdmi.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tc358768.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.ko \
- $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/panel-dpi.ko \
- $(KERNELDIR)/drivers/video/serdes/ti-fpd3-serdes.ko \
- $(KERNELDIR)/drivers/leds/leds-tlc591xx.ko \
- $(KERNELDIR)/drivers/video/backlight/gpio_backlight.ko \
- $(KERNELDIR)/drivers/video/backlight/led_bl.ko \
- $(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
on fs
mount_all /vendor/etc/fstab.am57xevmboard
-on late-init
- # Load modules
- exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d \
- /vendor/lib/modules snd-soc-simple-card.ko snd-soc-simple-card-utils.ko snd-soc-tlv320aic3x.ko
-
-on property:sys.boot_completed=1
- exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d \
- /vendor/lib/modules edt-ft5x06.ko pixcir_i2c_ts.ko \
- pruss_intc.ko pruss.ko rpmsg_pru.ko pru_rproc.ko pruss_soc_bus.ko prueth.ko
-
-# /vendor/lib/modules wl18xx.ko wlcore.ko wlcore_sdio.ko \
-# scsi_mod.ko usb-storage.ko sd_mod.ko \
-# dra7-evm-encoder-tpd12s015.ko encoder-tc358768.ko encoder-tpd12s015.ko \
-# ti-fpd3-serdes.ko \
-# connector-hdmi.ko \
-# panel-dpi.ko leds-tlc591xx.ko gpio_backlight.ko led_bl.ko pwm_bl.ko \
-# edt-ft5x06.ko goodix.ko input-polldev.ko ldc3001_ts.ko pixcir_i2c_ts.ko \
-# ov1063x.ko ov490.ko tvp5158.ko \
-# gpio-pca953x.ko \
-# snd-soc-tlv320aic3x.ko \
-
service pvrsrvinit /vendor/bin/pvrsrvctl --start
class core
user root