mirror of https://github.com/armbian/build.git
orangepi5pro: Fix uboot compilation (#8181)
* add u-boot patchset to fix compilation on noble * change to same directory as other boards using legacy u-boot * move orangepi5pro to csc again
This commit is contained in:
parent
719bae4246
commit
d965e2ac7b
|
|
@ -53,5 +53,5 @@ function post_uboot_custom_postprocess__create_sata_spi_image() {
|
|||
function post_family_config__orangepi5pro_use_vendor_uboot() {
|
||||
BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
|
||||
BOOTBRANCH='branch:v2017.09-rk3588'
|
||||
BOOTPATCHDIR="legacy/u-boot-orangepi5-rk3588"
|
||||
BOOTPATCHDIR="legacy"
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
|
||||
Date: Wed, 7 May 2025 09:13:39 +0000
|
||||
Subject: cmd: inconsistent return type of command_process()
|
||||
|
||||
Reported-by: Sergei Antonov <saproj at gmail.com>
|
||||
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
|
||||
Signed-off-by: Werner <werner at armbian.com>
|
||||
---
|
||||
include/command.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/command.h b/include/command.h
|
||||
index 681084b9ea3..14910ea0b79 100644
|
||||
--- a/include/command.h
|
||||
+++ b/include/command.h
|
||||
@@ -137,11 +137,11 @@ enum command_ret_t {
|
||||
* is left unchanged.
|
||||
* @param ticks If ticks is not null, this function set it to the
|
||||
* number of ticks the command took to complete.
|
||||
* @return 0 if the command succeeded, 1 if it failed
|
||||
*/
|
||||
-int cmd_process(int flag, int argc, char * const argv[],
|
||||
+enum command_ret_t cmd_process(int flag, int argc, char *const argv[],
|
||||
int *repeatable, unsigned long *ticks);
|
||||
|
||||
void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
|
||||
|
||||
/**
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Werner <werner at armbian.com>
|
||||
Date: Mon, 12 May 2025 03:51:51 +0000
|
||||
Subject: Patching u-boot rk35xx files drivers/mmc/rockchip_dw_mmc.c
|
||||
|
||||
Signed-off-by: Werner <werner at armbian.com>
|
||||
---
|
||||
drivers/mmc/rockchip_dw_mmc.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
|
||||
index 1287551bf12..a78cb39c7f0 100644
|
||||
--- a/drivers/mmc/rockchip_dw_mmc.c
|
||||
+++ b/drivers/mmc/rockchip_dw_mmc.c
|
||||
@@ -40,11 +40,11 @@ struct rockchip_dwmmc_priv {
|
||||
#ifdef CONFIG_USING_KERNEL_DTB
|
||||
int board_mmc_dm_reinit(struct udevice *dev)
|
||||
{
|
||||
struct rockchip_dwmmc_priv *priv = dev_get_priv(dev);
|
||||
|
||||
- if (!priv || !&priv->clk)
|
||||
+ if (!priv)
|
||||
return 0;
|
||||
|
||||
if (!memcmp(dev->name, "dwmmc", strlen("dwmmc")))
|
||||
return clk_get_by_index(dev, 0, &priv->clk);
|
||||
else
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
||||
Loading…
Reference in New Issue