From dde641c7f82be495aac103920e8d0348a2d40b72 Mon Sep 17 00:00:00 2001 From: Peter Yoon Date: Sun, 7 Feb 2021 18:19:10 +0900 Subject: [PATCH] build config for android-rpi --- arch/arm64/configs/bcm2711_defconfig | 52 +++++++++++++++------------- build.config.arpi | 23 ++++++++++++ build.config.common | 1 - 3 files changed, 51 insertions(+), 25 deletions(-) create mode 100644 build.config.arpi diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index c3bfafea4815..4a5273a8e3b6 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -46,7 +46,7 @@ CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y @@ -99,7 +99,9 @@ CONFIG_NET_FOU=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_DIAG=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_IPV6=m @@ -438,12 +440,12 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m -CONFIG_CFG80211=m +CONFIG_CFG80211=y CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=m CONFIG_MAC80211_MESH=y CONFIG_WIMAX=m -CONFIG_RFKILL=m +CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_NET_9P=m CONFIG_NFC=m @@ -578,7 +580,8 @@ CONFIG_AT76C50X_USB=m CONFIG_B43=m # CONFIG_B43_PHY_N is not set CONFIG_B43LEGACY=m -CONFIG_BRCMFMAC=m +CONFIG_BRCMUTIL=y +CONFIG_BRCMFMAC=y CONFIG_BRCMFMAC_USB=y CONFIG_BRCMDBG=y CONFIG_HOSTAP=m @@ -689,10 +692,10 @@ CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX_GPMUX=m CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_MUX_PINCTRL=m -CONFIG_I2C_BCM2708=m -CONFIG_I2C_BCM2835=m -CONFIG_I2C_BRCMSTB=m -CONFIG_I2C_GPIO=m +CONFIG_I2C_BCM2708=y +CONFIG_I2C_BCM2835=y +CONFIG_I2C_BRCMSTB=y +CONFIG_I2C_GPIO=y CONFIG_I2C_ROBOTFUZZ_OSIF=m CONFIG_I2C_TINY_USB=m CONFIG_SPI=y @@ -797,7 +800,7 @@ CONFIG_IR_TOY=m CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS=y CONFIG_USB_M5602=m CONFIG_USB_STV06XX=m CONFIG_USB_GL860=m @@ -952,7 +955,7 @@ CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_OV9281=m CONFIG_VIDEO_IRS1125=m CONFIG_VIDEO_MT9V011=m -CONFIG_DRM=m +CONFIG_DRM=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_UDL=m CONFIG_DRM_PANEL_SIMPLE=m @@ -961,8 +964,8 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m CONFIG_DRM_DISPLAY_CONNECTOR=m CONFIG_DRM_SIMPLE_BRIDGE=m CONFIG_DRM_TOSHIBA_TC358762=m -CONFIG_DRM_V3D=m -CONFIG_DRM_VC4=m +CONFIG_DRM_V3D=y +CONFIG_DRM_VC4=y CONFIG_DRM_VC4_HDMI_CEC=y CONFIG_TINYDRM_ILI9225=m CONFIG_TINYDRM_ILI9341=m @@ -972,16 +975,16 @@ CONFIG_TINYDRM_ST7586=m CONFIG_TINYDRM_ST7735R=m CONFIG_DRM_GUD=m CONFIG_FB=y -CONFIG_FB_BCM2708=y +CONFIG_FB_BCM2708=n CONFIG_FB_UDL=m CONFIG_FB_SIMPLE=y CONFIG_FB_SSD1307=m CONFIG_FB_RPISENSE=m CONFIG_BACKLIGHT_RPI=m CONFIG_BACKLIGHT_GPIO=m -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_LOGO=y +CONFIG_FRAMEBUFFER_CONSOLE=n +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=n +CONFIG_LOGO=n # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_SOUND=y @@ -997,14 +1000,14 @@ CONFIG_SND_VIRMIDI=m CONFIG_SND_MTPAV=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m -CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_AUDIO=y CONFIG_SND_USB_UA101=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_6FIRE=m CONFIG_SND_USB_HIFACE=m CONFIG_SND_USB_TONEPORT=m -CONFIG_SND_SOC=m +CONFIG_SND_SOC=y CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m @@ -1123,7 +1126,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_MON=m CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PLATFORM=y -CONFIG_USB_DWCOTG=y +CONFIG_USB_DWCOTG=n CONFIG_USB_PRINTER=m CONFIG_USB_TMC=m CONFIG_USB_STORAGE=y @@ -1147,7 +1150,8 @@ CONFIG_USBIP_CORE=m CONFIG_USBIP_VHCI_HCD=m CONFIG_USBIP_HOST=m CONFIG_USBIP_VUDC=m -CONFIG_USB_DWC2=m +CONFIG_USB_DWC2=y +CONFIG_USB_DWC2_PERIPHERAL=y CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m @@ -1342,6 +1346,7 @@ CONFIG_VT6656=m CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_RPIVID=m CONFIG_ASHMEM=y +CONFIG_ION_SYSTEM_HEAP=y CONFIG_FB_TFT=m CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m @@ -1373,7 +1378,7 @@ CONFIG_FB_TFT_UC1701=m CONFIG_FB_TFT_UPD161704=m CONFIG_FB_TFT_WATTEROTT=m CONFIG_BCM2835_VCHIQ=y -CONFIG_SND_BCM2835=m +CONFIG_SND_BCM2835=y CONFIG_VIDEO_BCM2835=m CONFIG_VIDEO_CODEC_BCM2835=m CONFIG_VIDEO_ISP_BCM2835=m @@ -1527,7 +1532,6 @@ CONFIG_NLS_KOI8_U=m CONFIG_DLM=m CONFIG_SECURITY=y CONFIG_SECURITY_APPARMOR=y -CONFIG_LSM="" CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_ADIANTUM=m @@ -1545,7 +1549,7 @@ CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=5 +CONFIG_CMA_SIZE_MBYTES=256 CONFIG_PRINTK_TIME=y CONFIG_BOOT_PRINTK_DELAY=y CONFIG_KGDB=y diff --git a/build.config.arpi b/build.config.arpi new file mode 100644 index 000000000000..33d9fdb9e392 --- /dev/null +++ b/build.config.arpi @@ -0,0 +1,23 @@ +KERNEL_DIR=common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common +. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64 + +BRANCH=arpi-5.10 +DEFCONFIG=arpi_defconfig +PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/bcm2711_defconfig ${ROOT_DIR}/${KERNEL_DIR}/kernel/configs/android-base.config ${ROOT_DIR}/${KERNEL_DIR}/kernel/configs/android-recommended.config ${ROOT_DIR}/${KERNEL_DIR}/kernel/configs/android-recommended-arm64.config ${ROOT_DIR}/${KERNEL_DIR}/kernel/configs/android-base-conditional.config" +POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}" +DTC_FLAGS="-@" + +MAKE_GOALS=" +Image.gz +broadcom/bcm2711-rpi-4-b.dtb +broadcom/bcm2711-rpi-400.dtb +overlays/vc4-kms-v3d-pi4.dtbo +" + +FILES=" +arch/arm64/boot/Image.gz +arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dtb +arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dtb +arch/arm64/boot/dts/overlays/vc4-kms-v3d-pi4.dtbo +" diff --git a/build.config.common b/build.config.common index b321ae20ecea..4b18503a5660 100644 --- a/build.config.common +++ b/build.config.common @@ -9,7 +9,6 @@ BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86 EXTRA_CMDS='' STOP_SHIP_TRACEPRINTK=1 -IN_KERNEL_MODULES=1 DO_NOT_STRIP_MODULES=1 HERMETIC_TOOLCHAIN=${HERMETIC_TOOLCHAIN:-1}