From 8bf2cebfabe5001fa49d455fabfac04554b01480 Mon Sep 17 00:00:00 2001 From: Fil Date: Sat, 29 Feb 2020 16:53:29 +0100 Subject: [PATCH] Remove upstreamed 5.x-dts patches Signed-off-by: Fil --- ...-raise-GPU-trip-point-temperatures-f.patch | 58 ------------------- ...-Switch-to-builtin-HDMI-DDC-bus-on-r.patch | 52 ----------------- scripts/buildKernel.sh | 3 +- 3 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 resources/BuildResources/patches-tested/DTS/5.x-dts/0033-ARM-dts-rockchip-raise-GPU-trip-point-temperatures-f.patch delete mode 100644 resources/BuildResources/patches-tested/DTS/5.x-dts/0045-ARM-dts-rockchip-Switch-to-builtin-HDMI-DDC-bus-on-r.patch diff --git a/resources/BuildResources/patches-tested/DTS/5.x-dts/0033-ARM-dts-rockchip-raise-GPU-trip-point-temperatures-f.patch b/resources/BuildResources/patches-tested/DTS/5.x-dts/0033-ARM-dts-rockchip-raise-GPU-trip-point-temperatures-f.patch deleted file mode 100644 index 650c1e8..0000000 --- a/resources/BuildResources/patches-tested/DTS/5.x-dts/0033-ARM-dts-rockchip-raise-GPU-trip-point-temperatures-f.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0f637e2565d175eeff664991be9a6d0753d0e484 Mon Sep 17 00:00:00 2001 -From: Matthias Kaehlcke -Date: Thu, 16 May 2019 09:29:41 -0700 -Subject: [PATCH 33/54] ARM: dts: rockchip: raise GPU trip point temperatures - for veyron -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The values match those used by the downstream Chrome OS 3.14 -kernel, the 'official' kernel for veyron devices. Keep the critical -trip point for speedy at 90°C as in the downstream configuration. - -Signed-off-by: Matthias Kaehlcke -Reviewed-by: Douglas Anderson -Signed-off-by: Heiko Stuebner ---- - arch/arm/boot/dts/rk3288-veyron-speedy.dts | 4 ++++ - arch/arm/boot/dts/rk3288-veyron.dtsi | 8 ++++++++ - 2 files changed, 12 insertions(+) - -diff --git a/arch/arm/boot/dts/rk3288-veyron-speedy.dts b/arch/arm/boot/dts/rk3288-veyron-speedy.dts -index b07a07e81551..aae37c535444 100644 ---- a/arch/arm/boot/dts/rk3288-veyron-speedy.dts -+++ b/arch/arm/boot/dts/rk3288-veyron-speedy.dts -@@ -75,6 +75,10 @@ - force-hpd; - }; - -+&gpu_crit { -+ temperature = <90000>; -+}; -+ - &panel { - power-supply= <&panel_regulator>; - }; -diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi -index e81f1a0cac83..90c8312d01ff 100644 ---- a/arch/arm/boot/dts/rk3288-veyron.dtsi -+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi -@@ -166,6 +166,14 @@ - status = "okay"; - }; - -+&gpu_alert0 { -+ temperature = <72500>; -+}; -+ -+&gpu_crit { -+ temperature = <100000>; -+}; -+ - &hdmi { - ddc-i2c-bus = <&i2c5>; - status = "okay"; --- -2.11.0 - diff --git a/resources/BuildResources/patches-tested/DTS/5.x-dts/0045-ARM-dts-rockchip-Switch-to-builtin-HDMI-DDC-bus-on-r.patch b/resources/BuildResources/patches-tested/DTS/5.x-dts/0045-ARM-dts-rockchip-Switch-to-builtin-HDMI-DDC-bus-on-r.patch deleted file mode 100644 index bc1e393..0000000 --- a/resources/BuildResources/patches-tested/DTS/5.x-dts/0045-ARM-dts-rockchip-Switch-to-builtin-HDMI-DDC-bus-on-r.patch +++ /dev/null @@ -1,52 +0,0 @@ -From bf09924f21767e6bb7cb3aae48c48c2c2ab8261a Mon Sep 17 00:00:00 2001 -From: Douglas Anderson -Date: Thu, 2 May 2019 15:53:34 -0700 -Subject: [PATCH 45/54] ARM: dts: rockchip: Switch to builtin HDMI DDC bus on - rk3288-veyron - -Downstream Chrome OS kernels use the builtin DDC bus from dw_hdmi on -veyron. This is the only way to get them to negotiate HDCP. - -Although HDCP isn't currently all supported upstream, it still seems -like it makes sense to use dw_hdmi's builtin I2C. Maybe eventually we -can get HDCP negotiation working. - -Signed-off-by: Douglas Anderson -Reviewed-by: Sean Paul -Signed-off-by: Heiko Stuebner ---- - arch/arm/boot/dts/rk3288-veyron.dtsi | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi -index 90c8312d01ff..99e2771d4d31 100644 ---- a/arch/arm/boot/dts/rk3288-veyron.dtsi -+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi -@@ -175,7 +175,8 @@ - }; - - &hdmi { -- ddc-i2c-bus = <&i2c5>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&hdmi_ddc>; - status = "okay"; - }; - -@@ -346,14 +347,6 @@ - i2c-scl-rising-time-ns = <300>; /* 225ns measured */ - }; - --&i2c5 { -- status = "okay"; -- -- clock-frequency = <100000>; -- i2c-scl-falling-time-ns = <300>; -- i2c-scl-rising-time-ns = <1000>; --}; -- - &io_domains { - status = "okay"; - --- -2.11.0 - diff --git a/scripts/buildKernel.sh b/scripts/buildKernel.sh index c12cce8..150f06f 100755 --- a/scripts/buildKernel.sh +++ b/scripts/buildKernel.sh @@ -56,14 +56,13 @@ make clean make mrproper #Apply the usb and mmc patches if unapplied [ "$FRESH" = true ] && for i in $RESOURCES/patches-tested/kernel/5.x-dwc2/*.patch; do echo $i; patch -p1 < $i; done -[ "$FRESH" = true ] && for i in $RESOURCES/patches-tested/DTS/5.x-dts/*.patch; do echo $i; patch -p1 < $i; done [ "$FRESH" = true ] && for i in $RESOURCES/patches-tested/DTS/*.patch; do echo $i; patch -p1 < $i; done [ "$FRESH" = true ] && for i in $RESOURCES/patches-tested/kernel/*.patch; do echo $i; patch -p1 < $i; done #copy in the initramfs and kernel config cp $ROOT_DIR/build/PrawnOS-initramfs.cpio.gz . cp $RESOURCES/config .config -make -j `grep ^processor /proc/cpuinfo | wc -l` CROSS_COMPILE=arm-none-eabi- ARCH=arm zImage modules dtbs +make -j $((`nproc` +1)) CROSS_COMPILE=arm-none-eabi- ARCH=arm zImage modules dtbs [ ! -h kernel.its ] && ln -s $RESOURCES/kernel.its . mkimage -D "-I dts -O dtb -p 2048" -f kernel.its vmlinux.uimg dd if=/dev/zero of=bootloader.bin bs=512 count=1