Re: update sysutils/dtb to linux 5.6
> Date: Sat, 11 Apr 2020 11:09:19 +1000
> From: Jonathan Gray
>
> Update dtb to the latest linux release now we can handle newer omap
> dtbs.
Go for it. I may have some further tweaks once this is in.
ok kettenis@
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/dtb/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- Makefile 30 Sep 2019 15:14:50 - 1.21
> +++ Makefile 1 Apr 2020 05:10:31 -
> @@ -3,8 +3,7 @@
> ONLY_FOR_ARCHS= ${GCC4_ARCHS} ${CLANG_ARCHS}
>
> COMMENT= Device Tree Blobs
> -VERSION= 4.20
> -REVISION=0
> +VERSION= 5.6
> DISTNAME=linux-${VERSION}
> PKGNAME= dtb-${VERSION:S/-//}
> CATEGORIES= sysutils
> @@ -14,7 +13,7 @@ MAINTAINER= Jonathan Gray # dual GPL/BSD
> PERMIT_PACKAGE= Yes
>
> -MASTER_SITES=https://cdn.kernel.org/pub/linux/kernel/v4.x/
> +MASTER_SITES=https://cdn.kernel.org/pub/linux/kernel/v5.x/
> EXTRACT_SUFX=.tar.xz
> #MASTER_SITES= https://git.kernel.org/torvalds/t/
> PKG_ARCH=*
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/dtb/distinfo,v
> retrieving revision 1.18
> diff -u -p -r1.18 distinfo
> --- distinfo 24 Dec 2018 08:55:20 - 1.18
> +++ distinfo 1 Apr 2020 05:10:47 -
> @@ -1,2 +1,2 @@
> -SHA256 (linux-4.20.tar.xz) = rQgjGDUi50OXI4LfCqCPta4wd/ZisSXx5ZmwsqqhJDg=
> -SIZE (linux-4.20.tar.xz) = 104257836
> +SHA256 (linux-5.6.tar.xz) = 40KwSiqmOAjqDvG6qyj8UgvQMe+M+T2e5KMdQFj8tiI=
> +SIZE (linux-5.6.tar.xz) = 111785252
> Index: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts
> ===
> RCS file: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts
> diff -N patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts
> --- patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts 30 Sep
> 2019 15:14:50 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts,v 1.1
> 2019/09/30 15:14:50 kurt Exp $
> -
> -Index: arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
> arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts.orig
> -+++ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
> -@@ -15,7 +15,7 @@
> - compatible = "pine64,rockpro64", "rockchip,rk3399";
> -
> - chosen {
> --stdout-path = "serial2:150n8";
> -+stdout-path = "serial2:115200n8";
> - };
> -
> - clkin_gmac: external-gmac-clock {
> Index: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
> ===
> RCS file: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
> diff -N patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi 1 Apr
> 2020 05:20:41 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
> +--- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi.orig
> arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
> +@@ -11,7 +11,7 @@
> +
> + / {
> + chosen {
> +-stdout-path = "serial2:150n8";
> ++stdout-path = "serial2:115200n8";
> + };
> +
> + clkin_gmac: external-gmac-clock {
> Index: patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts
> ===
> RCS file:
> /cvs/ports/sysutils/dtb/patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-arch_arm_boot_dts_imx6q-cm-fx6_dts
> --- patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts 31 Jul 2018 10:10:37
> - 1.2
> +++ patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts 1 Apr 2020 05:20:31
> -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-arch_arm_boot_dts_imx6q-
> Index: arch/arm/boot/dts/imx6q-cm-fx6.dts
> --- arch/arm/boot/dts/imx6q-cm-fx6.dts.orig
> +++ arch/arm/boot/dts/imx6q-cm-fx6.dts
> -@@ -54,6 +54,10 @@
> +@@ -55,6 +55,10 @@
> reg = <0x1000 0x8000>;
> };
>
> Index: patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts
> ===
> RCS file:
> /cvs/ports/sysutils/dtb/patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-arch_arm_boot_dts_omap3-beagle-xm_dts
> --- patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts 17 Jul 2016
> 15:09:39 - 1.1
> +++ patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts 1 Apr 2020
> 05:20:33 -
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-arch_arm_boot_dts_omap3-beagle-xm_dts,v 1.1 2016/07/17
> 15:09:39 jsg Exp $
> arch/arm/boot/dts/omap3-beagle-xm.dts.orig
update sysutils/dtb to linux 5.6
Update dtb to the latest linux release now we can handle newer omap
dtbs.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/dtb/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile30 Sep 2019 15:14:50 - 1.21
+++ Makefile1 Apr 2020 05:10:31 -
@@ -3,8 +3,7 @@
ONLY_FOR_ARCHS=${GCC4_ARCHS} ${CLANG_ARCHS}
COMMENT= Device Tree Blobs
-VERSION= 4.20
-REVISION= 0
+VERSION= 5.6
DISTNAME= linux-${VERSION}
PKGNAME= dtb-${VERSION:S/-//}
CATEGORIES=sysutils
@@ -14,7 +13,7 @@ MAINTAINER= Jonathan Gray https://cdn.kernel.org/pub/linux/kernel/v4.x/
+MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/v5.x/
EXTRACT_SUFX= .tar.xz
#MASTER_SITES= https://git.kernel.org/torvalds/t/
PKG_ARCH= *
Index: distinfo
===
RCS file: /cvs/ports/sysutils/dtb/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo24 Dec 2018 08:55:20 - 1.18
+++ distinfo1 Apr 2020 05:10:47 -
@@ -1,2 +1,2 @@
-SHA256 (linux-4.20.tar.xz) = rQgjGDUi50OXI4LfCqCPta4wd/ZisSXx5ZmwsqqhJDg=
-SIZE (linux-4.20.tar.xz) = 104257836
+SHA256 (linux-5.6.tar.xz) = 40KwSiqmOAjqDvG6qyj8UgvQMe+M+T2e5KMdQFj8tiI=
+SIZE (linux-5.6.tar.xz) = 111785252
Index: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts
===
RCS file: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts
diff -N patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts
--- patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts 30 Sep
2019 15:14:50 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts,v 1.1
2019/09/30 15:14:50 kurt Exp $
-
-Index: arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts.orig
-+++ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
-@@ -15,7 +15,7 @@
- compatible = "pine64,rockpro64", "rockchip,rk3399";
-
- chosen {
-- stdout-path = "serial2:150n8";
-+ stdout-path = "serial2:115200n8";
- };
-
- clkin_gmac: external-gmac-clock {
Index: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
===
RCS file: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
diff -N patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi1 Apr
2020 05:20:41 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+--- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi.orig
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+@@ -11,7 +11,7 @@
+
+ / {
+ chosen {
+- stdout-path = "serial2:150n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ clkin_gmac: external-gmac-clock {
Index: patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts
===
RCS file:
/cvs/ports/sysutils/dtb/patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts,v
retrieving revision 1.2
diff -u -p -r1.2 patch-arch_arm_boot_dts_imx6q-cm-fx6_dts
--- patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts31 Jul 2018 10:10:37
- 1.2
+++ patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts1 Apr 2020 05:20:31
-
@@ -2,7 +2,7 @@ $OpenBSD: patch-arch_arm_boot_dts_imx6q-
Index: arch/arm/boot/dts/imx6q-cm-fx6.dts
--- arch/arm/boot/dts/imx6q-cm-fx6.dts.orig
+++ arch/arm/boot/dts/imx6q-cm-fx6.dts
-@@ -54,6 +54,10 @@
+@@ -55,6 +55,10 @@
reg = <0x1000 0x8000>;
};
Index: patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts
===
RCS file:
/cvs/ports/sysutils/dtb/patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts,v
retrieving revision 1.1
diff -u -p -r1.1 patch-arch_arm_boot_dts_omap3-beagle-xm_dts
--- patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts 17 Jul 2016 15:09:39
- 1.1
+++ patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts 1 Apr 2020 05:20:33
-
@@ -1,7 +1,8 @@
$OpenBSD: patch-arch_arm_boot_dts_omap3-beagle-xm_dts,v 1.1 2016/07/17
15:09:39 jsg Exp $
arch/arm/boot/dts/omap3-beagle-xm.dts.orig Sun Jul 17 00:58:31 2016
-+++ arch/arm/boot/dts/omap3-beagle-xm.dts Sun Jul 17 00:59:41 2016
-@@ -24,6 +24,10 @@
+Index: arch/arm/boot/dts/omap3-beagle-xm.dts
+--- arch/arm/boot/dts/omap3-beagle-xm.dts.orig
arch/arm/boot/dts/omap3-beagle-xm.dts
+@@ -21,6 +21,10 @@
reg = <0x8000 0x2000>; /* 512 MB */
};
Index: patches/patch-arch_arm_boot_dts_omap3-beagle_dts
