From e71400cd5cd8ed378e92f93d56e9bfdb363f6a62 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 13 Sep 2019 14:08:47 +0200 Subject: [PATCH] Fix handling with FB on RPi4 (#477) --- buildroot-external/board/intel/nuc/kernel.config | 2 -- buildroot-external/board/raspberrypi/boot-env.txt | 6 +----- buildroot-external/board/raspberrypi/kernel.config | 1 - buildroot-external/configs/rpi4_64_defconfig | 2 +- buildroot-external/configs/rpi4_defconfig | 2 +- buildroot-external/kernel/hassos.config | 2 ++ 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/buildroot-external/board/intel/nuc/kernel.config b/buildroot-external/board/intel/nuc/kernel.config index 6425a815d..43e1899d7 100644 --- a/buildroot-external/board/intel/nuc/kernel.config +++ b/buildroot-external/board/intel/nuc/kernel.config @@ -3,8 +3,6 @@ CONFIG_EFI_STUB=y CONFIG_SCSI_LOWLEVEL=y CONFIG_USB_XHCI_HCD=y -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y - CONFIG_IGB=y CONFIG_IWLWIFI=m diff --git a/buildroot-external/board/raspberrypi/boot-env.txt b/buildroot-external/board/raspberrypi/boot-env.txt index 5f10cf891..e8922832a 100644 --- a/buildroot-external/board/raspberrypi/boot-env.txt +++ b/buildroot-external/board/raspberrypi/boot-env.txt @@ -62,10 +62,6 @@ kernel=u-boot.bin # Enable audio (loads snd_bcm2835) dtparam=audio=on -[pi4] -# Enable DRM VC4 V3D driver on top of the dispmanx display stack -dtoverlay=vc4-fkms-v3d -max_framebuffers=2 - [all] #dtoverlay=vc4-fkms-v3d +#max_framebuffers=2 diff --git a/buildroot-external/board/raspberrypi/kernel.config b/buildroot-external/board/raspberrypi/kernel.config index 37e0f19f0..323b34ea8 100644 --- a/buildroot-external/board/raspberrypi/kernel.config +++ b/buildroot-external/board/raspberrypi/kernel.config @@ -1,3 +1,2 @@ -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_FB_SIMPLE=y # CONFIG_FB_BCM2708 is not set \ No newline at end of file diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index f576a792f..370bfb33a 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="bd3452c84c206a171fa4cf5f6ddfab5687667228" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b" diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index 70f31599d..e68a78417 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="bd3452c84c206a171fa4cf5f6ddfab5687667228" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/kernel.config" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b" diff --git a/buildroot-external/kernel/hassos.config b/buildroot-external/kernel/hassos.config index b55fff013..9e4a40bf0 100644 --- a/buildroot-external/kernel/hassos.config +++ b/buildroot-external/kernel/hassos.config @@ -4,6 +4,8 @@ CONFIG_CMDLINE="" CONFIG_ZRAM=y CONFIG_ZSMALLOC=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y + CONFIG_MISC_FILESYSTEMS=y CONFIG_BLOCK=y CONFIG_EXT4_FS=y