working commit

benhoff · Jul 23, 2024 · abfaa6d · abfaa6d
1 parent eacd61a
commit abfaa6d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/config/kernel/linux-rockchip-rk3588-6.10.config b/config/kernel/linux-rockchip-rk3588-6.10.config
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.0-rc5 Kernel Configuration
+# Linux/arm64 6.10.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130200
+CONFIG_GCC_VERSION=110400
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=23800
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24200
+CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -446,7 +446,6 @@ CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_ARCH_SUPPORTS_KEXEC=y
@@ -712,7 +711,6 @@ CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
 CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
-CONFIG_VIDEO_SYNOPSYS_HDMIRX=m
 # CONFIG_NVHE_EL2_DEBUG is not set
 CONFIG_CPU_MITIGATIONS=y
 
@@ -776,8 +774,6 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y
-# CONFIG_SHADOW_CALL_STACK is not set
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
@@ -3918,6 +3914,7 @@ CONFIG_WLCORE_SDIO=m
 # CONFIG_RTL8821CU is not set
 # CONFIG_88XXAU is not set
 # CONFIG_RTL8192EU is not set
+# CONFIG_RTL8189FS is not set
 # CONFIG_RTL8189ES is not set
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_ZD1211RW=m
@@ -5871,6 +5868,8 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
 #
 # Sunxi media platform drivers
 #
+CONFIG_VIDEO_SYNOPSYS_HDMIRX=m
+CONFIG_HDMIRX_LOAD_DEFAULT_EDID=y
 
 #
 # Texas Instruments drivers
@@ -10129,12 +10128,7 @@ CONFIG_LSM="lockdown,yama,integrity,apparmor"
 #
 # Memory initialization
 #
-CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -10896,7 +10890,6 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_DHRY is not set
 # CONFIG_LKDTM is not set

diff --git a/...l/archive/rockchip-rk3588-6.10/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch b/...l/archive/rockchip-rk3588-6.10/1021-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
@@ -119,7 +119,7 @@ index 111111111111..222222222222 100644
  &pinctrl {
 +    hdmirx {
 +		hdmirx_5v_detection: hdmirx-5v-detection {
-+			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO GPIO_ACTIVE_LOW>;
++			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
 +		};
 +	};
 +
@@ -225,7 +225,7 @@ index 111111111111..222222222222 100644
  &usb_host1_ehci {
  	status = "okay";
  };
-@@ -846,3 +993,55 @@ &usb_host1_ehci {
+@@ -846,3 +993,57 @@ &usb_host1_ehci {
  &usb_host1_ohci {
  	status = "okay";
  };
@@ -242,6 +242,8 @@ index 111111111111..222222222222 100644
 +
 +&hdmi0 {
 +	status = "okay";
++   enable-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>;
++   cec-enable = "true";
 +};
 +
 +&hdptxphy_hdmi0 {