defconfig: Add Sony diffconfigs (534db831) · Commits · e / devices / android_kernel_sony_msm8998

AndroidKernel.mk

+35 −12

Original line number	Diff line number	Diff line
		@@ -107,7 +107,10 @@ $(INSTALLED_DTBIMAGE_TARGET): $(INSTALLED_KERNEL_TARGET)
		KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr
		KERNEL_MODULES_INSTALL ?= system
		KERNEL_MODULES_OUT ?= $(PRODUCT_OUT)/$(KERNEL_MODULES_INSTALL)/lib/modules

		ifneq ($(SOMC_PLATFORM),)
		KERNEL_DIFFCONFIG ?= $(TARGET_PRODUCT)_diffconfig
		endif
		KERNEL_SRC_DIR := $(TARGET_KERNEL_SOURCE)
		TARGET_PREBUILT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)

		define mv-modules
		@@ -126,6 +129,7 @@ mpath=`dirname $$mdpath`; rm -rf $$mpath;\
		fi
		endef

		FORCE:
		ifneq ($(KERNEL_LEGACY_DIR),true)
		$(KERNEL_USR): $(KERNEL_HEADERS_INSTALL)
		rm -rf $(KERNEL_SYMLINK)
		@@ -137,12 +141,9 @@ endif
		$(KERNEL_OUT):
		mkdir -p $(KERNEL_OUT)

		$(KERNEL_CONFIG): $(KERNEL_OUT)
		$(KERNEL_CONFIG): $(KERNEL_OUT) FORCE
		env KBUILD_DIFFCONFIG=$(KERNEL_DIFFCONFIG) \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)
		$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
		echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi

		$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)
		$(hide) echo "Building kernel..."
		@@ -156,11 +157,13 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)
		$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)
		$(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \
		rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \
		env KBUILD_DIFFCONFIG=$(KERNEL_DIFFCONFIG) \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_HEADER_DEFCONFIG); \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) headers_install; fi
		$(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \
		echo "Used a different defconfig for header generation"; \
		rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \
		env KBUILD_DIFFCONFIG=$(KERNEL_DIFFCONFIG) \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG); fi
		$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
		echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
		@@ -169,13 +172,33 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)

		kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) tags
		@if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
		echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
		$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; \
		fi

		platformconfig: KERNEL_DIFFCONFIG=""
		platformconfig: kernelconfig

		kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG)
		env KCONFIG_NOTIMESTAMP=true \
		@env KCONFIG_NOTIMESTAMP=true \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) menuconfig
		env KCONFIG_NOTIMESTAMP=true \
		@env KCONFIG_NOTIMESTAMP=true \
		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) savedefconfig
		cp $(KERNEL_OUT)/defconfig $(TARGET_KERNEL_SOURCE)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG)
		@env KCONFIG_NOTIMESTAMP=true KBUILD_DIFFCONFIG=$(KERNEL_DIFFCONFIG) \
		$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) savediffconfig
		@if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
		echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
		$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; \
		fi
		@if [ ! $(KERNEL_DIFFCONFIG) ]; then \
		cp -f $(KERNEL_OUT)/defconfig $(KERNEL_SRC_DIR)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG); \
		echo ===========; \
		echo $(KERNEL_DEFCONFIG) has been modified !; \
		echo ===========; \
		fi

		endif
		endif

arch/arm64/configs/diffconfig/common_diffconfig

0 → 100644

+201 −0

