u-boot (Allwinner H3): rebase patches for 2022.10-rc3

This commit is contained in:
Rudi Heitbaum 2022-09-05 10:29:52 +00:00
parent c8f25180bd
commit 4d2eedaeba
2 changed files with 11 additions and 11 deletions

View File

@ -174,13 +174,13 @@ index ad1f97632979..a2c74da81aa9 100644
#ifdef SCP_ADDR #ifdef SCP_ADDR
"scp", "scp",
#endif #endif
diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 563635636624..2f0d69bdfce2 100644 index 563635636624..2f0d69bdfce2 100644
--- a/include/configs/sun8i.h --- a/include/configs/sunxi-common.h
+++ b/include/configs/sun8i.h +++ b/include/configs/sunxi-common.h
@@ -14,6 +14,12 @@ @@ -15,6 +15,12 @@
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#include <linux/stringify.h>
+#ifdef SUNXI_SRAM_A2_SIZE +#ifdef SUNXI_SRAM_A2_SIZE
+#define SUNXI_RESUME_BASE (CONFIG_ARMV7_SECURE_BASE + \ +#define SUNXI_RESUME_BASE (CONFIG_ARMV7_SECURE_BASE + \
@ -188,9 +188,9 @@ index 563635636624..2f0d69bdfce2 100644
+#define SUNXI_RESUME_SIZE 1024 +#define SUNXI_RESUME_SIZE 1024
+#endif +#endif
+ +
/* /* Serial & console */
* Include common sunxi configuration where most the settings are #define CONFIG_SYS_NS16550_SERIAL
*/ /* ns16550 reg in the low bits of cpu reg */
-- --
2.33.0 2.33.0

View File

@ -53,10 +53,10 @@ index 2b7d655678d0..a25cd11f1124 100644
return 0; return 0;
} }
diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 2f0d69bdfce2..fda5b235a3e0 100644 index 2f0d69bdfce2..fda5b235a3e0 100644
--- a/include/configs/sun8i.h --- a/include/configs/sunxi-common.h
+++ b/include/configs/sun8i.h +++ b/include/configs/sunxi-common.h
@@ -26,6 +26,9 @@ @@ -26,6 +26,9 @@
#define SUNXI_RESUME_BASE (CONFIG_ARMV7_SECURE_BASE + \ #define SUNXI_RESUME_BASE (CONFIG_ARMV7_SECURE_BASE + \
CONFIG_ARMV7_SECURE_MAX_SIZE) CONFIG_ARMV7_SECURE_MAX_SIZE)