diff --git a/sys-boot/u-boot/files/rk3399-all.boot-order-usb-sd-mmc.patch b/sys-boot/u-boot-pbp/files/rk3399-all.boot-order-usb-sd-mmc.patch similarity index 100% rename from sys-boot/u-boot/files/rk3399-all.boot-order-usb-sd-mmc.patch rename to sys-boot/u-boot-pbp/files/rk3399-all.boot-order-usb-sd-mmc.patch diff --git a/sys-boot/u-boot/files/rk3399-pinebook-pro.edp-panel-reset.patch b/sys-boot/u-boot-pbp/files/rk3399-pinebook-pro.edp-panel-reset.patch similarity index 100% rename from sys-boot/u-boot/files/rk3399-pinebook-pro.edp-panel-reset.patch rename to sys-boot/u-boot-pbp/files/rk3399-pinebook-pro.edp-panel-reset.patch diff --git a/sys-boot/u-boot/files/rk3399-pinebook-pro.power-led.patch b/sys-boot/u-boot-pbp/files/rk3399-pinebook-pro.power-led.patch similarity index 100% rename from sys-boot/u-boot/files/rk3399-pinebook-pro.power-led.patch rename to sys-boot/u-boot-pbp/files/rk3399-pinebook-pro.power-led.patch diff --git a/sys-boot/u-boot/u-boot-2021.10-rc1.ebuild b/sys-boot/u-boot-pbp/u-boot-pbp-2021.10_rc1.ebuild similarity index 52% rename from sys-boot/u-boot/u-boot-2021.10-rc1.ebuild rename to sys-boot/u-boot-pbp/u-boot-pbp-2021.10_rc1.ebuild index 256285f..97bca3c 100644 --- a/sys-boot/u-boot/u-boot-2021.10-rc1.ebuild +++ b/sys-boot/u-boot-pbp/u-boot-pbp-2021.10_rc1.ebuild @@ -5,55 +5,32 @@ EAPI=7 MY_PV=$(ver_rs 2 -) MY_P="${PN}-v${MY_PV}" -DESCRIPTION="Das U-Boot with patches for the Pinebook Pro and NanoPi M4V2." +DESCRIPTION="Das U-Boot with patches for the Pinebook Pro." HOMEPAGE="https://www.denx.de/wiki/U-Boot" SRC_URI="https://gitlab.denx.de/${PN}/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="-* arm64" - -UBOOT_ALL_DEFCONFIGS=( pinebook-pro-rk3399 nanopi-m4v2-rk3399 ) -IUSE="${UBOOT_ALL_DEFCONFIGS[@]/#/uboot_defconfigs_}" -REQUIRED_USE="^^ ( ${IUSE} )" +IUSE="" DEPEND=" sys-apps/dtc sys-firmware/trusted-firmware-a[tfa_platforms_rk3399] " + RDEPEND="${DEPEND}" BDEPEND="" S="${WORKDIR}/${MY_P}" -uboot_get_defconfig() { - local cfg - for cfg in "${UBOOT_ALL_DEFCONFIGS[@]}"; do - if use "uboot_defconfigs_${cfg}"; then - echo ${cfg}_defconfig - return 0 - fi - done - - die "no uboot_defconfigs_ set" -} - -src_prepare() { - eapply "${FILESDIR}/rk3399-all.boot-order-usb-sd-mmc.patch" - - if use uboot_defconfigs_pinebook-pro-rk3399; then - eapply "${FILESDIR}/rk3399-pinebook-pro.power-led.patch" - eapply "${FILESDIR}/rk3399-pinebook-pro.edp-panel-reset.patch" - fi - - if use uboot_defconfigs_nanopi-m4v2-rk3399; then - eapply "${FILESDIR}/rk3399-nanopi-m4v2.add.patch" - fi - - default -} +PATCHES=( + "${FILESDIR}/rk3399-all.boot-order-usb-sd-mmc.patch" + "${FILESDIR}/rk3399-pinebook-pro.power-led.patch" + "${FILESDIR}/rk3399-pinebook-pro.edp-panel-reset.patch" +) src_configure() { - emake $(uboot_get_defconfig) + emake pinebook-pro-rk3399_defconfig # for some reason rk3399 fails to jump to a kernel if this is on?! sed -i -e '/CONFIG_USB_EHCI_HCD=y/d' -e '/CONFIG_USB_EHCI_GENERIC=y/d' .config diff --git a/sys-boot/u-boot/files/rk3399-nanopi-m4v2.add.patch b/sys-boot/u-boot/files/rk3399-nanopi-m4v2.add.patch deleted file mode 100644 index 1b5a4cb..0000000 --- a/sys-boot/u-boot/files/rk3399-nanopi-m4v2.add.patch +++ /dev/null @@ -1,232 +0,0 @@ -From e0d756f01e5c657ad975be7ae70274c07dbf5d46 Mon Sep 17 00:00:00 2001 -From: Martin Sekera -Date: Sat, 31 Jul 2021 14:37:01 +0200 -Subject: [PATCH] board: dts: rockchip: Add NanoPi M4V2 - ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi | 31 +++++++++ - arch/arm/dts/rk3399-nanopi-m4v2.dts | 77 +++++++++++++++++++++ - configs/nanopi-m4v2-rk3399_defconfig | 76 ++++++++++++++++++++ - 4 files changed, 185 insertions(+) - create mode 100644 arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi - create mode 100644 arch/arm/dts/rk3399-nanopi-m4v2.dts - create mode 100644 configs/nanopi-m4v2-rk3399_defconfig - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 537c96bf5b..49c327bb86 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -132,6 +132,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ - rk3399-nanopc-t4.dtb \ - rk3399-nanopi-m4.dtb \ - rk3399-nanopi-m4-2gb.dtb \ -+ rk3399-nanopi-m4v2.dtb \ - rk3399-nanopi-m4b.dtb \ - rk3399-nanopi-neo4.dtb \ - rk3399-nanopi-r4s.dtb \ -diff --git a/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi -new file mode 100644 -index 0000000000..2e3dba00c7 ---- /dev/null -+++ b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi -@@ -0,0 +1,31 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2019 Jagan Teki -+ */ -+ -+#include "rk3399-nanopi4-u-boot.dtsi" -+#include "rk3399-sdram-lpddr4-100.dtsi" -+ -+/ { -+ chosen { -+ u-boot,spl-boot-order = &sdmmc, &sdhci; -+ }; -+}; -+ -+&sdio0 { -+ status = "disabled"; -+}; -+ -+&vdd_center { -+ regulator-min-microvolt = <950000>; -+ regulator-max-microvolt = <950000>; -+}; -+ -+&vdd_log { -+ regulator-init-microvolt = <950000>; -+}; -+ -+&pwm2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pwm2_pin>; -+}; -diff --git a/arch/arm/dts/rk3399-nanopi-m4v2.dts b/arch/arm/dts/rk3399-nanopi-m4v2.dts -new file mode 100644 -index 0000000000..81d245e48d ---- /dev/null -+++ b/arch/arm/dts/rk3399-nanopi-m4v2.dts -@@ -0,0 +1,77 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * FriendlyElec NanoPi M4 board device tree source -+ * -+ * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd. -+ * (http://www.friendlyarm.com) -+ * -+ * Copyright (c) 2018 Collabora Ltd. -+ * Copyright (c) 2019 Arm Ltd. -+ */ -+ -+/dts-v1/; -+#include "rk3399-nanopi4.dtsi" -+ -+/ { -+ model = "FriendlyElec NanoPi M4V2"; -+ compatible = "friendlyarm,nanopi-m4", "rockchip,rk3399"; -+ -+ vdd_5v: vdd-5v { -+ compatible = "regulator-fixed"; -+ regulator-name = "vdd_5v"; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vcc5v0_core: vcc5v0-core { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc5v0_core"; -+ regulator-always-on; -+ regulator-boot-on; -+ vin-supply = <&vdd_5v>; -+ }; -+ -+ vcc5v0_usb1: vcc5v0-usb1 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc5v0_usb1"; -+ regulator-always-on; -+ regulator-boot-on; -+ vin-supply = <&vcc5v0_sys>; -+ }; -+ -+ vcc5v0_usb2: vcc5v0-usb2 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc5v0_usb2"; -+ regulator-always-on; -+ regulator-boot-on; -+ vin-supply = <&vcc5v0_sys>; -+ }; -+ -+ vdd_log: vdd-log { -+ compatible = "pwm-regulator"; -+ pwms = <&pwm2 0 25000 1>; -+ regulator-name = "vdd_log"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <800000>; -+ regulator-max-microvolt = <1400000>; -+ regulator-init-microvolt = <900000>; -+ }; -+}; -+ -+&vcc3v3_sys { -+ vin-supply = <&vcc5v0_core>; -+}; -+ -+&u2phy0_host { -+ phy-supply = <&vcc5v0_usb1>; -+}; -+ -+&u2phy1_host { -+ phy-supply = <&vcc5v0_usb2>; -+}; -+ -+&vbus_typec { -+ regulator-always-on; -+ vin-supply = <&vdd_5v>; -+}; -diff --git a/configs/nanopi-m4v2-rk3399_defconfig b/configs/nanopi-m4v2-rk3399_defconfig -new file mode 100644 -index 0000000000..71827d1b15 ---- /dev/null -+++ b/configs/nanopi-m4v2-rk3399_defconfig -@@ -0,0 +1,76 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_ROCKCHIP=y -+CONFIG_SYS_TEXT_BASE=0x00200000 -+CONFIG_NR_DRAM_BANKS=1 -+CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ROCKCHIP_RK3399=y -+CONFIG_TARGET_EVB_RK3399=y -+CONFIG_DEBUG_UART_BASE=0xFF1A0000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4v2" -+CONFIG_DEBUG_UART=y -+# CONFIG_ANDROID_BOOT_IMAGE is not set -+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-m4v2.dtb" -+CONFIG_MISC_INIT_R=y -+CONFIG_DISPLAY_BOARDINFO_LATE=y -+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -+CONFIG_SPL_STACK_R=y -+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 -+CONFIG_TPL=y -+CONFIG_CMD_BOOTZ=y -+CONFIG_CMD_GPT=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_REGULATOR=y -+CONFIG_CMD_PCI=y -+CONFIG_CMD_USB=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_TIME=y -+CONFIG_SPL_OF_CONTROL=y -+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_MMC=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_SPL_DM_SEQ_ALIAS=y -+CONFIG_ROCKCHIP_GPIO=y -+CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y -+CONFIG_MMC_DW=y -+CONFIG_MMC_DW_ROCKCHIP=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_DM_ETH=y -+CONFIG_ETH_DESIGNWARE=y -+CONFIG_GMAC_ROCKCHIP=y -+CONFIG_NVME=y -+CONFIG_PCI=y -+CONFIG_PHY_ROCKCHIP_INNO_USB2=y -+CONFIG_PHY_ROCKCHIP_TYPEC=y -+CONFIG_PMIC_RK8XX=y -+CONFIG_REGULATOR_PWM=y -+CONFIG_REGULATOR_RK8XX=y -+CONFIG_PWM_ROCKCHIP=y -+CONFIG_RAM_RK3399_LPDDR4=y -+CONFIG_DM_RESET=y -+CONFIG_BAUDRATE=1500000 -+CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_SYSRESET=y -+CONFIG_USB=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_DWC3=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y -+CONFIG_USB_KEYBOARD=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_HOST_ETHER=y -+CONFIG_USB_ETHER_ASIX=y -+CONFIG_USB_ETHER_ASIX88179=y -+CONFIG_USB_ETHER_MCS7830=y -+CONFIG_USB_ETHER_RTL8152=y -+CONFIG_USB_ETHER_SMSC95XX=y -+CONFIG_DM_VIDEO=y -+CONFIG_DISPLAY=y -+CONFIG_VIDEO_ROCKCHIP=y -+CONFIG_DISPLAY_ROCKCHIP_HDMI=y -+CONFIG_SPL_TINY_MEMSET=y -+CONFIG_ERRNO_STR=y --- -2.32.0 -