Merge branch 'd-oreo-r6-core-release' into d-oreo-mr1-core-released-oreo-mr1-core-release

* d-oreo-r6-core-release:
  jacinto6evm: fastboot.sh: remove oem spi
  jacinto6evm: make drivers built-in
  jacinto6evm: Add back auto configuration for initial bringup
  jacinto6evm: Make modules built-in
  jacinto6evm: Remove car configuration
  jacinto6evm: remove jamr services

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

5 files changed, 24 insertions, 60 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index ce42d02..080689a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -80,8 +80,7 @@ BOARD_SOFTAP_DEVICE         := wl12xx_mac80211
 endif
 
 BOARD_SEPOLICY_DIRS += \
-	device/ti/jacinto6evm/sepolicy \
-	packages/services/Car/car_product/sepolicy
+	device/ti/jacinto6evm/sepolicy
 
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 
@@ -93,43 +92,11 @@ VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000
 
 BOARD_VENDOR_KERNEL_MODULES := \
-	$(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/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/edt-ft5x06.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
+	$(KERNELDIR)/drivers/usb/storage/usb-storage.ko
 
 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 \
-	$(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/usb/storage/usb-storage.ko
diff --git a/fastboot.sh b/fastboot.sh
index 2dc0b82..ccf91e3 100755
--- a/fastboot.sh
+++ b/fastboot.sh
@@ -156,8 +156,8 @@ fi
 echo "Create GPT partition table"
 ${FASTBOOT} oem format
 
-echo "Setting target for bootloader to SPI"
-${FASTBOOT} oem spi
+# echo "Setting target for bootloader to SPI"
+# ${FASTBOOT} oem spi
 
 sleep 3
 
diff --git a/full_jacinto6evm.mk b/full_jacinto6evm.mk
index 9823b87..75fcae6 100644
--- a/full_jacinto6evm.mk
+++ b/full_jacinto6evm.mk
@@ -23,7 +23,7 @@
 
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+# $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 $(call inherit-product, device/ti/jacinto6evm/device.mk)
 
 PRODUCT_NAME := full_jacinto6evm
diff --git a/init.jacinto6evmboard.rc b/init.jacinto6evmboard.rc
index 14b64d1..7f491ce 100644
--- a/init.jacinto6evmboard.rc
+++ b/init.jacinto6evmboard.rc
@@ -30,19 +30,17 @@ on boot
 on fs
     mount_all /vendor/etc/fstab.jacinto6evmboard
 
-on late-init
+# 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 \
-                             ov1063x.ko ov490.ko tvp5158.ko \
-                             gpio-pca953x.ko \
-                             snd-soc-tlv320aic3x.ko
+#    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 \
+#                             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 \
+#                             gpio-pca953x.ko \
+#                             snd-soc-tlv320aic3x.ko
 
 service pvrsrvinit /vendor/bin/pvrsrvinit
     class core
diff --git a/init.recovery.jacinto6evmboard.rc b/init.recovery.jacinto6evmboard.rc
index 2cec302..5240a8b 100644
--- a/init.recovery.jacinto6evmboard.rc
+++ b/init.recovery.jacinto6evmboard.rc
@@ -1,8 +1,7 @@
-on late-init
+# 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
+#    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