mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-11 05:52:36 +02:00
u-boot: Update to v2023.10
Set default U-Boot revision to v2023.01 and rebase patches on top of that. Another series about 16x32 fonts was merged upstream, so drop some now-unnecessary patches we had for that. For the video damage tracking series, switch to the version I'm trying to upstream. Upstream kconfig status is a bit unstable, so updating configs with `make oldconfig` would miss important upstream changes, since they rely on carrying defaults via upstream defconfigs. Update the configs as such: - Turn old configs into defconfigs (./update project trees -s u-boot) - Save the diff from old upstream defconfig (diffconfig $theirs $ours) - Update U-Boot revision, rebase patches, and clean old trees - Prepare new U-Boot tree (./update project trees -f u-boot) - Review the diffconfigs to see if any options were renamed upstream - Copy over the new upstream defconfigs and apply earlier diff - Turn new defconfigs into configs (./update project trees -l u-boot) Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
This commit is contained in:
+5
-5
@@ -1,4 +1,4 @@
|
||||
From 7e73b7a7550cfdd22a1413c263026e41e56e7617 Mon Sep 17 00:00:00 2001
|
||||
From 27d49512277677afb7f71e093b007b3e2022b83e Mon Sep 17 00:00:00 2001
|
||||
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
|
||||
Date: Fri, 8 Oct 2021 17:33:22 +0300
|
||||
Subject: [PATCH] clk: rockchip: rk3399: Set hardcoded clock rates same as
|
||||
@@ -13,8 +13,8 @@ Also update VOP ACLK to 400MHz as it divides from CPLL (now 800MHz).
|
||||
All this stops the displayed vendor bitmap from getting disfigured
|
||||
when chainloading U-Boot from coreboot+depthcharge (as RW_LEGACY).
|
||||
|
||||
Link: https://github.com/alpernebbi/u-boot/commit/7e73b7a7550cfdd22a1413c263026e41e56e7617
|
||||
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
|
||||
Link: https://github.com/alpernebbi/u-boot/commit/7e73b7a7550cfdd22a1413c263026e41e56e7617
|
||||
---
|
||||
.../include/asm/arch-rockchip/cru_rk3399.h | 19 ++++++++++---------
|
||||
drivers/clk/rockchip/clk_rk3399.c | 10 ++++++----
|
||||
@@ -60,7 +60,7 @@ index d941a129f3e5..54035c0df1f3 100644
|
||||
#define PWM_CLOCK_HZ PMU_PCLK_HZ
|
||||
|
||||
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
|
||||
index 7d31a9f22a85..7cb3b0c23b72 100644
|
||||
index f748fb5189e0..33f02c2d633c 100644
|
||||
--- a/drivers/clk/rockchip/clk_rk3399.c
|
||||
+++ b/drivers/clk/rockchip/clk_rk3399.c
|
||||
@@ -54,10 +54,11 @@ struct pll_div {
|
||||
@@ -87,7 +87,7 @@ index 7d31a9f22a85..7cb3b0c23b72 100644
|
||||
void *aclkreg_addr, *dclkreg_addr;
|
||||
u32 div;
|
||||
|
||||
@@ -1316,6 +1317,7 @@ static void rkclk_init(struct rockchip_cru *cru)
|
||||
@@ -1336,6 +1337,7 @@ static void rkclk_init(struct rockchip_cru *cru)
|
||||
/* configure gpll cpll */
|
||||
rkclk_set_pll(&cru->gpll_con[0], &gpll_init_cfg);
|
||||
rkclk_set_pll(&cru->cpll_con[0], &cpll_init_cfg);
|
||||
@@ -96,5 +96,5 @@ index 7d31a9f22a85..7cb3b0c23b72 100644
|
||||
/* configure perihp aclk, hclk, pclk */
|
||||
aclk_div = GPLL_HZ / PERIHP_ACLK_HZ - 1;
|
||||
--
|
||||
2.37.2
|
||||
2.42.0
|
||||
|
||||
|
||||
+55
-8564
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,3 @@
|
||||
tree="default"
|
||||
rev="62e2ad1ceafbfdf2c44d3dc1b6efc81e768a96b9" # v2023.01
|
||||
rev="4459ed60cb1e0562bc5b40405e2b4b9bbf766d57" # v2023.10
|
||||
arch="AArch64"
|
||||
|
||||
Reference in New Issue
Block a user