Concatenate vendor_boot_modules.<PLATFORM>/<PROJECT> into one fileandroid-t-qpr1-beta-1_r0.3android-gs-raviole-5.10-android13-qpr1-beta

1) keep common part in PLATFORM file
2) keep non-common part in PROJECT file

Bug: 234674568
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: Ia6cb8c01bffea24ff47b0f1bdfe6255ca156557c

3 files changed, 222 insertions, 211 deletions

diff --git a/build.config.slider b/build.config.slider
index 495b1dd2e434..ba647ebd6339 100644
--- a/build.config.slider
+++ b/build.config.slider
@@ -25,7 +25,14 @@ $DEVICE_KERNEL_FILES
 "
 fi
 
-MODULES_LIST=${KERNEL_DIR}/vendor_boot_modules.slider
+# Concatenate vendor_boot_modules.gs101 (platform common) and vendor_boot_modules.slider (device specified) into one file
+POST_KERNEL_BUILD_CMDS="concat_vendor_boot_modules"
+function concat_vendor_boot_modules() {
+  cat ${KERNEL_DIR}/vendor_boot_modules.gs101 \
+    ${KERNEL_DIR}/vendor_boot_modules.slider > \
+    ${OUT_DIR}/vendor_boot_modules.concat
+  MODULES_LIST=${OUT_DIR}/vendor_boot_modules.concat
+}
 
 VENDOR_RAMDISK_CMDS="modify_vendor_ramdisk"
 function modify_vendor_ramdisk() {
diff --git a/vendor_boot_modules.gs101 b/vendor_boot_modules.gs101
new file mode 100644
index 000000000000..0dcf75714f4e
--- /dev/null
+++ b/vendor_boot_modules.gs101
@@ -0,0 +1,210 @@
+# List of modules loaded during first stage init from vendor_boot
+# Sort order defined by
+# LC_ALL=C sort
+abrolhos.ko
+acpm_flexpmu_dbg.ko
+acpm_mbox_test.ko
+aoc_alsa_dev.ko
+aoc_alsa_dev_util.ko
+aoc_channel_dev.ko
+aoc_char_dev.ko
+aoc_control_dev.ko
+aoc_core.ko
+aoc_usb_driver.ko
+aoc_uwb_platform_drv.ko
+aoc_uwb_service_dev.ko
+arm-memlat-mon.ko
+arm_dsu_pmu.ko
+at24.ko
+audiometrics.ko
+bbd.ko
+bc_max77759.ko
+bcm47765.ko
+bcm_dbg.ko
+bigocean.ko
+boot_control_sysfs.ko
+boot_device_spi.ko
+clk_exynos.ko
+cmupmucal.ko
+cp_thermal_zone.ko
+cpif.ko
+dbgcore-dump.ko
+debug-reboot.ko
+debug-snapshot-debug-kinfo.ko
+debug-snapshot-qd.ko
+debug-snapshot-sfrdump.ko
+dss.ko
+dw3000.ko
+dwc3-exynos-usb.ko
+ect_parser.ko
+eh.ko
+ehld.ko
+exynos-acme.ko
+exynos-adv-tracer-s2d.ko
+exynos-adv-tracer.ko
+exynos-bcm_dbg-dump.ko
+exynos-bts.ko
+exynos-btsopsgs101.ko
+exynos-coresight-etm.ko
+exynos-coresight.ko
+exynos-cpuhp.ko
+exynos-cpupm.ko
+exynos-debug-test.ko
+exynos-dm.ko
+exynos-drm.ko
+exynos-ecc-handler.ko
+exynos-pd-dbg.ko
+exynos-pd.ko
+exynos-pd_el3.ko
+exynos-pm.ko
+exynos-pmu-if.ko
+exynos-reboot.ko
+exynos-seclog.ko
+exynos_devfreq.ko
+exynos_dit.ko
+exynos_mct.ko
+exynos_mfc.ko
+exynos_pm_qos.ko
+exynos_tty.ko
+exyswd-rng.ko
+g2d.ko
+goodixfp.ko
+google-battery.ko
+google-bms.ko
+google-charger.ko
+google-cpm.ko
+google_bcl.ko
+google_dual_batt_gauge.ko
+governor_memlat.ko
+gpu_cooling.ko
+gs-chipid.ko
+gs101-itmon.ko
+gs101_spmic_thermal.ko
+gs101_thermal.ko
+gs_acpm.ko
+gsa.ko
+gsa_gsc.ko
+gsc-spi.ko
+gvotable.ko
+hardlockup-debug.ko
+hardlockup-watchdog.ko
+heatmap.ko
+i2c-acpm.ko
+i2c-dev.ko
+i2c-exynos5.ko
+keycombo.ko
+keydebug.ko
+logbuffer.ko
+lzo-rle.ko
+lzo.ko
+mailbox-wc.ko
+mali_kbase.ko
+mali_pixel.ko
+max1720x-battery.ko
+max20339.ko
+max77729-pmic.ko
+max77729_charger.ko
+max77729_uic.ko
+max77759_charger.ko
+max77759_contaminant.ko
+max77759_helper.ko
+max77826-gs-regulator.ko
+mcps802154.ko
+mcps802154_region_fira.ko
+mcps802154_region_nfcc_coex.ko
+memlat-devfreq.ko
+nitrous.ko
+odpm.ko
+overheat_mitigation.ko
+p9221.ko
+panel-samsung-drv.ko
+panel-samsung-emul.ko
+pca9468.ko
+pcie-exynos-core.ko
+pcie-exynos-gs101-rc-cal.ko
+phy-exynos-mipi-dsim.ko
+phy-exynos-mipi.ko
+phy-exynos-usbdrd-super.ko
+pinctrl-samsung-core.ko
+pixel-boot-metrics.ko
+pixel-debug-test.ko
+pixel_em.ko
+pixel_stat_mm.ko
+pixel_stat_sysfs.ko
+pl330.ko
+pmic_class.ko
+power_stats.ko
+rtc-s2mpg10.ko
+s2mpg10-mfd.ko
+s2mpg10-powermeter.ko
+s2mpg10-regulator.ko
+s2mpg11-mfd.ko
+s2mpg11-powermeter.ko
+s2mpg11-regulator.ko
+s2mpg1x-gpio.ko
+s2mpu.ko
+s3c2410_wdt.ko
+samsung-dma.ko
+samsung-iommu-group.ko
+samsung-secure-iova.ko
+samsung_dma_heap.ko
+samsung_iommu.ko
+sbb-mux.ko
+sched_tp.ko
+sg.ko
+shm_ipc.ko
+sjtag-driver.ko
+slc_acpm.ko
+slc_dummy.ko
+slc_pmon.ko
+slc_pt.ko
+slg46826.ko
+smfc.ko
+snd-soc-cs35l41-i2c.ko
+snd-soc-cs35l41-spi.ko
+snd-soc-cs35l41.ko
+snd-soc-max98357a.ko
+snd-soc-rl6231.ko
+snd-soc-rt5682-i2c.ko
+snd-soc-rt5682.ko
+snd-soc-wm-adsp.ko
+softdog.ko
+spi-s3c64xx.ko
+spidev.ko
+sscoredump.ko
+st21nfc.ko
+st33spi.ko
+st54spi.ko
+sysrq-hook.ko
+systrace.ko
+tcpci_fusb307.ko
+tcpci_max77759.ko
+touch_bus_negotiator.ko
+touch_offload.ko
+trusty-core.ko
+trusty-ipc.ko
+trusty-irq.ko
+trusty-log.ko
+trusty-test.ko
+trusty-virtio.ko
+ufs-exynos-core.ko
+ufs-pixel-fips140.ko
+usb_f_dm.ko
+usb_f_dm1.ko
+usb_f_etr_miu.ko
+usb_f_rndis.ko
+usb_psy.ko
+usbc_cooling_dev.ko
+vh_cgroup.ko
+vh_fs.ko
+vh_i2c.ko
+vh_mm.ko
+vh_preemptirq_long.ko
+vh_sched.ko
+vh_thermal.ko
+videobuf2-dma-sg.ko
+xhci-exynos.ko
+zcomp_cpu.ko
+zcomp_eh.ko
+zram.ko
+zsmalloc.ko
diff --git a/vendor_boot_modules.slider b/vendor_boot_modules.slider
index 700c15902f4a..a09aa5799fee 100644
--- a/vendor_boot_modules.slider
+++ b/vendor_boot_modules.slider
@@ -1,214 +1,8 @@
-# List of modules loaded during first stage init from vendor_boot
-# Sort order defined by
-# LC_ALL=C sort
-abrolhos.ko
-acpm_flexpmu_dbg.ko
-acpm_mbox_test.ko
-aoc_alsa_dev.ko
-aoc_alsa_dev_util.ko
-aoc_channel_dev.ko
-aoc_char_dev.ko
-aoc_control_dev.ko
-aoc_core.ko
-aoc_usb_driver.ko
-aoc_uwb_platform_drv.ko
-aoc_uwb_service_dev.ko
-arm-memlat-mon.ko
-arm_dsu_pmu.ko
-at24.ko
-audiometrics.ko
-bbd.ko
-bc_max77759.ko
-bcm47765.ko
-bcm_dbg.ko
-bigocean.ko
-boot_control_sysfs.ko
-boot_device_spi.ko
-clk_exynos.ko
-cmupmucal.ko
-cp_thermal_zone.ko
-cpif.ko
-dbgcore-dump.ko
-debug-reboot.ko
-debug-snapshot-debug-kinfo.ko
-debug-snapshot-qd.ko
-debug-snapshot-sfrdump.ko
-dss.ko
-dw3000.ko
-dwc3-exynos-usb.ko
-ect_parser.ko
-eh.ko
-ehld.ko
-exynos-acme.ko
-exynos-adv-tracer-s2d.ko
-exynos-adv-tracer.ko
-exynos-bcm_dbg-dump.ko
-exynos-bts.ko
-exynos-btsopsgs101.ko
-exynos-coresight-etm.ko
-exynos-coresight.ko
-exynos-cpuhp.ko
-exynos-cpupm.ko
-exynos-debug-test.ko
-exynos-dm.ko
-exynos-drm.ko
-exynos-ecc-handler.ko
-exynos-pd-dbg.ko
-exynos-pd.ko
-exynos-pd_el3.ko
-exynos-pm.ko
-exynos-pmu-if.ko
-exynos-reboot.ko
-exynos-seclog.ko
-exynos_devfreq.ko
-exynos_dit.ko
-exynos_mct.ko
-exynos_mfc.ko
-exynos_pm_qos.ko
-exynos_tty.ko
-exyswd-rng.ko
-g2d.ko
-goodixfp.ko
-google-battery.ko
-google-bms.ko
-google-charger.ko
-google-cpm.ko
-google_dual_batt_gauge.ko
-governor_memlat.ko
-gpu_cooling.ko
-gs-chipid.ko
-gs101-itmon.ko
-google_bcl.ko
-gs101_spmic_thermal.ko
-gs101_thermal.ko
-gs_acpm.ko
-gsa.ko
-gsa_gsc.ko
-gsc-spi.ko
-gvotable.ko
-hardlockup-debug.ko
-hardlockup-watchdog.ko
-heatmap.ko
-i2c-acpm.ko
-i2c-dev.ko
-i2c-exynos5.ko
-keycombo.ko
-keydebug.ko
-logbuffer.ko
-lzo-rle.ko
-lzo.ko
-mailbox-wc.ko
-mali_kbase.ko
-mali_pixel.ko
-max1720x-battery.ko
-max20339.ko
-max77729-pmic.ko
-max77729_charger.ko
-max77729_uic.ko
-max77759_charger.ko
-max77759_contaminant.ko
-max77759_helper.ko
-max77826-gs-regulator.ko
-mcps802154.ko
-mcps802154_region_fira.ko
-mcps802154_region_nfcc_coex.ko
-memlat-devfreq.ko
-nitrous.ko
-odpm.ko
-overheat_mitigation.ko
-p9221.ko
-panel-samsung-drv.ko
-panel-samsung-emul.ko
+#
+# slider specific modules loaded during first stage init from vendor_boot
+# (platform common modules are from vendor_boot_modules.gs101)
+#
 panel-samsung-s6e3fc3.ko
 panel-samsung-s6e3hc2.ko
 panel-samsung-s6e3hc3.ko
 panel-samsung-sofef01.ko
-pca9468.ko
-pcie-exynos-core.ko
-pcie-exynos-gs101-rc-cal.ko
-phy-exynos-mipi-dsim.ko
-phy-exynos-mipi.ko
-phy-exynos-usbdrd-super.ko
-pinctrl-samsung-core.ko
-pixel-boot-metrics.ko
-pixel-debug-test.ko
-pixel_em.ko
-pixel_stat_mm.ko
-pixel_stat_sysfs.ko
-pl330.ko
-pmic_class.ko
-power_stats.ko
-rtc-s2mpg10.ko
-s2mpg10-mfd.ko
-s2mpg10-powermeter.ko
-s2mpg10-regulator.ko
-s2mpg11-mfd.ko
-s2mpg11-powermeter.ko
-s2mpg11-regulator.ko
-s2mpg1x-gpio.ko
-s2mpu.ko
-s3c2410_wdt.ko
-samsung-dma.ko
-samsung-iommu-group.ko
-samsung-secure-iova.ko
-samsung_dma_heap.ko
-samsung_iommu.ko
-sbb-mux.ko
-sched_tp.ko
-sg.ko
-shm_ipc.ko
-sjtag-driver.ko
-slc_acpm.ko
-slc_dummy.ko
-slc_pmon.ko
-slc_pt.ko
-slg46826.ko
-smfc.ko
-snd-soc-cs35l41-i2c.ko
-snd-soc-cs35l41-spi.ko
-snd-soc-cs35l41.ko
-snd-soc-max98357a.ko
-snd-soc-rl6231.ko
-snd-soc-rt5682-i2c.ko
-snd-soc-rt5682.ko
-snd-soc-wm-adsp.ko
-softdog.ko
-spi-s3c64xx.ko
-spidev.ko
-sscoredump.ko
-st21nfc.ko
-st33spi.ko
-st54spi.ko
-systrace.ko
-sysrq-hook.ko
-tcpci_fusb307.ko
-tcpci_max77759.ko
-touch_bus_negotiator.ko
-touch_offload.ko
-trusty-core.ko
-trusty-ipc.ko
-trusty-irq.ko
-trusty-log.ko
-trusty-test.ko
-trusty-virtio.ko
-ufs-exynos-core.ko
-ufs-pixel-fips140.ko
-usb_f_dm.ko
-usb_f_dm1.ko
-usb_f_etr_miu.ko
-usb_f_rndis.ko
-usb_psy.ko
-usbc_cooling_dev.ko
-vh_cgroup.ko
-vh_fs.ko
-vh_i2c.ko
-vh_mm.ko
-vh_preemptirq_long.ko
-vh_sched.ko
-vh_thermal.ko
-videobuf2-dma-sg.ko
-xhci-exynos.ko
-zcomp_cpu.ko
-zcomp_eh.ko
-zram.ko
-zsmalloc.ko