summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPraneeth Bajjuri <praneeth@ti.com>2017-12-11 14:21:37 -0600
committerPraneeth Bajjuri <praneeth@ti.com>2017-12-11 14:21:37 -0600
commit3382941364c2871db292616278a01f61489ebd99 (patch)
treecc42a2de50a8f0d1f1083c838b94be6ebe4ba827
parentc0f40b67368660cfb4f96f6733e2084bee63ec87 (diff)
parent8a047969477cdb89c5699dfb83de295e7e6d8e74 (diff)
downloadam57xevm-3382941364c2871db292616278a01f61489ebd99.tar.gz
Merge remote-tracking branch 'origin/d-oreo-r6-release' into d-oreo-r6-core-release
* origin/d-oreo-r6-release: am57xevm: dont switch to CAR UI am57xevm: Enable early mount and make modules loadable am57xevm: Remove car configuration Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--BoardConfig.mk7
-rw-r--r--init.am57xevmboard.rc23
-rw-r--r--init.recovery.am57xevmboard.rc15
3 files changed, 27 insertions, 18 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 01d0615..8cb7b44 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -92,7 +92,10 @@ 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/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 \
@@ -124,7 +127,7 @@ BOARD_VENDOR_KERNEL_MODULES := \
BOARD_RECOVERY_KERNEL_MODULES := \
-# $(KERNELDIR)/drivers/scsi/scsi_mod.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 \
diff --git a/init.am57xevmboard.rc b/init.am57xevmboard.rc
index 9f9f50c..57942d6 100644
--- a/init.am57xevmboard.rc
+++ b/init.am57xevmboard.rc
@@ -30,15 +30,20 @@ on boot
on fs
mount_all /vendor/etc/fstab.am57xevmboard
-#on late-init
-# Load modules
-# exec u:r:modprobe:s0 -- /vendor/bin/modprobe -a -d \
-# /vendor/lib/modules scsi_mod.ko usb-storage.ko sd_mod.ko \
-# dra7-evm-encoder-tpd12s015.ko encoder-sii9022.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
+on late-init
+ # Load modules
+ exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d \
+ /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 \
+ pruss_intc.ko pruss.ko rpmsg_pru.ko pru_rproc.ko prueth.ko
service pvrsrvinit /vendor/bin/pvrsrvinit
class core
diff --git a/init.recovery.am57xevmboard.rc b/init.recovery.am57xevmboard.rc
index 102a481..2cec302 100644
--- a/init.recovery.am57xevmboard.rc
+++ b/init.recovery.am57xevmboard.rc
@@ -1,7 +1,8 @@
-#on late-init
-# # Load modules
-# exec u:r:modprobe:s0 -- /sbin/modprobe -a -d \
-# /lib/modules scsi_mod.ko usb-storage.ko sd_mod.ko \
-# dra7-evm-encoder-tpd12s015.ko encoder-sii9022.ko encoder-tc358768.ko encoder-tpd12s015.ko \
-# connector-hdmi.ko \
-# panel-dpi.ko leds-tlc591xx.ko gpio_backlight.ko led_bl.ko pwm_bl.ko
+on late-init
+ # Load modules
+ exec u:r:modprobe:s0 -- /sbin/modprobe -a -d \
+ /lib/modules scsi_mod.ko usb-storage.ko sd_mod.ko \
+ dra7-evm-encoder-tpd12s015.ko encoder-sii9022.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