Original line number	Diff line number	Diff line
		CONFIG_AHC=y
		CONFIG_ALLOC_BUFFERS_IN_4K_CHUNKS=y
		CONFIG_ANDROID_LOW_MEMORY_KILLER_STATS=y
		CONFIG_ANDROID_LOW_MEMORY_KILLER_TNG=y
		CONFIG_ARCH_SONY_YOSHINO=y
		CONFIG_ARM64_FLUSH_CONSOLE_ON_RESTART=y
		CONFIG_CRASH_NOTES=y
		CONFIG_DYNAMIC_DEBUG=y
		CONFIG_EDAC=y
		# CONFIG_EXT2_FS is not set
		# CONFIG_EXT3_FS is not set
		CONFIG_FB_MSM_MDSS_SPECIFIC_PANEL=y
		CONFIG_FORCE_24BIT_COPP=y
		# CONFIG_GPIO_USB_DETECT is not set
		CONFIG_HID_LOGITECH=y
		CONFIG_HID_PANTHERLORD=y
		CONFIG_HID_SONY=y
		# CONFIG_INPUT_HBTP_INPUT is not set
		CONFIG_INPUT_JOYSTICK=y
		# CONFIG_IOMMU_DEBUG is not set
		CONFIG_LAST_LOGS=y
		CONFIG_LOG_BUF_SHIFT=18
		CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0
		CONFIG_MEDIA_USB_SUPPORT=y
		CONFIG_MEMCG=y
		CONFIG_MEMORY_STATE_TIME=y
		CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
		CONFIG_MMC_CMD_DEBUG=y
		# CONFIG_MODULE_SIG_FORCE is not set
		CONFIG_MSM_FORCE_PANIC_ON_WDOG_BARK=y
		# CONFIG_MSM_QBT1000 is not set
		CONFIG_NLS_UTF8=y
		# CONFIG_NOP_USB_XCEIV is not set
		CONFIG_OOM_SCORE_NOTIFIER=y
		CONFIG_PANIC_ON_DM_VERITY_ERRORS=y
		CONFIG_PINCTRL_SOMC=y
		CONFIG_POWERKEY_FORCECRASH=y
		# CONFIG_PRINT_QUOTA_WARNING is not set
		CONFIG_PSTORE=y
		CONFIG_QCOM_DCC=y
		CONFIG_QCOM_RTB=y
		CONFIG_QNS_SYSTEM=y
		# CONFIG_QPNP_HAPTIC is not set
		# CONFIG_QPNP_QNOVO is not set
		CONFIG_RAMDUMP_MEMDESC=y
		CONFIG_RAMDUMP_TAGS=y
		CONFIG_RAS=y
		CONFIG_RCU_BOOST=y
		CONFIG_RCU_KTHREAD_PRIO=1
		CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
		CONFIG_SCSI_UFS_RESTRICT_TX_LANES=y
		CONFIG_SECURITY_SELINUX_AVC_EXTRA_INFO=y
		CONFIG_SECURITY_SELINUX_TRAP=y
		CONFIG_SECURITY_STATUS=y
		CONFIG_SERIAL_MSM=y
		CONFIG_SOMC_CHARGER_EXTENSION=y
		CONFIG_SOMC_LCD_OCP_ENABLED=y
		CONFIG_SONY_CAM_V4L2=y
		CONFIG_STRICT_DEVMEM=y
		CONFIG_SUBSYS_LAST_ERR_LOG=y
		# CONFIG_TRACE_PRINTK is not set
		CONFIG_UID_STAT=y
		# CONFIG_USB_CONFIGFS_NCM is not set
		CONFIG_USB_DWC3_MSM_ID_POLL=y
		# CONFIG_USB_DWC3_PCI is not set
		CONFIG_USB_HOST_EXTRA_NOTIFICATION=y
		# CONFIG_USB_NET_DRIVERS is not set
		# CONFIG_USB_OTG_WAKELOCK is not set
		CONFIG_VFAT_FS_NO_DUALNAMES=y
		CONFIG_WAKEUP_IRQ_DEBUG=y
		CONFIG_XFRM_RFC_4868_TRUNCATION=y
		CONFIG_Z3FOLD=y
		CONFIG_ZRAM_LZ4_COMPRESS=y
		CONFIG_ARCH_HAS_CRASH_NOTES=y
		# CONFIG_DVB_AS102 is not set
		# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
		# CONFIG_DVB_TTUSB_BUDGET is not set
		# CONFIG_DVB_TTUSB_DEC is not set
		# CONFIG_DVB_USB_V2 is not set
		CONFIG_EDAC_CORTEX_ARM64=y
		# CONFIG_EDAC_CORTEX_ARM64_DBE_IRQ_ONLY is not set
		# CONFIG_EDAC_CORTEX_ARM64_PANIC_ON_CE is not set
		CONFIG_EDAC_CORTEX_ARM64_PANIC_ON_UE=y
		# CONFIG_EDAC_DEBUG is not set
		CONFIG_EDAC_LEGACY_SYSFS=y
		CONFIG_EDAC_MM_EDAC=y
		# CONFIG_EDAC_XGENE is not set
		CONFIG_EXT4_USE_FOR_EXT2=y
		# CONFIG_HID_LOGITECH_HIDPP is not set
		# CONFIG_JOYSTICK_A3D is not set
		# CONFIG_JOYSTICK_ADI is not set
		# CONFIG_JOYSTICK_ANALOG is not set
		# CONFIG_JOYSTICK_AS5011 is not set
		# CONFIG_JOYSTICK_COBRA is not set
		# CONFIG_JOYSTICK_GF2K is not set
		# CONFIG_JOYSTICK_GRIP is not set
		# CONFIG_JOYSTICK_GRIP_MP is not set
		# CONFIG_JOYSTICK_GUILLEMOT is not set
		# CONFIG_JOYSTICK_IFORCE is not set
		# CONFIG_JOYSTICK_INTERACT is not set
		# CONFIG_JOYSTICK_JOYDUMP is not set
		# CONFIG_JOYSTICK_MAGELLAN is not set
		# CONFIG_JOYSTICK_SIDEWINDER is not set
		# CONFIG_JOYSTICK_SPACEBALL is not set
		# CONFIG_JOYSTICK_SPACEORB is not set
		# CONFIG_JOYSTICK_STINGER is not set
		# CONFIG_JOYSTICK_TMDC is not set
		# CONFIG_JOYSTICK_TWIDJOY is not set
		# CONFIG_JOYSTICK_WARRIOR is not set
		CONFIG_JOYSTICK_XPAD=y
		# CONFIG_JOYSTICK_XPAD_FF is not set
		# CONFIG_JOYSTICK_XPAD_LEDS is not set
		# CONFIG_JOYSTICK_ZHENHUA is not set
		# CONFIG_LOGIG940_FF is not set
		# CONFIG_LOGIRUMBLEPAD2_FF is not set
		# CONFIG_LOGITECH_FF is not set
		# CONFIG_LOGIWHEELS_FF is not set
		CONFIG_LZ4_COMPRESS=y
		CONFIG_LZ4_DECOMPRESS=y
		# CONFIG_MACH_SONY_LILAC is not set
		# CONFIG_MACH_SONY_MAPLE is not set
		# CONFIG_MACH_SONY_MAPLE_DSDS is not set
		# CONFIG_MACH_SONY_POPLAR is not set
		# CONFIG_MACH_SONY_POPLAR_DSDS is not set
		# CONFIG_MEMCG_KMEM is not set
		CONFIG_MEMCG_SWAP=y
		CONFIG_MEMCG_SWAP_ENABLED=y
		CONFIG_MMC_CMD_QUEUE_SIZE=256
		CONFIG_PAGE_COUNTER=y
		# CONFIG_PANTHERLORD_FF is not set
		CONFIG_PSTORE_CONSOLE=y
		# CONFIG_PSTORE_PMSG is not set
		CONFIG_PSTORE_RAM=y
		CONFIG_QCOM_RTB_SEPARATE_CPUS=y
		CONFIG_RCU_BOOST_DELAY=500
		CONFIG_REED_SOLOMON_ENC8=y
		CONFIG_SERIAL_CORE_CONSOLE=y
		CONFIG_SERIAL_EARLYCON=y
		CONFIG_SERIAL_MSM_CONSOLE=y
		# CONFIG_SMS_USB_DRV is not set
		# CONFIG_SONY_FF is not set
		# CONFIG_TOUCHSCREEN_SUR40 is not set
		# CONFIG_USB_GL860 is not set
		CONFIG_USB_GSPCA=m
		# CONFIG_USB_GSPCA_BENQ is not set
		# CONFIG_USB_GSPCA_CONEX is not set
		# CONFIG_USB_GSPCA_CPIA1 is not set
		# CONFIG_USB_GSPCA_DTCS033 is not set
		# CONFIG_USB_GSPCA_ETOMS is not set
		# CONFIG_USB_GSPCA_FINEPIX is not set
		# CONFIG_USB_GSPCA_JEILINJ is not set
		# CONFIG_USB_GSPCA_JL2005BCD is not set
		# CONFIG_USB_GSPCA_KINECT is not set
		# CONFIG_USB_GSPCA_KONICA is not set
		# CONFIG_USB_GSPCA_MARS is not set
		# CONFIG_USB_GSPCA_MR97310A is not set
		# CONFIG_USB_GSPCA_NW80X is not set
		# CONFIG_USB_GSPCA_OV519 is not set
		# CONFIG_USB_GSPCA_OV534 is not set
		# CONFIG_USB_GSPCA_OV534_9 is not set
		# CONFIG_USB_GSPCA_PAC207 is not set
		# CONFIG_USB_GSPCA_PAC7302 is not set
		# CONFIG_USB_GSPCA_PAC7311 is not set
		# CONFIG_USB_GSPCA_SE401 is not set
		# CONFIG_USB_GSPCA_SN9C2028 is not set
		# CONFIG_USB_GSPCA_SN9C20X is not set
		# CONFIG_USB_GSPCA_SONIXB is not set
		# CONFIG_USB_GSPCA_SONIXJ is not set
		# CONFIG_USB_GSPCA_SPCA1528 is not set
		# CONFIG_USB_GSPCA_SPCA500 is not set
		# CONFIG_USB_GSPCA_SPCA501 is not set
		# CONFIG_USB_GSPCA_SPCA505 is not set
		# CONFIG_USB_GSPCA_SPCA506 is not set
		# CONFIG_USB_GSPCA_SPCA508 is not set
		# CONFIG_USB_GSPCA_SPCA561 is not set
		# CONFIG_USB_GSPCA_SQ905 is not set
		# CONFIG_USB_GSPCA_SQ905C is not set
		# CONFIG_USB_GSPCA_SQ930X is not set
		# CONFIG_USB_GSPCA_STK014 is not set
		# CONFIG_USB_GSPCA_STK1135 is not set
		# CONFIG_USB_GSPCA_STV0680 is not set
		# CONFIG_USB_GSPCA_SUNPLUS is not set
		# CONFIG_USB_GSPCA_T613 is not set
		# CONFIG_USB_GSPCA_TOPRO is not set
		# CONFIG_USB_GSPCA_TOUPTEK is not set
		# CONFIG_USB_GSPCA_TV8532 is not set
		# CONFIG_USB_GSPCA_VC032X is not set
		# CONFIG_USB_GSPCA_VICAM is not set
		# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
		# CONFIG_USB_GSPCA_ZC3XX is not set
		# CONFIG_USB_M5602 is not set
		# CONFIG_USB_PWC is not set
		# CONFIG_USB_S2255 is not set
		# CONFIG_USB_STKWEBCAM is not set
		# CONFIG_USB_STV06XX is not set
		# CONFIG_USB_VIDEO_CLASS is not set
		# CONFIG_USB_ZR364XX is not set
		# CONFIG_VIDEO_AU0828 is not set
		# CONFIG_VIDEO_CPIA2 is not set
		# CONFIG_VIDEO_EM28XX is not set
		# CONFIG_VIDEO_USBTV is not set

