Ver código fonte

rockpi4-plus: fix drm support

Waldemar Brodkorb 1 ano atrás
pai
commit
8b7683d21b

+ 1 - 1
package/u-boot/files/boot.script.rockpi4

@@ -1,4 +1,4 @@
-setenv bootargs console=ttyS2,115200 root=/dev/mmcblk0p1 rootwait
+setenv bootargs console=tty0 console=ttyS2,115200 root=/dev/mmcblk0p1 rootwait
 ext4load mmc 1:1 $kernel_addr_r boot/kernel
 ext4load mmc 1:1 $fdt_addr_r boot/rk3399-rock-pi-4b-plus.dtb
 booti $kernel_addr_r - $fdt_addr_r

+ 5 - 127
target/aarch64/kernel/rockpi4-plus

@@ -391,68 +391,6 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPS11=y
-CONFIG_LIRC=y
-CONFIG_RC_DECODERS=y
-CONFIG_RC_DEVICES=y
-CONFIG_IR_SERIAL_TRANSMITTER=y
-CONFIG_CEC_CORE=y
-CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
-CONFIG_CEC_PIN_ERROR_INJ=y
-CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_TEST_SUPPORT=y
-
-CONFIG_MEDIA_CONTROLLER=y
-
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_FIXED_MINOR_RANGES=y
-
-CONFIG_MEDIA_CONTROLLER_DVB=y
-CONFIG_MEDIA_CONTROLLER_REQUEST_API=y
-
-
-CONFIG_DVB_MMAP=y
-CONFIG_DVB_NET=y
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_DYNAMIC_MINORS=y
-
-CONFIG_MEDIA_USB_SUPPORT=y
-
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_PWC_INPUT_EVDEV=y
-
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_AU0828_RC=y
-CONFIG_VIDEO_CX231XX_RC=y
-
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-
-
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-CONFIG_SMS_SIANO_RC=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_SDR_PLATFORM_DRIVERS=y
-
-CONFIG_MEDIA_ATTACH=y
-
-CONFIG_VIDEO_ADV7604_CEC=y
-CONFIG_VIDEO_ADV7842_CEC=y
-CONFIG_VIDEO_TC358743_CEC=y
 
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
@@ -467,6 +405,9 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 
 CONFIG_DRM_ROCKCHIP=y
+CONFIG_DRM_PANFROST=y
+CONFIG_ROCKCHIP_VOP=y
+CONFIG_ROCKCHIP_VOP2=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
@@ -521,71 +462,6 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_BOOTSPLASH=y
-
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_PCI=y
-
-
-CONFIG_SND_HDA_PREALLOC_SIZE=64
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-
-
-
-
-
-
-
-
-
-
-
-CONFIG_HID=y
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_HID_GENERIC=y
-
-CONFIG_HID_ACRUX_FF=y
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HOLTEK_FF=y
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_SONY_FF=y
-CONFIG_GREENASIA_FF=y
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_ZEROPLUS_FF=y
-
-CONFIG_USB_HID=y
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-
 
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
@@ -983,3 +859,5 @@ CONFIG_ROCKCHIP_EFUSE=y
 
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+
+

+ 13 - 0
target/linux/config/Config.in.graphics

@@ -312,6 +312,19 @@ config ADK_LINUX_KERNEL_FB_RADEON
  	help
 	  Framebuffer support for RADEON chips.
 
+config ADK_LINUX_KERNEL_DRM_ROCKCHIP
+	bool "Support for Rockchip graphic cards"
+	select ADK_LINUX_KERNEL_FB
+	select ADK_LINUX_KERNEL_DRM
+	select ADK_LINUX_KERNEL_FRAMEBUFFER_CONSOLE
+	select ADK_LINUX_KERNEL_DRM_KMS_HELPER
+	select ADK_LINUX_KERNEL_DRM_FBDEV_EMULATION
+	depends on ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default n
+	help
+          Support for Rockchip chipsets.
+
 config ADK_LINUX_KERNEL_DRM_I915
 	bool "Support for Intel graphic cards"
 	select ADK_LINUX_KERNEL_FB