From 084afd5a221a4decdc9bb85950b35f4ca5c1273b Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Wed, 19 Jan 2022 13:27:36 +0100 Subject: [PATCH] Rmoved --- sys-kernel/mkinitcpio/Manifest | 1 - sys-kernel/mkinitcpio/mkinitcpio-31.ebuild | 34 ----- .../dts-pinephone-pro-dts-modem-fix.patch | 118 ------------------ .../pinephone-sources-5.16.0.ebuild | 18 ++- 4 files changed, 8 insertions(+), 163 deletions(-) delete mode 100644 sys-kernel/mkinitcpio/Manifest delete mode 100644 sys-kernel/mkinitcpio/mkinitcpio-31.ebuild delete mode 100644 sys-kernel/pinephone-sources/files/dts-pinephone-pro-dts-modem-fix.patch diff --git a/sys-kernel/mkinitcpio/Manifest b/sys-kernel/mkinitcpio/Manifest deleted file mode 100644 index dc26cfd..0000000 --- a/sys-kernel/mkinitcpio/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mkinitcpio-31.tar.gz 57460 BLAKE2B 0113e288906e3b5fa485c29c00e7df60d85addd96718c45531031a686f18c739fa18303b6cac374d35b85edb7b663e221c8dc9158dff08c75858a4ed4dd154bf SHA512 4ef87c2e4f579b292c38f9c487e78b3b99f6db77909cab322e860e5ca70aca3747fcfc272e2e15c9a3605c924ab178057b8b23151f98debc5d96e65f3c0c49d5 diff --git a/sys-kernel/mkinitcpio/mkinitcpio-31.ebuild b/sys-kernel/mkinitcpio/mkinitcpio-31.ebuild deleted file mode 100644 index 73fabe6..0000000 --- a/sys-kernel/mkinitcpio/mkinitcpio-31.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Arch Linux initramfs generation tools" -HOMEPAGE="https://github.com/archlinux/mkinitcpio" -SRC_URI="https://github.com/archlinux/mkinitcpio/releases/download/v${PV}/mkinitcpio-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm64" - -RDEPEND="" -DEPEND="${RDEPEND}" -BDEPEND="" - -src_compile() { - local myemakeargs=( - AR="${AR}" - CC="${CC}" - HOSTCC="${BUILD_CC}" - HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' - HOSTLDFLAGS="${LDFLAGS}" - ) - - emake "${myemakeargs[@]}" -} - -src_install() { - emake "install" -} diff --git a/sys-kernel/pinephone-sources/files/dts-pinephone-pro-dts-modem-fix.patch b/sys-kernel/pinephone-sources/files/dts-pinephone-pro-dts-modem-fix.patch deleted file mode 100644 index 116c36a..0000000 --- a/sys-kernel/pinephone-sources/files/dts-pinephone-pro-dts-modem-fix.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 1cb7d149c74575485acd993e9b5416bef1a0843e Mon Sep 17 00:00:00 2001 -From: Ondrej Jirman -Date: Tue, 23 Nov 2021 23:26:26 +0100 -Subject: [PATCH 366/403] arm64: dts: rk3399-pinephone-pro: Add support for - powering up the modem - -Pinephone Pro has the same modem that's already supported by modem-power. -Add support for it do DT. - -Signed-off-by: Ondrej Jirman ---- - .../dts/rockchip/rk3399-pinephone-pro.dts | 76 +++++++++++++++++++ - 1 file changed, 76 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts -index b164f4db4151e..2e23744ca5452 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts -@@ -253,6 +253,30 @@ - }; - }; - -+ vcc_4g_5v: vcc-4g-5v { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc_4g_5v_en>; -+ regulator-name = "vcc_4g_5v"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc5v0_sys>; -+ }; -+ -+ vcc_4g: vcc-4g { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio4 RK_PC7 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc_4g_en>; -+ regulator-name = "vcc_4g"; -+ regulator-min-microvolt = <3800000>; -+ regulator-max-microvolt = <3800000>; -+ vin-supply = <&vcc_sysin>; -+ }; -+ - vcc1v8_codec: vcc1v8-codec-regulator { - compatible = "regulator-fixed"; - enable-active-high; -@@ -937,6 +961,35 @@ - }; - }; - -+&uart3 { -+ status = "okay"; -+ -+ modem { -+ compatible = "quectel,eg25"; -+ char-device-name = "modem-power"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&modem_control_pins>; -+ -+ power-supply = <&vcc_4g>; -+ vbus-supply = <&vcc_4g_5v>; -+ -+ enable-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; // W_DISABLE# -+ reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>; -+ status-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; -+ pwrkey-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; -+ -+ host-ready-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; // apready -+ wakeup-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; // ri -+ -+ dtr-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; -+ cts-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; -+ rts-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; -+ -+ quectel,qdai = "1,1,0,1,0,0,1,1"; -+ }; -+}; -+ - &pmu_io_domains { - pmu1830-supply = <&vcc_1v8>; - status = "okay"; -@@ -997,6 +1050,29 @@ - }; - }; - -+ modem { -+ vcc_4g_5v_en: vcc-4g-5v-en-pin { -+ rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ vcc_4g_en: vcc-4g-en-pin { -+ rockchip,pins = <4 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ modem_control_pins: modem-control-pins { -+ rockchip,pins = -+ <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, -+ <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, -+ <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>, -+ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, -+ <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, -+ <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>, -+ <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>, -+ <3 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>, -+ <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ - pmic { - pmic_int_l: pmic-int-l { - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; --- -2.34.1 - diff --git a/sys-kernel/pinephone-sources/pinephone-sources-5.16.0.ebuild b/sys-kernel/pinephone-sources/pinephone-sources-5.16.0.ebuild index bfeca5d..97ce344 100644 --- a/sys-kernel/pinephone-sources/pinephone-sources-5.16.0.ebuild +++ b/sys-kernel/pinephone-sources/pinephone-sources-5.16.0.ebuild @@ -1,29 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + EAPI="8" -K_NOUSENAME="yes" -K_NOSETEXTRAVERSION="yes" -K_SECURITY_UNSUPPORTED="1" ETYPE="sources" +K_WANT_GENPATCHES="base extras" +K_GENPATCHES_VER="1" + inherit kernel-2 detect_version +detect_arch KEYWORDS="~arm64" DEPEND="${RDEPEND} >=sys-devel/patch-2.7.5" -DESCRIPTION="Full sources for the Linux kernel, with megi's patch for pinephone" +DESCRIPTION="Full sources for the Linux kernel with gentoo patchset and with megi's patch for the PinePhone (Non pro), For the PinePhone Pro please use the pinephone-pro-sources" -MEGI_PATCH_URI="https://xff.cz/kernels/${PV:0:4}/patches/all.patch" -SRC_URI="${KERNEL_URI} ${MEGI_PATCH_URI} -> all-${PV}.patch" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" PATCHES=( ${DISTDIR}/all-${PV}.patch ${FILESDIR}/media-ov5640-Implement-autofocus.patch - ${FILESDIR}/dts-pinephone-pro-dts-modem-fix.patch ${FILESDIR}/panic-led.patch # Pinephone Keyboard @@ -44,8 +44,6 @@ pkg_postinst() { einfo "make Image Image.gz modules" einfo "make DTC_FLAGS="-@" dtbs" einfo "make install; make modules_intall; make dtbs_install" - einfo "If you use kernel config coming with this ebuild, don't forget to also copy dracut-pp.conf to /etc/dracut.conf.d/" - einfo "to make sure proper kernel modules are loaded into initramfs" einfo "if you want to cross compile pinephone kernel on amd64 host, follow the https://wiki.gentoo.org/wiki/Cross_build_environment" einfo "to setup cross toolchain environment, then create a xmake wrapper like the following, and replace make with xmake in above commands" einfo "#!/bin/sh"