enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armsom-sige5: update uboot from latest SDK

Browse Source
This commit is contained in:
amazingfate 2024-08-25 00:22:23 +08:00 committed by Igor
parent a1b1d61834
commit e13729b3e3
4 changed files with 5 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/boards/armsom-sige5.csc
View File

@ -16,10 +16,10 @@ function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
declare -g BOOTBRANCH="tag:rk3576"
declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
declare -g BOOTDIR="u-boot-${BOARD}"
declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
declare -g BOOTDIR="u-boot-${BOARD}"
declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
}
function post_family_tweaks__armsom-sige7_naming_audios() {

46
patch/u-boot/legacy/u-boot-armsom-rk3576/0001-dw_mmc-add-default-power-enable-config-val.patch
View File

@ -1,46 +0,0 @@
From d21080aff74c06f2b2303bc298bf7485818768db Mon Sep 17 00:00:00 2001
From: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Date: Wed, 8 May 2024 10:00:14 +0800
Subject: [PATCH 1/2] dw_mmc: add default power enable config value for rk3576
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I2ce85f3c107c51b84413ca2f9ae66b33e4a00c18
---
drivers/mmc/Kconfig | 7 +++++++
drivers/mmc/dw_mmc.c | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 8e365e45f58..3ccfaa5fa17 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -84,6 +84,13 @@ config MMC_DW
block, this provides host support for SD and MMC interfaces, in both
PIO, internal DMA mode and external DMA mode.
+config MMC_DW_PWREN_VALUE
+ hex "mmc dw powen value"
+ default 1 if ROCKCHIP_RK3576
+ default 0
+ help
+ Config the value for MMC-DW drivers to power on sd card.
+
config MMC_DW_EXYNOS
bool "Exynos specific extensions for Synopsys DW Memory Card Interface"
depends on ARCH_EXYNOS
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index d961bce248b..37e4d50512d 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -818,7 +818,7 @@ static int dwmci_init(struct mmc *mmc)
if (host->dev_index == 0)
dwmci_writel(host, DWMCI_PWREN, 1);
else if (host->dev_index == 1)
- dwmci_writel(host, DWMCI_PWREN, 0);
+ dwmci_writel(host, DWMCI_PWREN, CONFIG_MMC_DW_PWREN_VALUE);
else
dwmci_writel(host, DWMCI_PWREN, 1);
#else
--
2.34.1

38
patch/u-boot/legacy/u-boot-armsom-rk3576/0002-dts-rockchip-rk3576-the-power_en-for-SD-co.patch
View File

@ -1,38 +0,0 @@
From 2138ea1a16205051685bf85771b4412019df5a56 Mon Sep 17 00:00:00 2001
From: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Date: Wed, 8 May 2024 10:01:34 +0800
Subject: [PATCH 2/2] dts: rockchip: rk3576: the power_en for SD control by the
controller
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Ibf4d8a3f0502385c075cd114b13a30b1bff866a8
---
arch/arm/dts/rk3576-u-boot.dtsi | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/rk3576-u-boot.dtsi b/arch/arm/dts/rk3576-u-boot.dtsi
index 2abdef5c08f..fc7527064a5 100644
--- a/arch/arm/dts/rk3576-u-boot.dtsi
+++ b/arch/arm/dts/rk3576-u-boot.dtsi
@@ -139,7 +139,6 @@
&sdmmc {
bus-width = <4>;
u-boot,dm-spl;
- pwr-en-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -172,6 +171,10 @@
u-boot,dm-spl;
};
+&sdmmc0_pwren {
+ u-boot,dm-spl;
+};
+
&pinctrl {
u-boot,dm-spl;
};
--
2.34.1

2
patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-sige5-rk3576_defconfig
View File

@ -220,3 +220,5 @@ CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_ROCKCHIP_EARLY_DISTRO_DTB=y
CONFIG_ROCKCHIP_EARLY_DISTRO_DTB_PATH="/boot/dtb/rockchip/rk3576-armsom-sige5.dtb"