arch/arm64/configs/diffconfig/lilac_diffconfig

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		CONFIG_LEDS_QPNP_RGB_SCALE=y
		CONFIG_MACH_SONY_LILAC=y
		CONFIG_NFC_PN547=y
		CONFIG_SENSORS_TCS3490=y
		CONFIG_TOF_SENSOR=y
		CONFIG_TOUCHSCREEN_CLEARPAD=y
		CONFIG_FRONT_CAMERA_LED_SCALE=12
		CONFIG_TOUCHSCREEN_CLEARPAD_I2C=y
		CONFIG_TOUCHSCREEN_CLEARPAD_RMI_DEV=y

arch/arm64/configs/diffconfig/maple_diffconfig

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		CONFIG_MACH_SONY_MAPLE=y
		CONFIG_NFC_PN547=y
		CONFIG_SENSORS_TCS3490=y
		CONFIG_TOF_SENSOR=y
		CONFIG_TOUCHSCREEN_CLEARPAD=y
		CONFIG_TOUCHSCREEN_CLEARPAD_I2C=y
		CONFIG_TOUCHSCREEN_CLEARPAD_RMI_DEV=y

arch/arm64/configs/diffconfig/maple_dsds_diffconfig

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		CONFIG_MACH_SONY_MAPLE_DSDS=y
		CONFIG_NFC_PN547=y
		CONFIG_SENSORS_TCS3490=y
		CONFIG_TOF_SENSOR=y
		CONFIG_TOUCHSCREEN_CLEARPAD=y
		CONFIG_TOUCHSCREEN_CLEARPAD_I2C=y
		CONFIG_TOUCHSCREEN_CLEARPAD_RMI_DEV=y