diff options
| -rwxr-xr-x | release/scripts/pkg-stage.sh | 2 | ||||
| -rw-r--r-- | share/keys/pkgbase-15/trusted/Makefile | 3 | ||||
| -rw-r--r-- | share/keys/pkgbase-15/trusted/backup-signing-15 | 2 | ||||
| -rw-r--r-- | sys/arm64/arm64/mp_machdep.c | 4 | ||||
| -rw-r--r-- | sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi | 8 | ||||
| -rw-r--r-- | sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi | 14 |
6 files changed, 12 insertions, 21 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 083b1baa3358..c575f2d32bae 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,7 +15,7 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" devel/git@lite -editors/emacs +editors/emacs@nox editors/vim misc/freebsd-doc-all net/mpd5 diff --git a/share/keys/pkgbase-15/trusted/Makefile b/share/keys/pkgbase-15/trusted/Makefile index e6205999b12f..32db72ae368a 100644 --- a/share/keys/pkgbase-15/trusted/Makefile +++ b/share/keys/pkgbase-15/trusted/Makefile @@ -1,6 +1,7 @@ PACKAGE= pkg-bootstrap -FILES= awskms-15 +FILES= awskms-15 \ + backup-signing-15 FILESDIR= ${SHAREDIR}/keys/pkgbase-15/trusted FILESMODE= 644 diff --git a/share/keys/pkgbase-15/trusted/backup-signing-15 b/share/keys/pkgbase-15/trusted/backup-signing-15 new file mode 100644 index 000000000000..a147d6788cf2 --- /dev/null +++ b/share/keys/pkgbase-15/trusted/backup-signing-15 @@ -0,0 +1,2 @@ +function: "sha256" +fingerprint: "56a77bdcb6c3cf7984729c6138bd5617c24aa0d466b3b604c96205b2c5629f3c" diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index ba673ce9d6ee..0bdd2ecfd8a7 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -270,8 +270,6 @@ init_secondary(uint64_t cpu) install_cpu_errata(); enable_cpu_feat(CPU_FEAT_AFTER_DEV); - intr_pic_init_secondary(); - /* Signal we are done */ atomic_add_int(&aps_started, 1); @@ -290,6 +288,8 @@ init_secondary(uint64_t cpu) ("pmap0 doesn't match cpu %ld's ttbr0", cpu)); pcpup->pc_curpmap = pmap0; + intr_pic_init_secondary(); + /* Start per-CPU event timers. */ cpu_initclocks_ap(); diff --git a/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi b/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi index e719a3df126c..695cccbdab0f 100644 --- a/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi +++ b/sys/contrib/device-tree/src/arm64/rockchip/rk3568.dtsi @@ -152,7 +152,7 @@ compatible = "rockchip,rk3568-pcie"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x10 0x1f>; + bus-range = <0x0 0xf>; clocks = <&cru ACLK_PCIE30X1_MST>, <&cru ACLK_PCIE30X1_SLV>, <&cru ACLK_PCIE30X1_DBI>, <&cru PCLK_PCIE30X1>, <&cru CLK_PCIE30X1_AUX_NDFT>; @@ -175,7 +175,7 @@ num-ib-windows = <6>; num-ob-windows = <2>; max-link-speed = <3>; - msi-map = <0x1000 &its 0x1000 0x1000>; + msi-map = <0x0 &gic 0x1000 0x1000>; num-lanes = <1>; phys = <&pcie30phy>; phy-names = "pcie-phy"; @@ -205,7 +205,7 @@ compatible = "rockchip,rk3568-pcie"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x20 0x2f>; + bus-range = <0x0 0xf>; clocks = <&cru ACLK_PCIE30X2_MST>, <&cru ACLK_PCIE30X2_SLV>, <&cru ACLK_PCIE30X2_DBI>, <&cru PCLK_PCIE30X2>, <&cru CLK_PCIE30X2_AUX_NDFT>; @@ -228,7 +228,7 @@ num-ib-windows = <6>; num-ob-windows = <2>; max-link-speed = <3>; - msi-map = <0x2000 &its 0x2000 0x1000>; + msi-map = <0x0 &gic 0x2000 0x1000>; num-lanes = <2>; phys = <&pcie30phy>; phy-names = "pcie-phy"; diff --git a/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi b/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi index fd2214b6fad4..81e635620301 100644 --- a/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi +++ b/sys/contrib/device-tree/src/arm64/rockchip/rk356x-base.dtsi @@ -283,18 +283,6 @@ mbi-alias = <0x0 0xfd410000>; mbi-ranges = <296 24>; msi-controller; - ranges; - #address-cells = <2>; - #size-cells = <2>; - dma-noncoherent; - - its: msi-controller@fd440000 { - compatible = "arm,gic-v3-its"; - reg = <0x0 0xfd440000 0 0x20000>; - dma-noncoherent; - msi-controller; - #msi-cells = <1>; - }; }; usb_host0_ehci: usb@fd800000 { @@ -968,7 +956,7 @@ num-ib-windows = <6>; num-ob-windows = <2>; max-link-speed = <2>; - msi-map = <0x0 &its 0x0 0x1000>; + msi-map = <0x0 &gic 0x0 0x1000>; num-lanes = <1>; phys = <&combphy2 PHY_TYPE_PCIE>; phy-names = "pcie-phy"; |