Skip to content

Commit

Permalink
u-boot: bump Amlogic patches for 2021.01
Browse files Browse the repository at this point in the history
  • Loading branch information
chewitt committed Jan 13, 2021
1 parent f559296 commit b0c2688
Show file tree
Hide file tree
Showing 21 changed files with 5,579 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 4e109edd71cb99e6085031f160b5677e0f56bcff Mon Sep 17 00:00:00 2001
From 9f81b716f4f1f92c7d7e717736763c885ca592f3 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <[email protected]>
Date: Tue, 6 Oct 2020 12:56:09 +0000
Subject: [PATCH 1/2] HACK: prevent stdout/stderr on videoconsole
Date: Fri, 13 Nov 2020 02:09:36 +0000
Subject: [PATCH 01/21] HACK: configs: meson64: prevent stdout/stderr on
videoconsole

Several devices have CONFIG_DM_VIDEO enabled which causes stdout/stderr
to appear on videoconsole, so remove videoconsole from STDOUT so that
Expand All @@ -13,13 +14,13 @@ Signed-off-by: Christian Hewitt <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index c895a24eca..6b0e991a3c 100644
index 52cc01f73d..54f995e6fe 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -22,7 +22,7 @@
#define CONFIG_BMP_16BPP
#define CONFIG_BMP_24BPP
#define CONFIG_BMP_32BPP
@@ -18,7 +18,7 @@

/* For splashscreen */
#ifdef CONFIG_DM_VIDEO
-#define STDOUT_CFG "vidconsole,serial"
+#define STDOUT_CFG "serial"
#else
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From 59a2250691bb734b748d081ddcbc2431cf27bf62 Mon Sep 17 00:00:00 2001
From f9af8e2b20d319dc49f0732d0619dd622f2bf02d Mon Sep 17 00:00:00 2001
From: chewitt <[email protected]>
Date: Fri, 24 Apr 2020 15:15:04 +0000
Subject: [PATCH 2/2] HACK: mmc: meson-gx: limit to 24MHz
Subject: [PATCH 02/21] HACK: mmc: meson-gx: limit to 24MHz

---
drivers/mmc/meson_gx_mmc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 719dd1e5e5..dd3dd7c08c 100644
index a5e9ac5637..4d90343271 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -265,7 +265,7 @@ static int meson_mmc_probe(struct udevice *dev)
@@ -283,7 +283,7 @@ static int meson_mmc_probe(struct udevice *dev)
cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT |
MMC_MODE_HS_52MHz | MMC_MODE_HS;
cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV);
Expand Down
Loading

0 comments on commit b0c2688

Please sign in to comment.