fix sound HDMI rk3399 and bootsplash (#3260)

This commit is contained in:
Oleg 2021-11-17 09:22:04 +03:00 committed by GitHub
parent c666d285b4
commit 21d5340b35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 5 deletions

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.15.1 Kernel Configuration
# Linux/arm64 5.15.2 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
CONFIG_CC_IS_GCC=y
@ -5541,7 +5541,7 @@ CONFIG_DVB_DUMMY_FE=m
#
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
CONFIG_DRM=m
CONFIG_DRM=y
CONFIG_DRM_MIPI_DBI=m
CONFIG_DRM_MIPI_DSI=y
CONFIG_DRM_DP_AUX_BUS=m
@ -5584,15 +5584,15 @@ CONFIG_DRM_KOMEDA=m
# CONFIG_DRM_NOUVEAU is not set
# CONFIG_DRM_VGEM is not set
# CONFIG_DRM_VKMS is not set
CONFIG_DRM_ROCKCHIP=m
CONFIG_DRM_ROCKCHIP=y
CONFIG_ROCKCHIP_ANALOGIX_DP=y
CONFIG_ROCKCHIP_CDN_DP=y
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_INNO_HDMI=y
CONFIG_ROCKCHIP_LVDS=y
# CONFIG_ROCKCHIP_RGB is not set
# CONFIG_ROCKCHIP_RK3066_HDMI is not set
CONFIG_ROCKCHIP_RGB=y
CONFIG_ROCKCHIP_RK3066_HDMI=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_FBCON is not set
# CONFIG_DRM_UDL is not set

View File

@ -0,0 +1,14 @@
--- a/include/configs/roc-pc-rk3399.h
+++ b/include/configs/roc-pc-rk3399.h
@@ -6,10 +6,6 @@
#ifndef __ROC_PC_RK3399_H
#define __ROC_PC_RK3399_H
-#define ROCKCHIP_DEVICE_SETTINGS \
- "stdin=serial,usbkbd\0" \
- "stdout=serial,vidconsole\0" \
- "stderr=serial,vidconsole\0"
#include <configs/rk3399_common.h>

View File

@ -0,0 +1,16 @@
diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
index 2d3db228..c0b03588 100644
--- a/include/configs/evb_rk3399.h
+++ b/include/configs/evb_rk3399.h
@@ -6,11 +6,6 @@
#ifndef __EVB_RK3399_H
#define __EVB_RK3399_H
-#define ROCKCHIP_DEVICE_SETTINGS \
- "stdin=serial,usbkbd\0" \
- "stdout=serial,vidconsole\0" \
- "stderr=serial,vidconsole\0"
-
#include <configs/rk3399_common.h>
#if defined(CONFIG_ENV_IS_IN_MMC)