rename sys-boot/u-boot -> sys-boot/u-boot-pbp, remove nanopi-m4v2 capability
This commit is contained in:
Martin Sekera
parent
559b1a65f8
commit
28256ec9db
5 changed files with 9 additions and 264 deletions
|
|
@ -0,0 +1,38 @@
|
|||
From e622965b31e1d08c2b7c6b3a8d683c59f37b2733 Mon Sep 17 00:00:00 2001
|
||||
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
|
||||
Date: Sat, 20 Jun 2020 01:47:52 +0200
|
||||
Subject: [PATCH 2/3] Correct boot order to be USB -> SD -> eMMC
|
||||
|
||||
---
|
||||
include/configs/rockchip-common.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
|
||||
index 0b9e24d1db..9e217fad2a 100644
|
||||
--- a/include/configs/rockchip-common.h
|
||||
+++ b/include/configs/rockchip-common.h
|
||||
@@ -17,8 +17,8 @@
|
||||
/* First try to boot from SD (index 0), then eMMC (index 1) */
|
||||
#if CONFIG_IS_ENABLED(CMD_MMC)
|
||||
#define BOOT_TARGET_MMC(func) \
|
||||
- func(MMC, mmc, 0) \
|
||||
- func(MMC, mmc, 1)
|
||||
+ func(MMC, mmc, 1) \
|
||||
+ func(MMC, mmc, 0)
|
||||
#else
|
||||
#define BOOT_TARGET_MMC(func)
|
||||
#endif
|
||||
@@ -55,9 +55,9 @@
|
||||
|
||||
#ifdef CONFIG_ROCKCHIP_RK3399
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
+ BOOT_TARGET_USB(func) \
|
||||
BOOT_TARGET_MMC(func) \
|
||||
BOOT_TARGET_NVME(func) \
|
||||
- BOOT_TARGET_USB(func) \
|
||||
BOOT_TARGET_PXE(func) \
|
||||
BOOT_TARGET_DHCP(func) \
|
||||
BOOT_TARGET_SF(func)
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
From 352cb7b28bf4a16330f148043e8d10b0141bbfcb Mon Sep 17 00:00:00 2001
|
||||
From: Arnaud Patard <arnaud.patard@rtp-net.org>
|
||||
Date: Wed, 8 Jul 2020 21:43:36 -0400
|
||||
Subject: [PATCH 4/4] PBP: Fix panel reset
|
||||
|
||||
On warm reset, the pinebook pro panel is not working correctly.
|
||||
The issue is not yet debugged so, for now, this hack seems to be
|
||||
enough. It toggles the GPIO1_C6 gpio [ LCDVCC_EN signal in the
|
||||
schematics ] used by the vcc3v3_panel regulator.
|
||||
|
||||
There's no gpio_request, since the gpio is already in use at this
|
||||
stage, so it can only fail.
|
||||
|
||||
Origin: http://people.hupstream.com/~rtp/pbp/20200706/patches/hack-reset.patch
|
||||
---
|
||||
board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
|
||||
index 516292aaa59..ff9c916bcb7 100644
|
||||
--- a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
|
||||
+++ b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
|
||||
@@ -7,13 +7,15 @@
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <syscon.h>
|
||||
+#include <linux/delay.h>
|
||||
+#include <asm/gpio.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch-rockchip/clock.h>
|
||||
#include <asm/arch-rockchip/grf_rk3399.h>
|
||||
+#include <asm/arch-rockchip/gpio.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
|
||||
|
||||
@@ -59,6 +61,7 @@ int misc_init_r(void)
|
||||
const u32 cpuid_length = 0x10;
|
||||
u8 cpuid[cpuid_length];
|
||||
int ret;
|
||||
+ unsigned int gpio;
|
||||
|
||||
setup_iodomain();
|
||||
|
||||
@@ -70,6 +73,11 @@ int misc_init_r(void)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
+ gpio_lookup_name("B22", NULL, NULL, &gpio);
|
||||
+ gpio_direction_output(gpio, 0);
|
||||
+ udelay(500000);
|
||||
+ gpio_direction_output(gpio, 1);
|
||||
+
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
--
|
||||
2.25.4
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
From 08e8ace48b5c3a31b44661ef22a8b8a459906d7e Mon Sep 17 00:00:00 2001
|
||||
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
|
||||
Date: Sat, 20 Jun 2020 01:49:49 +0200
|
||||
Subject: [PATCH 3/3] Enable the power LED during early startup
|
||||
|
||||
---
|
||||
arch/arm/mach-rockchip/rk3399/rk3399.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
|
||||
index 4fda93b152..e24b39486d 100644
|
||||
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
|
||||
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
|
||||
@@ -19,6 +19,8 @@
|
||||
#include <asm/arch-rockchip/hardware.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <power/regulator.h>
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+#include <dt-bindings/pinctrl/rockchip.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
@@ -119,8 +121,8 @@ void board_debug_uart_init(void)
|
||||
struct rk3399_grf_regs * const grf = (void *)GRF_BASE;
|
||||
#ifdef CONFIG_TARGET_CHROMEBOOK_BOB
|
||||
struct rk3399_pmugrf_regs * const pmugrf = (void *)PMUGRF_BASE;
|
||||
- struct rockchip_gpio_regs * const gpio = (void *)GPIO0_BASE;
|
||||
#endif
|
||||
+ struct rockchip_gpio_regs * const gpio = (void *)GPIO0_BASE;
|
||||
|
||||
#if defined(CONFIG_DEBUG_UART_BASE) && (CONFIG_DEBUG_UART_BASE == 0xff180000)
|
||||
/* Enable early UART0 on the RK3399 */
|
||||
@@ -153,6 +155,14 @@ void board_debug_uart_init(void)
|
||||
spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_B, 4), GPIO_PULL_NORMAL);
|
||||
#endif /* CONFIG_TARGET_CHROMEBOOK_BOB */
|
||||
|
||||
+ {
|
||||
+ // set GPIO0_A2/B3 to GPIO_ACTIVE_HIGH
|
||||
+ // set GPIO0_A2/B3 to OUTPUT
|
||||
+ int mask = (1UL << RK_PA2) | (1UL << RK_PB3);
|
||||
+ setbits_le32(&gpio->swport_dr, mask);
|
||||
+ setbits_le32(&gpio->swport_ddr, mask);
|
||||
+ }
|
||||
+
|
||||
/* Enable early UART2 channel C on the RK3399 */
|
||||
rk_clrsetreg(&grf->gpio4c_iomux,
|
||||
GRF_GPIO4C3_SEL_MASK,
|
||||
--
|
||||
2.27.0
|
||||
|
||||
54
sys-boot/u-boot-pbp/u-boot-pbp-2021.10_rc1.ebuild
Normal file
54
sys-boot/u-boot-pbp/u-boot-pbp-2021.10_rc1.ebuild
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
# Copyright 2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
MY_PV=$(ver_rs 2 -)
|
||||
MY_P="${PN}-v${MY_PV}"
|
||||
|
||||
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"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
sys-apps/dtc
|
||||
sys-firmware/trusted-firmware-a[tfa_platforms_rk3399]
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND=""
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
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 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
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake BL31=/usr/share/trusted-firmware-a/rk3399/bl31.elf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/u-boot
|
||||
doins idbloader.img
|
||||
doins u-boot.itb
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "To install U-boot:"
|
||||
elog "Determine your device, then"
|
||||
elog "dd if=/usr/share/u-boot/idbloader.img of=/dev/... seek=64 conv=notrunc"
|
||||
elog "dd if=/usr/share/u-boot/u-boot.itb of=/dev/... seek=16384 conv=notrunc"
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue