mirror of
https://github.com/armbian/build.git
synced 2025-08-15 23:56:57 +02:00
1c9ef0872b
* Updated rockchip64-dev to u-boot v2019.10 and BL31 v1.30 (rk3399 boards) * Updated rk3399 to u-boot v2019.10 and BL31 v1.30 * Revert changes to renegade u-boot patches * Moved renegade u-boot patches into board dir * Added debug info for RockPro64 and switched sdmmc to fifo-mode * Disabled regulators in SPL for RockPro64 * Re-enabled sd vcc regulator in SPL for RockPro64 * Some device tree and config changes for OrangePi RK3399 * Fixed Rock Pi 4A's $BOOTCONFIG * Let some boards use mainline atf instead of the one in rkbin For example, roc-rk3399-pc can just boot the kernel using the mainline atf. * Add roc-rk3399-pc * Fixed reset in mainline ATF * Attached ATF version to v2.2 tag * WIP: sdmmc fifo-mode in SPL only * Renamed source config files * Reverted changes to rockchip64 sources config * Reverted patch moves * Add missing trust.ini patch to rk3399 u-boot * Reinstated tpl/spl patches in rk3399 family * Added $RKBIN_DIR prefix in rk3399 sources * Add demonstration of boards bootloader assignment in rk3399
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From f4707a3c40bfc752a24c427263f7cbe8d7adfcd6 Mon Sep 17 00:00:00 2001
|
|
From: Vasily Khoruzhick <anarsoul@gmail.com>
|
|
Date: Fri, 15 Nov 2019 08:25:02 -0800
|
|
Subject: [PATCH] plat/rockchip: initialize reset and poweroff GPIOs with known
|
|
invalid value
|
|
|
|
And return NULL if we didn't get them in bl aux params otherwise reset and poweroff
|
|
will be broken on platforms that do not have reset and poweroff GPIOs.
|
|
|
|
Fixes: c1185ffde17c ("plat/rockchip: Switch to use new common BL aux parameter library")
|
|
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
|
|
---
|
|
plat/rockchip/common/params_setup.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/plat/rockchip/common/params_setup.c b/plat/rockchip/common/params_setup.c
|
|
index 8c2e5e911b..b2fd2011e4 100644
|
|
--- a/plat/rockchip/common/params_setup.c
|
|
+++ b/plat/rockchip/common/params_setup.c
|
|
@@ -6,6 +6,7 @@
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
+#include <limits.h>
|
|
#include <string.h>
|
|
|
|
#include <lib/bl_aux_params/bl_aux_params.h>
|
|
@@ -21,8 +22,8 @@
|
|
#include <plat_params.h>
|
|
#include <plat_private.h>
|
|
|
|
-static struct bl_aux_gpio_info rst_gpio;
|
|
-static struct bl_aux_gpio_info poweroff_gpio;
|
|
+static struct bl_aux_gpio_info rst_gpio = { .index = UINT_MAX } ;
|
|
+static struct bl_aux_gpio_info poweroff_gpio = { .index = UINT_MAX };
|
|
static struct bl_aux_gpio_info suspend_gpio[10];
|
|
uint32_t suspend_gpio_cnt;
|
|
static struct bl_aux_rk_apio_info suspend_apio;
|
|
@@ -174,11 +175,17 @@ uint32_t rockchip_get_uart_clock(void)
|
|
|
|
struct bl_aux_gpio_info *plat_get_rockchip_gpio_reset(void)
|
|
{
|
|
+ if (rst_gpio.index == UINT_MAX)
|
|
+ return NULL;
|
|
+
|
|
return &rst_gpio;
|
|
}
|
|
|
|
struct bl_aux_gpio_info *plat_get_rockchip_gpio_poweroff(void)
|
|
{
|
|
+ if (poweroff_gpio.index == UINT_MAX)
|
|
+ return NULL;
|
|
+
|
|
return &poweroff_gpio;
|
|
}
|
|
|