From bd887dabc0efd5676764a400a6f6a0b44bb39c5f Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 8 Feb 2024 00:21:02 +0200 Subject: [PATCH] lynx: Squashed revert of inline kernel build Revert "lynx: Build mali_pixel prior to mali_kbase" This reverts commit edce8f177783115c538893a3c8e67b80ec9a98ad. Revert "lynx: Drop ufs-pixel-fips140.ko" This reverts commit 5cee66b06790f120a4a492077f895c531639cdd0. Revert "lynx: Build external modules" This reverts commit b9022d73744606bb4ea5fc2577e55cd5569f31ee. Revert "lynx: Inline kernel building" This reverts commit ab68d6b8cc93cb44d035763cfc887c15890e5f86. Change-Id: Ibd0c73352d5d2c52b9f0b31b4c7b8ce400699a35 --- BoardConfigLineage.mk | 43 -------- device-lynx.mk | 3 + vendor_dlkm.modules.load | 67 ------------ vendor_kernel_boot.modules.load | 185 -------------------------------- 4 files changed, 3 insertions(+), 295 deletions(-) delete mode 100644 vendor_dlkm.modules.load delete mode 100644 vendor_kernel_boot.modules.load diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk index e117006..8791e05 100644 --- a/BoardConfigLineage.mk +++ b/BoardConfigLineage.mk @@ -5,46 +5,3 @@ # BUILD_BROKEN_DUP_RULES := true - -# Kernel -TARGET_KERNEL_DTBO_PREFIX := dts/ -TARGET_KERNEL_DTBO := google/devices/lynx/dtbo.img -TARGET_KERNEL_DTB := \ - google/devices/lynx/google-base/gs201-a0.dtb \ - google/devices/lynx/google-base/gs201-b0.dtb \ - google/devices/lynx/google-base/gs201-b0_v2-ipop.dtb - -# Kernel modules -BOARD_VENDOR_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat device/google/lynx/vendor_dlkm.modules.load)) -BOARD_VENDOR_KERNEL_MODULES_LOAD := $(foreach m,$(BOARD_VENDOR_KERNEL_MODULES_LOAD_RAW),$(notdir $(m))) -BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat device/google/lynx/vendor_kernel_boot.modules.load)) -BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(foreach m,$(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW),$(notdir $(m))) -BOOT_KERNEL_MODULES := $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD) - -TARGET_KERNEL_EXT_MODULES := \ - amplifiers/audiometrics \ - amplifiers/cs35l41 \ - amplifiers/cs35l45 \ - amplifiers/cs40l26 \ - amplifiers/drv2624 \ - aoc \ - aoc/alsa \ - aoc/usb \ - bluetooth/qcom \ - bms \ - display/samsung \ - edgetpu/janeiro/drivers/edgetpu \ - gpu/mali_pixel \ - gpu/mali_kbase \ - gxp/gs201 \ - lwis \ - nfc \ - power/reset \ - touch/common \ - touch/focaltech/ft3658 \ - touch/goodix \ - uwb/kernel \ - video/gchips \ - wlan/wcn6740/cnss2 \ - wlan/wcn6740/wlan/qcacld-3.0 \ - ../devices/google/lynx/display diff --git a/device-lynx.mk b/device-lynx.mk index e821ee5..e9bebe0 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -14,6 +14,9 @@ # limitations under the License. # +TARGET_KERNEL_DIR ?= device/google/lynx-kernel +TARGET_BOARD_KERNEL_HEADERS := device/google/lynx-kernel/kernel-headers + $(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-vendor-lynx.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk) diff --git a/vendor_dlkm.modules.load b/vendor_dlkm.modules.load deleted file mode 100644 index 58f3806..0000000 --- a/vendor_dlkm.modules.load +++ /dev/null @@ -1,67 +0,0 @@ -kernel/crypto/crct10dif_common.ko -kernel/crypto/crct10dif_generic.ko -kernel/drivers/pinctrl/pinctrl-slg51000.ko -kernel/drivers/pinctrl/pinctrl-slg51002.ko -kernel/drivers/soc/google/vh/kernel/mm/vh_mm.ko -kernel/drivers/soc/google/vh/kernel/pixel_em/pixel_em.ko -kernel/drivers/soc/google/bcm_dbg.ko -kernel/drivers/soc/google/pixel_stat/pixel_stat_sysfs.ko -kernel/drivers/soc/google/pixel_stat/mm/pixel_stat_mm.ko -kernel/drivers/regulator/slg51000-regulator.ko -kernel/drivers/regulator/slg51002-regulator.ko -kernel/drivers/block/null_blk.ko -kernel/drivers/misc/sbb-mux/sbb-mux.ko -kernel/drivers/mfd/slg51000-core.ko -kernel/drivers/mfd/slg51002-core.ko -kernel/drivers/scsi/scsi_debug.ko -kernel/drivers/usb/gadget/function/usb_f_etr_miu.ko -kernel/drivers/usb/typec/tcpm/google/usbc_cooling_dev.ko -kernel/drivers/input/misc/vl53l1/stmvl53l1.ko -kernel/drivers/input/fingerprint/goodixfp.ko -kernel/drivers/thermal/samsung/gpu_cooling.ko -kernel/drivers/perf/arm_dsu_pmu.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/lib/crc-t10dif.ko -extra/audiometrics.ko -extra/bigocean.ko -extra/btpower.ko -extra/cl_dsp-core.ko -extra/cnss2/cnss2.ko -extra/cnss_genl/cnss_nl.ko -extra/cnss_prealloc/cnss_prealloc.ko -extra/cnss_utils/cnss_plat_ipc_qmi_svc.ko -extra/cnss_utils/cnss_utils.ko -extra/cnss_utils/wlan_firmware_service.ko -extra/cs40l26-core.ko -extra/cs40l26-i2c.ko -extra/drv2624.ko -extra/focal_touch.ko -extra/goodix_brl_touch.ko -extra/goog_touch_interface.ko -extra/google_dock.ko -extra/google_dual_batt_gauge.ko -extra/gxp.ko -extra/lwis.ko -extra/mali_kbase.ko -extra/mali_pixel.ko -extra/max77729_charger.ko -extra/mhi/core/mhi.ko -extra/net/mcps802154/mcps802154_region_pctt.ko -extra/overheat_mitigation.ko -extra/panel/panel-boe-nt37290.ko -extra/panel/panel-samsung-s6e3hc3-c10.ko -extra/panel/panel-samsung-s6e3hc4.ko -extra/qmi/qmi_helpers.ko -extra/qrtr/qrtr-mhi.ko -extra/qrtr/qrtr.ko -extra/snd-soc-cs35l41-i2c.ko -extra/snd-soc-cs35l45-i2c.ko -extra/snd-soc-cs40l26.ko -extra/wlan.ko -extra/wlan_mac/google_wlan_mac.ko diff --git a/vendor_kernel_boot.modules.load b/vendor_kernel_boot.modules.load deleted file mode 100644 index ef21d16..0000000 --- a/vendor_kernel_boot.modules.load +++ /dev/null @@ -1,185 +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-gs201-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-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/debug/etm2dram.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/cgroup/vh_cgroup.ko -kernel/drivers/soc/google/vh/kernel/i2c/vh_i2c.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/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/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/hardlockup-debug.ko -kernel/drivers/soc/google/hardlockup-watchdog.ko -kernel/drivers/soc/google/sysrq-hook.ko -kernel/drivers/soc/google/dbgcore-dump.ko -kernel/drivers/soc/google/exynos-seclog.ko -kernel/drivers/soc/google/pkvm-s2mpu.ko -kernel/drivers/soc/google/kernel-top.ko -kernel/drivers/regulator/pmic_class.ko -kernel/drivers/regulator/s2mpg12-regulator.ko -kernel/drivers/regulator/s2mpg12-powermeter.ko -kernel/drivers/regulator/s2mpg13-regulator.ko -kernel/drivers/regulator/s2mpg13-powermeter.ko -kernel/drivers/tty/serial/exynos_tty.ko -kernel/drivers/iommu/samsung_iommu.ko -kernel/drivers/iommu/samsung-iommu-group.ko -kernel/drivers/iommu/samsung-secure-iova.ko -kernel/drivers/iommu/exynos-pcie-iommu.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/logbuffer.ko -kernel/drivers/misc/gvotable.ko -kernel/drivers/misc/sscoredump/sscoredump.ko -kernel/drivers/misc/bbdpl/bcm47765.ko -kernel/drivers/mfd/s2mpg1x-gpio-gs201.ko -kernel/drivers/mfd/s2mpg12-mfd.ko -kernel/drivers/mfd/s2mpg13-mfd.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/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/input/keyboard/s2mpg12-key.ko -kernel/drivers/input/keycombo.ko -kernel/drivers/input/keydebug.ko -kernel/drivers/rtc/rtc-s2mpg12.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/google/google_bcl.ko -kernel/drivers/thermal/google/s2mpg13_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/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 -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/drivers/net/ieee802154/dw3000.ko -extra/ese/st33spi.ko -extra/ese/st54spi.ko -extra/exynos-drm.ko -extra/exynos-reboot.ko -extra/google-battery.ko -extra/google-bms.ko -extra/google-charger.ko -extra/google-cpm.ko -extra/heatmap.ko -extra/janeiro.ko -extra/mailbox-wc.ko -extra/max1720x-battery.ko -extra/max20339.ko -extra/max77729-pmic.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/p9221.ko -extra/panel-samsung-s6e3fc3-l10.ko -extra/panel-samsung-s6e3fc5.ko -extra/panel/panel-samsung-drv.ko -extra/panel/panel-samsung-emul.ko -extra/panel/panel-samsung-s6e3fc3-p10.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-spi.ko -extra/snd-soc-cs35l41.ko -extra/snd-soc-cs35l45-spi.ko -extra/snd-soc-cs35l45.ko -extra/snd-soc-wm-adsp.ko -extra/st21nfc.ko -extra/touch_bus_negotiator.ko -extra/touch_offload.ko