summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2018-01-15 12:43:48 -0600
committerPraneeth Bajjuri2018-01-15 12:43:48 -0600
commit84ef391f22274dcbcd9623cf813a9a44fa079920 (patch)
tree1e79fe2196772d5e33e54b047d23304a2242ae31
parent53c169385d970d85b5452c49c66eb0507d574951 (diff)
parentb189c0cfa6602f118bafc3b90ae903357eb774b3 (diff)
downloaddevice-ti-jacinto6evm-d-oreo-mr1-core-release.tar.gz
device-ti-jacinto6evm-d-oreo-mr1-core-release.tar.xz
device-ti-jacinto6evm-d-oreo-mr1-core-release.zip
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>
-rw-r--r--BoardConfig.mk43
-rwxr-xr-xfastboot.sh4
-rw-r--r--full_jacinto6evm.mk2
-rw-r--r--init.jacinto6evmboard.rc22
-rw-r--r--init.recovery.jacinto6evmboard.rc13
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
80endif 80endif
81 81
82BOARD_SEPOLICY_DIRS += \ 82BOARD_SEPOLICY_DIRS += \
83 device/ti/jacinto6evm/sepolicy \ 83 device/ti/jacinto6evm/sepolicy
84 packages/services/Car/car_product/sepolicy
85 84
86BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true 85BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
87 86
@@ -93,43 +92,11 @@ VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
93SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000 92SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000
94 93
95BOARD_VENDOR_KERNEL_MODULES := \ 94BOARD_VENDOR_KERNEL_MODULES := \
96 $(KERNELDIR)/drivers/net/wireless/ti/wl18xx/wl18xx.ko \ 95# $(KERNELDIR)/drivers/scsi/scsi_mod.ko \
97 $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore.ko \
98 $(KERNELDIR)/drivers/net/wireless/ti/wlcore/wlcore_sdio.ko\
99 $(KERNELDIR)/drivers/scsi/scsi_mod.ko \
100 $(KERNELDIR)/drivers/scsi/sd_mod.ko \ 96 $(KERNELDIR)/drivers/scsi/sd_mod.ko \
101 $(KERNELDIR)/drivers/usb/storage/usb-storage.ko \ 97 $(KERNELDIR)/drivers/usb/storage/usb-storage.ko
102 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/connector-hdmi.ko \
103 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.ko \
104 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tc358768.ko \
105 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.ko \
106 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/panel-dpi.ko \
107 $(KERNELDIR)/drivers/video/serdes/ti-fpd3-serdes.ko \
108 $(KERNELDIR)/drivers/leds/leds-tlc591xx.ko \
109 $(KERNELDIR)/drivers/video/backlight/gpio_backlight.ko \
110 $(KERNELDIR)/drivers/video/backlight/led_bl.ko \
111 $(KERNELDIR)/drivers/video/backlight/pwm_bl.ko \
112 $(KERNELDIR)/drivers/input/input-polldev.ko \
113 $(KERNELDIR)/drivers/input/touchscreen/edt-ft5x06.ko \
114 $(KERNELDIR)/drivers/input/touchscreen/goodix.ko \
115 $(KERNELDIR)/drivers/input/touchscreen/ldc3001_ts.ko \
116 $(KERNELDIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
117 $(KERNELDIR)/drivers/gpio/gpio-pca953x.ko \
118 $(KERNELDIR)/drivers/media/i2c/ov1063x.ko \
119 $(KERNELDIR)/drivers/media/i2c/ov490.ko \
120 $(KERNELDIR)/drivers/media/i2c/tvp5158.ko
121 98
122BOARD_RECOVERY_KERNEL_MODULES := \ 99BOARD_RECOVERY_KERNEL_MODULES := \
123 $(KERNELDIR)/drivers/scsi/scsi_mod.ko \ 100# $(KERNELDIR)/drivers/scsi/scsi_mod.ko \
124 $(KERNELDIR)/drivers/scsi/sd_mod.ko \ 101 $(KERNELDIR)/drivers/scsi/sd_mod.ko \
125 $(KERNELDIR)/drivers/usb/storage/usb-storage.ko \ 102 $(KERNELDIR)/drivers/usb/storage/usb-storage.ko
126 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/connector-hdmi.ko \
127 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.ko \
128 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tc358768.ko \
129 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.ko \
130 $(KERNELDIR)/drivers/gpu/drm/omapdrm/displays/panel-dpi.ko \
131 $(KERNELDIR)/drivers/video/serdes/ti-fpd3-serdes.ko \
132 $(KERNELDIR)/drivers/leds/leds-tlc591xx.ko \
133 $(KERNELDIR)/drivers/video/backlight/gpio_backlight.ko \
134 $(KERNELDIR)/drivers/video/backlight/led_bl.ko \
135 $(KERNELDIR)/drivers/video/backlight/pwm_bl.ko \
diff --git a/fastboot.sh b/fastboot.sh
index 2dc0b82..ccf91e3 100755
--- a/fastboot.sh
+++ b/fastboot.sh
@@ -156,8 +156,8 @@ fi
156echo "Create GPT partition table" 156echo "Create GPT partition table"
157${FASTBOOT} oem format 157${FASTBOOT} oem format
158 158
159echo "Setting target for bootloader to SPI" 159# echo "Setting target for bootloader to SPI"
160${FASTBOOT} oem spi 160# ${FASTBOOT} oem spi
161 161
162sleep 3 162sleep 3
163 163
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 @@
23 23
24# Inherit from those products. Most specific first. 24# Inherit from those products. Most specific first.
25$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) 25$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
26$(call inherit-product, packages/services/Car/car_product/build/car.mk) 26# $(call inherit-product, packages/services/Car/car_product/build/car.mk)
27$(call inherit-product, device/ti/jacinto6evm/device.mk) 27$(call inherit-product, device/ti/jacinto6evm/device.mk)
28 28
29PRODUCT_NAME := full_jacinto6evm 29PRODUCT_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
30on fs 30on fs
31 mount_all /vendor/etc/fstab.jacinto6evmboard 31 mount_all /vendor/etc/fstab.jacinto6evmboard
32 32
33on late-init 33# on late-init
34 # Load modules 34 # Load modules
35 exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d \ 35# exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d \
36 /vendor/lib/modules wl18xx.ko wlcore.ko wlcore_sdio.ko \ 36# /vendor/lib/modules wl18xx.ko wlcore.ko wlcore_sdio.ko \
37 scsi_mod.ko usb-storage.ko sd_mod.ko \ 37# scsi_mod.ko usb-storage.ko sd_mod.ko \
38 dra7-evm-encoder-tpd12s015.ko encoder-tc358768.ko encoder-tpd12s015.ko \ 38# dra7-evm-encoder-tpd12s015.ko encoder-tc358768.ko encoder-tpd12s015.ko \
39 ti-fpd3-serdes.ko \ 39# connector-hdmi.ko \
40 connector-hdmi.ko \ 40# panel-dpi.ko leds-tlc591xx.ko gpio_backlight.ko led_bl.ko pwm_bl.ko \
41 panel-dpi.ko leds-tlc591xx.ko gpio_backlight.ko led_bl.ko pwm_bl.ko \ 41# edt-ft5x06.ko goodix.ko input-polldev.ko \
42 edt-ft5x06.ko goodix.ko input-polldev.ko ldc3001_ts.ko \ 42# gpio-pca953x.ko \
43 ov1063x.ko ov490.ko tvp5158.ko \ 43# snd-soc-tlv320aic3x.ko
44 gpio-pca953x.ko \
45 snd-soc-tlv320aic3x.ko
46 44
47service pvrsrvinit /vendor/bin/pvrsrvinit 45service pvrsrvinit /vendor/bin/pvrsrvinit
48 class core 46 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 @@
1on late-init 1# on late-init
2 # Load modules 2 # Load modules
3 exec u:r:modprobe:s0 -- /sbin/modprobe -a -d \ 3# exec u:r:modprobe:s0 -- /sbin/modprobe -a -d \
4 /lib/modules scsi_mod.ko usb-storage.ko sd_mod.ko \ 4# /lib/modules scsi_mod.ko usb-storage.ko sd_mod.ko \
5 dra7-evm-encoder-tpd12s015.ko encoder-sii9022.ko encoder-tc358768.ko encoder-tpd12s015.ko \ 5# dra7-evm-encoder-tpd12s015.ko encoder-sii9022.ko encoder-tc358768.ko encoder-tpd12s015.ko \
6 ti-fpd3-serdes.ko \ 6# connector-hdmi.ko \
7 connector-hdmi.ko \ 7# panel-dpi.ko leds-tlc591xx.ko gpio_backlight.ko led_bl.ko pwm_bl.ko
8 panel-dpi.ko leds-tlc591xx.ko gpio_backlight.ko led_bl.ko pwm_bl.ko