pagure pushed to rpms/emacs (rawhide). "Remove exec permissions from
eln files to prevent build failures due to duplicate build-ids"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 11:13:45 UTC
From 69e6751434abab2daaad8c111f47ef55416a8658 Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak(a)cgc-instruments.com>
Date: Dec 30 2022 23:07:31 +0000
Subject: Remove exec permissions from eln files to prevent build failures due to duplicate build-ids
---
diff --git a/emacs.spec b/emacs.spec
index d1ad498..09955a4 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -436,6 +436,10 @@ echo %{native_lisp}/${gtk_comp_native_ver} >> gtk-filelist
echo %{native_lisp}/${lucid_comp_native_ver} >> lucid-filelist
echo %{native_lisp}/${nox_comp_native_ver} >> nox-filelist
+# remove exec permissions from eln files to prevent the debuginfo extractor from
+# trying to extract debuginfo from them
+find %{buildroot}%{_libdir}/ -name '*eln' -type f | xargs chmod -x
+
%check
appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml
desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
https://src.fedoraproject.org/rpms/emacs/c/69e6751434abab2daaad8c111f47ef...
1Â year, 5Â months
pagure pushed to rpms/emacs (rawhide). "Rebase pdm-fingerprint patch"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 11:13:45 UTC
From b7ecd2292740f01eb57b4444c51d133876fcac3c Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak(a)cgc-instruments.com>
Date: Dec 30 2022 23:06:47 +0000
Subject: Rebase pdm-fingerprint patch
---
diff --git a/emacs-pdmp-fingerprint.patch b/emacs-pdmp-fingerprint.patch
index b2247e6..b50d121 100644
--- a/emacs-pdmp-fingerprint.patch
+++ b/emacs-pdmp-fingerprint.patch
@@ -1,7 +1,7 @@
-From e81f1faca4382ed5c8f15fec84fb7c900a5468f9 Mon Sep 17 00:00:00 2001
+From 31607778ef262e5c25a65eb479f9531c5803f4a6 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm(a)gnu.org>
Date: Mon, 11 Oct 2021 14:03:26 +0200
-Subject: Make the installed pmdp file use a fingerprint
+Subject: [PATCH] Make the installed pmdp file use a fingerprint
* Makefile.in (EMACS_PDMP): Use --fingerprint.
@@ -23,10 +23,10 @@ pdmp file (bug#42790).
5 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 5fc1edc..c6c507f 100644
+index c902b46ced..f8b8058d96 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -313,6 +313,7 @@ TRANSFORM = @program_transform_name@
+@@ -313,6 +313,7 @@ TRANSFORM =
EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'`
EMACS = ${EMACS_NAME}${EXEEXT}
EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
@@ -34,7 +34,7 @@ index 5fc1edc..c6c507f 100644
# Subdirectories to make recursively.
SUBDIR = $(NTDIR) lib lib-src src lisp
-@@ -521,7 +522,7 @@ install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
+@@ -521,7 +522,7 @@ install-arch-dep:
ifeq (${ns_self_contained},no)
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)"
ifeq (${DUMPING},pdumper)
@@ -44,10 +44,10 @@ index 5fc1edc..c6c507f 100644
-chmod 755 "$(DESTDIR)${bindir}/$(EMACSFULL)"
ifndef NO_BIN_LINK
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
-index d5177fa..313682b 100644
+index ffab2b2213..b3f84098e7 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
-@@ -185,6 +185,11 @@ successfully.
+@@ -185,6 +185,11 @@ Action Arguments
@item --version
@opindex --version
Print Emacs version, then exit successfully.
@@ -60,10 +60,10 @@ index d5177fa..313682b 100644
@node Initial Options
diff --git a/src/emacs.c b/src/emacs.c
-index 866e43f..cda7a9b 100644
+index 0a90b0913b..1907065a95 100644
--- a/src/emacs.c
+++ b/src/emacs.c
-@@ -133,6 +133,7 @@ extern char etext;
+@@ -133,6 +133,7 @@ #define MAIN_PROGRAM
#endif
#include "pdumper.h"
@@ -71,7 +71,7 @@ index 866e43f..cda7a9b 100644
#include "epaths.h"
static const char emacs_version[] = PACKAGE_VERSION;
-@@ -255,6 +256,7 @@ Initialization options:\n\
+@@ -255,6 +256,7 @@ #define MAIN_PROGRAM
#ifdef HAVE_PDUMPER
"\
--dump-file FILE read dumped state from FILE\n\
@@ -113,9 +113,9 @@ index 866e43f..cda7a9b 100644
+ sprintf (dump_file, "%s%c%s-%s%s",
+ path_exec, DIRECTORY_SEP, argv0_base, hexbuf, suffix);
#if !defined (NS_SELF_CONTAINED)
- /* Assume the Emacs binary lives in a sibling directory as set up by
- the default installation configuration. */
-@@ -1387,6 +1397,23 @@ main (int argc, char **argv)
+ if (!(emacs_executable && *emacs_executable))
+ {
+@@ -1424,6 +1434,23 @@ main (int argc, char **argv)
exit (0);
}
@@ -140,7 +140,7 @@ index 866e43f..cda7a9b 100644
#ifdef HAVE_PDUMPER
if (dumped_with_pdumper_p ())
diff --git a/src/pdumper.c b/src/pdumper.c
-index 11c680d..977f4fb 100644
+index b0167299d7..56a5e2ec6d 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -312,7 +312,7 @@ dump_reloc_set_offset (struct dump_reloc *reloc, dump_off offset)
@@ -153,10 +153,10 @@ index 11c680d..977f4fb 100644
unsigned char const xfingerprint[sizeof fingerprint])
{
diff --git a/src/pdumper.h b/src/pdumper.h
-index deec9af..bc339c4 100644
+index 8383283894..002e1d88ce 100644
--- a/src/pdumper.h
+++ b/src/pdumper.h
-@@ -50,6 +50,9 @@ enum { PDUMPER_NO_OBJECT = -1 };
+@@ -50,6 +50,9 @@ #define PDUMPER_IGNORE(thing) ((void) &(thing))
#define PDUMPER_REMEMBER_SCALAR(thing) \
pdumper_remember_scalar (&(thing), sizeof (thing))
@@ -167,5 +167,5 @@ index deec9af..bc339c4 100644
INLINE void
--
-cgit v1.1
+2.37.3
https://src.fedoraproject.org/rpms/emacs/c/b7ecd2292740f01eb57b4444c51d13...
1Â year, 5Â months
pagure pushed to rpms/emacs (rawhide). "New upstream release 28.2,
fixes rhbz#2126048"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 11:13:44 UTC
From 27348f8c69c599fd803743452ec606cf3e098667 Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak(a)cgc-instruments.com>
Date: Dec 30 2022 23:06:43 +0000
Subject: New upstream release 28.2, fixes rhbz#2126048
---
diff --git a/.gitignore b/.gitignore
index 00773df..0546e5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,6 @@
/emacs-27.2.tar.xz
/emacs-27.2.tar.xz.sig
/emacs-28.1.tar.xz
-/emacs-28.1.tar.xz.sig
\ No newline at end of file
+/emacs-28.1.tar.xz.sig
+/emacs-28.2.tar.xz
+/emacs-28.2.tar.xz.sig
diff --git a/emacs.spec b/emacs.spec
index e910ae2..92f5349 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -4,8 +4,8 @@
Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
-Version: 28.1
-Release: 4%{?dist}
+Version: 28.2
+Release: 1%{?dist}
License: GPLv3+ and CC0
URL: http://www.gnu.org/software/emacs/
Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
@@ -516,6 +516,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
%{_includedir}/emacs-module.h
%changelog
+* Tue Nov 1 2022 Dan Čermák <dan.cermak(a)cgc-instruments.com> - 1:28.2-1
+- New upstream release 28.2, fixes rhbz#2126048
+
* Fri Dec 23 2022 Florian Weimer <fweimer(a)redhat.com> - 1:28.1-4
- C99 compatibility fixes for the configure script
diff --git a/sources b/sources
index 1895ed4..fcd9d25 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (emacs-28.1.tar.xz) = c146ff7086aba49fa6c18adf4e485a59eb4c6525fddb9d385034446830b8bb0ac9e6fb76e7b6d94a9fddc41643415f36acad57a1ae16a841c97f61bc211459d9
-SHA512 (emacs-28.1.tar.xz.sig) = cc905fb3d75c2f03c491fb1e0edd883312147d65125a667dcf77e6a078a6381f0674e321feba24a205d819275b6f31282a54910b3fc1c1284421a0fd35a2882a
+SHA512 (emacs-28.2.tar.xz) = a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
+SHA512 (emacs-28.2.tar.xz.sig) = de40bc10088051b2707fc9764a5a5fb49687c05bf0e27bd7ad6f5a952ad324904366ca10dbd58015e1d3d5206b900da99cf4485d7f048220e4dda657180f3d1c
https://src.fedoraproject.org/rpms/emacs/c/27348f8c69c599fd803743452ec606...
1Â year, 5Â months
pagure pushed to rpms/emacs (rawhide). "Update cdefs.h from gnulib"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 11:13:45 UTC
From 665fa92b7e9d5cfa99bc88006e166ad2687466f7 Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak(a)cgc-instruments.com>
Date: Dec 30 2022 23:06:46 +0000
Subject: Update cdefs.h from gnulib
---
diff --git a/cdefs.h b/cdefs.h
index cb25145..7b8ed5b 100644
--- a/cdefs.h
+++ b/cdefs.h
@@ -164,13 +164,13 @@
|| (__builtin_constant_p (__l) && (__l) > 0))
/* Length is known to be safe at compile time if the __L * __S <= __OBJSZ
- condition can be folded to a constant and if it is true. The -1 check is
- redundant because since it implies that __glibc_safe_len_cond is true. */
+ condition can be folded to a constant and if it is true, or unknown (-1) */
#define __glibc_safe_or_unknown_len(__l, __s, __osz) \
- (__glibc_unsigned_or_positive (__l) \
- && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \
- __s, __osz)) \
- && __glibc_safe_len_cond ((__SIZE_TYPE__) (__l), __s, __osz))
+ ((__osz) == (__SIZE_TYPE__) -1 \
+ || (__glibc_unsigned_or_positive (__l) \
+ && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \
+ (__s), (__osz))) \
+ && __glibc_safe_len_cond ((__SIZE_TYPE__) (__l), (__s), (__osz))))
/* Conversely, we know at compile time that the length is unsafe if the
__L * __S <= __OBJSZ condition can be folded to a constant and if it is
https://src.fedoraproject.org/rpms/emacs/c/665fa92b7e9d5cfa99bc88006e166a...
1Â year, 5Â months
pagure pushed to rpms/emacs (rawhide). "Use Stefan Kangas' gpg key
for verification (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 11:13:45 UTC
From 2d9a8cd7420813a23a00623e872183e9f5cb9d12 Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak(a)cgc-instruments.com>
Date: Dec 30 2022 23:06:46 +0000
Subject: Use Stefan Kangas' gpg key for verification
The Emacs 28.2 tarballs have been signed by Stefan
---
diff --git a/CEA1DE21AB108493CC9C65742E82323B8F4353EE b/CEA1DE21AB108493CC9C65742E82323B8F4353EE
new file mode 100644
index 0000000..f2b7905
--- /dev/null
+++ b/CEA1DE21AB108493CC9C65742E82323B8F4353EE
@@ -0,0 +1,257 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: CEA1 DE21 AB10 8493 CC9C 6574 2E82 323B 8F43 53EE
+Comment: Stefan Kangas <skangas(a)skangas.se>
+Comment: Stefan Kangas <stefan(a)marxist.se>
+Comment: Stefan Kangas <stefankangas(a)gmail.com>
+
+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
+=gNkS
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/emacs.spec b/emacs.spec
index 92f5349..2993475 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -10,9 +10,8 @@ License: GPLv3+ and CC0
URL: http://www.gnu.org/software/emacs/
Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz.sig
-# get Eli Zaretskii's key
-# wget https://keys.openpgp.org/vks/v1/by-fingerprint/17E90D521672C04631B1183EE7... -O gpgkey-17E90D521672C04631B1183EE78DAE0F3115E06B.gpg
-Source2: gpgkey-17E90D521672C04631B1183EE78DAE0F3115E06B.gpg
+# Stefan Kangas' key
+Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/CEA1DE21AB108493CC9C65742E...
Source3: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/cdef...
Source4: dotemacs.el
Source5: site-start.el
diff --git a/gpgkey-17E90D521672C04631B1183EE78DAE0F3115E06B.gpg b/gpgkey-17E90D521672C04631B1183EE78DAE0F3115E06B.gpg
deleted file mode 100644
index 5e2fd16..0000000
--- a/gpgkey-17E90D521672C04631B1183EE78DAE0F3115E06B.gpg
+++ /dev/null
@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: 17E9 0D52 1672 C046 31B1 183E E78D AE0F 3115 E06B
-Comment: Eli Zaretskii <eliz(a)gnu.org>
-
-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
-=+3ql
------END PGP PUBLIC KEY BLOCK-----
https://src.fedoraproject.org/rpms/emacs/c/2d9a8cd7420813a23a00623e872183...
1Â year, 5Â months
pagure pushed to rpms/emacs (rawhide). "Add missing BuildRequires:
pkgconfig(systemd) (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 11:13:45 UTC
From e6bb9418752631827675299f1a6ff83e1edc29ee Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak(a)cgc-instruments.com>
Date: Dec 30 2022 23:07:31 +0000
Subject: Add missing BuildRequires: pkgconfig(systemd)
emacs-libdir-vs-systemd.patch relies on the systemd package config files being
in the buildroot, which stopped being the case in Fedora >= 37. Thus we need to
depend on systemd explicitly
---
diff --git a/emacs.spec b/emacs.spec
index d44519e..d1ad498 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -22,6 +22,8 @@ Source8: emacs-terminal.sh
# rhbz#713600
Patch1: emacs-spellchecker.patch
Patch2: emacs-system-crypto-policies.patch
+# causes a dependency on pkgconfig(systemd)
+# => remove it if we stop using this patch
Patch3: emacs-libdir-vs-systemd.patch
Patch4: emacs-pdmp-fingerprint.patch
Patch5: emacs-configure-c99-1.patch
@@ -80,6 +82,9 @@ BuildRequires: gnupg2
# For lucid
BuildRequires: Xaw3d-devel
+# for Patch3
+BuildRequires: pkgconfig(systemd)
+
%ifarch %{ix86}
BuildRequires: util-linux
%endif
https://src.fedoraproject.org/rpms/emacs/c/e6bb9418752631827675299f1a6ff8...
1Â year, 5Â months
pbrobinson pushed to rpms/uboot-tools (rawhide). "Update PinePhone
Pro to latest rev"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 11:07:08 UTC
From eee75bb93405dab219d382f79435fd65ef4aa9df Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson(a)gmail.com>
Date: Dec 31 2022 11:06:47 +0000
Subject: Update PinePhone Pro to latest rev
---
diff --git a/aarch64-boards b/aarch64-boards
index ab282d9..f8e2f3b 100644
--- a/aarch64-boards
+++ b/aarch64-boards
@@ -61,6 +61,7 @@ pinebook
pinebook-pro-rk3399
pine_h64
pinephone
+pinephone-pro-rk3399
pinetab
poplar
puma-rk3399
@@ -77,8 +78,8 @@ roc-pc-rk3399
rpi_3
rpi_4
rpi_arm64
-starqltechn
sopine_baseboard
+starqltechn
tanix_tx6
teres_i
turris_mox
diff --git a/rockchip-Add-initial-support-for-the-PinePhone-Pro.patch b/rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
index f06c063..30012ad 100644
--- a/rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
+++ b/rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
@@ -1,34 +1,38 @@
-From: Martijn Braam <martijn(a)brixit.nl>
-Subject: [PATCH] rockchip: Add initial support for the PinePhone Pro
-Date: Thu, 21 Oct 2021 19:18:43 +0200
+From 004af623388022d258cbc29c0b71d8e22cd96c52 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson(a)gmail.com>
+Date: Sat, 31 Dec 2022 09:20:34 +0000
+Subject: [PATCH v2 0/2] Initial support for Pinephone Pro
-This is a new device by PINE64 that's very similar to the Pinebook Pro
-that's already supported.
+This adds initial support for the PINE64 Pinephone Pro. It's a rebase
+to upstream core rk3399 DT pieces, and the addition of the upstream
+PPP DT from 6.2-rc1 and the U-Boot pieces are based on my work on
+the Pinebook Pro.
-Specification:
-- Rockchip RK3399
-- 4GB Dual-Channel LPDDR4
-- 128GB eMMC
-- mSD card slot
-- AP6255 for 802.11ac WiFi and Bluetooth
-- 6 inch 720*1440 DSI display
-- Quectel EG25g usb modem
-- Type-C port with alt-mode display (DP 1.2) and PD charging.
+Changes v2:
+- Drop the rk3399.dtsi sync for time being, causing issues around
+ clock/dram
+- Sync the Pinephone DT to 6.2-rc1
+- Update for the CONFIG_SYS_TEXT_BASE -> CONFIG_TEXT_BASE change
+- usb: ohci: Use a flexible array member for portstatus
+- Rename CONFIG_DM_VIDEO to CONFIG_VIDEO
+- Enable DM_REGULATOR_FAN53555
+- Don't initialize i2c before relocation
-Signed-off-by: Martijn Braam <martijn(a)brixit.nl>
----
+Peter Robinson (2):
+ arm64: dts: rk3399: Add upstream Pinephone Pro dts
+ rockchip: Add initial support for the PINE64 Pinephone Pro
arch/arm/dts/Makefile | 1 +
- arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 44 ++
- arch/arm/dts/rk3399-pinephone-pro.dts | 520 ++++++++++++++++++
+ arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 31 ++
+ arch/arm/dts/rk3399-pinephone-pro.dts | 474 ++++++++++++++++++
arch/arm/mach-rockchip/rk3399/Kconfig | 8 +
board/pine64/pinephone-pro-rk3399/Kconfig | 15 +
board/pine64/pinephone-pro-rk3399/MAINTAINERS | 8 +
board/pine64/pinephone-pro-rk3399/Makefile | 1 +
- .../pinephone-pro-rk3399.c | 57 ++
- configs/pinephone-pro-rk3399_defconfig | 92 ++++
- include/configs/pinephone-pro-rk3399.h | 23 +
- 10 files changed, 769 insertions(+)
+ .../pinephone-pro-rk3399.c | 76 +++
+ configs/pinephone-pro-rk3399_defconfig | 104 ++++
+ include/configs/pinephone-pro-rk3399.h | 19 +
+ 10 files changed, 737 insertions(+)
create mode 100644 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3399-pinephone-pro.dts
create mode 100644 board/pine64/pinephone-pro-rk3399/Kconfig
@@ -37,12 +41,30 @@ Signed-off-by: Martijn Braam <martijn(a)brixit.nl>
create mode 100644 board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
create mode 100644 configs/pinephone-pro-rk3399_defconfig
create mode 100644 include/configs/pinephone-pro-rk3399.h
-
+
+--
+2.39.0
+
+From 9976caacb35316cbe047ded58855d2ca1a54243b Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson(a)gmail.com>
+Date: Sat, 31 Dec 2022 09:18:44 +0000
+Subject: [PATCH v2 1/2] arm64: dts: rk3399: Add upstream Pinephone Pro dts
+
+Initial support for the PinePhone Pro has now landed upstream in
+Linux 6.1 RC1 so sync the dts from 6.2-rc1 for initial support.
+
+Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
+---
+ arch/arm/dts/Makefile | 1 +
+ arch/arm/dts/rk3399-pinephone-pro.dts | 474 ++++++++++++++++++++++++++
+ 2 files changed, 475 insertions(+)
+ create mode 100644 arch/arm/dts/rk3399-pinephone-pro.dts
+
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index ed3d360bb1..3206370226 100644
+index 43951a7731e..8c1eec1025f 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
-@@ -137,6 +137,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
+@@ -153,6 +153,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-nanopi-r4s.dtb \
rk3399-orangepi.dtb \
rk3399-pinebook-pro.dtb \
@@ -50,106 +72,115 @@ index ed3d360bb1..3206370226 100644
rk3399-puma-haikou.dtb \
rk3399-roc-pc.dtb \
rk3399-roc-pc-mezzanine.dtb \
-diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
-new file mode 100644
-index 0000000000..9d44db5978
---- /dev/null
-+++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
-@@ -0,0 +1,44 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Copyright (C) 2019 Peter Robinson <pbrobinson at gmail.com>
-+ * Copyright (C) 2021 Martijn Braam <martijn at brixit.nl>
-+ */
-+
-+#include "rk3399-u-boot.dtsi"
-+#include "rk3399-sdram-lpddr4-100.dtsi"
-+
-+/ {
-+ aliases {
-+ spi0 = &spi1;
-+ };
-+
-+ chosen {
-+ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
-+ };
-+
-+ config {
-+ u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
-+ };
-+};
-+
-+&i2c0 {
-+ u-boot,dm-pre-reloc;
-+};
-+
-+&rk818 {
-+ u-boot,dm-pre-reloc;
-+};
-+
-+&rng {
-+ status = "okay";
-+};
-+
-+&sdhci {
-+ max-frequency = <25000000>;
-+ u-boot,dm-pre-reloc;
-+};
-+
-+&sdmmc {
-+ max-frequency = <20000000>;
-+ u-boot,dm-pre-reloc;
-+};
diff --git a/arch/arm/dts/rk3399-pinephone-pro.dts b/arch/arm/dts/rk3399-pinephone-pro.dts
new file mode 100644
-index 0000000000..3fe1845ced
+index 00000000000..04403a76238
--- /dev/null
+++ b/arch/arm/dts/rk3399-pinephone-pro.dts
-@@ -0,0 +1,520 @@
+@@ -0,0 +1,474 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
-+ * Copyright (c) 2021 Martijn Braam <martijn(a)brixit.nl>
++ * Copyright (c) 2020 Martijn Braam <martijn(a)brixit.nl>
++ * Copyright (c) 2021 Kamil Trzciński <ayufan(a)ayufan.eu>
++ */
++
++/*
++ * PinePhone Pro datasheet:
++ * https://files.pine64.org/doc/PinePhonePro/PinephonePro-Schematic-V1.0-202...
+ */
+
+/dts-v1/;
++#include <dt-bindings/input/linux-event-codes.h>
+#include "rk3399.dtsi"
+#include "rk3399-opp.dtsi"
+
+/ {
-+ model = "Pine64 PinePhone Pro";
++ model = "Pine64 PinePhonePro";
+ compatible = "pine64,pinephone-pro", "rockchip,rk3399";
++ chassis-type = "handset";
++
++ aliases {
++ mmc0 = &sdio0;
++ mmc1 = &sdmmc;
++ mmc2 = &sdhci;
++ };
+
+ chosen {
-+ stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
-+ sdio_pwrseq: sdio-pwrseq {
-+ compatible = "mmc-pwrseq-simple";
++ gpio-keys {
++ compatible = "gpio-keys";
+ pinctrl-names = "default";
++ pinctrl-0 = <&pwrbtn_pin>;
++
++ key-power {
++ debounce-interval = <20>;
++ gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
++ label = "Power";
++ linux,code = <KEY_POWER>;
++ wakeup-source;
++ };
+ };
+
-+ /* Power tree */
-+ /* Root power source */
-+ vcc_sysin: vcc-sysin {
++ vcc_sys: vcc-sys-regulator {
+ compatible = "regulator-fixed";
-+ regulator-name = "vcc_sysin";
++ regulator-name = "vcc_sys";
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
-+ /* Main 3.3v supply */
-+ vcc3v3_sys: vcc3v3-sys {
++ vcc3v3_sys: vcc3v3-sys-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc3v3_sys";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
-+ vin-supply = <&vcc_sysin>;
++ vin-supply = <&vcc_sys>;
++ };
+
-+ regulator-state-mem {
-+ regulator-on-in-suspend;
-+ };
++ vcca1v8_s3: vcc1v8-s3-regulator {
++ compatible = "regulator-fixed";
++ regulator-name = "vcca1v8_s3";
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ vin-supply = <&vcc3v3_sys>;
++ regulator-always-on;
++ regulator-boot-on;
++ };
++
++ vcc1v8_codec: vcc1v8-codec-regulator {
++ compatible = "regulator-fixed";
++ enable-active-high;
++ gpio = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&vcc1v8_codec_en>;
++ regulator-name = "vcc1v8_codec";
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ vin-supply = <&vcc3v3_sys>;
++ };
++
++ wifi_pwrseq: sdio-wifi-pwrseq {
++ compatible = "mmc-pwrseq-simple";
++ clocks = <&rk818 1>;
++ clock-names = "ext_clock";
++ pinctrl-names = "default";
++ pinctrl-0 = <&wifi_enable_h_pin>;
++ /*
++ * Wait between power-on and SDIO access for CYP43455
++ * POR circuit.
++ */
++ post-power-on-delay-ms = <110>;
++ /*
++ * Wait between consecutive toggles for CYP43455 CBUCK
++ * regulator discharge.
++ */
++ power-off-delay-us = <10000>;
++
++ /* WL_REG_ON on module */
++ reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
+ };
+};
+
@@ -181,11 +212,6 @@ index 0000000000..3fe1845ced
+ status = "okay";
+};
+
-+&gpu {
-+ mali-supply = <&vdd_gpu>;
-+ status = "okay";
-+};
-+
+&i2c0 {
+ clock-frequency = <400000>;
+ i2c-scl-rising-time-ns = <168>;
@@ -204,22 +230,22 @@ index 0000000000..3fe1845ced
+ rockchip,system-power-controller;
+ wakeup-source;
+
-+ vcc1-supply = <&vcc_sysin>;
-+ vcc2-supply = <&vcc_sysin>;
-+ vcc3-supply = <&vcc_sysin>;
-+ vcc4-supply = <&vcc_sysin>;
-+ vcc6-supply = <&vcc_sysin>;
++ vcc1-supply = <&vcc_sys>;
++ vcc2-supply = <&vcc_sys>;
++ vcc3-supply = <&vcc_sys>;
++ vcc4-supply = <&vcc_sys>;
++ vcc6-supply = <&vcc_sys>;
+ vcc7-supply = <&vcc3v3_sys>;
-+ vcc8-supply = <&vcc_sysin>;
++ vcc8-supply = <&vcc_sys>;
+ vcc9-supply = <&vcc3v3_sys>;
+
+ regulators {
+ vdd_cpu_l: DCDC_REG1 {
-+ regulator-name = "vdd_cpu_1";
++ regulator-name = "vdd_cpu_l";
+ regulator-always-on;
+ regulator-boot-on;
-+ regulator-min-microvolt = <750000>;
-+ regulator-max-microvolt = <1350000>;
++ regulator-min-microvolt = <875000>;
++ regulator-max-microvolt = <975000>;
+ regulator-ramp-delay = <6001>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
@@ -231,7 +257,7 @@ index 0000000000..3fe1845ced
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <800000>;
-+ regulator-max-microvolt = <1350000>;
++ regulator-max-microvolt = <1000000>;
+ regulator-ramp-delay = <6001>;
+ regulator-state-mem {
+ regulator-off-in-suspend;
@@ -255,52 +281,35 @@ index 0000000000..3fe1845ced
+ regulator-max-microvolt = <1800000>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
-+ regulator-suspend-microvolt = <1800000>;
+ };
+ };
+
+ vcca3v0_codec: LDO_REG1 {
+ regulator-name = "vcca3v0_codec";
-+ regulator-always-on;
-+ regulator-boot-on;
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
-+ regulator-state-mem {
-+ regulator-off-in-suspend;
-+ };
+ };
+
+ vcc3v0_touch: LDO_REG2 {
+ regulator-name = "vcc3v0_touch";
-+ regulator-always-on;
-+ regulator-boot-on;
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
-+ regulator-state-mem {
-+ regulator-off-in-suspend;
-+ };
+ };
+
+ vcca1v8_codec: LDO_REG3 {
+ regulator-name = "vcca1v8_codec";
-+ regulator-always-on;
-+ regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
-+ regulator-state-mem {
-+ regulator-off-in-suspend;
-+ };
+ };
+
-+ vcc_power_on: LDO_REG4 {
-+ regulator-name = "vcc_power_on";
++ rk818_pwr_on: LDO_REG4 {
++ regulator-name = "rk818_pwr_on";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
-+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
@@ -312,7 +321,6 @@ index 0000000000..3fe1845ced
+ regulator-max-microvolt = <3000000>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
-+ regulator-suspend-microvolt = <3000000>;
+ };
+ };
+
@@ -324,19 +332,13 @@ index 0000000000..3fe1845ced
+ regulator-max-microvolt = <1500000>;
+ regulator-state-mem {
+ regulator-on-in-suspend;
-+ regulator-suspend-microvolt = <1500000>;
+ };
+ };
+
+ vcc1v8_dvp: LDO_REG7 {
+ regulator-name = "vcc1v8_dvp";
-+ regulator-always-on;
-+ regulator-boot-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
-+ regulator-state-mem {
-+ regulator-off-in-suspend;
-+ };
+ };
+
+ vcc3v3_s3: LDO_REG8 {
@@ -350,14 +352,10 @@ index 0000000000..3fe1845ced
+ };
+ };
+
-+ vcc_sd: LDO_REG9 {
-+ regulator-name = "vcc_sd";
++ vccio_sd: LDO_REG9 {
++ regulator-name = "vccio_sd";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
-+ regulator-state-mem {
-+ regulator-on-in-suspend;
-+ regulator-suspend-microvolt = <3300000>;
-+ };
+ };
+
+ vcc3v3_s0: SWITCH_REG {
@@ -368,22 +366,6 @@ index 0000000000..3fe1845ced
+ regulator-on-in-suspend;
+ };
+ };
-+
-+ boost_otg: DCDC_BOOST {
-+ regulator-name = "boost_otg";
-+ regulator-always-on;
-+ regulator-boot-on;
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ regulator-state-mem {
-+ regulator-on-in-suspend;
-+ regulator-suspend-microvolt = <5000000>;
-+ };
-+ };
-+
-+ otg_switch: OTG_SWITCH {
-+ regulator-name = "otg_switch";
-+ };
+ };
+ };
+
@@ -394,8 +376,8 @@ index 0000000000..3fe1845ced
+ pinctrl-names = "default";
+ pinctrl-0 = <&vsel1_pin>;
+ regulator-name = "vdd_cpu_b";
-+ regulator-min-microvolt = <712500>;
-+ regulator-max-microvolt = <1500000>;
++ regulator-min-microvolt = <875000>;
++ regulator-max-microvolt = <1150000>;
+ regulator-ramp-delay = <1000>;
+ regulator-always-on;
+ regulator-boot-on;
@@ -412,8 +394,8 @@ index 0000000000..3fe1845ced
+ pinctrl-names = "default";
+ pinctrl-0 = <&vsel2_pin>;
+ regulator-name = "vdd_gpu";
-+ regulator-min-microvolt = <712500>;
-+ regulator-max-microvolt = <1500000>;
++ regulator-min-microvolt = <875000>;
++ regulator-max-microvolt = <975000>;
+ regulator-ramp-delay = <1000>;
+ regulator-always-on;
+ regulator-boot-on;
@@ -424,95 +406,47 @@ index 0000000000..3fe1845ced
+ };
+};
+
-+&i2c1 {
-+ i2c-scl-rising-time-ns = <300>;
-+ i2c-scl-falling-time-ns = <15>;
-+ status = "okay";
-+};
++&cluster0_opp {
++ opp04 {
++ status = "disabled";
++ };
+
-+&i2c3 {
-+ i2c-scl-rising-time-ns = <450>;
-+ i2c-scl-falling-time-ns = <15>;
-+ status = "okay";
++ opp05 {
++ status = "disabled";
++ };
+};
+
-+&i2c4 {
-+ i2c-scl-rising-time-ns = <600>;
-+ i2c-scl-falling-time-ns = <20>;
-+ status = "okay";
++&cluster1_opp {
++ opp06 {
++ opp-hz = /bits/ 64 <1500000000>;
++ opp-microvolt = <1100000 1100000 1150000>;
++ };
+
-+ fusb0: typec-portc@22 {
-+ compatible = "fcs,fusb302";
-+ reg = <0x22>;
-+ interrupt-parent = <&gpio1>;
-+ interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&fusb0_int>;
-+ status = "okay";
++ opp07 {
++ status = "disabled";
+ };
+};
+
+&io_domains {
-+ status = "okay";
-+
+ bt656-supply = <&vcc1v8_dvp>;
+ audio-supply = <&vcca1v8_codec>;
-+ sdmmc-supply = <&vcc_sd>;
++ sdmmc-supply = <&vccio_sd>;
+ gpio1830-supply = <&vcc_3v0>;
++ status = "okay";
+};
+
+&pmu_io_domains {
-+ pmu1830-supply = <&vcc_3v0>;
++ pmu1830-supply = <&vcc_1v8>;
+ status = "okay";
+};
+
+&pinctrl {
-+ bt {
-+ bt_enable_h: bt-enable-h {
-+ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
-+ };
-+
-+ bt_host_wake_l: bt-host-wake-l {
-+ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
-+ };
-+
-+ bt_wake_l: bt-wake-l {
-+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
-+ };
-+ };
-+
+ buttons {
-+ pwrbtn: pwrbtn {
++ pwrbtn_pin: pwrbtn-pin {
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+
-+ fusb302x {
-+ fusb0_int: fusb0-int {
-+ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
-+ };
-+ };
-+
-+ leds {
-+ work_led_pin: work-led-pin {
-+ rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
-+ };
-+
-+ diy_led_pin: diy-led-pin {
-+ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
-+ };
-+ };
-+
-+ pcie {
-+ pcie_perst: pcie-perst {
-+ rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
-+ };
-+
-+ pcie_pwr_en: pcie-pwr-en {
-+ rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
-+ };
-+ };
-+
+ pmic {
+ pmic_int_l: pmic-int-l {
+ rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -527,42 +461,31 @@ index 0000000000..3fe1845ced
+ };
+ };
+
-+ sdcard {
-+ sdmmc0_pwr_h: sdmmc0-pwr-h {
-+ rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
-+ };
-+
-+ };
-+
+ sdio-pwrseq {
-+ wifi_enable_h: wifi-enable-h {
++ wifi_enable_h_pin: wifi-enable-h-pin {
+ rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
-+ usb-typec {
-+ vcc5v0_typec_en: vcc5v0_typec_en {
-+ rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
++ sound {
++ vcc1v8_codec_en: vcc1v8-codec-en {
++ rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
+ };
+ };
+
-+ usb2 {
-+ vcc5v0_host_en: vcc5v0-host-en {
-+ rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
++ wireless-bluetooth {
++ bt_wake_pin: bt-wake-pin {
++ rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
-+ };
-+};
+
-+&pwm0 {
-+ status = "okay";
-+};
-+
-+&pwm1 {
-+ status = "okay";
-+};
++ bt_host_wake_pin: bt-host-wake-pin {
++ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
++ };
+
-+&pwm2 {
-+ status = "okay";
++ bt_reset_pin: bt-reset-pin {
++ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
++ };
++ };
+};
+
+&sdio0 {
@@ -571,7 +494,7 @@ index 0000000000..3fe1845ced
+ cap-sdio-irq;
+ disable-wp;
+ keep-power-in-suspend;
-+ mmc-pwrseq = <&sdio_pwrseq>;
++ mmc-pwrseq = <&wifi_pwrseq>;
+ non-removable;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
@@ -582,13 +505,13 @@ index 0000000000..3fe1845ced
+&sdmmc {
+ bus-width = <4>;
+ cap-sd-highspeed;
-+ cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
++ cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
+ disable-wp;
+ max-frequency = <150000000>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
-+ vmmc-supply = <&vcc3v3_s3>;
-+ vqmmc-supply = <&vcc_1v8>;
++ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
++ vmmc-supply = <&vcc3v3_sys>;
++ vqmmc-supply = <&vccio_sd>;
+ status = "okay";
+};
+
@@ -600,51 +523,133 @@ index 0000000000..3fe1845ced
+};
+
+&tsadc {
-+ /* tshut mode 0:CRU 1:GPIO */
+ rockchip,hw-tshut-mode = <1>;
-+ /* tshut polarity 0:LOW 1:HIGH */
+ rockchip,hw-tshut-polarity = <1>;
+ status = "okay";
+};
+
-+&uart2 {
++&uart0 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
++ uart-has-rtscts;
+ status = "okay";
++
++ bluetooth {
++ compatible = "brcm,bcm4345c5";
++ clocks = <&rk818 1>;
++ clock-names = "lpo";
++ device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
++ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
++ max-speed = <1500000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&bt_host_wake_pin &bt_wake_pin &bt_reset_pin>;
++ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
++ vbat-supply = <&vcc3v3_sys>;
++ vddio-supply = <&vcc_1v8>;
++ };
+};
+
-+&vopb {
++&uart2 {
+ status = "okay";
+};
+--
+2.39.0
+
+From 004af623388022d258cbc29c0b71d8e22cd96c52 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson(a)gmail.com>
+Date: Wed, 28 Dec 2022 03:52:27 +0000
+Subject: [PATCH v2 2/2] rockchip: Add initial support for the PINE64 Pinephone
+ Pro
+
+The Pinephone Pro is another device by PINE64. It's closely related
+to the Pinebook Pro of which this initial support is derived from.
+
+Specification:
+- A variant of the Rockchip RK3399
+- A 6 inch 720*1440 DSI display
+- Front and rear cameras
+- Type-C interface with alt mode display (DP 1.2) and PD charging
+- 4GB LPDDR4 RAM
+- 128GB eMMC
+- mSD card slot
+- An AP6255 module for 802.11ac WiFi and Bluetooth 5
+- Quectel EG25-G 4G/LTE modem
+
+Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
+---
+ arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 31 ++++++
+ arch/arm/mach-rockchip/rk3399/Kconfig | 8 ++
+ board/pine64/pinephone-pro-rk3399/Kconfig | 15 +++
+ board/pine64/pinephone-pro-rk3399/MAINTAINERS | 8 ++
+ board/pine64/pinephone-pro-rk3399/Makefile | 1 +
+ .../pinephone-pro-rk3399.c | 76 +++++++++++++
+ configs/pinephone-pro-rk3399_defconfig | 104 ++++++++++++++++++
+ include/configs/pinephone-pro-rk3399.h | 19 ++++
+ 8 files changed, 262 insertions(+)
+ create mode 100644 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
+ create mode 100644 board/pine64/pinephone-pro-rk3399/Kconfig
+ create mode 100644 board/pine64/pinephone-pro-rk3399/MAINTAINERS
+ create mode 100644 board/pine64/pinephone-pro-rk3399/Makefile
+ create mode 100644 board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
+ create mode 100644 configs/pinephone-pro-rk3399_defconfig
+ create mode 100644 include/configs/pinephone-pro-rk3399.h
+
+diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
+new file mode 100644
+index 00000000000..1dad283ad05
+--- /dev/null
++++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
+@@ -0,0 +1,31 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * Copyright (C) 2022 Peter Robinson <pbrobinson at gmail.com>
++ */
+
-+&vopb_mmu {
-+ status = "okay";
++#include "rk3399-u-boot.dtsi"
++#include "rk3399-sdram-lpddr4-100.dtsi"
++
++/ {
++ chosen {
++ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
++ };
++
++ config {
++ u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
++ };
+};
+
-+&vopl {
++&rng {
+ status = "okay";
+};
+
-+&vopl_mmu {
-+ status = "okay";
++&sdhci {
++ max-frequency = <25000000>;
++ u-boot,dm-pre-reloc;
++};
++
++&sdmmc {
++ max-frequency = <20000000>;
++ u-boot,dm-pre-reloc;
+};
diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
-index 17628f9171..3ba603ca80 100644
+index b48feeb3466..d01063ac98b 100644
--- a/arch/arm/mach-rockchip/rk3399/Kconfig
+++ b/arch/arm/mach-rockchip/rk3399/Kconfig
-@@ -28,6 +28,13 @@ config TARGET_PINEBOOK_PRO_RK3399
+@@ -39,6 +39,13 @@ config TARGET_PINEBOOK_PRO_RK3399
with 4Gb RAM, onboard eMMC, USB-C, a USB3 and USB2 port,
1920*1080 screen and all the usual laptop features.
+config TARGET_PINEPHONE_PRO_RK3399
+ bool "PinePhone Pro"
+ help
-+ PinePhone Pro is a phone based on the Rockchip rk3399 SoC
-+ with 4Gb RAM, onboard eMMC, USB-C, a headphone jack,
-+ 720x1440 screen and an external Quectel USB modem.
++ PinePhone Pro is a phone based on a variant of the Rockchip
++ rk3399 SoC with 4Gb RAM, onboard eMMC, USB-C, headphone jack,
++ 720x1440 screen and a Quectel 4G/LTE modem.
+
config TARGET_PUMA_RK3399
bool "Theobroma Systems RK3399-Q7 (Puma)"
help
-@@ -154,6 +161,7 @@ endif # BOOTCOUNT_LIMIT
+@@ -165,6 +172,7 @@ endif # BOOTCOUNT_LIMIT
source "board/firefly/roc-pc-rk3399/Kconfig"
source "board/google/gru/Kconfig"
source "board/pine64/pinebook-pro-rk3399/Kconfig"
@@ -654,7 +659,7 @@ index 17628f9171..3ba603ca80 100644
source "board/theobroma-systems/puma_rk3399/Kconfig"
diff --git a/board/pine64/pinephone-pro-rk3399/Kconfig b/board/pine64/pinephone-pro-rk3399/Kconfig
new file mode 100644
-index 0000000000..13d6465ae6
+index 00000000000..13d6465ae6e
--- /dev/null
+++ b/board/pine64/pinephone-pro-rk3399/Kconfig
@@ -0,0 +1,15 @@
@@ -675,12 +680,12 @@ index 0000000000..13d6465ae6
+endif
diff --git a/board/pine64/pinephone-pro-rk3399/MAINTAINERS b/board/pine64/pinephone-pro-rk3399/MAINTAINERS
new file mode 100644
-index 0000000000..9ca4fc4cbe
+index 00000000000..c923ff1be32
--- /dev/null
+++ b/board/pine64/pinephone-pro-rk3399/MAINTAINERS
@@ -0,0 +1,8 @@
+PINEPHONE_PRO
-+M: Martijn Braam <martijn(a)brixit.nl>
++M: Peter Robinson <pbrobinson(a)gmail.com>
+S: Maintained
+F: board/pine64/rk3399-pinephone-pro/
+F: include/configs/rk3399-pinephone-pro.h
@@ -689,21 +694,21 @@ index 0000000000..9ca4fc4cbe
+F: configs/pinephone-pro-rk3399_defconfig
diff --git a/board/pine64/pinephone-pro-rk3399/Makefile b/board/pine64/pinephone-pro-rk3399/Makefile
new file mode 100644
-index 0000000000..8d9203053e
+index 00000000000..8d9203053e5
--- /dev/null
+++ b/board/pine64/pinephone-pro-rk3399/Makefile
@@ -0,0 +1 @@
+obj-y += pinephone-pro-rk3399.o
diff --git a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
new file mode 100644
-index 0000000000..8efeb6ea3d
+index 00000000000..eb639cd0d07
--- /dev/null
+++ b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
-+ * (C) Copyright 2019 Vasily Khoruzhick <anarsoul(a)gmail.com>
-+ * (C) Copyright 2021 Martijn Braam <martijn(a)brixit.nl>
++ * (C) Copyright 2016 Rockchip Electronics Co., Ltd
++ * (C) Copyright 2022 Peter Robinson <pbrobinson at gmail.com>
+ */
+
+#include <common.h>
@@ -715,17 +720,39 @@ index 0000000000..8efeb6ea3d
+#include <asm/arch-rockchip/grf_rk3399.h>
+#include <asm/arch-rockchip/hardware.h>
+#include <asm/arch-rockchip/misc.h>
++#include <power/regulator.h>
+
+#define GRF_IO_VSEL_BT565_SHIFT 0
+#define PMUGRF_CON0_VSEL_SHIFT 8
+
++#ifndef CONFIG_SPL_BUILD
++int board_early_init_f(void)
++{
++ struct udevice *regulator;
++ int ret;
++
++ ret = regulator_get_by_platname("vcc5v0_usb", ®ulator);
++ if (ret) {
++ pr_debug("%s vcc5v0_usb init fail! ret %d\n", __func__, ret);
++ goto out;
++ }
++
++ ret = regulator_set_enable(regulator, true);
++ if (ret)
++ pr_debug("%s vcc5v0-host-en-gpio set fail! ret %d\n", __func__, ret);
++
++out:
++ return 0;
++}
++#endif
++
+#ifdef CONFIG_MISC_INIT_R
+static void setup_iodomain(void)
+{
+ struct rk3399_grf_regs *grf =
-+ syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
++ syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+ struct rk3399_pmugrf_regs *pmugrf =
-+ syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);
++ syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);
+
+ /* BT565 is in 1.8v domain */
+ rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT);
@@ -751,42 +778,49 @@ index 0000000000..8efeb6ea3d
+ if (ret)
+ return ret;
+
-+ ret = rockchip_setup_macaddr();
-+
+ return ret;
+}
-+
+#endif
diff --git a/configs/pinephone-pro-rk3399_defconfig b/configs/pinephone-pro-rk3399_defconfig
new file mode 100644
-index 0000000000..2cf80f7d35
+index 00000000000..eb979f6c051
--- /dev/null
+++ b/configs/pinephone-pro-rk3399_defconfig
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,104 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
++CONFIG_COUNTER_FREQUENCY=24000000
+CONFIG_ARCH_ROCKCHIP=y
-+CONFIG_SYS_TEXT_BASE=0x00200000
++CONFIG_TEXT_BASE=0x00200000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x8000
++CONFIG_ENV_OFFSET=0x3F8000
++CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinephone-pro"
+CONFIG_ROCKCHIP_RK3399=y
+CONFIG_TARGET_PINEPHONE_PRO_RK3399=y
+CONFIG_DEBUG_UART_BASE=0xFF1A0000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
-+CONFIG_SPL_SPI_SUPPORT=y
-+CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinephone-pro"
-+CONFIG_DEBUG_UART=y
++CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x800800
++CONFIG_DEBUG_UART=y
++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
+CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinephone-pro.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_R=y
++CONFIG_SPL_MAX_SIZE=0x2e000
++CONFIG_SPL_PAD_TO=0x7f8000
++CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
++CONFIG_SPL_BSS_START_ADDR=0x400000
++CONFIG_SPL_BSS_MAX_SIZE=0x2000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
++# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
++CONFIG_SPL_STACK=0x400000
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
-+CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_TPL=y
+CONFIG_CMD_BOOTZ=y
@@ -804,6 +838,7 @@ index 0000000000..2cf80f7d35
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
++CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_DM_KEYBOARD=y
@@ -816,13 +851,14 @@ index 0000000000..2cf80f7d35
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
++CONFIG_SF_DEFAULT_BUS=1
+CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_DM_ETH=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
+CONFIG_DM_PMIC_FAN53555=y
++CONFIG_DM_REGULATOR_FAN53555=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK8XX=y
@@ -849,23 +885,22 @@ index 0000000000..2cf80f7d35
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_RTL8152=y
-+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
++CONFIG_VIDEO=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_EDP=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
diff --git a/include/configs/pinephone-pro-rk3399.h b/include/configs/pinephone-pro-rk3399.h
new file mode 100644
-index 0000000000..fefa793fdd
+index 00000000000..78017d6bcc3
--- /dev/null
+++ b/include/configs/pinephone-pro-rk3399.h
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2016 Rockchip Electronics Co., Ltd
-+ * Copyright (C) 2020 Peter Robinson <pbrobinson at gmail.com>
-+ * Copyright (C) 2021 Martijn Braam <martijn(a)brixit.nl>
++ * Copyright (C) 2022 Peter Robinson <pbrobinson at gmail.com>
+ */
+
+#ifndef __PINEPHONE_PRO_RK3399_H
@@ -880,89 +915,6 @@ index 0000000000..fefa793fdd
+
+#define SDRAM_BANK_SIZE (2UL << 30)
+
-+#define CONFIG_USB_OHCI_NEW
-+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-+
+#endif
---- u-boot-2022.10/configs/pinephone-pro-rk3399_defconfig.orig 2022-10-12 16:14:17.050158119 +0100
-+++ u-boot-2022.10/configs/pinephone-pro-rk3399_defconfig 2022-10-12 16:14:28.525240728 +0100
-@@ -1,27 +1,37 @@
- CONFIG_ARM=y
- CONFIG_SKIP_LOWLEVEL_INIT=y
-+CONFIG_COUNTER_FREQUENCY=24000000
- CONFIG_ARCH_ROCKCHIP=y
- CONFIG_SYS_TEXT_BASE=0x00200000
- CONFIG_NR_DRAM_BANKS=1
- CONFIG_ENV_SIZE=0x8000
-+CONFIG_ENV_OFFSET=0x3F8000
-+CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinephone-pro"
- CONFIG_ROCKCHIP_RK3399=y
- CONFIG_TARGET_PINEPHONE_PRO_RK3399=y
- CONFIG_DEBUG_UART_BASE=0xFF1A0000
- CONFIG_DEBUG_UART_CLOCK=24000000
- CONFIG_SPL_SPI_FLASH_SUPPORT=y
--CONFIG_SPL_SPI_SUPPORT=y
--CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinephone-pro"
--CONFIG_DEBUG_UART=y
-+CONFIG_SPL_SPI=y
- CONFIG_SYS_LOAD_ADDR=0x800800
-+CONFIG_DEBUG_UART=y
-+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
- CONFIG_BOOTDELAY=3
- CONFIG_USE_PREBOOT=y
- CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinephone-pro.dtb"
- CONFIG_DISPLAY_BOARDINFO_LATE=y
- CONFIG_MISC_INIT_R=y
-+CONFIG_SPL_MAX_SIZE=0x2e000
-+CONFIG_SPL_PAD_TO=0x7f8000
-+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
-+CONFIG_SPL_BSS_START_ADDR=0x400000
-+CONFIG_SPL_BSS_MAX_SIZE=0x2000
- # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
-+CONFIG_SPL_STACK=0x400000
- CONFIG_SPL_STACK_R=y
- CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
--CONFIG_SPL_MTD_SUPPORT=y
- CONFIG_SPL_SPI_LOAD=y
- CONFIG_TPL=y
- CONFIG_CMD_BOOTZ=y
-@@ -39,6 +49,7 @@
- CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
- CONFIG_ENV_IS_IN_SPI_FLASH=y
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_SPL_DM_SEQ_ALIAS=y
- CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
- CONFIG_DM_KEYBOARD=y
-@@ -51,10 +62,10 @@
- CONFIG_MMC_SDHCI=y
- CONFIG_MMC_SDHCI_SDMA=y
- CONFIG_MMC_SDHCI_ROCKCHIP=y
-+CONFIG_SF_DEFAULT_BUS=1
- CONFIG_SF_DEFAULT_SPEED=20000000
- CONFIG_SPI_FLASH_GIGADEVICE=y
- CONFIG_SPI_FLASH_WINBOND=y
--CONFIG_DM_ETH=y
- CONFIG_PHY_ROCKCHIP_INNO_USB2=y
- CONFIG_PHY_ROCKCHIP_TYPEC=y
- CONFIG_DM_PMIC_FAN53555=y
-@@ -77,6 +88,7 @@
- CONFIG_USB_EHCI_GENERIC=y
- CONFIG_USB_OHCI_HCD=y
- CONFIG_USB_OHCI_GENERIC=y
-+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
- CONFIG_USB_DWC3=y
- CONFIG_USB_DWC3_GENERIC=y
- CONFIG_USB_KEYBOARD=y
---- u-boot-2022.10/include/configs/pinephone-pro-rk3399.h.orig 2022-10-12 16:14:51.881408874 +0100
-+++ u-boot-2022.10/include/configs/pinephone-pro-rk3399.h 2022-10-12 16:14:58.693457915 +0100
-@@ -17,7 +17,4 @@
-
- #define SDRAM_BANK_SIZE (2UL << 30)
-
--#define CONFIG_USB_OHCI_NEW
--#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
--
- #endif
+--
+2.39.0
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 09d8e3e..095727c 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -7,7 +7,7 @@
Name: uboot-tools
Version: 2023.01
-Release: 0.3%{?candidate:.%{candidate}}%{?dist}
+Release: 0.4%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
URL: http://www.denx.de/wiki/U-Boot
@@ -211,6 +211,9 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
%endif
%changelog
+* Sat Dec 31 2022 Peter Robinson <pbrobinson(a)fedoraproject.org> - 2023.01-0.4.rc4
+- Update PinePhone Pro to latest rev
+
* Tue Dec 20 2022 Peter Robinson <pbrobinson(a)fedoraproject.org> - 2023.01-0.3.rc4
- Update to 2023.01 RC4
https://src.fedoraproject.org/rpms/uboot-tools/c/eee75bb93405dab219d382f7...
1Â year, 5Â months
valtri pushed to rpms/rubygem-ox (rawhide). "Update to 2.14.12 (#2156597)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 10:13:47 UTC
From e1ee5b3f39cfb64c9a32dae694dde3e2e7523457 Mon Sep 17 00:00:00 2001
From: František Dvořák <valtri(a)civ.zcu.cz>
Date: Dec 31 2022 10:07:48 +0000
Subject: Update to 2.14.12 (#2156597)
---
diff --git a/.gitignore b/.gitignore
index 973f941..0215bfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@
/rubygem-ox-2.14.8-repo.tgz
/ox-2.14.11.gem
/rubygem-ox-2.14.11-repo.tgz
+/ox-2.14.12.gem
+/rubygem-ox-2.14.12-repo.tgz
diff --git a/rubygem-ox-2.14.11-ox-dump-order.patch b/rubygem-ox-2.14.11-ox-dump-order.patch
deleted file mode 100644
index 12fe7cc..0000000
--- a/rubygem-ox-2.14.11-ox-dump-order.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From 6f759e9b1c153ed97a9f8618adceb480bdae993c Mon Sep 17 00:00:00 2001
-From: Peter Fry <peter.fry(a)mac.com>
-Date: Fri, 16 Dec 2022 10:36:54 -0500
-Subject: [PATCH 1/3] Resolve warnings:
-
-warning: undefining the allocator of T_DATA class Ox::Cache
-warning: undefining the allocator of T_DATA class Ox::Sax::Value
-
-See: https://bugs.ruby-lang.org/issues/18007
-
-Order of dumped XML elements changed in a test, but I believe the
-change is not significant.
----
- ext/ox/builder.c | 1 +
- ext/ox/intern.c | 1 +
- ext/ox/sax_as.c | 2 ++
- test/tests.rb | 10 +++++-----
- 4 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/ext/ox/builder.c b/ext/ox/builder.c
-index ad854d7..9db6d82 100644
---- a/ext/ox/builder.c
-+++ b/ext/ox/builder.c
-@@ -952,6 +952,7 @@ ox_init_builder(VALUE ox) {
- ox = rb_define_module("Ox");
- #endif
- builder_class = rb_define_class_under(ox, "Builder", rb_cObject);
-+ rb_undef_alloc_func(builder_class);
- rb_define_module_function(builder_class, "new", builder_new, -1);
- rb_define_module_function(builder_class, "file", builder_file, -1);
- rb_define_module_function(builder_class, "io", builder_io, -1);
-diff --git a/ext/ox/intern.c b/ext/ox/intern.c
-index ffd2656..a470604 100644
---- a/ext/ox/intern.c
-+++ b/ext/ox/intern.c
-@@ -68,6 +68,7 @@ static VALUE form_id(const char *str, size_t len) {
-
- void ox_hash_init() {
- VALUE cache_class = rb_define_class_under(Ox, "Cache", rb_cObject);
-+ rb_undef_alloc_func(cache_class);
-
- ox_str_cache = ox_cache_create(0, form_str, true, false);
- ox_str_cache_obj = Data_Wrap_Struct(cache_class, ox_cache_mark, ox_cache_free, ox_str_cache);
-diff --git a/ext/ox/sax_as.c b/ext/ox/sax_as.c
-index 644fc40..861cc25 100644
---- a/ext/ox/sax_as.c
-+++ b/ext/ox/sax_as.c
-@@ -255,10 +255,12 @@ ox_sax_define() {
- #if 0
- ox = rb_define_module("Ox");
- sax_module = rb_define_class_under(ox, "Sax", rb_cObject);
-+ rb_undef_alloc_func(sax_module);
- #endif
- VALUE sax_module = rb_const_get_at(Ox, rb_intern("Sax"));
-
- ox_sax_value_class = rb_define_class_under(sax_module, "Value", rb_cObject);
-+ rb_undef_alloc_func(ox_sax_value_class);
-
- rb_define_method(ox_sax_value_class, "as_s", sax_value_as_s, 0);
- rb_define_method(ox_sax_value_class, "as_sym", sax_value_as_sym, 0);
-diff --git a/test/tests.rb b/test/tests.rb
-index 117be7b..5419acd 100755
---- a/test/tests.rb
-+++ b/test/tests.rb
-@@ -795,6 +795,11 @@ def test_dump_margin
- x = Ox.dump(Bag.new(:@o => Bag.new(:@a => [2]), :@a => [1, {:b => 3, :a => [5], :c => Bag.new(:@x => 7)}]), :indent => 1, :margin => '##')
-
- assert_equal('##<o c="Bag">
-+## <o a="@o" c="Bag">
-+## <a a="@a">
-+## <i>2</i>
-+## </a>
-+## </o>
- ## <a a="@a">
- ## <i>1</i>
- ## <h>
-@@ -810,11 +815,6 @@ def test_dump_margin
- ## </o>
- ## </h>
- ## </a>
--## <o a="@o" c="Bag">
--## <a a="@a">
--## <i>2</i>
--## </a>
--## </o>
- ##</o>
- ', x)
- end
-
-From 81dfa2f82b22c5effdabd29cb36ef35a46e8b5b2 Mon Sep 17 00:00:00 2001
-From: Peter Fry <peter.fry(a)mac.com>
-Date: Mon, 19 Dec 2022 09:11:26 -0500
-Subject: [PATCH 2/3] Split the assert into two asserts that verify both
- elements are exported, but not requiring them be in a particular order.
-
----
- test/tests.rb | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/test/tests.rb b/test/tests.rb
-index 5419acd..8ec70c3 100755
---- a/test/tests.rb
-+++ b/test/tests.rb
-@@ -794,13 +794,13 @@ def test_dump_margin
- Ox::default_options = $ox_object_options
- x = Ox.dump(Bag.new(:@o => Bag.new(:@a => [2]), :@a => [1, {:b => 3, :a => [5], :c => Bag.new(:@x => 7)}]), :indent => 1, :margin => '##')
-
-- assert_equal('##<o c="Bag">
--## <o a="@o" c="Bag">
-+ assert(x.include?('## <o a="@o" c="Bag">
- ## <a a="@a">
- ## <i>2</i>
- ## </a>
- ## </o>
--## <a a="@a">
-+'))
-+ assert(x.include?('## <a a="@a">
- ## <i>1</i>
- ## <h>
- ## <m>b</m>
-@@ -815,8 +815,7 @@ def test_dump_margin
- ## </o>
- ## </h>
- ## </a>
--##</o>
--', x)
-+'))
- end
-
- # Create an Object and an Array with the same Objects in them. Dump and load
-
-From 894b532cd35a1174555e6047ab58ff01a0260f80 Mon Sep 17 00:00:00 2001
-From: Peter Fry <peter.fry(a)mac.com>
-Date: Mon, 19 Dec 2022 09:55:11 -0500
-Subject: [PATCH 3/3] Protect calls to rb_undef_alloc_func against old Ruby API
- versions.
-
----
- ext/ox/builder.c | 3 +++
- ext/ox/intern.c | 4 ++++
- ext/ox/sax_as.c | 6 +++++-
- 3 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/ext/ox/builder.c b/ext/ox/builder.c
-index 9db6d82..582a4ad 100644
---- a/ext/ox/builder.c
-+++ b/ext/ox/builder.c
-@@ -10,6 +10,7 @@
-
- #include "ruby.h"
- #include "ruby/encoding.h"
-+#include "ruby/version.h"
- #include "ox.h"
- #include "buf.h"
- #include "err.h"
-@@ -952,7 +953,9 @@ ox_init_builder(VALUE ox) {
- ox = rb_define_module("Ox");
- #endif
- builder_class = rb_define_class_under(ox, "Builder", rb_cObject);
-+#if RUBY_API_VERSION_CODE >= 30200
- rb_undef_alloc_func(builder_class);
-+#endif
- rb_define_module_function(builder_class, "new", builder_new, -1);
- rb_define_module_function(builder_class, "file", builder_file, -1);
- rb_define_module_function(builder_class, "io", builder_io, -1);
-diff --git a/ext/ox/intern.c b/ext/ox/intern.c
-index a470604..569442f 100644
---- a/ext/ox/intern.c
-+++ b/ext/ox/intern.c
-@@ -5,6 +5,8 @@
-
- #include <stdint.h>
-
-+#include "ruby/version.h"
-+
- #include "cache.h"
- #include "ox.h"
-
-@@ -68,7 +70,9 @@ static VALUE form_id(const char *str, size_t len) {
-
- void ox_hash_init() {
- VALUE cache_class = rb_define_class_under(Ox, "Cache", rb_cObject);
-+#if RUBY_API_VERSION_CODE >= 30200
- rb_undef_alloc_func(cache_class);
-+#endif
-
- ox_str_cache = ox_cache_create(0, form_str, true, false);
- ox_str_cache_obj = Data_Wrap_Struct(cache_class, ox_cache_mark, ox_cache_free, ox_str_cache);
-diff --git a/ext/ox/sax_as.c b/ext/ox/sax_as.c
-index 861cc25..e367040 100644
---- a/ext/ox/sax_as.c
-+++ b/ext/ox/sax_as.c
-@@ -15,6 +15,7 @@
- #include <time.h>
-
- #include "ruby.h"
-+#include "ruby/version.h"
- #include "ox.h"
- #include "sax.h"
-
-@@ -254,13 +255,16 @@ void
- ox_sax_define() {
- #if 0
- ox = rb_define_module("Ox");
-+#if RUBY_API_VERSION_CODE >= 30200
- sax_module = rb_define_class_under(ox, "Sax", rb_cObject);
-- rb_undef_alloc_func(sax_module);
-+#endif
- #endif
- VALUE sax_module = rb_const_get_at(Ox, rb_intern("Sax"));
-
- ox_sax_value_class = rb_define_class_under(sax_module, "Value", rb_cObject);
-+#if RUBY_API_VERSION_CODE >= 30200
- rb_undef_alloc_func(ox_sax_value_class);
-+#endif
-
- rb_define_method(ox_sax_value_class, "as_s", sax_value_as_s, 0);
- rb_define_method(ox_sax_value_class, "as_sym", sax_value_as_sym, 0);
diff --git a/rubygem-ox.spec b/rubygem-ox.spec
index 36fbce1..8c7e887 100644
--- a/rubygem-ox.spec
+++ b/rubygem-ox.spec
@@ -1,19 +1,16 @@
%global gem_name ox
Name: rubygem-%{gem_name}
-Version: 2.14.11
-Release: 4%{?dist}
+Version: 2.14.12
+Release: 1%{?dist}
Summary: Fast XML parser and object serializer
License: MIT
URL: http://www.ohler.com/ox
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# git clone https://github.com/ohler55/ox && cd ox
-# git archive -v -o rubygem-ox-2.14.8-repo.tgz v2.14.8 test/ examples/
+# git archive -v -o rubygem-ox-2.14.12-repo.tgz v2.14.12 test/ examples/
Source1: %{name}-%{version}-repo.tgz
-# https://github.com/ohler55/ox/pull/299
-# Ox.dump result differs on ruby3.2
-Patch0: %{name}-2.14.11-ox-dump-order.patch
BuildRequires: gcc
BuildRequires: rubygems-devel
@@ -44,7 +41,6 @@ Documentation for %{name}.
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version} -a1
-%patch0 -p1
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
@@ -99,6 +95,9 @@ popd
%changelog
+* Sat Dec 31 2022 František Dvořák <valtri(a)civ.zcu.cz> - 2.14.12-1
+- Update to 2.14.12 (#2156597)
+
* Sun Dec 25 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 2.14.11-4
- Add %%gem_extdir_mri for RUBYLIB for %%check due to ruby3.2 change
for ext cleanup during build
diff --git a/sources b/sources
index 834a97e..faca777 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ox-2.14.11.gem) = 0870efb62d387e9c30c9ae275fc0d1a45998f493e1d87d43c25d0c4323e59887a1b7ff4442d6aacd4e937dca4e665fed1958ba7b9da519c5f1a637dc47066ff8
-SHA512 (rubygem-ox-2.14.11-repo.tgz) = c5dfbec4a8a85dc4f748053f5641348cc363141cfbaa53d4d0850cc766bc379582be2b08381f1c3c5ba430004ac3e894b3f086de2eaf0ff5ebfbabef73f8874c
+SHA512 (ox-2.14.12.gem) = 230b39b0a1d29259c20b2d78243866646e63b2a8472fc06ad65c5a0d7db91368a5c653cfd5465b5e78306c3c6f14e63d7e8c35479a33f4ab95eb892ed248ab06
+SHA512 (rubygem-ox-2.14.12-repo.tgz) = da4aeb7422e06828d93f73d5ce524db10662e038637e14728f380c01511b9d493b7d16a85bcef94faf94f1f786df84866cc7aaabb05568362356d39904a9b85d
https://src.fedoraproject.org/rpms/rubygem-ox/c/e1ee5b3f39cfb64c9a32dae69...
1Â year, 5Â months