bluejay: Squashed revert of inline kernel build
Revert "bluejay: Add kernel dependency"
This reverts commit 9daa4fc7f1e57153a2f8eb7384f6dc98f03e167e.
Revert "bluejay: Build mali_pixel prior to mali_kbase"
This reverts commit 67e9b603ddb7b99e742f0960ef6fb54ab7c57565.
Revert "bluejay: Drop ufs-pixel-fips140.ko"
This reverts commit 9b7d261a8fa2943bb1458519d7d33ab67defacee.
Revert "bluejay: Build external modules"
This reverts commit bbb7ab8563b549453d6507bee3f2d4941f456ac1.
Revert "bluejay: Inline kernel building"
This reverts commit d636d900a734d9a625d4e09ce8b98815bbf544be.
Change-Id: Ibd0c73352d5d2c52b9f0b31b4c7b8ce400699a35
diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
index d2b16d4..6aace2b 100644
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -5,45 +5,3 @@
#
BUILD_BROKEN_DUP_RULES := true
-
-# Kernel
-TARGET_KERNEL_DTBO_PREFIX := dts/
-TARGET_KERNEL_DTBO := google/devices/bluejay/dtbo.img
-TARGET_KERNEL_DTB := \
- google/devices/bluejay/google-base/gs101-a0.dtb \
- google/devices/bluejay/google-base/gs101-b0.dtb
-
-# Kernel modules
-BOARD_VENDOR_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat device/google/bluejay/vendor_dlkm.modules.load))
-BOARD_VENDOR_KERNEL_MODULES_LOAD := $(foreach m,$(BOARD_VENDOR_KERNEL_MODULES_LOAD_RAW),$(notdir $(m)))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat device/google/bluejay/vendor_boot.modules.load))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(foreach m,$(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_RAW),$(notdir $(m)))
-BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD)
-
-TARGET_KERNEL_EXT_MODULES := \
- amplifiers/audiometrics \
- amplifiers/cs35l41 \
- amplifiers/cs40l25 \
- amplifiers/cs40l26 \
- aoc \
- aoc/alsa \
- aoc/usb \
- bluetooth/broadcom \
- bms \
- display/samsung \
- edgetpu/abrolhos/drivers/edgetpu \
- fingerprint/fpc \
- gpu/mali_pixel \
- gpu/mali_kbase \
- lwis \
- nfc \
- power/reset \
- sensors/hall_sensor \
- touch/common \
- touch/fts/fst2 \
- touch/fts/ftm5 \
- touch/sec \
- uwb/kernel \
- video/gchips \
- wlan/bcmdhd4389 \
- ../devices/google/bluejay/display
diff --git a/device-bluejay.mk b/device-bluejay.mk
index c3dad95..9580ec7 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -14,6 +14,9 @@
# limitations under the License.
#
+TARGET_KERNEL_DIR ?= device/google/bluejay-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/bluejay-kernel/kernel-headers
+
$(call inherit-product-if-exists, vendor/google_devices/bluejay/prebuilts/device-vendor-bluejay.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
diff --git a/lineage.dependencies b/lineage.dependencies
index 587f3c6..9f79101 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -2,9 +2,5 @@
{
"repository": "android_device_google_gs101",
"target_path": "device/google/gs101"
- },
- {
- "repository": "android_kernel_google_gs201",
- "target_path": "kernel/google/gs201/private/gs-google"
}
]
diff --git a/vendor_boot.modules.load b/vendor_boot.modules.load
deleted file mode 100644
index 6aeb565..0000000
--- a/vendor_boot.modules.load
+++ /dev/null
@@ -1,212 +0,0 @@
-kernel/mm/zsmalloc.ko
-kernel/crypto/lzo.ko
-kernel/crypto/lzo-rle.ko
-kernel/drivers/phy/samsung/phy-exynos-usbdrd-super.ko
-kernel/drivers/phy/samsung/phy-exynos-mipi-dsim.ko
-kernel/drivers/phy/samsung/phy-exynos-mipi.ko
-kernel/drivers/pinctrl/samsung/pinctrl-samsung-core.ko
-kernel/drivers/pci/controller/dwc/pcie-exynos-core.ko
-kernel/drivers/pci/controller/dwc/pcie-exynos-gs101-rc-cal.ko
-kernel/drivers/clk/samsung/clk_exynos.ko
-kernel/drivers/dma/pl330.ko
-kernel/drivers/dma/samsung-dma.ko
-kernel/drivers/soc/google/debug/dss.ko
-kernel/drivers/soc/google/debug/debug-snapshot-sfrdump.ko
-kernel/drivers/soc/google/debug/debug-snapshot-qd.ko
-kernel/drivers/soc/google/debug/debug-snapshot-debug-kinfo.ko
-kernel/drivers/soc/google/debug/ehld.ko
-kernel/drivers/soc/google/debug/exynos-debug-test.ko
-kernel/drivers/soc/google/debug/pixel-debug-test.ko
-kernel/drivers/soc/google/debug/pixel-suspend-diag.ko
-kernel/drivers/soc/google/debug/itmon.ko
-kernel/drivers/soc/google/debug/exynos-coresight.ko
-kernel/drivers/soc/google/debug/exynos-ecc-handler.ko
-kernel/drivers/soc/google/debug/exynos-coresight-etm.ko
-kernel/drivers/soc/google/debug/exynos-adv-tracer.ko
-kernel/drivers/soc/google/debug/exynos-adv-tracer-s2d.ko
-kernel/drivers/soc/google/debug/pixel-boot-metrics.ko
-kernel/drivers/soc/google/debug/sjtag-driver.ko
-kernel/drivers/soc/google/vh/kernel/sched/vh_sched.ko
-kernel/drivers/soc/google/vh/kernel/sched/sched_tp.ko
-kernel/drivers/soc/google/vh/kernel/sched/vh_preemptirq_long.ko
-kernel/drivers/soc/google/vh/kernel/systrace.ko
-kernel/drivers/soc/google/vh/kernel/thermal/vh_thermal.ko
-kernel/drivers/soc/google/vh/kernel/fs/vh_fs.ko
-kernel/drivers/soc/google/vh/kernel/mm/vh_mm.ko
-kernel/drivers/soc/google/vh/kernel/cgroup/vh_cgroup.ko
-kernel/drivers/soc/google/vh/kernel/i2c/vh_i2c.ko
-kernel/drivers/soc/google/vh/kernel/pixel_em/pixel_em.ko
-kernel/drivers/soc/google/vh/kernel/metrics/pixel_metrics.ko
-kernel/drivers/soc/google/gs-chipid.ko
-kernel/drivers/soc/google/cal-if/cmupmucal.ko
-kernel/drivers/soc/google/exynos-pmu-if.ko
-kernel/drivers/soc/google/exynos-cpuhp.ko
-kernel/drivers/soc/google/exynos-pd.ko
-kernel/drivers/soc/google/exynos-pd-dbg.ko
-kernel/drivers/soc/google/exynos-pd_el3.ko
-kernel/drivers/soc/google/exynos-pm.ko
-kernel/drivers/soc/google/exynos-cpupm.ko
-kernel/drivers/soc/google/ect_parser.ko
-kernel/drivers/soc/google/acpm/gs_acpm.ko
-kernel/drivers/soc/google/acpm/acpm_flexpmu_dbg.ko
-kernel/drivers/soc/google/acpm/power_stats.ko
-kernel/drivers/soc/google/acpm/acpm_mbox_test.ko
-kernel/drivers/soc/google/exynos-dm.ko
-kernel/drivers/soc/google/exynos_pm_qos.ko
-kernel/drivers/soc/google/pt/slc_pt.ko
-kernel/drivers/soc/google/pt/slc_dummy.ko
-kernel/drivers/soc/google/pt/slc_acpm.ko
-kernel/drivers/soc/google/pt/slc_pmon.ko
-kernel/drivers/soc/google/gsa/gsa.ko
-kernel/drivers/soc/google/gsa/gsa_gsc.ko
-kernel/drivers/soc/google/bcm_dbg.ko
-kernel/drivers/soc/google/exynos-bcm_dbg-dump.ko
-kernel/drivers/soc/google/cpif/shm_ipc.ko
-kernel/drivers/soc/google/cpif/boot_device_spi.ko
-kernel/drivers/soc/google/cpif/dit/exynos_dit.ko
-kernel/drivers/soc/google/cpif/cpif_page.ko
-kernel/drivers/soc/google/cpif/cpif.ko
-kernel/drivers/soc/google/cpif/cp_thermal_zone.ko
-kernel/drivers/soc/google/eh/eh.ko
-kernel/drivers/soc/google/s2mpu/s2mpu.ko
-kernel/drivers/soc/google/hardlockup-debug.ko
-kernel/drivers/soc/google/hardlockup-watchdog.ko
-kernel/drivers/soc/google/sysrq-hook.ko
-kernel/drivers/soc/google/pixel_stat/pixel_stat_sysfs.ko
-kernel/drivers/soc/google/pixel_stat/mm/pixel_stat_mm.ko
-kernel/drivers/soc/google/dbgcore-dump.ko
-kernel/drivers/soc/google/exynos-seclog.ko
-kernel/drivers/soc/google/boot_control/boot_control_sysfs.ko
-kernel/drivers/soc/google/kernel-top.ko
-kernel/drivers/regulator/max77826-gs-regulator.ko
-kernel/drivers/regulator/pmic_class.ko
-kernel/drivers/regulator/s2mpg10-regulator.ko
-kernel/drivers/regulator/s2mpg10-powermeter.ko
-kernel/drivers/regulator/s2mpg11-regulator.ko
-kernel/drivers/regulator/s2mpg11-powermeter.ko
-kernel/drivers/tty/serial/exynos_tty.ko
-kernel/drivers/char/hw_random/exyswd-rng.ko
-kernel/drivers/iommu/samsung_iommu.ko
-kernel/drivers/iommu/samsung-iommu-group.ko
-kernel/drivers/iommu/samsung-secure-iova.ko
-kernel/drivers/gpu/exynos/g2d/g2d.ko
-kernel/drivers/block/zram/zram.ko
-kernel/drivers/block/zram/zcomp_cpu.ko
-kernel/drivers/block/zram/zcomp_eh.ko
-kernel/drivers/misc/eeprom/at24.ko
-kernel/drivers/misc/gsc-spi.ko
-kernel/drivers/misc/logbuffer.ko
-kernel/drivers/misc/gvotable.ko
-kernel/drivers/misc/sbb-mux/sbb-mux.ko
-kernel/drivers/misc/sscoredump/sscoredump.ko
-kernel/drivers/misc/bbdpl/bcm47765.ko
-kernel/drivers/mfd/s2mpg10-mfd.ko
-kernel/drivers/mfd/s2mpg11-mfd.ko
-kernel/drivers/mfd/s2mpg1x-gpio-gs101.ko
-kernel/drivers/dma-buf/heaps/samsung/samsung_dma_heap.ko
-kernel/drivers/scsi/ufs/ufs-exynos-core.ko
-kernel/drivers/scsi/sg.ko
-kernel/drivers/spi/spidev.ko
-kernel/drivers/spi/spi-s3c64xx.ko
-kernel/drivers/usb/dwc3/dwc3-exynos-usb.ko
-kernel/drivers/usb/host/xhci-exynos.ko
-kernel/drivers/usb/gadget/function/usb_f_rndis.ko
-kernel/drivers/usb/gadget/function/usb_f_dm.ko
-kernel/drivers/usb/gadget/function/usb_f_dm1.ko
-kernel/drivers/usb/gadget/function/usb_f_etr_miu.ko
-kernel/drivers/usb/typec/tcpm/google/tcpci_fusb307.ko
-kernel/drivers/usb/typec/tcpm/google/slg46826.ko
-kernel/drivers/usb/typec/tcpm/google/usb_psy.ko
-kernel/drivers/usb/typec/tcpm/google/tcpci_max77759.ko
-kernel/drivers/usb/typec/tcpm/google/max77759_helper.ko
-kernel/drivers/usb/typec/tcpm/google/bc_max77759.ko
-kernel/drivers/usb/typec/tcpm/google/max77759_contaminant.ko
-kernel/drivers/usb/typec/tcpm/google/usbc_cooling_dev.ko
-kernel/drivers/input/fingerprint/goodixfp.ko
-kernel/drivers/input/keycombo.ko
-kernel/drivers/input/keydebug.ko
-kernel/drivers/rtc/rtc-s2mpg10.ko
-kernel/drivers/i2c/busses/i2c-exynos5.ko
-kernel/drivers/i2c/busses/i2c-acpm.ko
-kernel/drivers/i2c/i2c-dev.ko
-kernel/drivers/media/platform/exynos/mfc/exynos_mfc.ko
-kernel/drivers/media/platform/exynos/smfc/smfc.ko
-kernel/drivers/power/reset/debug-reboot.ko
-kernel/drivers/thermal/samsung/gs_thermal.ko
-kernel/drivers/thermal/samsung/gpu_cooling.ko
-kernel/drivers/thermal/google/google_bcl.ko
-kernel/drivers/thermal/google/gs101_spmic_thermal.ko
-kernel/drivers/watchdog/s3c2410_wdt.ko
-kernel/drivers/watchdog/softdog.ko
-kernel/drivers/cpufreq/exynos-acme.ko
-kernel/drivers/clocksource/exynos_mct.ko
-kernel/drivers/devfreq/google/exynos_devfreq.ko
-kernel/drivers/devfreq/google/arm-memlat-mon.ko
-kernel/drivers/devfreq/google/governor_memlat.ko
-kernel/drivers/devfreq/google/memlat-devfreq.ko
-kernel/drivers/iio/power/odpm.ko
-kernel/drivers/perf/arm_dsu_pmu.ko
-kernel/drivers/trusty/trusty-core.ko
-kernel/drivers/trusty/trusty-log.ko
-kernel/drivers/trusty/trusty-test.ko
-kernel/drivers/trusty/trusty-virtio.ko
-kernel/drivers/trusty/trusty-ipc.ko
-kernel/drivers/bts/bts.ko
-kernel/sound/soc/codecs/snd-soc-max98357a.ko
-kernel/sound/soc/codecs/snd-soc-rl6231.ko
-kernel/sound/soc/codecs/snd-soc-rt5682.ko
-kernel/sound/soc/codecs/snd-soc-rt5682-i2c.ko
-extra/abrolhos.ko
-extra/aoc_alsa_dev.ko
-extra/aoc_alsa_dev_util.ko
-extra/aoc_channel_dev.ko
-extra/aoc_char_dev.ko
-extra/aoc_control_dev.ko
-extra/aoc_core.ko
-extra/aoc_usb_driver.ko
-extra/aoc_uwb_platform_drv.ko
-extra/aoc_uwb_service_dev.ko
-extra/audiometrics.ko
-extra/drivers/net/ieee802154/dw3000.ko
-extra/ese/st33spi.ko
-extra/ese/st54spi.ko
-extra/exynos-drm.ko
-extra/exynos-reboot.ko
-extra/fpc1020_platform_tee.ko
-extra/google-battery.ko
-extra/google-bms.ko
-extra/google-charger.ko
-extra/google-cpm.ko
-extra/google_dual_batt_gauge.ko
-extra/hall_sensor.ko
-extra/heatmap.ko
-extra/mailbox-wc.ko
-extra/mali_kbase.ko
-extra/mali_pixel.ko
-extra/max1720x-battery.ko
-extra/max20339.ko
-extra/max77729-pmic.ko
-extra/max77729_charger.ko
-extra/max77729_uic.ko
-extra/max77759_charger.ko
-extra/net/mcps802154/mcps802154.ko
-extra/net/mcps802154/mcps802154_region_fira.ko
-extra/net/mcps802154/mcps802154_region_nfcc_coex.ko
-extra/nitrous.ko
-extra/overheat_mitigation.ko
-extra/p9221.ko
-extra/panel-samsung-s6e3fc3_6a.ko
-extra/panel/panel-samsung-drv.ko
-extra/panel/panel-samsung-emul.ko
-extra/panel/panel-samsung-s6e3fc3.ko
-extra/panel/panel-samsung-s6e3hc2.ko
-extra/panel/panel-samsung-s6e3hc3.ko
-extra/panel/panel-samsung-sofef01.ko
-extra/pca9468.ko
-extra/snd-soc-cs35l41-i2c.ko
-extra/snd-soc-cs35l41-spi.ko
-extra/snd-soc-cs35l41.ko
-extra/snd-soc-wm-adsp.ko
-extra/st21nfc.ko
-extra/touch_bus_negotiator.ko
-extra/touch_offload.ko
diff --git a/vendor_dlkm.modules.load b/vendor_dlkm.modules.load
deleted file mode 100644
index 6b67016..0000000
--- a/vendor_dlkm.modules.load
+++ /dev/null
@@ -1,31 +0,0 @@
-kernel/drivers/pinctrl/pinctrl-slg51000.ko
-kernel/drivers/regulator/slg51000-regulator.ko
-kernel/drivers/mfd/slg51000-core.ko
-kernel/drivers/input/misc/vl53l1/stmvl53l1.ko
-kernel/drivers/pps/clients/pps-gpio.ko
-kernel/drivers/pps/pps_core.ko
-kernel/drivers/hwtracing/coresight/coresight.ko
-kernel/drivers/hwtracing/coresight/coresight-tmc.ko
-kernel/drivers/hwtracing/coresight/coresight-funnel.ko
-kernel/drivers/hwtracing/coresight/coresight-replicator.ko
-kernel/drivers/hwtracing/coresight/coresight-etm4x.ko
-kernel/net/core/pktgen.ko
-extra/bcmdhd4389.ko
-extra/bigocean.ko
-extra/cl_dsp-core.ko
-extra/cs40l26-core.ko
-extra/cs40l26-i2c.ko
-extra/fst2.ko
-extra/ftm5.ko
-extra/goog_touch_interface.ko
-extra/google_dock.ko
-extra/haptics-cs40l2x.ko
-extra/lwis.ko
-extra/net/mcps802154/mcps802154_region_pctt.ko
-extra/panel/panel-boe-nt37290.ko
-extra/panel/panel-samsung-s6e3fc3-p10.ko
-extra/panel/panel-samsung-s6e3hc3-c10.ko
-extra/panel/panel-samsung-s6e3hc4.ko
-extra/sec_touch.ko
-extra/snd-soc-cs40l26.ko
-extra/snd_soc_cs40l2x.ko