-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
u-boot: sunxi: bumped to 2023.10 (#5780)
- Loading branch information
Showing
3 changed files
with
11 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From a35a53fd1e4b82dc1bf441b6986fffa87c30400d Mon Sep 17 00:00:00 2001 | ||
From f0df8777f6d406d5022eaec8ac3ec20f5b12aa3c Mon Sep 17 00:00:00 2001 | ||
From: The Going <[email protected]> | ||
Date: Fri, 1 Apr 2022 22:57:09 +0300 | ||
Subject: [PATCH] sunxi boot splash | ||
|
@@ -10,22 +10,22 @@ Subject: [PATCH] sunxi boot splash | |
3 files changed, 40 insertions(+) | ||
|
||
diff --git a/cmd/Kconfig b/cmd/Kconfig | ||
index b2d7598717..ccd585bb24 100644 | ||
index 43ca10f69cc..9051800d6d1 100644 | ||
--- a/cmd/Kconfig | ||
+++ b/cmd/Kconfig | ||
@@ -1912,6 +1912,7 @@ menu "Misc commands" | ||
config CMD_BMP | ||
@@ -2017,6 +2017,7 @@ config CMD_BMP | ||
bool "Enable 'bmp' command" | ||
depends on VIDEO | ||
select BMP | ||
+ default y | ||
help | ||
This provides a way to obtain information about a BMP-format image | ||
and to display it. BMP (which presumably stands for BitMaP) is a | ||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h | ||
index c3a2414b91..3f75840f27 100644 | ||
index 2a136b96a6d..fac28ceb155 100644 | ||
--- a/include/config_distro_bootcmd.h | ||
+++ b/include/config_distro_bootcmd.h | ||
@@ -469,6 +469,15 @@ | ||
@@ -492,6 +492,15 @@ | ||
BOOTENV_SHARED_VIRTIO \ | ||
BOOTENV_SHARED_EXTENSION \ | ||
"boot_prefixes=/ /boot/\0" \ | ||
|
@@ -42,10 +42,10 @@ index c3a2414b91..3f75840f27 100644 | |
"boot_script_dhcp=boot.scr.uimg\0" \ | ||
BOOTENV_BOOT_TARGETS \ | ||
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h | ||
index e89ad42ce8..54fee64bcc 100644 | ||
index d2d70f0fc23..b318baf17c4 100644 | ||
--- a/include/configs/sunxi-common.h | ||
+++ b/include/configs/sunxi-common.h | ||
@@ -106,6 +106,30 @@ | ||
@@ -97,6 +97,30 @@ | ||
#define LOW_LEVEL_SRAM_STACK 0x00008000 /* End of sram */ | ||
#endif | ||
|
||
|
@@ -76,7 +76,7 @@ index e89ad42ce8..54fee64bcc 100644 | |
/* Ethernet support */ | ||
|
||
#ifdef CONFIG_ARM64 | ||
@@ -286,8 +310,14 @@ | ||
@@ -277,8 +301,14 @@ | ||
#include <config_distro_bootcmd.h> | ||
|
||
#ifdef CONFIG_USB_KEYBOARD | ||
|