diff options
21 files changed, 1328 insertions, 497 deletions
diff --git a/config/coreboot/default/patches/0040-Fix-build-with-GCC-15-as-host-compiler.patch b/config/coreboot/default/patches/0040-Fix-build-with-GCC-15-as-host-compiler.patch new file mode 100644 index 00000000..a7b28f2e --- /dev/null +++ b/config/coreboot/default/patches/0040-Fix-build-with-GCC-15-as-host-compiler.patch @@ -0,0 +1,62 @@ +From 281151d85240bd8a60545b6415e0f44ce6a2af33 Mon Sep 17 00:00:00 2001 +From: Alper Nebi Yasak <alpernebiyasak@gmail.com> +Date: Tue, 29 Apr 2025 17:31:13 +0300 +Subject: [PATCH] WIP: Fix build with GCC 15 as host compiler + +GCC 15 now considers the unterminated-string-initialization warning as +part of -Werror by default. Coreboot compiles host utilities with the +system compiler, which results in getting this error in some files. + +Mark a hexadecimal translation table in cbfstool code as "nonstring" to +avoid the warning-turned-error. + +The bios log prefixes are non-null-terminated as well, but I couldn't +figure out how to mark them as non-strings. Temporarily disable the +warning with a pragma to avoid the error. That pragma causes an error on +GCC 14, so disable pragma warnings along with it to avoid that as well. + +Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> +--- + src/commonlib/include/commonlib/loglevel.h | 4 ++++ + util/cbfstool/common.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/commonlib/include/commonlib/loglevel.h b/src/commonlib/include/commonlib/loglevel.h +index 79fbcfc6d92b..31438c945ff5 100644 +--- a/src/commonlib/include/commonlib/loglevel.h ++++ b/src/commonlib/include/commonlib/loglevel.h +@@ -163,6 +163,9 @@ + * When printing logs, lines should be printed with the following prefixes in + * front of them according to the BIOS_LOG_PREFIX_PATTERN printf() pattern. + */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wpragmas" ++#pragma GCC diagnostic ignored "-Wunterminated-string-initialization" + #define BIOS_LOG_PREFIX_PATTERN "[%.5s] " + #define BIOS_LOG_PREFIX_MAX_LEVEL BIOS_SPEW + static const char bios_log_prefix[BIOS_LOG_PREFIX_MAX_LEVEL + 1][5] = { +@@ -177,6 +180,7 @@ static const char bios_log_prefix[BIOS_LOG_PREFIX_MAX_LEVEL + 1][5] = { + [BIOS_DEBUG] = "DEBUG", + [BIOS_SPEW] = "SPEW ", + }; ++#pragma GCC diagnostic pop + + /* + * When printing to terminals supporting ANSI escape sequences, the following +diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c +index 7154bc9d5425..cb08c9e8ec11 100644 +--- a/util/cbfstool/common.c ++++ b/util/cbfstool/common.c +@@ -192,7 +192,7 @@ uint64_t intfiletype(const char *name) + + char *bintohex(uint8_t *data, size_t len) + { +- static const char translate[16] = "0123456789abcdef"; ++ static const char translate[16] __attribute__((__nonstring__)) = "0123456789abcdef"; + + char *result = malloc(len * 2 + 1); + if (result == NULL) + +-- +2.49.0 + diff --git a/config/coreboot/default/patches/0041-crossgcc-gmp-Add-upstream-fix-for-GCC-15.patch b/config/coreboot/default/patches/0041-crossgcc-gmp-Add-upstream-fix-for-GCC-15.patch new file mode 100644 index 00000000..1d0b6072 --- /dev/null +++ b/config/coreboot/default/patches/0041-crossgcc-gmp-Add-upstream-fix-for-GCC-15.patch @@ -0,0 +1,71 @@ +From ee3925486f3567b9fe45cb98a88b9acc64991127 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Tue, 29 Apr 2025 21:15:22 +0100 +Subject: [PATCH 1/1] crossgcc/gmp: Add upstream fix for GCC 15 + +See: +https://gmplib.org/list-archives/gmp-devel/2025-January/006279.html + +by default, upstream GCC-15 now defaults to -std=c23, instead +of -std=c17, which can cause some build issues. + +GMP has this patch on their mailing list for GCC-15 (see link). + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + .../gmp-6.3.0_acinclude-m4-fix-std-c23.patch | 43 +++++++++++++++++++ + 1 file changed, 43 insertions(+) + create mode 100644 util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23.patch + +diff --git a/util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23.patch b/util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23.patch +new file mode 100644 +index 0000000000..b884b62df7 +--- /dev/null ++++ b/util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23.patch +@@ -0,0 +1,43 @@ ++From b1b61bc8ab19659f0fb8c0f87edcd79ae1bfef7e Mon Sep 17 00:00:00 2001 ++From: Rudi Heitbaum <rudi@heitbaum.com> ++Date: Wed, 22 Jan 2025 02:34:09 +0100 ++Subject: [PATCH 1/1] acinclude.m4: fix -std=c23 build failure ++ ++Add prototype to configure test function as c23 removes unprototyped ++functions. ++ ++gcc-15 switched to -std=c23 by default: ++ ++ https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 ++ ++As a result `configure` fails with: ++ conftest.c: In function 'f': ++ conftest.c:12:48: error: too many arguments to function 'g'; expected 0, have 6 ++ 12 | for(i=0;i<1;i++){if(e(got,got,9,d[i].n)==0)h();g(i,d[i].src,d[i].n,got,d[i].want,9);if(d[i].n)h();}} ++ | ^ ~ ++ conftest.c:7:6: note: declared here ++ 7 | void g(){} ++ | ^ ++ ++Link: https://gmplib.org/list-archives/gmp-bugs/2024-November/005550.html ++Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> ++--- ++ acinclude.m4 | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/acinclude.m4 b/acinclude.m4 ++index 9cf9483..1eed843 100644 ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -609,7 +609,7 @@ GMP_PROG_CC_WORKS_PART([$1], [long long reliability test 1], ++ ++ #if defined (__GNUC__) && ! defined (__cplusplus) ++ typedef unsigned long long t1;typedef t1*t2; ++-void g(){} +++void g(int,const t1 *,t1,t1 *,const t1 *,int){} ++ void h(){} ++ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) ++ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;} ++-- ++2.39.5 ++ +-- +2.39.5 + diff --git a/config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch b/config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch new file mode 100644 index 00000000..a2f5c982 --- /dev/null +++ b/config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch @@ -0,0 +1,54 @@ +From 983835d1470dde4559d9ee58c60e65c0bb3873c2 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Tue, 29 Apr 2025 23:13:42 +0100 +Subject: [PATCH 1/1] further gcc-15 fix for compiling gmp + +same as the previous fix, but we needed to apply +the exact same change to the configure file, in +the appropriate place. + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + ...6.3.0_acinclude-m4-fix-std-c23-extra.patch | 30 +++++++++++++++++++ + 1 file changed, 30 insertions(+) + create mode 100644 util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23-extra.patch + +diff --git a/util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23-extra.patch b/util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23-extra.patch +new file mode 100644 +index 0000000000..bee0159abf +--- /dev/null ++++ b/util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23-extra.patch +@@ -0,0 +1,30 @@ ++From f1da82325f91ccf8f3a251c0f94388acf091c1fe Mon Sep 17 00:00:00 2001 ++From: Leah Rowe <leah@libreboot.org> ++Date: Tue, 29 Apr 2025 23:11:25 +0100 ++Subject: [PATCH 1/1] further gcc-15 -std=23 mitigation ++ ++the same fix as in the previous revision, also needs ++to be applied here. this make the coreboot build process ++pass, when compiling gmp. ++ ++Signed-off-by: Leah Rowe <leah@libreboot.org> ++--- ++ configure | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/configure b/configure ++index 7910aa0..bd4342d 100755 ++--- a/configure +++++ b/configure ++@@ -6568,7 +6568,7 @@ if test "$gmp_prog_cc_works" = yes; then ++ ++ #if defined (__GNUC__) && ! defined (__cplusplus) ++ typedef unsigned long long t1;typedef t1*t2; ++-void g(){} +++void g(int,const t1 *,t1,t1 *,const t1 *,int){} ++ void h(){} ++ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) ++ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;} ++-- ++2.39.5 ++ +-- +2.39.5 + diff --git a/config/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch b/config/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch new file mode 100644 index 00000000..b08c9edf --- /dev/null +++ b/config/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch @@ -0,0 +1,39 @@ +From 281151d85240bd8a60545b6415e0f44ce6a2af33 Mon Sep 17 00:00:00 2001 +From: Alper Nebi Yasak <alpernebiyasak@gmail.com> +Date: Tue, 29 Apr 2025 17:31:13 +0300 +Subject: [PATCH] WIP: Fix build with GCC 15 as host compiler + +GCC 15 now considers the unterminated-string-initialization warning as +part of -Werror by default. Coreboot compiles host utilities with the +system compiler, which results in getting this error in some files. + +Mark a hexadecimal translation table in cbfstool code as "nonstring" to +avoid the warning-turned-error. + +The bios log prefixes are non-null-terminated as well, but I couldn't +figure out how to mark them as non-strings. Temporarily disable the +warning with a pragma to avoid the error. That pragma causes an error on +GCC 14, so disable pragma warnings along with it to avoid that as well. + +Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> +--- + util/cbfstool/common.c | 2 +- + 1 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c +index 7154bc9d5425..cb08c9e8ec11 100644 +--- a/util/cbfstool/common.c ++++ b/util/cbfstool/common.c +@@ -192,7 +192,7 @@ uint64_t intfiletype(const char *name) + + char *bintohex(uint8_t *data, size_t len) + { +- static const char translate[16] = "0123456789abcdef"; ++ static const char translate[16] __attribute__((__nonstring__)) = "0123456789abcdef"; + + char *result = malloc(len * 2 + 1); + if (result == NULL) + +-- +2.49.0 + diff --git a/config/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch b/config/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch new file mode 100644 index 00000000..d9de94c6 --- /dev/null +++ b/config/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch @@ -0,0 +1,119 @@ +From 74dc3c0a4603bc635c8bc5e95490cdf168af5f41 Mon Sep 17 00:00:00 2001 +From: Alper Nebi Yasak <alpernebiyasak@gmail.com> +Date: Tue, 29 Apr 2025 19:46:14 +0300 +Subject: [PATCH] util/romcc: Fix build with GCC 15 + +With GCC 15, we get build errors complaining bool is a reserved keyword, +so cannot be used as a function name. Rename our bool() to bool_(). + +Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> +--- + util/romcc/romcc.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c +index 378bfc50f290..b375e0fc83cb 100644 +--- a/util/romcc/romcc.c ++++ b/util/romcc/romcc.c +@@ -7137,7 +7137,7 @@ static void integral(struct compile_state *state, struct triple *def) + } + + +-static void bool(struct compile_state *state, struct triple *def) ++static void bool_(struct compile_state *state, struct triple *def) + { + if (!TYPE_ARITHMETIC(def->type->type) && + ((def->type->type & TYPE_MASK) != TYPE_POINTER)) { +@@ -7705,7 +7705,7 @@ static struct triple *mkcond_expr( + struct triple *def, *val, *var, *jmp1, *jmp2, *top, *mid, *end; + struct type *result_type; + unsigned int left_type, right_type; +- bool(state, test); ++ bool_(state, test); + left_type = left->type->type; + right_type = right->type->type; + result_type = 0; +@@ -11036,7 +11036,7 @@ static struct triple *unary_expr(struct compile_state *state) + case TOK_BANG: + eat(state, TOK_BANG); + right = read_expr(state, cast_expr(state)); +- bool(state, right); ++ bool_(state, right); + def = lfalse_expr(state, right); + break; + case TOK_SIZEOF: +@@ -11363,10 +11363,10 @@ static struct triple *land_expr(struct compile_state *state) + while(peek(state) == TOK_LOGAND) { + struct triple *left, *right; + left = read_expr(state, def); +- bool(state, left); ++ bool_(state, left); + eat(state, TOK_LOGAND); + right = read_expr(state, or_expr(state)); +- bool(state, right); ++ bool_(state, right); + + def = mkland_expr(state, + ltrue_expr(state, left), +@@ -11382,10 +11382,10 @@ static struct triple *lor_expr(struct compile_state *state) + while(peek(state) == TOK_LOGOR) { + struct triple *left, *right; + left = read_expr(state, def); +- bool(state, left); ++ bool_(state, left); + eat(state, TOK_LOGOR); + right = read_expr(state, land_expr(state)); +- bool(state, right); ++ bool_(state, right); + + def = mklor_expr(state, + ltrue_expr(state, left), +@@ -11400,7 +11400,7 @@ static struct triple *conditional_expr(struct compile_state *state) + def = lor_expr(state); + if (peek(state) == TOK_QUEST) { + struct triple *test, *left, *right; +- bool(state, def); ++ bool_(state, def); + test = ltrue_expr(state, read_expr(state, def)); + eat(state, TOK_QUEST); + left = read_expr(state, expr(state)); +@@ -11676,7 +11676,7 @@ static void if_statement(struct compile_state *state, struct triple *first) + eat(state, TOK_IF); + eat(state, TOK_LPAREN); + test = expr(state); +- bool(state, test); ++ bool_(state, test); + /* Cleanup and invert the test */ + test = lfalse_expr(state, read_expr(state, test)); + eat(state, TOK_RPAREN); +@@ -11719,7 +11719,7 @@ static void for_statement(struct compile_state *state, struct triple *first) + eat(state, TOK_SEMI); + if (peek(state) != TOK_SEMI) { + test = expr(state); +- bool(state, test); ++ bool_(state, test); + test = ltrue_expr(state, read_expr(state, test)); + } + eat(state, TOK_SEMI); +@@ -11767,7 +11767,7 @@ static void while_statement(struct compile_state *state, struct triple *first) + eat(state, TOK_WHILE); + eat(state, TOK_LPAREN); + test = expr(state); +- bool(state, test); ++ bool_(state, test); + test = ltrue_expr(state, read_expr(state, test)); + eat(state, TOK_RPAREN); + /* Generate the needed pieces */ +@@ -11818,7 +11818,7 @@ static void do_statement(struct compile_state *state, struct triple *first) + eat(state, TOK_WHILE); + eat(state, TOK_LPAREN); + test = read_expr(state, expr(state)); +- bool(state, test); ++ bool_(state, test); + eat(state, TOK_RPAREN); + eat(state, TOK_SEMI); + /* Thread the pieces together */ + +-- +2.49.0 + diff --git a/config/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch b/config/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch new file mode 100644 index 00000000..40ea7c14 --- /dev/null +++ b/config/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch @@ -0,0 +1,65 @@ +From 8663b2a75d69aa241f86dd6e813232343a05b609 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Tue, 29 Apr 2025 21:26:25 +0100 +Subject: [PATCH 1/1] gmp gcc15 patch + +https://gmplib.org/list-archives/gmp-devel/2025-January/006279.html + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + ...include.m4-fix-std-c23-build-failure.patch | 43 +++++++++++++++++++ + 1 file changed, 43 insertions(+) + create mode 100644 util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch + +diff --git a/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch +new file mode 100644 +index 0000000000..adb66c6043 +--- /dev/null ++++ b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch +@@ -0,0 +1,43 @@ ++From 7d4aa08224b53054754b8ee6fd61a4297ac47119 Mon Sep 17 00:00:00 2001 ++From: Rudi Heitbaum <rudi@heitbaum.com> ++Date: Wed, 22 Jan 2025 02:34:09 +0100 ++Subject: [PATCH 1/1] acinclude.m4: fix -std=c23 build failure ++ ++Add prototype to configure test function as c23 removes unprototyped ++functions. ++ ++gcc-15 switched to -std=c23 by default: ++ ++ https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 ++ ++As a result `configure` fails with: ++ conftest.c: In function 'f': ++ conftest.c:12:48: error: too many arguments to function 'g'; expected 0, have 6 ++ 12 | for(i=0;i<1;i++){if(e(got,got,9,d[i].n)==0)h();g(i,d[i].src,d[i].n,got,d[i].want,9);if(d[i].n)h();}} ++ | ^ ~ ++ conftest.c:7:6: note: declared here ++ 7 | void g(){} ++ | ^ ++ ++Link: https://gmplib.org/list-archives/gmp-bugs/2024-November/005550.html ++Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> ++--- ++ acinclude.m4 | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/acinclude.m4 b/acinclude.m4 ++index 3c3ecf5..3a226fd 100644 ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -609,7 +609,7 @@ GMP_PROG_CC_WORKS_PART([$1], [long long reliability test 1], ++ ++ #if defined (__GNUC__) && ! defined (__cplusplus) ++ typedef unsigned long long t1;typedef t1*t2; ++-void g(){} +++void g(int,const t1 *,t1,t1 *,const t1 *,int){} ++ void h(){} ++ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) ++ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;} ++-- ++2.39.5 ++ +-- +2.39.5 + diff --git a/config/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch b/config/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch new file mode 100644 index 00000000..1287a02d --- /dev/null +++ b/config/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch @@ -0,0 +1,55 @@ +From 8c3a1163eb24a608ad14747cd40169fb5a41d4f9 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Tue, 29 Apr 2025 23:18:56 +0100 +Subject: [PATCH 1/1] further fix for std=c23 on gmp with host gcc-15 + +the fix had to be applied in the configure file, so that +the correct function call is generated in conftest.c + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + ...e.m4-fix-std-c23-build-failure-extra.patch | 32 +++++++++++++++++++ + 1 file changed, 32 insertions(+) + create mode 100644 util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch + +diff --git a/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch +new file mode 100644 +index 0000000000..40569b27d8 +--- /dev/null ++++ b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch +@@ -0,0 +1,32 @@ ++From 6316016cfe6834b6d3242e7e088b7d2af91ada22 Mon Sep 17 00:00:00 2001 ++From: Leah Rowe <leah@libreboot.org> ++Date: Tue, 29 Apr 2025 23:16:51 +0100 ++Subject: [PATCH 1/1] further -std=23 gcc-15 fix for gmp ++ ++the previously merged revision was correct, but ++applied in the wrong place. the conftest.c file ++was being generated by configure, in this place. ++ ++this should fix build errors now, on gcc-15. ++ ++Signed-off-by: Leah Rowe <leah@libreboot.org> ++--- ++ configure | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/configure b/configure ++index 12ddffd..8b07818 100755 ++--- a/configure +++++ b/configure ++@@ -6458,7 +6458,7 @@ if test "$gmp_prog_cc_works" = yes; then ++ ++ #if defined (__GNUC__) && ! defined (__cplusplus) ++ typedef unsigned long long t1;typedef t1*t2; ++-void g(){} +++void g(int,const t1 *,t1,t1 *,const t1 *,int){} ++ void h(){} ++ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) ++ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;} ++-- ++2.39.5 ++ +-- +2.39.5 + diff --git a/config/dependencies/debian b/config/dependencies/debian index 00ccfc1a..992fb690 100755 --- a/config/dependencies/debian +++ b/config/dependencies/debian @@ -7,9 +7,9 @@ binutils-arm-none-eabi bison build-essential cmake curl device-tree-compiler \ doxygen e2fsprogs efitools flex fonts-unifont gawk gcc-arm-linux-gnueabi \ gcc-arm-none-eabi gdb gettext git gnat help2man innoextract libdevmapper-dev \ libfdt-dev libfont-freetype-perl libfreetype-dev libftdi-dev libftdi1-dev libfuse-dev \ -libjaylink-dev libgnutls28-dev libgpiod-dev lz4 liblz4-dev liblzma-dev libncurses5-dev +libjaylink-dev libgnutls28-dev libgpiod-dev lz4 liblz4-dev liblzma-dev libncurses5-dev \ libncurses-dev libnewlib-arm-none-eabi libopts25 libopts25-dev libpci-dev libpython3-dev \ -libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0 libusb-1.0-0-dev \ +libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0-0 libusb-1.0-0-dev \ libusb-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted pciutils \ perl pkg-config python3 python3-distutils-extra python3-pkg-resources python3-pycryptodome \ python3-pyelftools python3-setuptools python-is-python3 sharutils swig unar \ diff --git a/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch b/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch index f0682c11..2c042776 100644 --- a/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch +++ b/config/seabios/default/patches/0001-romfile-implement-a-generic-loader.patch @@ -18,7 +18,7 @@ Signed-off-by: Riku Viitanen <riku.viitanen@protonmail.com> 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/romfile.c b/src/romfile.c -index b598274e..8bf95713 100644 +index b598274edc09..8ccf5139ece8 100644 --- a/src/romfile.c +++ b/src/romfile.c @@ -47,10 +47,12 @@ romfile_find(const char *name) @@ -33,7 +33,7 @@ index b598274e..8bf95713 100644 void * -romfile_loadfile(const char *name, int *psize) +romfile_loadfile_g(const char *name, int *psize, -+ void *(*malloc_fn)(), int add_len) ++ void *(*malloc_fn)(u32), int add_len) { struct romfile_s *file = romfile_find(name); if (!file) @@ -69,7 +69,7 @@ index b598274e..8bf95713 100644 } diff --git a/src/romfile.h b/src/romfile.h -index 3e0f8200..a320a5bc 100644 +index 3e0f820047dd..1b967d86551f 100644 --- a/src/romfile.h +++ b/src/romfile.h @@ -13,6 +13,8 @@ struct romfile_s { @@ -77,7 +77,7 @@ index 3e0f8200..a320a5bc 100644 struct romfile_s *romfile_findprefix(const char *prefix, struct romfile_s *prev); struct romfile_s *romfile_find(const char *name); +void *romfile_loadfile_g(const char *name, int *psize, -+ void *(*malloc_fn)(), int add_len); ++ void *(*malloc_fn)(u32), int add_len); void *romfile_loadfile(const char *name, int *psize); u64 romfile_loadint(const char *name, u64 defval); diff --git a/config/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch b/config/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch index 32647ed0..8227b076 100644 --- a/config/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch +++ b/config/u-boot/default/patches/0001-clk-rockchip-rk3399-Set-hardcoded-clock-rates-same-a.patch @@ -1,4 +1,4 @@ -From bc5204d0d28bb431186fd106f9a79f69bfad005d Mon Sep 17 00:00:00 2001 +From ee94f55d37fc8c133faa5055184f75f99830cfdc 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 @@ -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 24cefebd1b2a..6f874bd347e0 100644 +index 6e87db18be07..1b8ffe9e794e 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -53,10 +53,11 @@ struct pll_div { @@ -72,7 +72,7 @@ index 24cefebd1b2a..6f874bd347e0 100644 +static const struct pll_div gpll_init_cfg = PLL_DIVISORS(GPLL_HZ, 1, 4, 1); +static const struct pll_div cpll_init_cfg = PLL_DIVISORS(CPLL_HZ, 1, 3, 1); +static const struct pll_div npll_init_cfg = PLL_DIVISORS(NPLL_HZ, 1, 3, 1); - #if !defined(CONFIG_SPL_BUILD) + #if !defined(CONFIG_XPL_BUILD) -static const struct pll_div ppll_init_cfg = PLL_DIVISORS(PPLL_HZ, 2, 2, 1); +static const struct pll_div ppll_init_cfg = PLL_DIVISORS(PPLL_HZ, 3, 2, 1); #endif @@ -96,5 +96,5 @@ index 24cefebd1b2a..6f874bd347e0 100644 /* configure perihp aclk, hclk, pclk */ aclk_div = GPLL_HZ / PERIHP_ACLK_HZ - 1; -- -2.45.2 +2.49.0 diff --git a/config/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch b/config/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch index bb264b00..e2de311c 100644 --- a/config/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch +++ b/config/u-boot/default/patches/0002-video-improve-UEFI-experience-on-DM_VIDEO.patch @@ -1,4 +1,4 @@ -From 03750188cbe305cd8383178a1ee476de2aa5953e Mon Sep 17 00:00:00 2001 +From 780d8ffe985441824a242e5b853721dfe14435dd Mon Sep 17 00:00:00 2001 From: Andre Przywara <andre.przywara@arm.com> Date: Mon, 10 Jan 2022 00:56:31 +0000 Subject: [PATCH 1/3] video: Add cursor support for video consoles @@ -36,7 +36,7 @@ index 939363653f6c..6b531718276f 100644 vc_priv->y_charsize = fontdata->height; if (vid_priv->rot % 2) { diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c -index 80e7adf6a1a4..8b2ef51f1b3b 100644 +index ebe96bf0c2f3..8613c464040f 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -57,6 +57,26 @@ int vidconsole_entry_start(struct udevice *dev) @@ -84,7 +84,7 @@ index 80e7adf6a1a4..8b2ef51f1b3b 100644 priv->xcur_frac = priv->xstart_frac; priv->ycur += priv->y_charsize; -@@ -284,6 +308,14 @@ static void vidconsole_escape_char(struct udevice *dev, char ch) +@@ -286,6 +310,14 @@ static void vidconsole_escape_char(struct udevice *dev, char ch) break; } @@ -99,7 +99,7 @@ index 80e7adf6a1a4..8b2ef51f1b3b 100644 case 'J': { int mode; -@@ -458,6 +490,11 @@ int vidconsole_put_char(struct udevice *dev, char ch) +@@ -460,6 +492,11 @@ int vidconsole_put_char(struct udevice *dev, char ch) struct vidconsole_priv *priv = dev_get_uclass_priv(dev); int cp, ret; @@ -111,7 +111,7 @@ index 80e7adf6a1a4..8b2ef51f1b3b 100644 if (priv->escape) { vidconsole_escape_char(dev, ch); return 0; -@@ -472,6 +509,7 @@ int vidconsole_put_char(struct udevice *dev, char ch) +@@ -474,6 +511,7 @@ int vidconsole_put_char(struct udevice *dev, char ch) /* beep */ break; case '\r': @@ -119,7 +119,7 @@ index 80e7adf6a1a4..8b2ef51f1b3b 100644 priv->xcur_frac = priv->xstart_frac; break; case '\n': -@@ -479,6 +517,7 @@ int vidconsole_put_char(struct udevice *dev, char ch) +@@ -481,6 +519,7 @@ int vidconsole_put_char(struct udevice *dev, char ch) vidconsole_entry_start(dev); break; case '\t': /* Tab (8 chars alignment) */ @@ -127,7 +127,7 @@ index 80e7adf6a1a4..8b2ef51f1b3b 100644 priv->xcur_frac = ((priv->xcur_frac / priv->tab_width_frac) + 1) * priv->tab_width_frac; -@@ -503,6 +542,8 @@ int vidconsole_put_char(struct udevice *dev, char ch) +@@ -505,6 +544,8 @@ int vidconsole_put_char(struct udevice *dev, char ch) break; } @@ -136,7 +136,7 @@ index 80e7adf6a1a4..8b2ef51f1b3b 100644 return 0; } -@@ -723,6 +764,7 @@ static int vidconsole_pre_probe(struct udevice *dev) +@@ -725,6 +766,7 @@ static int vidconsole_pre_probe(struct udevice *dev) struct video_priv *vid_priv = dev_get_uclass_priv(vid); priv->xsize_frac = VID_TO_POS(vid_priv->xsize); @@ -145,10 +145,10 @@ index 80e7adf6a1a4..8b2ef51f1b3b 100644 return 0; } diff --git a/include/video_console.h b/include/video_console.h -index 8b5928dc5ebb..00c5ecb664b9 100644 +index 723d2315606d..17a9aa3f9295 100644 --- a/include/video_console.h +++ b/include/video_console.h -@@ -66,6 +66,7 @@ struct vidconsole_priv { +@@ -74,6 +74,7 @@ struct vidconsole_priv { int escape_len; int row_saved; int col_saved; @@ -157,10 +157,10 @@ index 8b5928dc5ebb..00c5ecb664b9 100644 char utf8_buf[5]; }; -- -2.45.2 +2.49.0 -From f63a54996fdaac7ff995e26fd4318a09a9c14dff Mon Sep 17 00:00:00 2001 +From b2b921d7bc69b505562cf02d1b4c6f6d4325c7d5 Mon Sep 17 00:00:00 2001 From: Andre Przywara <andre.przywara@arm.com> Date: Mon, 10 Jan 2022 00:56:36 +0000 Subject: [PATCH 2/3] efi-selftest: Add international characters test @@ -196,10 +196,10 @@ index a3023c82567c..2f8d8d323c2b 100644 ret = con_out->output_string(con_out, text); if (ret != EFI_ST_SUCCESS) { -- -2.45.2 +2.49.0 -From cc05aa26c43c35e9155d958400532005ae7eeede Mon Sep 17 00:00:00 2001 +From 082422499a5f2689e715df68bfd025a5cc15cc64 Mon Sep 17 00:00:00 2001 From: Andre Przywara <andre.przywara@arm.com> Date: Mon, 10 Jan 2022 00:56:37 +0000 Subject: [PATCH 3/3] efi_selftest: Add box drawing character selftest @@ -242,5 +242,5 @@ index 2f8d8d323c2b..02209a5bf224 100644 ret = con_out->output_string(con_out, text); if (ret != EFI_ST_SUCCESS) { -- -2.45.2 +2.49.0 diff --git a/config/u-boot/default/patches/0003-Add-video-damage-tracking.patch b/config/u-boot/default/patches/0003-Add-video-damage-tracking.patch index 07a5fe8c..18c93ab8 100644 --- a/config/u-boot/default/patches/0003-Add-video-damage-tracking.patch +++ b/config/u-boot/default/patches/0003-Add-video-damage-tracking.patch @@ -1,4 +1,4 @@ -From c3ae7d7f7af47e747f85f06662e26f434c25c891 Mon Sep 17 00:00:00 2001 +From dae1f9cafd3d2061336f5d230ebc1f236423fa0e Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak <alpernebiyasak@gmail.com> Date: Fri, 18 Aug 2023 13:31:36 +0300 Subject: [PATCH 01/13] video: test: Split copy frame buffer check into a @@ -19,10 +19,10 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-2-alpernebiyasak@gma 1 file changed, 58 insertions(+), 11 deletions(-) diff --git a/test/dm/video.c b/test/dm/video.c -index 7dfbeb9555d1..14e6af5181f1 100644 +index e347c1403fda..01fa9e1b2415 100644 --- a/test/dm/video.c +++ b/test/dm/video.c -@@ -54,9 +54,6 @@ DM_TEST(dm_test_video_base, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); +@@ -54,9 +54,6 @@ DM_TEST(dm_test_video_base, UTF_SCAN_PDATA | UTF_SCAN_FDT); * size of the compressed data. This provides a pretty good level of * certainty and the resulting tests need only check a single value. * @@ -301,10 +301,10 @@ index 7dfbeb9555d1..14e6af5181f1 100644 return 0; } -- -2.45.2 +2.49.0 -From 575ebe8b5d9ae9c9818b4deb708f8a69f9f9a9b1 Mon Sep 17 00:00:00 2001 +From 3c4f71fb10a827db53d6ed637e39afb5cc19a871 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak <alpernebiyasak@gmail.com> Date: Sun, 20 Aug 2023 17:46:46 +0300 Subject: [PATCH 02/13] video: test: Support checking copy frame buffer @@ -328,10 +328,10 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-3-alpernebiyasak@gma 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/test/dm/video.c b/test/dm/video.c -index 14e6af5181f1..50374cafc009 100644 +index 01fa9e1b2415..edb1b4ede8c9 100644 --- a/test/dm/video.c +++ b/test/dm/video.c -@@ -56,22 +56,28 @@ DM_TEST(dm_test_video_base, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); +@@ -56,22 +56,28 @@ DM_TEST(dm_test_video_base, UTF_SCAN_PDATA | UTF_SCAN_FDT); * * @uts: Test state * @dev: Video device @@ -614,10 +614,10 @@ index 14e6af5181f1..50374cafc009 100644 return 0; -- -2.45.2 +2.49.0 -From d1fddc8cbe64a5532ddc43d0b1413ff7cc1bf618 Mon Sep 17 00:00:00 2001 +From ecd9200f2068ab8bbeda5c7b8ddc4b8d7ca6b038 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak <alpernebiyasak@gmail.com> Date: Fri, 18 Aug 2023 17:31:27 +0300 Subject: [PATCH 03/13] video: test: Test partial updates of hardware frame @@ -637,13 +637,13 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-4-alpernebiyasak@gma 1 file changed, 54 insertions(+) diff --git a/test/dm/video.c b/test/dm/video.c -index 50374cafc009..4798f2205a99 100644 +index edb1b4ede8c9..80e65d66dbaf 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -656,3 +656,57 @@ static int dm_test_video_truetype_bs(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_video_truetype_bs, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); + DM_TEST(dm_test_video_truetype_bs, UTF_SCAN_PDATA | UTF_SCAN_FDT); + +/* Test partial rendering onto hardware frame buffer */ +static int dm_test_video_copy(struct unit_test_state *uts) @@ -697,12 +697,12 @@ index 50374cafc009..4798f2205a99 100644 + + return 0; +} -+DM_TEST(dm_test_video_copy, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); ++DM_TEST(dm_test_video_copy, UTF_SCAN_PDATA | UTF_SCAN_FDT); -- -2.45.2 +2.49.0 -From 700a7cdc62fa08f425c05db2061f06c56d96d5b6 Mon Sep 17 00:00:00 2001 +From 6ecfb63749d955fc28e6312583865c902ffb1175 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf@csgraf.de> Date: Fri, 10 Jun 2022 00:59:15 +0200 Subject: [PATCH 04/13] dm: video: Add damage tracking API @@ -728,7 +728,7 @@ Reviewed-by: Simon Glass <sjg@chromium.org> 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index 6e79694fd192..d7da655cea62 100644 +index 3c3cebaacd02..5d67067891be 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -98,6 +98,19 @@ config VIDEO_COPY @@ -752,10 +752,10 @@ index 6e79694fd192..d7da655cea62 100644 bool "Generic PWM based Backlight Driver" depends on BACKLIGHT && DM_PWM diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c -index a5aa8dd52954..b95f2dbc7703 100644 +index ff4f21995859..da035e5c92b7 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c -@@ -352,6 +352,34 @@ void video_set_default_colors(struct udevice *dev, bool invert) +@@ -367,6 +367,34 @@ void video_set_default_colors(struct udevice *dev, bool invert) priv->colour_bg = video_index_to_colour(priv, back); } @@ -790,7 +790,7 @@ index a5aa8dd52954..b95f2dbc7703 100644 /* Flush video activity to the caches */ int video_sync(struct udevice *vid, bool force) { -@@ -385,6 +413,13 @@ int video_sync(struct udevice *vid, bool force) +@@ -400,6 +428,13 @@ int video_sync(struct udevice *vid, bool force) #endif priv->last_sync = get_timer(0); @@ -805,10 +805,10 @@ index a5aa8dd52954..b95f2dbc7703 100644 } diff --git a/include/video.h b/include/video.h -index 4013a949983f..835d7734cb75 100644 +index a1f7fd7e839c..7eed112e00c4 100644 --- a/include/video.h +++ b/include/video.h -@@ -88,6 +88,11 @@ enum video_format { +@@ -85,6 +85,11 @@ enum video_format { * @fb_size: Frame buffer size * @copy_fb: Copy of the frame buffer to keep up to date; see struct * video_uc_plat @@ -820,7 +820,7 @@ index 4013a949983f..835d7734cb75 100644 * @line_length: Length of each frame buffer line, in bytes. This can be * set by the driver, but if not, the uclass will set it after * probing -@@ -116,6 +121,12 @@ struct video_priv { +@@ -113,6 +118,12 @@ struct video_priv { void *fb; int fb_size; void *copy_fb; @@ -877,10 +877,10 @@ index 4013a949983f..835d7734cb75 100644 * video_is_active() - Test if one video device it active * -- -2.45.2 +2.49.0 -From b84ee524454fbfebd71532532bf2e28ad97ef676 Mon Sep 17 00:00:00 2001 +From c23d99983901910dadf43f2b4d0b833a0a6d6c92 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf@csgraf.de> Date: Fri, 10 Jun 2022 00:59:16 +0200 Subject: [PATCH 05/13] dm: video: Add damage notification on display fills @@ -899,10 +899,10 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-6-alpernebiyasak@gma 1 file changed, 4 insertions(+) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c -index b95f2dbc7703..6906b2b83623 100644 +index da035e5c92b7..1c07613539f2 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c -@@ -201,6 +201,8 @@ int video_fill_part(struct udevice *dev, int xstart, int ystart, int xend, +@@ -214,6 +214,8 @@ int video_fill_part(struct udevice *dev, int xstart, int ystart, int xend, if (ret) return ret; @@ -911,7 +911,7 @@ index b95f2dbc7703..6906b2b83623 100644 return 0; } -@@ -250,6 +252,8 @@ int video_fill(struct udevice *dev, u32 colour) +@@ -262,6 +264,8 @@ int video_fill(struct udevice *dev, u32 colour) if (ret) return ret; @@ -921,10 +921,10 @@ index b95f2dbc7703..6906b2b83623 100644 } -- -2.45.2 +2.49.0 -From b18a1ef92e2a003771a4a846c592302c1e92bd83 Mon Sep 17 00:00:00 2001 +From bc55519e74270926ee3680002c58fdeb21cd41ce Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf@csgraf.de> Date: Fri, 10 Jun 2022 00:59:17 +0200 Subject: [PATCH 06/13] vidconsole: Add damage notifications to all vidconsole @@ -1112,7 +1112,7 @@ index a3f8c6352f83..f11dc3a0b075 100644 } diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c -index c435162d3f94..6a17f732fc26 100644 +index 17a29817664f..073ddcfb6950 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -190,6 +190,7 @@ struct console_tt_store { @@ -1172,10 +1172,10 @@ index c435162d3f94..6a17f732fc26 100644 if (ret) return ret; -- -2.45.2 +2.49.0 -From 991d7e646de88fd019059679f659761072412e15 Mon Sep 17 00:00:00 2001 +From e759e3ab52f4373d4f2487d857118b3f0b5998b2 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak <alpernebiyasak@gmail.com> Date: Fri, 18 Aug 2023 17:55:08 +0300 Subject: [PATCH 07/13] video: test: Test video damage tracking via vidconsole @@ -1194,10 +1194,10 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-8-alpernebiyasak@gma 2 files changed, 57 insertions(+) diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index dc5fcdbd1c9e..5e5ad60ee057 100644 +index 861a1f4cd90e..8bf36ff325d8 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig -@@ -319,6 +319,7 @@ CONFIG_USB_ETH_CDC=y +@@ -328,6 +328,7 @@ CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y CONFIG_VIDEO_FONT_SUN12X22=y CONFIG_VIDEO_COPY=y @@ -1206,13 +1206,13 @@ index dc5fcdbd1c9e..5e5ad60ee057 100644 CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y diff --git a/test/dm/video.c b/test/dm/video.c -index 4798f2205a99..119c43153165 100644 +index 80e65d66dbaf..e76fa986d359 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -710,3 +710,59 @@ static int dm_test_video_copy(struct unit_test_state *uts) return 0; } - DM_TEST(dm_test_video_copy, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); + DM_TEST(dm_test_video_copy, UTF_SCAN_PDATA | UTF_SCAN_FDT); + +/* Test video damage tracking */ +static int dm_test_video_damage(struct unit_test_state *uts) @@ -1268,12 +1268,12 @@ index 4798f2205a99..119c43153165 100644 + + return 0; +} -+DM_TEST(dm_test_video_damage, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); ++DM_TEST(dm_test_video_damage, UTF_SCAN_PDATA | UTF_SCAN_FDT); -- -2.45.2 +2.49.0 -From f74688b9828f83306dea8553eafe61b5d81fbbe0 Mon Sep 17 00:00:00 2001 +From aa9d791d839b1004809b4a6cba38cd0bfd3dafa9 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf@csgraf.de> Date: Fri, 10 Jun 2022 00:59:18 +0200 Subject: [PATCH 08/13] video: Add damage notification on bmp display @@ -1303,10 +1303,10 @@ index ad512d99a1b9..78de95607924 100644 fb = (uchar *)(priv->fb + y * priv->line_length + x * bpix / 8); ret = video_sync_copy(dev, start, fb); -- -2.45.2 +2.49.0 -From 791b0accde45ada93fdf61773f8c7e69b934e55e Mon Sep 17 00:00:00 2001 +From 68262daa712e3202149aa0249bcff233234b6dfa Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf@csgraf.de> Date: Fri, 10 Jun 2022 00:59:19 +0200 Subject: [PATCH 09/13] efi_loader: GOP: Add damage notification on BLT @@ -1326,10 +1326,10 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-10-alpernebiyasak@gm 1 file changed, 7 insertions(+) diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c -index 41e12fa72460..1694e23dcc62 100644 +index 4593975be5af..3abb47d610e6 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c -@@ -24,6 +24,7 @@ static const efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; +@@ -26,6 +26,7 @@ static const efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; * @ops: graphical output protocol interface * @info: graphical output mode information * @mode: graphical output mode @@ -1337,7 +1337,7 @@ index 41e12fa72460..1694e23dcc62 100644 * @bpix: bits per pixel * @fb: frame buffer */ -@@ -32,6 +33,7 @@ struct efi_gop_obj { +@@ -34,6 +35,7 @@ struct efi_gop_obj { struct efi_gop ops; struct efi_gop_mode_info info; struct efi_gop_mode mode; @@ -1345,7 +1345,7 @@ index 41e12fa72460..1694e23dcc62 100644 /* Fields we only have access to during init */ u32 bpix; void *fb; -@@ -120,6 +122,7 @@ static __always_inline efi_status_t gop_blt_int(struct efi_gop *this, +@@ -122,6 +124,7 @@ static __always_inline efi_status_t gop_blt_int(struct efi_gop *this, u32 *fb32 = gopobj->fb; u16 *fb16 = gopobj->fb; struct efi_gop_pixel *buffer = __builtin_assume_aligned(bufferp, 4); @@ -1353,7 +1353,7 @@ index 41e12fa72460..1694e23dcc62 100644 if (delta) { /* Check for 4 byte alignment */ -@@ -243,6 +246,9 @@ static __always_inline efi_status_t gop_blt_int(struct efi_gop *this, +@@ -245,6 +248,9 @@ static __always_inline efi_status_t gop_blt_int(struct efi_gop *this, dlineoff += dwidth; } @@ -1363,7 +1363,7 @@ index 41e12fa72460..1694e23dcc62 100644 return EFI_SUCCESS; } -@@ -549,6 +555,7 @@ efi_status_t efi_gop_register(void) +@@ -551,6 +557,7 @@ efi_status_t efi_gop_register(void) gopobj->info.pixels_per_scanline = col; gopobj->bpix = bpix; gopobj->fb = map_sysmem(fb_base, fb_size); @@ -1372,10 +1372,10 @@ index 41e12fa72460..1694e23dcc62 100644 return EFI_SUCCESS; } -- -2.45.2 +2.49.0 -From 1b0905d54711c6c170de575a36e66006b8a6583a Mon Sep 17 00:00:00 2001 +From b9d38bb68233d917a84c589b098699bd9ef08d70 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf@csgraf.de> Date: Fri, 10 Jun 2022 00:59:20 +0200 Subject: [PATCH 10/13] video: Only dcache flush damaged lines @@ -1396,10 +1396,10 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-11-alpernebiyasak@gm 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c -index 6906b2b83623..3f6572a124ea 100644 +index 1c07613539f2..2dffcc229f6f 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c -@@ -384,6 +384,40 @@ void video_damage(struct udevice *vid, int x, int y, int width, int height) +@@ -399,6 +399,40 @@ void video_damage(struct udevice *vid, int x, int y, int width, int height) } #endif @@ -1440,7 +1440,7 @@ index 6906b2b83623..3f6572a124ea 100644 /* Flush video activity to the caches */ int video_sync(struct udevice *vid, bool force) { -@@ -407,11 +441,10 @@ int video_sync(struct udevice *vid, bool force) +@@ -422,11 +456,10 @@ int video_sync(struct udevice *vid, bool force) * out whether it exists? For now, ARM is safe. */ #if defined(CONFIG_ARM) && !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) @@ -1457,10 +1457,10 @@ index 6906b2b83623..3f6572a124ea 100644 sandbox_sdl_sync(priv->fb); #endif -- -2.45.2 +2.49.0 -From 4c02e522cb00b84cfa61004c32b4e5ae28457c58 Mon Sep 17 00:00:00 2001 +From bcb0061c373dca651760928ec6f8e13842b26e55 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf@csgraf.de> Date: Fri, 10 Jun 2022 00:59:21 +0200 Subject: [PATCH 11/13] video: Use VIDEO_DAMAGE for VIDEO_COPY @@ -1493,20 +1493,20 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-12-alpernebiyasak@gm drivers/video/Kconfig | 5 ++ drivers/video/console_normal.c | 13 +---- drivers/video/console_rotate.c | 44 +++----------- - drivers/video/console_truetype.c | 16 +----- + drivers/video/console_truetype.c | 20 +------ drivers/video/vidconsole-uclass.c | 16 ------ drivers/video/video-uclass.c | 96 ++++++++----------------------- drivers/video/video_bmp.c | 7 --- include/video.h | 37 ------------ include/video_console.h | 52 ----------------- test/dm/video.c | 3 +- - 11 files changed, 43 insertions(+), 247 deletions(-) + 11 files changed, 43 insertions(+), 251 deletions(-) diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index 5e5ad60ee057..dc5fcdbd1c9e 100644 +index 8bf36ff325d8..861a1f4cd90e 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig -@@ -319,7 +319,6 @@ CONFIG_USB_ETH_CDC=y +@@ -328,7 +328,6 @@ CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y CONFIG_VIDEO_FONT_SUN12X22=y CONFIG_VIDEO_COPY=y @@ -1515,7 +1515,7 @@ index 5e5ad60ee057..dc5fcdbd1c9e 100644 CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index d7da655cea62..d6497819ea73 100644 +index 5d67067891be..964174b01acc 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -89,11 +89,14 @@ config VIDEO_PCI_DEFAULT_FB_SIZE @@ -1729,7 +1729,7 @@ index f11dc3a0b075..886b25dcfafc 100644 return ret; diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c -index 6a17f732fc26..58dcd8e050c3 100644 +index 073ddcfb6950..56c3af3d5aad 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -194,7 +194,6 @@ static int console_truetype_set_row(struct udevice *dev, uint row, int clr) @@ -1786,11 +1786,29 @@ index 6a17f732fc26..58dcd8e050c3 100644 free(data); return width_frac; +@@ -872,7 +862,6 @@ static int truetype_set_cursor_visible(struct udevice *dev, bool visible, + uint row, width, height, xoff; + void *start, *line; + uint out, val; +- int ret; + + if (xpl_phase() <= PHASE_SPL) + return -ENOSYS; +@@ -962,9 +951,6 @@ static int truetype_set_cursor_visible(struct udevice *dev, bool visible, + + line += vid_priv->line_length; + } +- ret = vidconsole_sync_copy(dev, start, line); +- if (ret) +- return ret; + + return video_sync(vid, true); + } diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c -index 8b2ef51f1b3b..bcc46a08cbbd 100644 +index 8613c464040f..ce6c8bb70cb7 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c -@@ -801,22 +801,6 @@ UCLASS_DRIVER(vidconsole) = { +@@ -803,22 +803,6 @@ UCLASS_DRIVER(vidconsole) = { .per_device_auto = sizeof(struct vidconsole_priv), }; @@ -1814,10 +1832,10 @@ index 8b2ef51f1b3b..bcc46a08cbbd 100644 { int ret; diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c -index 3f6572a124ea..845db1c9b6d3 100644 +index 2dffcc229f6f..eeee5d960838 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c -@@ -158,7 +158,7 @@ int video_fill_part(struct udevice *dev, int xstart, int ystart, int xend, +@@ -171,7 +171,7 @@ int video_fill_part(struct udevice *dev, int xstart, int ystart, int xend, struct video_priv *priv = dev_get_uclass_priv(dev); void *start, *line; int pixels = xend - xstart; @@ -1826,7 +1844,7 @@ index 3f6572a124ea..845db1c9b6d3 100644 start = priv->fb + ystart * priv->line_length; start += xstart * VNBYTES(priv->bpix); -@@ -197,9 +197,6 @@ int video_fill_part(struct udevice *dev, int xstart, int ystart, int xend, +@@ -210,9 +210,6 @@ int video_fill_part(struct udevice *dev, int xstart, int ystart, int xend, } line += priv->line_length; } @@ -1836,7 +1854,7 @@ index 3f6572a124ea..845db1c9b6d3 100644 video_damage(dev, xstart, ystart, xend - xstart, yend - ystart); -@@ -223,7 +220,6 @@ int video_reserve_from_bloblist(struct video_handoff *ho) +@@ -235,7 +232,6 @@ int video_reserve_from_bloblist(struct video_handoff *ho) int video_fill(struct udevice *dev, u32 colour) { struct video_priv *priv = dev_get_uclass_priv(dev); @@ -1844,7 +1862,7 @@ index 3f6572a124ea..845db1c9b6d3 100644 switch (priv->bpix) { case VIDEO_BPP16: -@@ -248,9 +244,6 @@ int video_fill(struct udevice *dev, u32 colour) +@@ -260,9 +256,6 @@ int video_fill(struct udevice *dev, u32 colour) memset(priv->fb, colour, priv->fb_size); break; } @@ -1854,7 +1872,7 @@ index 3f6572a124ea..845db1c9b6d3 100644 video_damage(dev, 0, 0, priv->xsize, priv->ysize); -@@ -418,6 +411,27 @@ static void video_flush_dcache(struct udevice *vid, bool use_copy) +@@ -433,6 +426,27 @@ static void video_flush_dcache(struct udevice *vid, bool use_copy) } #endif @@ -1882,7 +1900,7 @@ index 3f6572a124ea..845db1c9b6d3 100644 /* Flush video activity to the caches */ int video_sync(struct udevice *vid, bool force) { -@@ -425,6 +439,9 @@ int video_sync(struct udevice *vid, bool force) +@@ -440,6 +454,9 @@ int video_sync(struct udevice *vid, bool force) struct video_ops *ops = video_get_ops(vid); int ret; @@ -1892,7 +1910,7 @@ index 3f6572a124ea..845db1c9b6d3 100644 if (ops && ops->video_sync) { ret = ops->video_sync(vid); if (ret) -@@ -508,69 +525,6 @@ int video_get_ysize(struct udevice *dev) +@@ -523,69 +540,6 @@ int video_get_ysize(struct udevice *dev) return priv->ysize; } @@ -1987,7 +2005,7 @@ index 78de95607924..1f267d45812c 100644 return video_sync(dev, false); } diff --git a/include/video.h b/include/video.h -index 835d7734cb75..705076facfb5 100644 +index 7eed112e00c4..2fe2f73a865b 100644 --- a/include/video.h +++ b/include/video.h @@ -355,43 +355,6 @@ void video_set_default_colors(struct udevice *dev, bool invert); @@ -2035,10 +2053,10 @@ index 835d7734cb75..705076facfb5 100644 /** * video_damage() - Notify the video subsystem about screen updates. diff --git a/include/video_console.h b/include/video_console.h -index 00c5ecb664b9..ead0e05e4003 100644 +index 17a9aa3f9295..b228c725fd80 100644 --- a/include/video_console.h +++ b/include/video_console.h -@@ -530,56 +530,4 @@ void vidconsole_list_fonts(struct udevice *dev); +@@ -538,56 +538,4 @@ void vidconsole_list_fonts(struct udevice *dev); */ int vidconsole_get_font_size(struct udevice *dev, const char **name, uint *sizep); @@ -2096,7 +2114,7 @@ index 00c5ecb664b9..ead0e05e4003 100644 - #endif diff --git a/test/dm/video.c b/test/dm/video.c -index 119c43153165..9b7bb51a3dd9 100644 +index e76fa986d359..021f4b3fa733 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -105,6 +105,7 @@ static int check_copy_frame_buffer(struct unit_test_state *uts, @@ -2117,10 +2135,10 @@ index 119c43153165..9b7bb51a3dd9 100644 return 0; } -- -2.45.2 +2.49.0 -From 174b8b118c02e7cadf9ad56462b481c91f4a3343 Mon Sep 17 00:00:00 2001 +From 631692ed7090a8cfd0b2a3b3f23c295644f1393e Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf@csgraf.de> Date: Tue, 3 Jan 2023 22:50:03 +0100 Subject: [PATCH 12/13] video: Always compile cache flushing code @@ -2145,10 +2163,10 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-13-alpernebiyasak@gm 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c -index 845db1c9b6d3..5416e0d9030b 100644 +index eeee5d960838..6c5a86d85dbc 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c -@@ -383,6 +383,9 @@ static void video_flush_dcache(struct udevice *vid, bool use_copy) +@@ -398,6 +398,9 @@ static void video_flush_dcache(struct udevice *vid, bool use_copy) struct video_priv *priv = dev_get_uclass_priv(vid); ulong fb = use_copy ? (ulong)priv->copy_fb : (ulong)priv->fb; @@ -2158,7 +2176,7 @@ index 845db1c9b6d3..5416e0d9030b 100644 if (!priv->flush_dcache) return; -@@ -452,17 +455,12 @@ int video_sync(struct udevice *vid, bool force) +@@ -467,17 +470,12 @@ int video_sync(struct udevice *vid, bool force) get_timer(priv->last_sync) < CONFIG_VIDEO_SYNC_MS) return 0; @@ -2179,10 +2197,10 @@ index 845db1c9b6d3..5416e0d9030b 100644 #endif priv->last_sync = get_timer(0); -- -2.45.2 +2.49.0 -From 2a1af00665464023c38903eeb75a0c89099892fb Mon Sep 17 00:00:00 2001 +From 08f3add44c202053f5ba882cb2f440e8e470229c Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf@csgraf.de> Date: Tue, 3 Jan 2023 22:50:04 +0100 Subject: [PATCH 13/13] video: Enable VIDEO_DAMAGE for drivers that need it @@ -2214,10 +2232,10 @@ Link: https://lore.kernel.org/u-boot/20230821135111.3558478-14-alpernebiyasak@gm 9 files changed, 16 insertions(+) diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig -index 17666814c52e..1ba0d2c1c8d7 100644 +index ba1b15414379..bb1ea961704e 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig -@@ -863,6 +863,7 @@ config VIDEO_SUNXI +@@ -882,6 +882,7 @@ config VIDEO_SUNXI depends on !SUNXI_GEN_NCAT2 select VIDEO select DISPLAY @@ -2226,7 +2244,7 @@ index 17666814c52e..1ba0d2c1c8d7 100644 default y ---help--- diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index d6497819ea73..8fb69e0b16c2 100644 +index 964174b01acc..6e1577ae6871 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -534,6 +534,7 @@ config VIDEO_LCD_ANX9804 @@ -2245,7 +2263,7 @@ index d6497819ea73..8fb69e0b16c2 100644 help The graphics processor already sets up the display so this driver simply checks the resolution and then sets up the frame buffer with -@@ -706,6 +708,7 @@ source "drivers/video/meson/Kconfig" +@@ -715,6 +717,7 @@ source "drivers/video/meson/Kconfig" config VIDEO_MVEBU bool "Armada XP LCD controller" @@ -2253,7 +2271,7 @@ index d6497819ea73..8fb69e0b16c2 100644 ---help--- Support for the LCD controller integrated in the Marvell Armada XP SoC. -@@ -740,6 +743,7 @@ config NXP_TDA19988 +@@ -749,6 +752,7 @@ config NXP_TDA19988 config ATMEL_HLCD bool "Enable ATMEL video support using HLCDC" @@ -2261,7 +2279,7 @@ index d6497819ea73..8fb69e0b16c2 100644 help HLCDC supports video output to an attached LCD panel. -@@ -816,6 +820,7 @@ source "drivers/video/tidss/Kconfig" +@@ -825,6 +829,7 @@ source "drivers/video/tidss/Kconfig" config VIDEO_TEGRA124 bool "Enable video support on Tegra124" @@ -2269,7 +2287,7 @@ index d6497819ea73..8fb69e0b16c2 100644 help Tegra124 supports many video output options including eDP and HDMI. At present only eDP is supported by U-Boot. This option -@@ -830,6 +835,7 @@ source "drivers/video/imx/Kconfig" +@@ -839,6 +844,7 @@ source "drivers/video/imx/Kconfig" config VIDEO_MXS bool "Enable video support on i.MX28/i.MX6UL/i.MX7 SoCs" @@ -2277,7 +2295,7 @@ index d6497819ea73..8fb69e0b16c2 100644 help Enable framebuffer driver for i.MX28/i.MX6UL/i.MX7 processors -@@ -892,6 +898,7 @@ config VIDEO_DW_MIPI_DSI +@@ -901,6 +907,7 @@ config VIDEO_DW_MIPI_DSI config VIDEO_SIMPLE bool "Simple display driver for preconfigured display" @@ -2285,7 +2303,7 @@ index d6497819ea73..8fb69e0b16c2 100644 help Enables a simple generic display driver which utilizes the simple-framebuffer devicetree bindings. -@@ -910,6 +917,7 @@ config VIDEO_DT_SIMPLEFB +@@ -919,6 +926,7 @@ config VIDEO_DT_SIMPLEFB config VIDEO_MCDE_SIMPLE bool "Simple driver for ST-Ericsson MCDE with preconfigured display" @@ -2377,5 +2395,5 @@ index 95086f3a5d66..3291b3ceb8d5 100644 TIDSS supports video output options LVDS and DPI . This option enables these supports which can be used on -- -2.45.2 +2.49.0 diff --git a/config/u-boot/default/patches/0004-HACK-Makefile-Ignore-missing-input-files-for-binman.patch b/config/u-boot/default/patches/0004-HACK-Makefile-Ignore-missing-input-files-for-binman.patch index fc3dea4d..5307f378 100644 --- a/config/u-boot/default/patches/0004-HACK-Makefile-Ignore-missing-input-files-for-binman.patch +++ b/config/u-boot/default/patches/0004-HACK-Makefile-Ignore-missing-input-files-for-binman.patch @@ -1,4 +1,4 @@ -From ec8f5b8e949995eb34b7e54b9f06894eb38d02b4 Mon Sep 17 00:00:00 2001 +From faa87ed4d2ff07e9e8cc98cd08cbb34c905c1ac6 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak <alpernebiyasak@gmail.com> Date: Wed, 10 Jul 2024 17:37:56 +0300 Subject: [PATCH] HACK: Makefile: Ignore missing input files for binman images @@ -17,18 +17,18 @@ Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 34dd029d0cda..d5d89bd2e35c 100644 +index a7593e8a1680..30deb760bf8f 100644 --- a/Makefile +++ b/Makefile -@@ -1375,7 +1375,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ - --toolpath $(objtree)/tools \ +@@ -1410,7 +1410,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ - build -u -d u-boot.dtb -O . -m \ -- --allow-missing $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \ -+ --allow-missing --ignore-missing \ + build -u -d $(binman_dtb) -O . -m \ + --allow-missing --fake-ext-blobs \ +- $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \ ++ --ignore-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ - -I $(dt_dir) -a of-list=$(CONFIG_OF_LIST) \ + $(foreach f,$(of_list_dirs),-I $(f)) -a of-list=$(of_list) \ $(foreach f,$(BINMAN_INDIRS),-I $(f)) \ -- -2.45.2 +2.49.0 diff --git a/config/u-boot/default/patches/0005-HACK-rk3399-gru-Remove-assigned-clock-dt-properties-.patch b/config/u-boot/default/patches/0005-HACK-rk3399-gru-Remove-assigned-clock-dt-properties-.patch index 45a6ab4a..018da338 100644 --- a/config/u-boot/default/patches/0005-HACK-rk3399-gru-Remove-assigned-clock-dt-properties-.patch +++ b/config/u-boot/default/patches/0005-HACK-rk3399-gru-Remove-assigned-clock-dt-properties-.patch @@ -1,4 +1,4 @@ -From 9685041c19bcc61ca847a59e93c716d23df51898 Mon Sep 17 00:00:00 2001 +From d02163324baeb817ed55df41fac863cab4be038c Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak <alpernebiyasak@gmail.com> Date: Wed, 10 Jul 2024 14:32:19 +0300 Subject: [PATCH] HACK: rk3399: gru: Remove assigned clock dt properties for @@ -18,7 +18,7 @@ Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> 1 file changed, 3 insertions(+) diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi b/arch/arm/dts/rk3399-gru-u-boot.dtsi -index 6bdc892bd913..f4457c1b9b48 100644 +index 5517176aa4a0..9f40cf1e0208 100644 --- a/arch/arm/dts/rk3399-gru-u-boot.dtsi +++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi @@ -27,6 +27,9 @@ &cros_ec { @@ -30,7 +30,7 @@ index 6bdc892bd913..f4457c1b9b48 100644 + /delete-property/ assigned-clock-rates; }; - &pp1800_audio { + &emmc_phy { -- -2.45.2 +2.49.0 diff --git a/config/u-boot/default/patches/0009-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/config/u-boot/default/patches/0009-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch deleted file mode 100644 index 905b311c..00000000 --- a/config/u-boot/default/patches/0009-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3c61a3257ad5799202cac64020d3b4af21b72de3 Mon Sep 17 00:00:00 2001 -From: Markus Volk <f_l_k@t-online.de> -Date: Wed, 30 Oct 2024 06:07:16 +0100 -Subject: [PATCH 1/1] scripts/dtc/pylibfdt/libfdt.i_shipped: Use - SWIG_AppendOutput -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Swig has changed language specific AppendOutput functions. The helper -macro SWIG_AppendOutput remains unchanged. Use that instead -of SWIG_Python_AppendOutput, which would require an extra parameter -since swig 4.3.0. - -/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds -| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’: -| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’ -| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val); -| | ^~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Markus Volk <f_l_k@t-online.de> -Reported-by: Rudi Heitbaum <rudi@heitbaum.com> -Link: https://github.com/dgibson/dtc/pull/154 ---- - scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped -index 56cc5d48f4..e4659489a9 100644 ---- a/scripts/dtc/pylibfdt/libfdt.i_shipped -+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped -@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t; - fdt_string(fdt1, fdt32_to_cpu($1->nameoff))); - buff = PyByteArray_FromStringAndSize( - (const char *)($1 + 1), fdt32_to_cpu($1->len)); -- resultobj = SWIG_Python_AppendOutput(resultobj, buff); -+ resultobj = SWIG_AppendOutput(resultobj, buff); - } - } - -@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t; - - %typemap(argout) int *depth { - PyObject *val = Py_BuildValue("i", *arg$argnum); -- resultobj = SWIG_Python_AppendOutput(resultobj, val); -+ resultobj = SWIG_AppendOutput(resultobj, val); - } - - %apply int *depth { int *depth }; -@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t; - if (PyTuple_GET_SIZE(resultobj) == 0) - resultobj = val; - else -- resultobj = SWIG_Python_AppendOutput(resultobj, val); -+ resultobj = SWIG_AppendOutput(resultobj, val); - } - } - --- -2.39.5 - diff --git a/config/u-boot/default/target.cfg b/config/u-boot/default/target.cfg index c0fb6209..f3c856d4 100644 --- a/config/u-boot/default/target.cfg +++ b/config/u-boot/default/target.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later tree="default" -rev="f919c3a889f0ec7d63a48b5d0ed064386b0980bd" # v2024.10 +rev="34820924edbc4ec7803eb89d9852f4b870fa760a" # v2025.04 diff --git a/config/u-boot/gru_bob/config/default b/config/u-boot/gru_bob/config/default index bdd3ee98..cc93540c 100644 --- a/config/u-boot/gru_bob/config/default +++ b/config/u-boot/gru_bob/config/default @@ -1,15 +1,17 @@ # # Automatically generated file; DO NOT EDIT. -# U-Boot 2024.10 Configuration +# U-Boot 2025.04 Configuration # # -# Compiler: gcc (Debian 12.2.0-14) 12.2.0 +# Compiler: gcc (Debian 14.2.0-19) 14.2.0 # CONFIG_CREATE_ARCH_SYMLINK=y +CONFIG_HAVE_SETJMP=y CONFIG_SUPPORT_LITTLE_ENDIAN=y CONFIG_SYS_CACHE_SHIFT_6=y CONFIG_64BIT=y +CONFIG_SPL_64BIT=y CONFIG_SYS_CACHELINE_SIZE=64 CONFIG_LINKER_LIST_ALIGN=8 # CONFIG_ARC is not set @@ -39,10 +41,11 @@ CONFIG_SKIP_LOWLEVEL_INIT=y # CONFIG_TPL_SKIP_LOWLEVEL_INIT is not set # CONFIG_SKIP_LOWLEVEL_INIT_ONLY is not set # CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY is not set +# CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY is not set # CONFIG_SYS_ICACHE_OFF is not set # CONFIG_SPL_SYS_ICACHE_OFF is not set # CONFIG_SYS_DCACHE_OFF is not set -CONFIG_SPL_SYS_DCACHE_OFF=y +# CONFIG_SPL_SYS_DCACHE_OFF is not set # # ARM architecture @@ -51,9 +54,9 @@ CONFIG_ARM64=y CONFIG_ARM64_CRC32=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_POSITION_INDEPENDENT=y -CONFIG_INIT_SP_RELATIVE=y -CONFIG_SYS_INIT_SP_BSS_OFFSET=524288 +# CONFIG_INIT_SP_RELATIVE is not set CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE=0x18000000 +# CONFIG_DRIVER_GICV2 is not set # CONFIG_GIC_V3_ITS is not set # CONFIG_GICV3_SUPPORT_GIC600 is not set CONFIG_STATIC_RELA=y @@ -75,8 +78,10 @@ CONFIG_ARM_SMCCC=y CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMCPY is not set +# CONFIG_TPL_USE_ARCH_MEMCPY is not set # CONFIG_USE_ARCH_MEMSET is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set +# CONFIG_TPL_USE_ARCH_MEMSET is not set CONFIG_ARM64_SUPPORT_AARCH32=y # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_DAVINCI is not set @@ -100,6 +105,7 @@ CONFIG_ARM64_SUPPORT_AARCH32=y # CONFIG_ARCH_OMAP2PLUS is not set # CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MEDIATEK is not set +# CONFIG_ARCH_MMP is not set # CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_IMX8 is not set # CONFIG_ARCH_IMX8M is not set @@ -183,23 +189,25 @@ CONFIG_ARCH_ROCKCHIP=y # CONFIG_TARGET_PRESIDIO_ASIC is not set # CONFIG_TARGET_XENGUEST_ARM64 is not set # CONFIG_ARCH_GXP is not set -# CONFIG_STATIC_MACH_TYPE is not set CONFIG_TEXT_BASE=0x18000000 CONFIG_SYS_MALLOC_LEN=0x2000000 -CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_SYS_MALLOC_F_LEN=0x10000 +CONFIG_BLOBLIST_SIZE_RELOC=0x1000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL_LDSCRIPT="arch/arm/cpu/armv8/u-boot-spl.lds" CONFIG_ENV_SOURCE_FILE="" +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x3f00000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_SF_DEFAULT_MODE=0x0 CONFIG_ENV_SIZE=0x1f000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-bob" -CONFIG_SPL_TEXT_BASE=0xff8c2000 +CONFIG_DDR_SI_TEST=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000 CONFIG_DM_RESET=y @@ -221,16 +229,20 @@ CONFIG_ROCKCHIP_RK3399=y # CONFIG_ROCKCHIP_RV1126 is not set # CONFIG_ROCKCHIP_USB_UART is not set # CONFIG_SPL_ROCKCHIP_BACK_TO_BROM is not set +CONFIG_TPL_ROCKCHIP_BACK_TO_BROM=y CONFIG_ROCKCHIP_COMMON_BOARD=y CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y # CONFIG_ROCKCHIP_EXTERNAL_TPL is not set CONFIG_ROCKCHIP_BOOT_MODE_REG=0 # CONFIG_ROCKCHIP_RK8XX_DISABLE_BOOT_ON_POWERON is not set CONFIG_ROCKCHIP_STIMER=y CONFIG_ROCKCHIP_STIMER_BASE=0xff8680a0 -CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000 +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 +CONFIG_ROCKCHIP_BROM_HELPER=y # CONFIG_SPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set CONFIG_ROCKCHIP_DISABLE_FORCE_JTAG=y +# CONFIG_TPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set # CONFIG_SPL_MMC is not set CONFIG_ROCKCHIP_SPI_IMAGE=y CONFIG_ROCKCHIP_COMMON_STACK_ADDR=y @@ -238,8 +250,12 @@ CONFIG_SPL_SERIAL=y CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl-v8.lds" CONFIG_TPL_TEXT_BASE=0xff8c2000 CONFIG_TPL_STACK=0xff8effff +CONFIG_TPL_SYS_MALLOC_F_LEN=0x4000 +CONFIG_TPL_LIBCOMMON_SUPPORT=y +CONFIG_TPL_LIBGENERIC_SUPPORT=y +CONFIG_TPL_SERIAL=y # CONFIG_SPL_DRIVERS_MISC is not set -CONFIG_SPL_STACK_R_ADDR=0x04000000 +CONFIG_SPL_STACK_R_ADDR=0x3e00000 CONFIG_TARGET_CHROMEBOOK_BOB=y # CONFIG_TARGET_CHROMEBOOK_KEVIN is not set # CONFIG_TARGET_EVB_RK3399 is not set @@ -250,14 +266,20 @@ CONFIG_TARGET_CHROMEBOOK_BOB=y # CONFIG_TARGET_ROCKPI4_RK3399 is not set # CONFIG_TARGET_ROCKPRO64_RK3399 is not set # CONFIG_TARGET_ROC_PC_RK3399 is not set -CONFIG_SPL_STACK=0xff8effff -CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000 +CONFIG_TPL_SYS_MALLOC_F=y +CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000 +CONFIG_SPL_TEXT_BASE=0x0 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0xff8e0000 -CONFIG_SPL_BSS_MAX_SIZE=0x10000 +CONFIG_SPL_BSS_START_ADDR=0x3f80000 +CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000 +CONFIG_SYS_BOOTM_LEN=0x4000000 +CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 +CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff +CONFIG_SF_DEFAULT_BUS=1 +CONFIG_SF_DEFAULT_CS=0 CONFIG_SPL_SYS_MALLOC_F=y CONFIG_ERR_PTR_OFFSET=0x0 CONFIG_SPL_SIZE_LIMIT=0x0 @@ -293,24 +315,18 @@ CONFIG_PSCI_RESET=y CONFIG_ARMV8_CRYPTO=y CONFIG_ARMV8_CE_SHA1=y CONFIG_ARMV8_CE_SHA256=y -# CONFIG_CMD_DEKBLOB is not set -# CONFIG_IMX_CAAM_DEK_ENCAP is not set -# CONFIG_IMX_OPTEE_DEK_ENCAP is not set -# CONFIG_IMX_SECO_DEK_ENCAP is not set -# CONFIG_IMX_ELE_DEK_ENCAP is not set -# CONFIG_CMD_HDMIDETECT is not set -CONFIG_IMX_DCD_ADDR=0x00910000 CONFIG_SYS_MEM_TOP_HIDE=0x0 -CONFIG_SYS_LOAD_ADDR=0x800800 # # ARM debug # -CONFIG_SPL_PAYLOAD="u-boot.bin" +CONFIG_TPL_MAX_SIZE=0x2e000 +CONFIG_SPL_PAYLOAD="tpl/u-boot-with-tpl.bin" CONFIG_BUILD_TARGET="" # CONFIG_PCI is not set CONFIG_FWU_NUM_BANKS=2 CONFIG_FWU_NUM_IMAGES_PER_BANK=2 +CONFIG_TPL_SIZE_LIMIT=0x0 CONFIG_DEBUG_UART=y # CONFIG_AHCI is not set # CONFIG_OF_BOARD_FIXUP is not set @@ -327,7 +343,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set @@ -336,6 +352,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_SPL_OPTIMIZE_INLINING is not set CONFIG_ARCH_SUPPORTS_LTO=y # CONFIG_LTO is not set +# CONFIG_TPL_OPTIMIZE_INLINING is not set CONFIG_CC_HAS_ASM_INLINE=y # CONFIG_XEN is not set CONFIG_ENV_VARS_UBOOT_CONFIG=y @@ -357,8 +374,6 @@ CONFIG_REMAKE_ELF=y # CONFIG_SYS_CUSTOM_LDSCRIPT is not set CONFIG_PLATFORM_ELFENTRY="_start" CONFIG_STACK_SIZE=0x1000000 -CONFIG_SYS_SRAM_BASE=0x0 -CONFIG_SYS_SRAM_SIZE=0x0 # CONFIG_MP is not set CONFIG_HAVE_TEXT_BASE=y # CONFIG_HAVE_SYS_UBOOT_START is not set @@ -371,6 +386,63 @@ CONFIG_SYS_UBOOT_START=0x18000000 # # +# UEFI Support +# +CONFIG_EFI_LOADER=y +CONFIG_EFI_BINARY_EXEC=y +# CONFIG_EFI_SECURE_BOOT is not set + +# +# UEFI services +# +CONFIG_EFI_HAVE_RUNTIME_RESET=y + +# +# UEFI Variables +# +# CONFIG_EFI_VARIABLE_FILE_STORE is not set +CONFIG_EFI_VARIABLE_NO_STORE=y +# CONFIG_EFI_VARIABLES_PRESEED is not set +CONFIG_EFI_VAR_BUF_SIZE=131072 +CONFIG_EFI_PLATFORM_LANG_CODES="en-US" + +# +# Capsule support +# +# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set +# CONFIG_EFI_CAPSULE_ON_DISK is not set +CONFIG_EFI_CAPSULE_MAX=15 + +# +# UEFI protocol support +# +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_DEVICE_PATH_UTIL=y +CONFIG_EFI_DT_FIXUP=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_RNG_PROTOCOL=y +CONFIG_EFI_LOAD_FILE2_INITRD=y +# CONFIG_EFI_IP4_CONFIG2_PROTOCOL is not set + +# +# Misc options +# +# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set +CONFIG_EFI_ECPT=y +CONFIG_EFI_EBBR_2_1_CONFORMANCE=y +# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set + +# +# EFI bootmanager +# +CONFIG_EFI_BOOTMGR=y +# CONFIG_EFI_HTTP_BOOT is not set +CONFIG_BOOTEFI_HELLO_COMPILE=y +CONFIG_BOOTEFI_TESTAPP_COMPILE=y + +# # Boot images # # CONFIG_ANDROID_BOOT_IMAGE is not set @@ -378,22 +450,26 @@ CONFIG_SYS_UBOOT_START=0x18000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x0 CONFIG_FIT_FULL_CHECK=y -# CONFIG_FIT_SIGNATURE is not set +CONFIG_FIT_SIGNATURE=y +CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 +# CONFIG_FIT_RSASSA_PSS is not set # CONFIG_FIT_CIPHER is not set # CONFIG_FIT_VERBOSE is not set # CONFIG_FIT_BEST_MATCH is not set CONFIG_FIT_PRINT=y CONFIG_SPL_FIT=y +# CONFIG_TPL_FIT is not set # CONFIG_SPL_FIT_PRINT is not set -# CONFIG_SPL_FIT_FULL_CHECK is not set -# CONFIG_SPL_FIT_SIGNATURE is not set +CONFIG_SPL_FIT_FULL_CHECK=y +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_FIT_SIGNATURE_MAX_SIZE=0x10000000 +# CONFIG_SPL_FIT_RSASSA_PSS is not set CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x0 # CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY is not set # CONFIG_SPL_LOAD_FIT_FULL is not set +# CONFIG_TPL_LOAD_FIT is not set # CONFIG_SPL_FIT_IMAGE_POST_PROCESS is not set -CONFIG_SPL_FIT_SOURCE="" -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_PXE_UTILS=y CONFIG_BOOT_DEFAULTS_FEATURES=y CONFIG_BOOT_DEFAULTS_CMDS=y @@ -403,6 +479,7 @@ CONFIG_BOOTSTD=y CONFIG_BOOTSTD_FULL=y CONFIG_BOOTSTD_DEFAULTS=y CONFIG_BOOTSTD_BOOTCOMMAND=y +CONFIG_BOOTSTD_MENU=y CONFIG_BOOTMETH_GLOBAL=y # CONFIG_BOOTMETH_ANDROID is not set # CONFIG_BOOTMETH_CROS is not set @@ -413,15 +490,17 @@ CONFIG_BOOTMETH_EFI_BOOTMGR=y CONFIG_BOOTMETH_VBE=y CONFIG_BOOTMETH_DISTRO=y # CONFIG_SPL_BOOTMETH_VBE is not set +CONFIG_TPL_BOOTMETH_VBE=y CONFIG_BOOTMETH_VBE_REQUEST=y # CONFIG_SPL_BOOTMETH_VBE_REQUEST is not set CONFIG_BOOTMETH_VBE_SIMPLE=y +# CONFIG_BOOTMETH_VBE_ABREC is not set CONFIG_BOOTMETH_VBE_SIMPLE_OS=y # CONFIG_SPL_BOOTMETH_VBE_SIMPLE is not set CONFIG_EXPO=y CONFIG_BOOTMETH_SCRIPT=y +# CONFIG_UPL is not set CONFIG_LEGACY_IMAGE_FORMAT=y -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_CHROMEOS is not set # CONFIG_CHROMEOS_VBOOT is not set @@ -498,6 +577,7 @@ CONFIG_SYS_PBSIZE=1044 # CONFIG_DISABLE_CONSOLE is not set CONFIG_LOGLEVEL=4 CONFIG_SPL_LOGLEVEL=4 +CONFIG_TPL_LOGLEVEL=4 # CONFIG_SILENT_CONSOLE is not set # CONFIG_SPL_SILENT_CONSOLE is not set # CONFIG_TPL_SILENT_CONSOLE is not set @@ -526,6 +606,7 @@ CONFIG_LOG_CONSOLE=y CONFIG_LOGF_FUNC_PAD=20 # CONFIG_LOG_SYSLOG is not set # CONFIG_SPL_LOG is not set +# CONFIG_TPL_LOG is not set # CONFIG_LOG_ERROR_RETURN is not set # @@ -562,6 +643,7 @@ CONFIG_MISC_INIT_R=y # Security support # CONFIG_HASH=y +# CONFIG_HASH_CRC8 is not set CONFIG_SPL_HASH=y # CONFIG_STACKPROTECTOR is not set # CONFIG_BOARD_RNG_SEED is not set @@ -577,11 +659,11 @@ CONFIG_SPL_HASH=y # CONFIG_BLOBLIST=y CONFIG_SPL_BLOBLIST=y +# CONFIG_TPL_BLOBLIST is not set CONFIG_BLOBLIST_FIXED=y # CONFIG_BLOBLIST_ALLOC is not set CONFIG_BLOBLIST_ADDR=0x100000 CONFIG_BLOBLIST_SIZE=0x1000 -CONFIG_BLOBLIST_SIZE_RELOC=0x1000 CONFIG_SPL_BLOBLIST_FIXED=y # CONFIG_SPL_BLOBLIST_ALLOC is not set CONFIG_SUPPORT_SPL=y @@ -592,7 +674,7 @@ CONFIG_SUPPORT_TPL=y # CONFIG_SPL_FRAMEWORK=y # CONFIG_SPL_FRAMEWORK_BOARD_INIT_F is not set -CONFIG_SPL_MAX_SIZE=0x1e000 +CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_NO_BSS_LIMIT is not set CONFIG_SPL_BSS_LIMIT=y @@ -606,24 +688,27 @@ CONFIG_HANDOFF=y CONFIG_SPL_HANDOFF=y # CONFIG_SPL_SOC_INIT is not set CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_LOAD_BLOCK=y # CONFIG_SPL_BOOTROM_SUPPORT is not set # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set # CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set # CONFIG_SPL_LOAD_IMX_CONTAINER is not set CONFIG_SPL_SYS_MALLOC_SIMPLE=y -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_SHARES_INIT_SP_ADDR=y CONFIG_SPL_SEPARATE_BSS=y # CONFIG_SPL_SYS_MALLOC is not set CONFIG_SPL_BANNER_PRINT=y # CONFIG_SPL_DISPLAY_PRINT is not set +CONFIG_SPL_SYS_MMCSD_RAW_MODE=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is not set +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE is not set CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x4000 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x0 -# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is not set # CONFIG_SPL_FIT_IMAGE_TINY is not set # CONFIG_SPL_CACHE is not set # CONFIG_SPL_CPU is not set -# CONFIG_SPL_CRYPTO is not set +CONFIG_SPL_CRYPTO=y # CONFIG_SPL_DMA is not set # CONFIG_SPL_ENV_SUPPORT is not set # CONFIG_SPL_FS_EXT4 is not set @@ -640,6 +725,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x0 # CONFIG_SPL_NAND_DRIVERS is not set # CONFIG_SPL_NAND_ECC is not set # CONFIG_SPL_NAND_SIMPLE is not set +# CONFIG_SPL_RELOC_LOADER is not set # CONFIG_SPL_UBI is not set CONFIG_SPL_DM_SPI_FLASH=y # CONFIG_SPL_NET is not set @@ -653,7 +739,7 @@ CONFIG_SPL_DM_SPI_FLASH=y # CONFIG_SPL_DM_RESET is not set # CONFIG_SPL_POWER is not set # CONFIG_SPL_POWER_DOMAIN is not set -# CONFIG_SPL_RAM_SUPPORT is not set +# CONFIG_SPL_RAM_DEVICE is not set # CONFIG_SPL_REMOTEPROC is not set # CONFIG_SPL_RTC is not set # CONFIG_SPL_SATA is not set @@ -661,7 +747,7 @@ CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_SPI_FLASH_TINY=y # CONFIG_SPL_SPI_FLASH_MTD is not set CONFIG_SPL_SPI_LOAD=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 # CONFIG_SPL_THERMAL is not set # CONFIG_SPL_WATCHDOG is not set # CONFIG_SPL_YMODEM_SUPPORT is not set @@ -670,8 +756,42 @@ CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y # CONFIG_SPL_OPTEE_IMAGE is not set CONFIG_SPL_TARGET="" -# CONFIG_TPL is not set +CONFIG_TPL=y + +# +# TPL configuration options +# +CONFIG_TPL_BINMAN_SYMBOLS=y +CONFIG_TPL_BINMAN_UBOOT_SYMBOLS=y +CONFIG_TPL_FRAMEWORK=y +CONFIG_TPL_BANNER_PRINT=y +# CONFIG_TPL_BOARD_INIT is not set +CONFIG_TPL_SYS_MALLOC_SIMPLE=y +CONFIG_TPL_SEPARATE_BSS=y +CONFIG_TPL_NEEDS_SEPARATE_STACK=y +# CONFIG_TPL_POWER is not set +CONFIG_TPL_BOOTROM_SUPPORT=y +# CONFIG_TPL_CRC32 is not set +# CONFIG_TPL_DRIVERS_MISC is not set +# CONFIG_TPL_ENV_SUPPORT is not set +CONFIG_TPL_GPIO=y +# CONFIG_TPL_I2C is not set +# CONFIG_TPL_MPC8XXX_INIT_DDR is not set +# CONFIG_TPL_MMC is not set +# CONFIG_TPL_NAND_SUPPORT is not set +# CONFIG_TPL_PCI is not set +# CONFIG_TPL_PCH is not set +# CONFIG_TPL_RAM_SUPPORT is not set +# CONFIG_TPL_RELOC_LOADER is not set +# CONFIG_TPL_RTC is not set +# CONFIG_TPL_SPI_FLASH_SUPPORT is not set +# CONFIG_TPL_SPI is not set +# CONFIG_TPL_DM_SPI is not set +# CONFIG_TPL_DM_SPI_FLASH is not set +# CONFIG_TPL_YMODEM_SUPPORT is not set # CONFIG_VPL is not set +CONFIG_IMAGE_SIGN_INFO=y +CONFIG_SPL_IMAGE_SIGN_INFO=y CONFIG_CMDLINE=y CONFIG_HUSH_PARSER=y @@ -700,6 +820,7 @@ CONFIG_CMD_BDI=y # CONFIG_CMD_BDINFO_EXTRA is not set # CONFIG_CMD_CONFIG is not set CONFIG_CMD_CONSOLE=y +# CONFIG_CMD_UFETCH is not set # CONFIG_CMD_HISTORY is not set # CONFIG_CMD_LICENSE is not set # CONFIG_CMD_PMC is not set @@ -713,8 +834,9 @@ CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTDEV=y CONFIG_CMD_BOOTFLOW=y CONFIG_CMD_BOOTFLOW_FULL=y -CONFIG_CMD_BOOTFLOW_BOOTDELAY=8 +CONFIG_CMD_BOOTFLOW_BOOTDELAY=30 CONFIG_CMD_BOOTMETH=y +CONFIG_CMD_BOOTSTD=y CONFIG_BOOTM_EFI=y CONFIG_BOOTM_ELF=y CONFIG_CMD_BOOTZ=y @@ -725,17 +847,18 @@ CONFIG_BOOTM_NETBSD=y # CONFIG_BOOTM_OSE is not set CONFIG_BOOTM_PLAN9=y CONFIG_BOOTM_RTEMS=y +# CONFIG_CMD_UPL is not set CONFIG_CMD_VBE=y CONFIG_BOOTM_VXWORKS=y CONFIG_CMD_BOOTEFI=y CONFIG_CMD_BOOTEFI_BINARY=y CONFIG_CMD_BOOTEFI_BOOTMGR=y -CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y CONFIG_CMD_BOOTEFI_HELLO=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_BOOTMENU=y # CONFIG_CMD_ADTIMG is not set CONFIG_CMD_ELF=y +CONFIG_CMD_ELF_BOOTVX=y # CONFIG_CMD_ELF_FDT_SETUP is not set CONFIG_CMD_FDT=y CONFIG_CMD_GO=y @@ -826,10 +949,10 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_BKOPS_ENABLE is not set # CONFIG_CMD_MMC_REG is not set # CONFIG_CMD_MMC_SWRITE is not set +CONFIG_MMC_SPEED_MODE_SET=y # CONFIG_CMD_CLONE is not set # CONFIG_CMD_MTD is not set # CONFIG_CMD_ONENAND is not set -# CONFIG_CMD_OSD is not set CONFIG_CMD_PART=y # CONFIG_CMD_PCI is not set CONFIG_CMD_PINMUX=y @@ -843,7 +966,6 @@ CONFIG_CMD_SPI=y CONFIG_DEFAULT_SPI_BUS=0 CONFIG_DEFAULT_SPI_MODE=0x0 CONFIG_CMD_USB=y -# CONFIG_CMD_USB_SDP is not set # CONFIG_CMD_RKMTD is not set # CONFIG_CMD_WRITE is not set @@ -856,13 +978,8 @@ CONFIG_CMD_ITEST=y CONFIG_CMD_SOURCE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_XXD is not set - -# -# Android support commands -# CONFIG_CMD_NET=y CONFIG_CMD_BOOTP=y -CONFIG_CMD_DHCP=y # CONFIG_BOOTP_MAY_FAIL is not set CONFIG_BOOTP_BOOTPATH=y # CONFIG_BOOTP_VENDOREX is not set @@ -880,24 +997,25 @@ CONFIG_BOOTP_PXE=y CONFIG_BOOTP_PXE_CLIENTARCH=0x16 # CONFIG_BOOTP_PXE_DHCP_OPTION is not set CONFIG_BOOTP_VCI_STRING="U-Boot.armv8" -CONFIG_CMD_TFTPBOOT=y # CONFIG_CMD_TFTPPUT is not set # CONFIG_CMD_TFTPSRV is not set CONFIG_NET_TFTP_VARS=y # CONFIG_CMD_RARP is not set # CONFIG_CMD_NFS is not set # CONFIG_SYS_DISABLE_AUTOLOAD is not set -# CONFIG_CMD_WGET is not set -CONFIG_CMD_MII=y -CONFIG_CMD_MDIO=y -CONFIG_CMD_PING=y # CONFIG_CMD_CDP is not set # CONFIG_CMD_SNTP is not set -# CONFIG_CMD_DNS is not set # CONFIG_CMD_LINK_LOCAL is not set # CONFIG_CMD_ETHSW is not set -CONFIG_CMD_PXE=y # CONFIG_CMD_WOL is not set +CONFIG_CMD_DHCP=y +# CONFIG_CMD_DNS is not set +CONFIG_CMD_MII=y +CONFIG_CMD_MDIO=y +CONFIG_CMD_PING=y +CONFIG_CMD_TFTPBOOT=y +# CONFIG_CMD_WGET is not set +CONFIG_CMD_PXE=y # # Misc commands @@ -979,7 +1097,6 @@ CONFIG_CMD_CYCLIC=y # CONFIG_CMD_EVENT is not set CONFIG_CMD_LOG=y # CONFIG_CMD_UBI is not set -CONFIG_MMC_SPEED_MODE_SET=y # # Partition Types @@ -988,6 +1105,7 @@ CONFIG_PARTITIONS=y CONFIG_SPL_PARTITIONS=y # CONFIG_MAC_PARTITION is not set # CONFIG_SPL_MAC_PARTITION is not set +# CONFIG_TEGRA_PARTITION is not set CONFIG_DOS_PARTITION=y CONFIG_SPL_DOS_PARTITION=y CONFIG_ISO_PARTITION=y @@ -1013,9 +1131,11 @@ CONFIG_BINMAN=y CONFIG_OF_CONTROL=y CONFIG_OF_REAL=y CONFIG_SPL_OF_CONTROL=y +CONFIG_TPL_OF_CONTROL=y CONFIG_OF_LIVE=y CONFIG_OF_UPSTREAM=y # CONFIG_OF_UPSTREAM_BUILD_VENDOR is not set +# CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS is not set CONFIG_OF_SEPARATE=y # CONFIG_OF_EMBED is not set # CONFIG_OF_INITIAL_DTB_READONLY is not set @@ -1023,19 +1143,23 @@ CONFIG_OF_SEPARATE=y # CONFIG_OF_OMIT_DTB is not set CONFIG_DEVICE_TREE_INCLUDES="" CONFIG_OF_LIST="rockchip/rk3399-gru-bob" +CONFIG_OF_OVERLAY_LIST="" # CONFIG_MULTI_DTB_FIT is not set # CONFIG_SPL_MULTI_DTB_FIT is not set CONFIG_SPL_OF_LIST="rockchip/rk3399-gru-bob" CONFIG_OF_TAG_MIGRATE=y -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" # CONFIG_OF_DTB_PROPS_REMOVE is not set # CONFIG_SPL_OF_PLATDATA is not set CONFIG_SPL_OF_REAL=y +CONFIG_TPL_OF_REAL=y +# CONFIG_TPL_OF_PLATDATA is not set # # Environment # CONFIG_ENV_SUPPORT=y +CONFIG_ENV_CALLBACK_LIST_STATIC="" CONFIG_SAVEENV=y # CONFIG_ENV_OVERWRITE is not set # CONFIG_OVERWRITE_ETHADDR_ONCE is not set @@ -1064,17 +1188,20 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_USE_ETHPRIME is not set # CONFIG_USE_HOSTNAME is not set # CONFIG_VERSION_VARIABLE is not set + +# +# Networking +# +# CONFIG_NO_NET is not set CONFIG_NET=y +# CONFIG_NET_LWIP is not set CONFIG_ARP_TIMEOUT=5000 CONFIG_NET_RETRY_COUNT=5 # CONFIG_PROT_UDP is not set -CONFIG_BOOTDEV_ETH=y # CONFIG_BOOTP_SEND_HOSTNAME is not set -# CONFIG_NET_RANDOM_ETHADDR is not set # CONFIG_NETCONSOLE is not set # CONFIG_IP_DEFRAG is not set # CONFIG_SYS_FAULT_ECHO_LINK_DOWN is not set -CONFIG_TFTP_BLOCKSIZE=1468 # CONFIG_TFTP_PORT is not set CONFIG_TFTP_WINDOWSIZE=1 # CONFIG_TFTP_TSIZE is not set @@ -1091,6 +1218,10 @@ CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64 # CONFIG_USE_SERVERIP is not set # CONFIG_PROT_TCP is not set # CONFIG_IPV6 is not set +CONFIG_BOOTDEV_ETH=y +# CONFIG_NET_RANDOM_ETHADDR is not set +# CONFIG_WGET is not set +CONFIG_TFTP_BLOCKSIZE=1468 CONFIG_SYS_RX_ETH_BUFFER=4 # @@ -1102,6 +1233,7 @@ CONFIG_SYS_RX_ETH_BUFFER=4 # CONFIG_DM=y CONFIG_SPL_DM=y +CONFIG_TPL_DM=y # CONFIG_DM_WARN is not set # CONFIG_SPL_DM_WARN is not set # CONFIG_DM_DEBUG is not set @@ -1113,18 +1245,24 @@ CONFIG_DM_EVENT=y CONFIG_DM_STDIO=y CONFIG_DM_SEQ_ALIAS=y CONFIG_SPL_DM_SEQ_ALIAS=y +# CONFIG_TPL_DM_SEQ_ALIAS is not set CONFIG_SPL_DM_INLINE_OFNODE=y +CONFIG_TPL_DM_INLINE_OFNODE=y # CONFIG_DM_DMA is not set CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y +CONFIG_TPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_TPL_SYSCON=y # CONFIG_DEVRES is not set CONFIG_SIMPLE_BUS=y CONFIG_SPL_SIMPLE_BUS=y +# CONFIG_TPL_SIMPLE_BUS is not set # CONFIG_SIMPLE_BUS_CORRECT_RANGE is not set CONFIG_OF_TRANSLATE=y # CONFIG_SPL_OF_TRANSLATE is not set +# CONFIG_TPL_OF_TRANSLATE is not set # CONFIG_TRANSLATION_OFFSET is not set CONFIG_OFNODE_MULTI_TREE=y CONFIG_OFNODE_MULTI_TREE_MAX=4 @@ -1149,11 +1287,11 @@ CONFIG_SARADC_ROCKCHIP=y # CONFIG_BLK=y CONFIG_SPL_BLK=y +# CONFIG_TPL_BLK is not set CONFIG_BLOCK_CACHE=y # CONFIG_BLKMAP is not set # CONFIG_SPL_BLOCK_CACHE is not set # CONFIG_EFI_MEDIA is not set -# CONFIG_SPL_BLK_FS is not set # CONFIG_IDE is not set # CONFIG_LBA48 is not set # CONFIG_SYS_64BIT_LBA is not set @@ -1180,10 +1318,12 @@ CONFIG_BLOCK_CACHE=y # CONFIG_CLK=y CONFIG_SPL_CLK=y +CONFIG_TPL_CLK=y # CONFIG_SPL_CLK_CCF is not set # CONFIG_CLK_CCF is not set # CONFIG_CLK_GPIO is not set # CONFIG_SPL_CLK_GPIO is not set +# CONFIG_CLK_STUB is not set # CONFIG_CLK_CDCE9XX is not set # CONFIG_CLK_ICS8N3QV01 is not set # CONFIG_CLK_K210 is not set @@ -1193,6 +1333,7 @@ CONFIG_SPL_CLK=y # CONFIG_CLK_AT91 is not set # CONFIG_CLK_RCAR is not set # CONFIG_CLK_RCAR_CPG_LIB is not set +# CONFIG_CLK_SOPHGO_CV1800B is not set # CONFIG_CLK_SIFIVE is not set # CONFIG_CLK_TI_AM3_DPLL is not set # CONFIG_CLK_TI_CTRL is not set @@ -1262,6 +1403,7 @@ CONFIG_ARM_PSCI_FW=y # CONFIG_FWU_MDATA is not set CONFIG_GPIO=y CONFIG_SPL_DM_GPIO=y +CONFIG_TPL_DM_GPIO=y # CONFIG_GPIO_HOG is not set # CONFIG_SPL_GPIO_HOG is not set # CONFIG_DM_GPIO_LOOKUP_LABEL is not set @@ -1272,6 +1414,8 @@ CONFIG_SPL_DM_GPIO=y # CONFIG_AT91_GPIO is not set # CONFIG_ATMEL_PIO4 is not set # CONFIG_ASPEED_GPIO is not set +# CONFIG_ASPEED_SGPIO is not set +# CONFIG_ASPEED_G7_GPIO is not set # CONFIG_DA8XX_GPIO is not set # CONFIG_FXL6408_GPIO is not set # CONFIG_HIKEY_GPIO is not set @@ -1289,6 +1433,7 @@ CONFIG_SPL_DM_GPIO=y # CONFIG_MXC_GPIO is not set # CONFIG_MXS_GPIO is not set # CONFIG_NPCM_GPIO is not set +# CONFIG_NPCM_SGPIO is not set # CONFIG_CMD_PCA953X is not set # CONFIG_PCF8575_GPIO is not set CONFIG_ROCKCHIP_GPIO=y @@ -1318,6 +1463,7 @@ CONFIG_ROCKCHIP_GPIO=y CONFIG_I2C=y CONFIG_DM_I2C=y CONFIG_SPL_DM_I2C=y +# CONFIG_TPL_DM_I2C is not set CONFIG_I2C_CROS_EC_TUNNEL=y # CONFIG_I2C_CROS_EC_LDO is not set # CONFIG_I2C_SET_DEFAULT_BUS_NUM is not set @@ -1348,8 +1494,10 @@ CONFIG_I2C_MUX=y # CONFIG_I2C_MUX_GPIO is not set CONFIG_INPUT=y # CONFIG_SPL_INPUT is not set +# CONFIG_TPL_INPUT is not set CONFIG_DM_KEYBOARD=y # CONFIG_SPL_DM_KEYBOARD is not set +# CONFIG_TPL_DM_KEYBOARD is not set # CONFIG_APPLE_SPI_KEYB is not set # CONFIG_BUTTON_KEYBOARD is not set CONFIG_CROS_EC_KEYB=y @@ -1366,6 +1514,8 @@ CONFIG_CROS_EC_KEYB=y # LED Support # # CONFIG_LED is not set +# CONFIG_LED_BOOT is not set +# CONFIG_LED_ACTIVITY is not set # CONFIG_SPL_LED is not set # CONFIG_LED_STATUS is not set @@ -1386,6 +1536,7 @@ CONFIG_CROS_EC_KEYB=y # CONFIG_MISC=y CONFIG_SPL_MISC=y +CONFIG_TPL_MISC=y # CONFIG_NVMEM is not set # CONFIG_SPL_NVMEM is not set # CONFIG_ALTERA_SYSID is not set @@ -1400,9 +1551,11 @@ CONFIG_ROCKCHIP_IODOMAIN=y # CONFIG_VEXPRESS_CONFIG is not set CONFIG_CROS_EC=y # CONFIG_SPL_CROS_EC is not set +# CONFIG_TPL_CROS_EC is not set # CONFIG_CROS_EC_I2C is not set # CONFIG_CROS_EC_LPC is not set # CONFIG_SPL_CROS_EC_LPC is not set +# CONFIG_TPL_CROS_EC_LPC is not set CONFIG_CROS_EC_SPI=y # CONFIG_DS4510 is not set # CONFIG_FSL_SEC_MON is not set @@ -1440,6 +1593,7 @@ CONFIG_MMC_PWRSEQ=y # CONFIG_MMC_BROKEN_CD is not set CONFIG_DM_MMC=y CONFIG_SPL_DM_MMC=y +# CONFIG_TPL_DM_MMC is not set # CONFIG_MMC_SPI is not set # CONFIG_ARM_PL180_MMCI is not set CONFIG_MMC_QUIRKS=y @@ -1478,6 +1632,7 @@ CONFIG_MMC_SDHCI_ADMA_64BIT=y # CONFIG_MMC_SDHCI_NPCM is not set CONFIG_MMC_SDHCI_ROCKCHIP=y # CONFIG_MMC_SDHCI_S5P is not set +# CONFIG_MMC_SDHCI_SNPS is not set # CONFIG_MMC_SDHCI_STI is not set # CONFIG_MMC_SDHCI_XENON is not set # CONFIG_MMC_SDHCI_TANGIER is not set @@ -1498,7 +1653,6 @@ CONFIG_MTD=y # CONFIG_MTD_BLOCK is not set # CONFIG_SYS_MTDPARTS_RUNTIME is not set # CONFIG_FLASH_CFI_DRIVER is not set -# CONFIG_HBMC_AM654 is not set # CONFIG_SAMSUNG_ONENAND is not set # CONFIG_USE_SYS_MAX_FLASH_BANKS is not set # CONFIG_MTD_RAW_NAND is not set @@ -1508,8 +1662,6 @@ CONFIG_MTD=y # CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y -CONFIG_SF_DEFAULT_BUS=1 -CONFIG_SF_DEFAULT_CS=0 # CONFIG_BOOTDEV_SPI_FLASH is not set # CONFIG_SPI_FLASH_SFDP_SUPPORT is not set CONFIG_SPI_FLASH_SMART_HWCAPS=y @@ -1523,6 +1675,7 @@ CONFIG_SPI_FLASH_UNLOCK_ALL=y CONFIG_SPI_FLASH_GIGADEVICE=y # CONFIG_SPI_FLASH_ISSI is not set # CONFIG_SPI_FLASH_MACRONIX is not set +# CONFIG_SPI_FLASH_PUYA is not set # CONFIG_SPI_FLASH_SILICONKAISER is not set # CONFIG_SPI_FLASH_SPANSION is not set # CONFIG_SPI_FLASH_STMICRO is not set @@ -1691,6 +1844,7 @@ CONFIG_PINMUX=y # CONFIG_PINCONF is not set CONFIG_PINCONF_RECURSIVE=y CONFIG_SPL_PINCTRL=y +# CONFIG_TPL_PINCTRL is not set CONFIG_SPL_PINCTRL_FULL=y CONFIG_SPL_PINCTRL_GENERIC=y CONFIG_SPL_PINMUX=y @@ -1714,6 +1868,7 @@ CONFIG_POWER=y # CONFIG_POWER_LEGACY is not set # CONFIG_ACPI_PMC is not set # CONFIG_SPL_ACPI_PMC is not set +# CONFIG_TPL_ACPI_PMC is not set # # Power Domain Support @@ -1774,13 +1929,15 @@ CONFIG_DM_REGULATOR=y CONFIG_REGULATOR_PWM=y # CONFIG_SPL_REGULATOR_PWM is not set CONFIG_DM_REGULATOR_COMMON=y +CONFIG_SPL_DM_REGULATOR_COMMON=y CONFIG_DM_REGULATOR_FIXED=y -# CONFIG_SPL_DM_REGULATOR_FIXED is not set +CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y # CONFIG_SPL_DM_REGULATOR_GPIO is not set CONFIG_REGULATOR_RK8XX=y # CONFIG_DM_REGULATOR_PBIAS is not set # CONFIG_DM_REGULATOR_TPS62360 is not set +# CONFIG_DM_REGULATOR_TPS6287X is not set # CONFIG_DM_REGULATOR_ANATOP is not set # CONFIG_DM_REGULATOR_SCMI is not set # CONFIG_TPS6586X_POWER is not set @@ -1801,6 +1958,7 @@ CONFIG_PWM_ROCKCHIP=y # CONFIG_U_QE is not set CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y # CONFIG_STM32_SDRAM is not set # CONFIG_MPC83XX_SDRAM is not set # CONFIG_K3_DDRSS is not set @@ -1849,6 +2007,7 @@ CONFIG_RNG_ROCKCHIP=y # # CONFIG_DM_RTC is not set # CONFIG_SPL_DM_RTC is not set +# CONFIG_TPL_DM_RTC is not set # CONFIG_RTC_ENABLE_32KHZ_OUTPUT is not set # CONFIG_RTC_DS1337 is not set # CONFIG_RTC_DS1338 is not set @@ -1856,7 +2015,6 @@ CONFIG_RNG_ROCKCHIP=y # CONFIG_RTC_DS3231 is not set # CONFIG_RTC_PCF8563 is not set # CONFIG_RTC_PT7C4338 is not set -# CONFIG_RTC_PL031 is not set # CONFIG_RTC_S35392A is not set # CONFIG_RTC_MC13XXX is not set # CONFIG_RTC_MC146818 is not set @@ -1869,15 +2027,18 @@ CONFIG_REQUIRE_SERIAL_CONSOLE=y # CONFIG_SPECIFY_CONSOLE_INDEX is not set CONFIG_SERIAL_PRESENT=y CONFIG_SPL_SERIAL_PRESENT=y +CONFIG_TPL_SERIAL_PRESENT=y CONFIG_DM_SERIAL=y # CONFIG_SERIAL_RX_BUFFER is not set # CONFIG_SERIAL_PUTS is not set # CONFIG_SERIAL_SEARCH_ALL is not set # CONFIG_SERIAL_PROBE_ALL is not set CONFIG_SPL_DM_SERIAL=y +CONFIG_TPL_DM_SERIAL=y # CONFIG_VPL_DM_SERIAL is not set CONFIG_DEBUG_UART_NS16550=y CONFIG_SPL_DEBUG_UART_BASE=0xff1a0000 +CONFIG_TPL_DEBUG_UART_BASE=0xff1a0000 CONFIG_DEBUG_UART_SHIFT=2 # CONFIG_DEBUG_UART_ANNOUNCE is not set # CONFIG_DEBUG_UART_SKIP_INIT is not set @@ -1935,27 +2096,18 @@ CONFIG_SPI_MEM=y # CONFIG_ALTERA_SPI is not set # CONFIG_APPLE_SPI is not set # CONFIG_ATCSPI200_SPI is not set -# CONFIG_ATMEL_SPI is not set -# CONFIG_BCMSTB_SPI is not set # CONFIG_CORTINA_SFLASH is not set # CONFIG_CADENCE_QSPI is not set -# CONFIG_CF_SPI is not set # CONFIG_CV1800B_SPIF is not set # CONFIG_DESIGNWARE_SPI is not set -# CONFIG_EXYNOS_SPI is not set -# CONFIG_FSL_DSPI is not set # CONFIG_FSL_QSPI is not set # CONFIG_GXP_SPI is not set -# CONFIG_ICH_SPI is not set # CONFIG_IPROC_QSPI is not set -# CONFIG_KIRKWOOD_SPI is not set # CONFIG_MICROCHIP_COREQSPI is not set -# CONFIG_MPC8XXX_SPI is not set # CONFIG_MTK_SNOR is not set # CONFIG_MTK_SNFI_SPI is not set # CONFIG_MTK_SPIM is not set # CONFIG_MVEBU_A3700_SPI is not set -# CONFIG_MXS_SPI is not set # CONFIG_SPI_MXIC is not set # CONFIG_NPCM_FIU_SPI is not set # CONFIG_NPCM_PSPI is not set @@ -1969,17 +2121,11 @@ CONFIG_ROCKCHIP_SPI=y # CONFIG_SOFT_SPI is not set # CONFIG_SPI_SN_F_OSPI is not set # CONFIG_SPI_SUNXI is not set -# CONFIG_TEGRA114_SPI is not set -# CONFIG_TEGRA20_SFLASH is not set -# CONFIG_TEGRA20_SLINK is not set -# CONFIG_TEGRA210_QSPI is not set -# CONFIG_TI_QSPI is not set # CONFIG_XILINX_SPI is not set # CONFIG_ZYNQ_SPI is not set # CONFIG_ZYNQ_QSPI is not set # CONFIG_ZYNQMP_GQSPI is not set -# CONFIG_SH_QSPI is not set -# CONFIG_MXC_SPI is not set +# CONFIG_SPI_STACKED_PARALLEL is not set # # SPMI support @@ -1992,6 +2138,7 @@ CONFIG_ROCKCHIP_SPI=y # CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y +CONFIG_TPL_SYSRESET=y CONFIG_SYSRESET_CMD_RESET=y CONFIG_SYSRESET_CMD_POWEROFF=y # CONFIG_SYSRESET_CV1800B is not set @@ -2027,6 +2174,7 @@ CONFIG_USB_HOST=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_DWC3 is not set # CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set +# CONFIG_USB_XHCI_GENERIC is not set # CONFIG_USB_XHCI_FSL is not set # CONFIG_USB_XHCI_BRCM is not set CONFIG_USB_EHCI_HCD=y @@ -2055,6 +2203,7 @@ CONFIG_USB_DWC3_GENERIC=y # CONFIG_SPL_USB_DWC3_GENERIC is not set # CONFIG_USB_DWC3_AM62 is not set # CONFIG_USB_DWC3_LAYERSCAPE is not set +# CONFIG_USB_DWC3_STI is not set # # PHY Subsystem @@ -2079,6 +2228,7 @@ CONFIG_USB_DWC3_GENERIC=y # # CONFIG_TWL4030_USB is not set # CONFIG_ROCKCHIP_USB2_PHY is not set +# CONFIG_TYPEC_TCPM is not set # # ULPI drivers @@ -2159,6 +2309,7 @@ CONFIG_SIMPLE_PANEL=y # CONFIG_VIDEO_LCD_RENESAS_R61307 is not set # CONFIG_VIDEO_LCD_RENESAS_R69328 is not set # CONFIG_VIDEO_LCD_SAMSUNG_LTL106HL02 is not set +# CONFIG_VIDEO_LCD_SHARP_LQ101R1SX01 is not set # CONFIG_VIDEO_LCD_SSD2828 is not set # CONFIG_VIDEO_LCD_TDO_TL070WSH30 is not set # CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set @@ -2248,7 +2399,6 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536 # CONFIG_UBIFS_SILENCE_MSG is not set # CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set # CONFIG_FS_CRAMFS is not set -# CONFIG_YAFFS2 is not set # CONFIG_FS_SQUASHFS is not set # CONFIG_FS_EROFS is not set @@ -2260,6 +2410,7 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536 # CONFIG_PHYSMEM is not set # CONFIG_BCH is not set # CONFIG_BINMAN_FDT is not set +CONFIG_BINMAN_DTB="" # CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set CONFIG_CHARSET=y # CONFIG_DYNAMIC_CRC_TABLE is not set @@ -2270,12 +2421,16 @@ CONFIG_SPL_LIB_UUID=y # CONFIG_SPL_SEMIHOSTING is not set CONFIG_PRINTF=y CONFIG_SPL_PRINTF=y +CONFIG_TPL_PRINTF=y CONFIG_SPRINTF=y CONFIG_SPL_SPRINTF=y +CONFIG_TPL_SPRINTF=y CONFIG_STRTO=y CONFIG_SPL_STRTO=y +CONFIG_TPL_STRTO=y CONFIG_SYS_HZ=1000 CONFIG_SPL_USE_TINY_PRINTF=y +CONFIG_TPL_USE_TINY_PRINTF=y CONFIG_PANIC_HANG=y CONFIG_REGEX=y CONFIG_LIB_RAND=y @@ -2284,19 +2439,48 @@ CONFIG_SUPPORT_ACPI=y # CONFIG_ACPI is not set # CONFIG_SPL_ACPI is not set # CONFIG_SPL_TINY_MEMSET is not set +CONFIG_TPL_TINY_MEMSET=y # CONFIG_BITREVERSE is not set # CONFIG_TRACE is not set # CONFIG_CIRCBUF is not set CONFIG_CMD_DHRYSTONE=y # +# Alternative crypto libraries +# +CONFIG_LEGACY_HASHING_AND_CRYPTO=y +# CONFIG_MBEDTLS_LIB is not set +CONFIG_LEGACY_HASHING=y +CONFIG_SHA1_LEGACY=y +CONFIG_SHA256_LEGACY=y +CONFIG_MD5_LEGACY=y +CONFIG_LEGACY_CRYPTO=y +CONFIG_SPL_LEGACY_HASHING_AND_CRYPTO=y +# CONFIG_SPL_MBEDTLS_LIB is not set +CONFIG_SPL_LEGACY_HASHING=y +CONFIG_SPL_SHA1_LEGACY=y +CONFIG_SPL_SHA256_LEGACY=y +CONFIG_SPL_LEGACY_CRYPTO=y +CONFIG_TPL_LEGACY_HASHING_AND_CRYPTO=y +# CONFIG_TPL_MBEDTLS_LIB is not set +CONFIG_TPL_LEGACY_HASHING=y + +# # Security support # # CONFIG_AES is not set # CONFIG_ECDSA is not set -# CONFIG_RSA is not set +CONFIG_RSA=y +CONFIG_SPL_RSA=y +CONFIG_SPL_RSA_VERIFY=y +CONFIG_RSA_VERIFY=y +# CONFIG_RSA_VERIFY_WITH_PKEY is not set +# CONFIG_SPL_RSA_VERIFY_WITH_PKEY is not set +CONFIG_RSA_SOFTWARE_EXP=y +# CONFIG_ASYMMETRIC_KEY_TYPE is not set # CONFIG_TPM is not set # CONFIG_SPL_TPM is not set +# CONFIG_TPL_TPM is not set # # Android Verified Boot @@ -2320,7 +2504,9 @@ CONFIG_SPL_SHA256=y CONFIG_MD5=y # CONFIG_SPL_MD5 is not set CONFIG_CRC8=y -# CONFIG_SPL_CRC8 is not set +CONFIG_SPL_CRC8=y +# CONFIG_TPL_CRC8 is not set +CONFIG_CRC16=y # CONFIG_SPL_CRC16 is not set CONFIG_CRC32=y @@ -2337,10 +2523,13 @@ CONFIG_ZLIB=y # CONFIG_ZSTD is not set # CONFIG_SPL_BZIP2 is not set # CONFIG_SPL_LZ4 is not set +# CONFIG_TPL_LZ4 is not set # CONFIG_SPL_LZMA is not set +# CONFIG_TPL_LZMA is not set CONFIG_VPL_LZMA=y # CONFIG_SPL_LZO is not set # CONFIG_SPL_GZIP is not set +# CONFIG_TPL_GZIP is not set # CONFIG_SPL_ZSTD is not set CONFIG_ERRNO_STR=y # CONFIG_HEXDUMP is not set @@ -2349,49 +2538,26 @@ CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_ASSUME_MASK=0x0 CONFIG_SYS_FDT_PAD=0x3000 CONFIG_SPL_OF_LIBFDT=y -CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff +CONFIG_TPL_OF_LIBFDT=y +CONFIG_TPL_OF_LIBFDT_ASSUME_MASK=0xff # # System tables # +# CONFIG_BLOBLIST_TABLES is not set CONFIG_GENERATE_SMBIOS_TABLE=y +# CONFIG_GENERATE_SMBIOS_TABLE_VERBOSE is not set # CONFIG_LIB_RATIONAL is not set # CONFIG_SPL_LIB_RATIONAL is not set CONFIG_SMBIOS=y # CONFIG_SMBIOS_PARSER is not set -CONFIG_EFI_LOADER=y -CONFIG_EFI_BINARY_EXEC=y -CONFIG_EFI_BOOTMGR=y -# CONFIG_EFI_VARIABLE_FILE_STORE is not set -CONFIG_EFI_VARIABLE_NO_STORE=y -# CONFIG_EFI_VARIABLES_PRESEED is not set -CONFIG_EFI_VAR_BUF_SIZE=131072 -# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set -# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set -# CONFIG_EFI_CAPSULE_ON_DISK is not set -CONFIG_EFI_CAPSULE_MAX=15 -CONFIG_EFI_DEVICE_PATH_TO_TEXT=y -CONFIG_EFI_DEVICE_PATH_UTIL=y -CONFIG_EFI_DT_FIXUP=y -CONFIG_EFI_LOADER_HII=y -CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y -CONFIG_EFI_UNICODE_CAPITALIZATION=y -# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set -CONFIG_EFI_PLATFORM_LANG_CODES="en-US" -CONFIG_EFI_HAVE_RUNTIME_RESET=y -CONFIG_EFI_RNG_PROTOCOL=y -CONFIG_EFI_LOAD_FILE2_INITRD=y -CONFIG_EFI_ECPT=y -CONFIG_EFI_EBBR_2_1_CONFORMANCE=y -# CONFIG_EFI_HTTP_BOOT is not set # CONFIG_OPTEE_LIB is not set # CONFIG_OPTEE_IMAGE is not set # CONFIG_BOOTM_OPTEE is not set # CONFIG_TEST_FDTDEC is not set CONFIG_LIB_ELF=y CONFIG_LMB=y -CONFIG_LMB_USE_MAX_REGIONS=y -CONFIG_LMB_MAX_REGIONS=16 +# CONFIG_LMB_ARCH_MEM_MAP is not set # CONFIG_PHANDLE_CHECK_SEQ is not set # @@ -2405,6 +2571,7 @@ CONFIG_LMB_MAX_REGIONS=16 # Tools options # CONFIG_MKIMAGE_DTC_PATH="dtc" +CONFIG_TOOLS_CRC16=y CONFIG_TOOLS_CRC32=y CONFIG_TOOLS_LIBCRYPTO=y CONFIG_TOOLS_KWBIMAGE=y diff --git a/config/u-boot/gru_kevin/config/default b/config/u-boot/gru_kevin/config/default index 2a15b9bf..310fcb6f 100644 --- a/config/u-boot/gru_kevin/config/default +++ b/config/u-boot/gru_kevin/config/default @@ -1,15 +1,17 @@ # # Automatically generated file; DO NOT EDIT. -# U-Boot 2024.10 Configuration +# U-Boot 2025.04 Configuration # # -# Compiler: gcc (Debian 12.2.0-14) 12.2.0 +# Compiler: gcc (Debian 14.2.0-19) 14.2.0 # CONFIG_CREATE_ARCH_SYMLINK=y +CONFIG_HAVE_SETJMP=y CONFIG_SUPPORT_LITTLE_ENDIAN=y CONFIG_SYS_CACHE_SHIFT_6=y CONFIG_64BIT=y +CONFIG_SPL_64BIT=y CONFIG_SYS_CACHELINE_SIZE=64 CONFIG_LINKER_LIST_ALIGN=8 # CONFIG_ARC is not set @@ -39,10 +41,11 @@ CONFIG_SKIP_LOWLEVEL_INIT=y # CONFIG_TPL_SKIP_LOWLEVEL_INIT is not set # CONFIG_SKIP_LOWLEVEL_INIT_ONLY is not set # CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY is not set +# CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY is not set # CONFIG_SYS_ICACHE_OFF is not set # CONFIG_SPL_SYS_ICACHE_OFF is not set # CONFIG_SYS_DCACHE_OFF is not set -CONFIG_SPL_SYS_DCACHE_OFF=y +# CONFIG_SPL_SYS_DCACHE_OFF is not set # # ARM architecture @@ -51,9 +54,9 @@ CONFIG_ARM64=y CONFIG_ARM64_CRC32=y CONFIG_COUNTER_FREQUENCY=24000000 CONFIG_POSITION_INDEPENDENT=y -CONFIG_INIT_SP_RELATIVE=y -CONFIG_SYS_INIT_SP_BSS_OFFSET=524288 +# CONFIG_INIT_SP_RELATIVE is not set CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE=0x18000000 +# CONFIG_DRIVER_GICV2 is not set # CONFIG_GIC_V3_ITS is not set # CONFIG_GICV3_SUPPORT_GIC600 is not set CONFIG_STATIC_RELA=y @@ -75,8 +78,10 @@ CONFIG_ARM_SMCCC=y CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y # CONFIG_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMCPY is not set +# CONFIG_TPL_USE_ARCH_MEMCPY is not set # CONFIG_USE_ARCH_MEMSET is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set +# CONFIG_TPL_USE_ARCH_MEMSET is not set CONFIG_ARM64_SUPPORT_AARCH32=y # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_DAVINCI is not set @@ -100,6 +105,7 @@ CONFIG_ARM64_SUPPORT_AARCH32=y # CONFIG_ARCH_OMAP2PLUS is not set # CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MEDIATEK is not set +# CONFIG_ARCH_MMP is not set # CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_IMX8 is not set # CONFIG_ARCH_IMX8M is not set @@ -183,23 +189,25 @@ CONFIG_ARCH_ROCKCHIP=y # CONFIG_TARGET_PRESIDIO_ASIC is not set # CONFIG_TARGET_XENGUEST_ARM64 is not set # CONFIG_ARCH_GXP is not set -# CONFIG_STATIC_MACH_TYPE is not set CONFIG_TEXT_BASE=0x18000000 CONFIG_SYS_MALLOC_LEN=0x2000000 -CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_SYS_MALLOC_F_LEN=0x10000 +CONFIG_BLOBLIST_SIZE_RELOC=0x1000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL_LDSCRIPT="arch/arm/cpu/armv8/u-boot-spl.lds" CONFIG_ENV_SOURCE_FILE="" +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x3f00000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_SF_DEFAULT_MODE=0x0 CONFIG_ENV_SIZE=0x1f000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-kevin" -CONFIG_SPL_TEXT_BASE=0xff8c2000 +CONFIG_DDR_SI_TEST=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000 CONFIG_DM_RESET=y @@ -221,16 +229,20 @@ CONFIG_ROCKCHIP_RK3399=y # CONFIG_ROCKCHIP_RV1126 is not set # CONFIG_ROCKCHIP_USB_UART is not set # CONFIG_SPL_ROCKCHIP_BACK_TO_BROM is not set +CONFIG_TPL_ROCKCHIP_BACK_TO_BROM=y CONFIG_ROCKCHIP_COMMON_BOARD=y CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y # CONFIG_ROCKCHIP_EXTERNAL_TPL is not set CONFIG_ROCKCHIP_BOOT_MODE_REG=0 # CONFIG_ROCKCHIP_RK8XX_DISABLE_BOOT_ON_POWERON is not set CONFIG_ROCKCHIP_STIMER=y CONFIG_ROCKCHIP_STIMER_BASE=0xff8680a0 -CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000 +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 +CONFIG_ROCKCHIP_BROM_HELPER=y # CONFIG_SPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set CONFIG_ROCKCHIP_DISABLE_FORCE_JTAG=y +# CONFIG_TPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set # CONFIG_SPL_MMC is not set CONFIG_ROCKCHIP_SPI_IMAGE=y CONFIG_ROCKCHIP_COMMON_STACK_ADDR=y @@ -238,8 +250,12 @@ CONFIG_SPL_SERIAL=y CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl-v8.lds" CONFIG_TPL_TEXT_BASE=0xff8c2000 CONFIG_TPL_STACK=0xff8effff +CONFIG_TPL_SYS_MALLOC_F_LEN=0x4000 +CONFIG_TPL_LIBCOMMON_SUPPORT=y +CONFIG_TPL_LIBGENERIC_SUPPORT=y +CONFIG_TPL_SERIAL=y # CONFIG_SPL_DRIVERS_MISC is not set -CONFIG_SPL_STACK_R_ADDR=0x04000000 +CONFIG_SPL_STACK_R_ADDR=0x3e00000 # CONFIG_TARGET_CHROMEBOOK_BOB is not set CONFIG_TARGET_CHROMEBOOK_KEVIN=y # CONFIG_TARGET_EVB_RK3399 is not set @@ -250,14 +266,20 @@ CONFIG_TARGET_CHROMEBOOK_KEVIN=y # CONFIG_TARGET_ROCKPI4_RK3399 is not set # CONFIG_TARGET_ROCKPRO64_RK3399 is not set # CONFIG_TARGET_ROC_PC_RK3399 is not set -CONFIG_SPL_STACK=0xff8effff -CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000 +CONFIG_TPL_SYS_MALLOC_F=y +CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000 +CONFIG_SPL_TEXT_BASE=0x0 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0xff8e0000 -CONFIG_SPL_BSS_MAX_SIZE=0x10000 +CONFIG_SPL_BSS_START_ADDR=0x3f80000 +CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000 +CONFIG_SYS_BOOTM_LEN=0x4000000 +CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 +CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff +CONFIG_SF_DEFAULT_BUS=1 +CONFIG_SF_DEFAULT_CS=0 CONFIG_SPL_SYS_MALLOC_F=y CONFIG_ERR_PTR_OFFSET=0x0 CONFIG_SPL_SIZE_LIMIT=0x0 @@ -293,24 +315,18 @@ CONFIG_PSCI_RESET=y CONFIG_ARMV8_CRYPTO=y CONFIG_ARMV8_CE_SHA1=y CONFIG_ARMV8_CE_SHA256=y -# CONFIG_CMD_DEKBLOB is not set -# CONFIG_IMX_CAAM_DEK_ENCAP is not set -# CONFIG_IMX_OPTEE_DEK_ENCAP is not set -# CONFIG_IMX_SECO_DEK_ENCAP is not set -# CONFIG_IMX_ELE_DEK_ENCAP is not set -# CONFIG_CMD_HDMIDETECT is not set -CONFIG_IMX_DCD_ADDR=0x00910000 CONFIG_SYS_MEM_TOP_HIDE=0x0 -CONFIG_SYS_LOAD_ADDR=0x800800 # # ARM debug # -CONFIG_SPL_PAYLOAD="u-boot.bin" +CONFIG_TPL_MAX_SIZE=0x2e000 +CONFIG_SPL_PAYLOAD="tpl/u-boot-with-tpl.bin" CONFIG_BUILD_TARGET="" # CONFIG_PCI is not set CONFIG_FWU_NUM_BANKS=2 CONFIG_FWU_NUM_IMAGES_PER_BANK=2 +CONFIG_TPL_SIZE_LIMIT=0x0 CONFIG_DEBUG_UART=y # CONFIG_AHCI is not set # CONFIG_OF_BOARD_FIXUP is not set @@ -327,7 +343,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set @@ -336,6 +352,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_SPL_OPTIMIZE_INLINING is not set CONFIG_ARCH_SUPPORTS_LTO=y # CONFIG_LTO is not set +# CONFIG_TPL_OPTIMIZE_INLINING is not set CONFIG_CC_HAS_ASM_INLINE=y # CONFIG_XEN is not set CONFIG_ENV_VARS_UBOOT_CONFIG=y @@ -357,8 +374,6 @@ CONFIG_REMAKE_ELF=y # CONFIG_SYS_CUSTOM_LDSCRIPT is not set CONFIG_PLATFORM_ELFENTRY="_start" CONFIG_STACK_SIZE=0x1000000 -CONFIG_SYS_SRAM_BASE=0x0 -CONFIG_SYS_SRAM_SIZE=0x0 # CONFIG_MP is not set CONFIG_HAVE_TEXT_BASE=y # CONFIG_HAVE_SYS_UBOOT_START is not set @@ -371,6 +386,63 @@ CONFIG_SYS_UBOOT_START=0x18000000 # # +# UEFI Support +# +CONFIG_EFI_LOADER=y +CONFIG_EFI_BINARY_EXEC=y +# CONFIG_EFI_SECURE_BOOT is not set + +# +# UEFI services +# +CONFIG_EFI_HAVE_RUNTIME_RESET=y + +# +# UEFI Variables +# +# CONFIG_EFI_VARIABLE_FILE_STORE is not set +CONFIG_EFI_VARIABLE_NO_STORE=y +# CONFIG_EFI_VARIABLES_PRESEED is not set +CONFIG_EFI_VAR_BUF_SIZE=131072 +CONFIG_EFI_PLATFORM_LANG_CODES="en-US" + +# +# Capsule support +# +# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set +# CONFIG_EFI_CAPSULE_ON_DISK is not set +CONFIG_EFI_CAPSULE_MAX=15 + +# +# UEFI protocol support +# +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_DEVICE_PATH_UTIL=y +CONFIG_EFI_DT_FIXUP=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_RNG_PROTOCOL=y +CONFIG_EFI_LOAD_FILE2_INITRD=y +# CONFIG_EFI_IP4_CONFIG2_PROTOCOL is not set + +# +# Misc options +# +# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set +CONFIG_EFI_ECPT=y +CONFIG_EFI_EBBR_2_1_CONFORMANCE=y +# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set + +# +# EFI bootmanager +# +CONFIG_EFI_BOOTMGR=y +# CONFIG_EFI_HTTP_BOOT is not set +CONFIG_BOOTEFI_HELLO_COMPILE=y +CONFIG_BOOTEFI_TESTAPP_COMPILE=y + +# # Boot images # # CONFIG_ANDROID_BOOT_IMAGE is not set @@ -378,22 +450,26 @@ CONFIG_SYS_UBOOT_START=0x18000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x0 CONFIG_FIT_FULL_CHECK=y -# CONFIG_FIT_SIGNATURE is not set +CONFIG_FIT_SIGNATURE=y +CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 +# CONFIG_FIT_RSASSA_PSS is not set # CONFIG_FIT_CIPHER is not set # CONFIG_FIT_VERBOSE is not set # CONFIG_FIT_BEST_MATCH is not set CONFIG_FIT_PRINT=y CONFIG_SPL_FIT=y +# CONFIG_TPL_FIT is not set # CONFIG_SPL_FIT_PRINT is not set -# CONFIG_SPL_FIT_FULL_CHECK is not set -# CONFIG_SPL_FIT_SIGNATURE is not set +CONFIG_SPL_FIT_FULL_CHECK=y +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_FIT_SIGNATURE_MAX_SIZE=0x10000000 +# CONFIG_SPL_FIT_RSASSA_PSS is not set CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x0 # CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY is not set # CONFIG_SPL_LOAD_FIT_FULL is not set +# CONFIG_TPL_LOAD_FIT is not set # CONFIG_SPL_FIT_IMAGE_POST_PROCESS is not set -CONFIG_SPL_FIT_SOURCE="" -# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_PXE_UTILS=y CONFIG_BOOT_DEFAULTS_FEATURES=y CONFIG_BOOT_DEFAULTS_CMDS=y @@ -403,6 +479,7 @@ CONFIG_BOOTSTD=y CONFIG_BOOTSTD_FULL=y CONFIG_BOOTSTD_DEFAULTS=y CONFIG_BOOTSTD_BOOTCOMMAND=y +CONFIG_BOOTSTD_MENU=y CONFIG_BOOTMETH_GLOBAL=y # CONFIG_BOOTMETH_ANDROID is not set # CONFIG_BOOTMETH_CROS is not set @@ -413,15 +490,17 @@ CONFIG_BOOTMETH_EFI_BOOTMGR=y CONFIG_BOOTMETH_VBE=y CONFIG_BOOTMETH_DISTRO=y # CONFIG_SPL_BOOTMETH_VBE is not set +CONFIG_TPL_BOOTMETH_VBE=y CONFIG_BOOTMETH_VBE_REQUEST=y # CONFIG_SPL_BOOTMETH_VBE_REQUEST is not set CONFIG_BOOTMETH_VBE_SIMPLE=y +# CONFIG_BOOTMETH_VBE_ABREC is not set CONFIG_BOOTMETH_VBE_SIMPLE_OS=y # CONFIG_SPL_BOOTMETH_VBE_SIMPLE is not set CONFIG_EXPO=y CONFIG_BOOTMETH_SCRIPT=y +# CONFIG_UPL is not set CONFIG_LEGACY_IMAGE_FORMAT=y -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_CHROMEOS is not set # CONFIG_CHROMEOS_VBOOT is not set @@ -498,6 +577,7 @@ CONFIG_SYS_PBSIZE=1044 # CONFIG_DISABLE_CONSOLE is not set CONFIG_LOGLEVEL=4 CONFIG_SPL_LOGLEVEL=4 +CONFIG_TPL_LOGLEVEL=4 # CONFIG_SILENT_CONSOLE is not set # CONFIG_SPL_SILENT_CONSOLE is not set # CONFIG_TPL_SILENT_CONSOLE is not set @@ -526,6 +606,7 @@ CONFIG_LOG_CONSOLE=y CONFIG_LOGF_FUNC_PAD=20 # CONFIG_LOG_SYSLOG is not set # CONFIG_SPL_LOG is not set +# CONFIG_TPL_LOG is not set # CONFIG_LOG_ERROR_RETURN is not set # @@ -562,6 +643,7 @@ CONFIG_MISC_INIT_R=y # Security support # CONFIG_HASH=y +# CONFIG_HASH_CRC8 is not set CONFIG_SPL_HASH=y # CONFIG_STACKPROTECTOR is not set # CONFIG_BOARD_RNG_SEED is not set @@ -577,11 +659,11 @@ CONFIG_SPL_HASH=y # CONFIG_BLOBLIST=y CONFIG_SPL_BLOBLIST=y +# CONFIG_TPL_BLOBLIST is not set CONFIG_BLOBLIST_FIXED=y # CONFIG_BLOBLIST_ALLOC is not set CONFIG_BLOBLIST_ADDR=0x100000 CONFIG_BLOBLIST_SIZE=0x1000 -CONFIG_BLOBLIST_SIZE_RELOC=0x1000 CONFIG_SPL_BLOBLIST_FIXED=y # CONFIG_SPL_BLOBLIST_ALLOC is not set CONFIG_SUPPORT_SPL=y @@ -592,7 +674,7 @@ CONFIG_SUPPORT_TPL=y # CONFIG_SPL_FRAMEWORK=y # CONFIG_SPL_FRAMEWORK_BOARD_INIT_F is not set -CONFIG_SPL_MAX_SIZE=0x1e000 +CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_NO_BSS_LIMIT is not set CONFIG_SPL_BSS_LIMIT=y @@ -606,24 +688,27 @@ CONFIG_HANDOFF=y CONFIG_SPL_HANDOFF=y # CONFIG_SPL_SOC_INIT is not set CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_LOAD_BLOCK=y # CONFIG_SPL_BOOTROM_SUPPORT is not set # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set # CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set # CONFIG_SPL_LOAD_IMX_CONTAINER is not set CONFIG_SPL_SYS_MALLOC_SIMPLE=y -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_SHARES_INIT_SP_ADDR=y CONFIG_SPL_SEPARATE_BSS=y # CONFIG_SPL_SYS_MALLOC is not set CONFIG_SPL_BANNER_PRINT=y # CONFIG_SPL_DISPLAY_PRINT is not set +CONFIG_SPL_SYS_MMCSD_RAW_MODE=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is not set +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE is not set CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x4000 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x0 -# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is not set # CONFIG_SPL_FIT_IMAGE_TINY is not set # CONFIG_SPL_CACHE is not set # CONFIG_SPL_CPU is not set -# CONFIG_SPL_CRYPTO is not set +CONFIG_SPL_CRYPTO=y # CONFIG_SPL_DMA is not set # CONFIG_SPL_ENV_SUPPORT is not set # CONFIG_SPL_FS_EXT4 is not set @@ -640,6 +725,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET=0x0 # CONFIG_SPL_NAND_DRIVERS is not set # CONFIG_SPL_NAND_ECC is not set # CONFIG_SPL_NAND_SIMPLE is not set +# CONFIG_SPL_RELOC_LOADER is not set # CONFIG_SPL_UBI is not set CONFIG_SPL_DM_SPI_FLASH=y # CONFIG_SPL_NET is not set @@ -653,7 +739,7 @@ CONFIG_SPL_DM_SPI_FLASH=y # CONFIG_SPL_DM_RESET is not set # CONFIG_SPL_POWER is not set # CONFIG_SPL_POWER_DOMAIN is not set -# CONFIG_SPL_RAM_SUPPORT is not set +# CONFIG_SPL_RAM_DEVICE is not set # CONFIG_SPL_REMOTEPROC is not set # CONFIG_SPL_RTC is not set # CONFIG_SPL_SATA is not set @@ -661,7 +747,7 @@ CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_SPI_FLASH_TINY=y # CONFIG_SPL_SPI_FLASH_MTD is not set CONFIG_SPL_SPI_LOAD=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000 # CONFIG_SPL_THERMAL is not set # CONFIG_SPL_WATCHDOG is not set # CONFIG_SPL_YMODEM_SUPPORT is not set @@ -670,8 +756,42 @@ CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y # CONFIG_SPL_OPTEE_IMAGE is not set CONFIG_SPL_TARGET="" -# CONFIG_TPL is not set +CONFIG_TPL=y + +# +# TPL configuration options +# +CONFIG_TPL_BINMAN_SYMBOLS=y +CONFIG_TPL_BINMAN_UBOOT_SYMBOLS=y +CONFIG_TPL_FRAMEWORK=y +CONFIG_TPL_BANNER_PRINT=y +# CONFIG_TPL_BOARD_INIT is not set +CONFIG_TPL_SYS_MALLOC_SIMPLE=y +CONFIG_TPL_SEPARATE_BSS=y +CONFIG_TPL_NEEDS_SEPARATE_STACK=y +# CONFIG_TPL_POWER is not set +CONFIG_TPL_BOOTROM_SUPPORT=y +# CONFIG_TPL_CRC32 is not set +# CONFIG_TPL_DRIVERS_MISC is not set +# CONFIG_TPL_ENV_SUPPORT is not set +CONFIG_TPL_GPIO=y +# CONFIG_TPL_I2C is not set +# CONFIG_TPL_MPC8XXX_INIT_DDR is not set +# CONFIG_TPL_MMC is not set +# CONFIG_TPL_NAND_SUPPORT is not set +# CONFIG_TPL_PCI is not set +# CONFIG_TPL_PCH is not set +# CONFIG_TPL_RAM_SUPPORT is not set +# CONFIG_TPL_RELOC_LOADER is not set +# CONFIG_TPL_RTC is not set +# CONFIG_TPL_SPI_FLASH_SUPPORT is not set +# CONFIG_TPL_SPI is not set +# CONFIG_TPL_DM_SPI is not set +# CONFIG_TPL_DM_SPI_FLASH is not set +# CONFIG_TPL_YMODEM_SUPPORT is not set # CONFIG_VPL is not set +CONFIG_IMAGE_SIGN_INFO=y +CONFIG_SPL_IMAGE_SIGN_INFO=y CONFIG_CMDLINE=y CONFIG_HUSH_PARSER=y @@ -700,6 +820,7 @@ CONFIG_CMD_BDI=y # CONFIG_CMD_BDINFO_EXTRA is not set # CONFIG_CMD_CONFIG is not set CONFIG_CMD_CONSOLE=y +# CONFIG_CMD_UFETCH is not set # CONFIG_CMD_HISTORY is not set # CONFIG_CMD_LICENSE is not set # CONFIG_CMD_PMC is not set @@ -713,8 +834,9 @@ CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTDEV=y CONFIG_CMD_BOOTFLOW=y CONFIG_CMD_BOOTFLOW_FULL=y -CONFIG_CMD_BOOTFLOW_BOOTDELAY=8 +CONFIG_CMD_BOOTFLOW_BOOTDELAY=30 CONFIG_CMD_BOOTMETH=y +CONFIG_CMD_BOOTSTD=y CONFIG_BOOTM_EFI=y CONFIG_BOOTM_ELF=y CONFIG_CMD_BOOTZ=y @@ -725,17 +847,18 @@ CONFIG_BOOTM_NETBSD=y # CONFIG_BOOTM_OSE is not set CONFIG_BOOTM_PLAN9=y CONFIG_BOOTM_RTEMS=y +# CONFIG_CMD_UPL is not set CONFIG_CMD_VBE=y CONFIG_BOOTM_VXWORKS=y CONFIG_CMD_BOOTEFI=y CONFIG_CMD_BOOTEFI_BINARY=y CONFIG_CMD_BOOTEFI_BOOTMGR=y -CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y CONFIG_CMD_BOOTEFI_HELLO=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_BOOTMENU=y # CONFIG_CMD_ADTIMG is not set CONFIG_CMD_ELF=y +CONFIG_CMD_ELF_BOOTVX=y # CONFIG_CMD_ELF_FDT_SETUP is not set CONFIG_CMD_FDT=y CONFIG_CMD_GO=y @@ -826,10 +949,10 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_BKOPS_ENABLE is not set # CONFIG_CMD_MMC_REG is not set # CONFIG_CMD_MMC_SWRITE is not set +CONFIG_MMC_SPEED_MODE_SET=y # CONFIG_CMD_CLONE is not set # CONFIG_CMD_MTD is not set # CONFIG_CMD_ONENAND is not set -# CONFIG_CMD_OSD is not set CONFIG_CMD_PART=y # CONFIG_CMD_PCI is not set CONFIG_CMD_PINMUX=y @@ -843,7 +966,6 @@ CONFIG_CMD_SPI=y CONFIG_DEFAULT_SPI_BUS=0 CONFIG_DEFAULT_SPI_MODE=0x0 CONFIG_CMD_USB=y -# CONFIG_CMD_USB_SDP is not set # CONFIG_CMD_RKMTD is not set # CONFIG_CMD_WRITE is not set @@ -856,13 +978,8 @@ CONFIG_CMD_ITEST=y CONFIG_CMD_SOURCE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_XXD is not set - -# -# Android support commands -# CONFIG_CMD_NET=y CONFIG_CMD_BOOTP=y -CONFIG_CMD_DHCP=y # CONFIG_BOOTP_MAY_FAIL is not set CONFIG_BOOTP_BOOTPATH=y # CONFIG_BOOTP_VENDOREX is not set @@ -880,24 +997,25 @@ CONFIG_BOOTP_PXE=y CONFIG_BOOTP_PXE_CLIENTARCH=0x16 # CONFIG_BOOTP_PXE_DHCP_OPTION is not set CONFIG_BOOTP_VCI_STRING="U-Boot.armv8" -CONFIG_CMD_TFTPBOOT=y # CONFIG_CMD_TFTPPUT is not set # CONFIG_CMD_TFTPSRV is not set CONFIG_NET_TFTP_VARS=y # CONFIG_CMD_RARP is not set # CONFIG_CMD_NFS is not set # CONFIG_SYS_DISABLE_AUTOLOAD is not set -# CONFIG_CMD_WGET is not set -CONFIG_CMD_MII=y -CONFIG_CMD_MDIO=y -CONFIG_CMD_PING=y # CONFIG_CMD_CDP is not set # CONFIG_CMD_SNTP is not set -# CONFIG_CMD_DNS is not set # CONFIG_CMD_LINK_LOCAL is not set # CONFIG_CMD_ETHSW is not set -CONFIG_CMD_PXE=y # CONFIG_CMD_WOL is not set +CONFIG_CMD_DHCP=y +# CONFIG_CMD_DNS is not set +CONFIG_CMD_MII=y +CONFIG_CMD_MDIO=y +CONFIG_CMD_PING=y +CONFIG_CMD_TFTPBOOT=y +# CONFIG_CMD_WGET is not set +CONFIG_CMD_PXE=y # # Misc commands @@ -979,7 +1097,6 @@ CONFIG_CMD_CYCLIC=y # CONFIG_CMD_EVENT is not set CONFIG_CMD_LOG=y # CONFIG_CMD_UBI is not set -CONFIG_MMC_SPEED_MODE_SET=y # # Partition Types @@ -988,6 +1105,7 @@ CONFIG_PARTITIONS=y CONFIG_SPL_PARTITIONS=y # CONFIG_MAC_PARTITION is not set # CONFIG_SPL_MAC_PARTITION is not set +# CONFIG_TEGRA_PARTITION is not set CONFIG_DOS_PARTITION=y CONFIG_SPL_DOS_PARTITION=y CONFIG_ISO_PARTITION=y @@ -1013,9 +1131,11 @@ CONFIG_BINMAN=y CONFIG_OF_CONTROL=y CONFIG_OF_REAL=y CONFIG_SPL_OF_CONTROL=y +CONFIG_TPL_OF_CONTROL=y CONFIG_OF_LIVE=y CONFIG_OF_UPSTREAM=y # CONFIG_OF_UPSTREAM_BUILD_VENDOR is not set +# CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS is not set CONFIG_OF_SEPARATE=y # CONFIG_OF_EMBED is not set # CONFIG_OF_INITIAL_DTB_READONLY is not set @@ -1023,19 +1143,23 @@ CONFIG_OF_SEPARATE=y # CONFIG_OF_OMIT_DTB is not set CONFIG_DEVICE_TREE_INCLUDES="" CONFIG_OF_LIST="rockchip/rk3399-gru-kevin" +CONFIG_OF_OVERLAY_LIST="" # CONFIG_MULTI_DTB_FIT is not set # CONFIG_SPL_MULTI_DTB_FIT is not set CONFIG_SPL_OF_LIST="rockchip/rk3399-gru-kevin" CONFIG_OF_TAG_MIGRATE=y -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" # CONFIG_OF_DTB_PROPS_REMOVE is not set # CONFIG_SPL_OF_PLATDATA is not set CONFIG_SPL_OF_REAL=y +CONFIG_TPL_OF_REAL=y +# CONFIG_TPL_OF_PLATDATA is not set # # Environment # CONFIG_ENV_SUPPORT=y +CONFIG_ENV_CALLBACK_LIST_STATIC="" CONFIG_SAVEENV=y # CONFIG_ENV_OVERWRITE is not set # CONFIG_OVERWRITE_ETHADDR_ONCE is not set @@ -1064,17 +1188,20 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_USE_ETHPRIME is not set # CONFIG_USE_HOSTNAME is not set # CONFIG_VERSION_VARIABLE is not set + +# +# Networking +# +# CONFIG_NO_NET is not set CONFIG_NET=y +# CONFIG_NET_LWIP is not set CONFIG_ARP_TIMEOUT=5000 CONFIG_NET_RETRY_COUNT=5 # CONFIG_PROT_UDP is not set -CONFIG_BOOTDEV_ETH=y # CONFIG_BOOTP_SEND_HOSTNAME is not set -# CONFIG_NET_RANDOM_ETHADDR is not set # CONFIG_NETCONSOLE is not set # CONFIG_IP_DEFRAG is not set # CONFIG_SYS_FAULT_ECHO_LINK_DOWN is not set -CONFIG_TFTP_BLOCKSIZE=1468 # CONFIG_TFTP_PORT is not set CONFIG_TFTP_WINDOWSIZE=1 # CONFIG_TFTP_TSIZE is not set @@ -1091,6 +1218,10 @@ CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64 # CONFIG_USE_SERVERIP is not set # CONFIG_PROT_TCP is not set # CONFIG_IPV6 is not set +CONFIG_BOOTDEV_ETH=y +# CONFIG_NET_RANDOM_ETHADDR is not set +# CONFIG_WGET is not set +CONFIG_TFTP_BLOCKSIZE=1468 CONFIG_SYS_RX_ETH_BUFFER=4 # @@ -1102,6 +1233,7 @@ CONFIG_SYS_RX_ETH_BUFFER=4 # CONFIG_DM=y CONFIG_SPL_DM=y +CONFIG_TPL_DM=y # CONFIG_DM_WARN is not set # CONFIG_SPL_DM_WARN is not set # CONFIG_DM_DEBUG is not set @@ -1113,18 +1245,24 @@ CONFIG_DM_EVENT=y CONFIG_DM_STDIO=y CONFIG_DM_SEQ_ALIAS=y CONFIG_SPL_DM_SEQ_ALIAS=y +# CONFIG_TPL_DM_SEQ_ALIAS is not set CONFIG_SPL_DM_INLINE_OFNODE=y +CONFIG_TPL_DM_INLINE_OFNODE=y # CONFIG_DM_DMA is not set CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y +CONFIG_TPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_TPL_SYSCON=y # CONFIG_DEVRES is not set CONFIG_SIMPLE_BUS=y CONFIG_SPL_SIMPLE_BUS=y +# CONFIG_TPL_SIMPLE_BUS is not set # CONFIG_SIMPLE_BUS_CORRECT_RANGE is not set CONFIG_OF_TRANSLATE=y # CONFIG_SPL_OF_TRANSLATE is not set +# CONFIG_TPL_OF_TRANSLATE is not set # CONFIG_TRANSLATION_OFFSET is not set CONFIG_OFNODE_MULTI_TREE=y CONFIG_OFNODE_MULTI_TREE_MAX=4 @@ -1149,11 +1287,11 @@ CONFIG_SARADC_ROCKCHIP=y # CONFIG_BLK=y CONFIG_SPL_BLK=y +# CONFIG_TPL_BLK is not set CONFIG_BLOCK_CACHE=y # CONFIG_BLKMAP is not set # CONFIG_SPL_BLOCK_CACHE is not set # CONFIG_EFI_MEDIA is not set -# CONFIG_SPL_BLK_FS is not set # CONFIG_IDE is not set # CONFIG_LBA48 is not set # CONFIG_SYS_64BIT_LBA is not set @@ -1180,10 +1318,12 @@ CONFIG_BLOCK_CACHE=y # CONFIG_CLK=y CONFIG_SPL_CLK=y +CONFIG_TPL_CLK=y # CONFIG_SPL_CLK_CCF is not set # CONFIG_CLK_CCF is not set # CONFIG_CLK_GPIO is not set # CONFIG_SPL_CLK_GPIO is not set +# CONFIG_CLK_STUB is not set # CONFIG_CLK_CDCE9XX is not set # CONFIG_CLK_ICS8N3QV01 is not set # CONFIG_CLK_K210 is not set @@ -1193,6 +1333,7 @@ CONFIG_SPL_CLK=y # CONFIG_CLK_AT91 is not set # CONFIG_CLK_RCAR is not set # CONFIG_CLK_RCAR_CPG_LIB is not set +# CONFIG_CLK_SOPHGO_CV1800B is not set # CONFIG_CLK_SIFIVE is not set # CONFIG_CLK_TI_AM3_DPLL is not set # CONFIG_CLK_TI_CTRL is not set @@ -1262,6 +1403,7 @@ CONFIG_ARM_PSCI_FW=y # CONFIG_FWU_MDATA is not set CONFIG_GPIO=y CONFIG_SPL_DM_GPIO=y +CONFIG_TPL_DM_GPIO=y # CONFIG_GPIO_HOG is not set # CONFIG_SPL_GPIO_HOG is not set # CONFIG_DM_GPIO_LOOKUP_LABEL is not set @@ -1272,6 +1414,8 @@ CONFIG_SPL_DM_GPIO=y # CONFIG_AT91_GPIO is not set # CONFIG_ATMEL_PIO4 is not set # CONFIG_ASPEED_GPIO is not set +# CONFIG_ASPEED_SGPIO is not set +# CONFIG_ASPEED_G7_GPIO is not set # CONFIG_DA8XX_GPIO is not set # CONFIG_FXL6408_GPIO is not set # CONFIG_HIKEY_GPIO is not set @@ -1289,6 +1433,7 @@ CONFIG_SPL_DM_GPIO=y # CONFIG_MXC_GPIO is not set # CONFIG_MXS_GPIO is not set # CONFIG_NPCM_GPIO is not set +# CONFIG_NPCM_SGPIO is not set # CONFIG_CMD_PCA953X is not set # CONFIG_PCF8575_GPIO is not set CONFIG_ROCKCHIP_GPIO=y @@ -1318,6 +1463,7 @@ CONFIG_ROCKCHIP_GPIO=y CONFIG_I2C=y CONFIG_DM_I2C=y CONFIG_SPL_DM_I2C=y +# CONFIG_TPL_DM_I2C is not set CONFIG_I2C_CROS_EC_TUNNEL=y # CONFIG_I2C_CROS_EC_LDO is not set # CONFIG_I2C_SET_DEFAULT_BUS_NUM is not set @@ -1348,8 +1494,10 @@ CONFIG_I2C_MUX=y # CONFIG_I2C_MUX_GPIO is not set CONFIG_INPUT=y # CONFIG_SPL_INPUT is not set +# CONFIG_TPL_INPUT is not set CONFIG_DM_KEYBOARD=y # CONFIG_SPL_DM_KEYBOARD is not set +# CONFIG_TPL_DM_KEYBOARD is not set # CONFIG_APPLE_SPI_KEYB is not set # CONFIG_BUTTON_KEYBOARD is not set CONFIG_CROS_EC_KEYB=y @@ -1366,6 +1514,8 @@ CONFIG_CROS_EC_KEYB=y # LED Support # # CONFIG_LED is not set +# CONFIG_LED_BOOT is not set +# CONFIG_LED_ACTIVITY is not set # CONFIG_SPL_LED is not set # CONFIG_LED_STATUS is not set @@ -1386,6 +1536,7 @@ CONFIG_CROS_EC_KEYB=y # CONFIG_MISC=y CONFIG_SPL_MISC=y +CONFIG_TPL_MISC=y # CONFIG_NVMEM is not set # CONFIG_SPL_NVMEM is not set # CONFIG_ALTERA_SYSID is not set @@ -1400,9 +1551,11 @@ CONFIG_ROCKCHIP_IODOMAIN=y # CONFIG_VEXPRESS_CONFIG is not set CONFIG_CROS_EC=y # CONFIG_SPL_CROS_EC is not set +# CONFIG_TPL_CROS_EC is not set # CONFIG_CROS_EC_I2C is not set # CONFIG_CROS_EC_LPC is not set # CONFIG_SPL_CROS_EC_LPC is not set +# CONFIG_TPL_CROS_EC_LPC is not set CONFIG_CROS_EC_SPI=y # CONFIG_DS4510 is not set # CONFIG_FSL_SEC_MON is not set @@ -1440,6 +1593,7 @@ CONFIG_MMC_PWRSEQ=y # CONFIG_MMC_BROKEN_CD is not set CONFIG_DM_MMC=y CONFIG_SPL_DM_MMC=y +# CONFIG_TPL_DM_MMC is not set # CONFIG_MMC_SPI is not set # CONFIG_ARM_PL180_MMCI is not set CONFIG_MMC_QUIRKS=y @@ -1478,6 +1632,7 @@ CONFIG_MMC_SDHCI_ADMA_64BIT=y # CONFIG_MMC_SDHCI_NPCM is not set CONFIG_MMC_SDHCI_ROCKCHIP=y # CONFIG_MMC_SDHCI_S5P is not set +# CONFIG_MMC_SDHCI_SNPS is not set # CONFIG_MMC_SDHCI_STI is not set # CONFIG_MMC_SDHCI_XENON is not set # CONFIG_MMC_SDHCI_TANGIER is not set @@ -1498,7 +1653,6 @@ CONFIG_MTD=y # CONFIG_MTD_BLOCK is not set # CONFIG_SYS_MTDPARTS_RUNTIME is not set # CONFIG_FLASH_CFI_DRIVER is not set -# CONFIG_HBMC_AM654 is not set # CONFIG_SAMSUNG_ONENAND is not set # CONFIG_USE_SYS_MAX_FLASH_BANKS is not set # CONFIG_MTD_RAW_NAND is not set @@ -1508,8 +1662,6 @@ CONFIG_MTD=y # CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y -CONFIG_SF_DEFAULT_BUS=1 -CONFIG_SF_DEFAULT_CS=0 # CONFIG_BOOTDEV_SPI_FLASH is not set # CONFIG_SPI_FLASH_SFDP_SUPPORT is not set CONFIG_SPI_FLASH_SMART_HWCAPS=y @@ -1523,6 +1675,7 @@ CONFIG_SPI_FLASH_UNLOCK_ALL=y CONFIG_SPI_FLASH_GIGADEVICE=y # CONFIG_SPI_FLASH_ISSI is not set # CONFIG_SPI_FLASH_MACRONIX is not set +# CONFIG_SPI_FLASH_PUYA is not set # CONFIG_SPI_FLASH_SILICONKAISER is not set # CONFIG_SPI_FLASH_SPANSION is not set # CONFIG_SPI_FLASH_STMICRO is not set @@ -1691,6 +1844,7 @@ CONFIG_PINMUX=y # CONFIG_PINCONF is not set CONFIG_PINCONF_RECURSIVE=y CONFIG_SPL_PINCTRL=y +# CONFIG_TPL_PINCTRL is not set CONFIG_SPL_PINCTRL_FULL=y CONFIG_SPL_PINCTRL_GENERIC=y CONFIG_SPL_PINMUX=y @@ -1714,6 +1868,7 @@ CONFIG_POWER=y # CONFIG_POWER_LEGACY is not set # CONFIG_ACPI_PMC is not set # CONFIG_SPL_ACPI_PMC is not set +# CONFIG_TPL_ACPI_PMC is not set # # Power Domain Support @@ -1774,13 +1929,15 @@ CONFIG_DM_REGULATOR=y CONFIG_REGULATOR_PWM=y # CONFIG_SPL_REGULATOR_PWM is not set CONFIG_DM_REGULATOR_COMMON=y +CONFIG_SPL_DM_REGULATOR_COMMON=y CONFIG_DM_REGULATOR_FIXED=y -# CONFIG_SPL_DM_REGULATOR_FIXED is not set +CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y # CONFIG_SPL_DM_REGULATOR_GPIO is not set CONFIG_REGULATOR_RK8XX=y # CONFIG_DM_REGULATOR_PBIAS is not set # CONFIG_DM_REGULATOR_TPS62360 is not set +# CONFIG_DM_REGULATOR_TPS6287X is not set # CONFIG_DM_REGULATOR_ANATOP is not set # CONFIG_DM_REGULATOR_SCMI is not set # CONFIG_TPS6586X_POWER is not set @@ -1801,6 +1958,7 @@ CONFIG_PWM_ROCKCHIP=y # CONFIG_U_QE is not set CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y # CONFIG_STM32_SDRAM is not set # CONFIG_MPC83XX_SDRAM is not set # CONFIG_K3_DDRSS is not set @@ -1849,6 +2007,7 @@ CONFIG_RNG_ROCKCHIP=y # # CONFIG_DM_RTC is not set # CONFIG_SPL_DM_RTC is not set +# CONFIG_TPL_DM_RTC is not set # CONFIG_RTC_ENABLE_32KHZ_OUTPUT is not set # CONFIG_RTC_DS1337 is not set # CONFIG_RTC_DS1338 is not set @@ -1856,7 +2015,6 @@ CONFIG_RNG_ROCKCHIP=y # CONFIG_RTC_DS3231 is not set # CONFIG_RTC_PCF8563 is not set # CONFIG_RTC_PT7C4338 is not set -# CONFIG_RTC_PL031 is not set # CONFIG_RTC_S35392A is not set # CONFIG_RTC_MC13XXX is not set # CONFIG_RTC_MC146818 is not set @@ -1869,15 +2027,18 @@ CONFIG_REQUIRE_SERIAL_CONSOLE=y # CONFIG_SPECIFY_CONSOLE_INDEX is not set CONFIG_SERIAL_PRESENT=y CONFIG_SPL_SERIAL_PRESENT=y +CONFIG_TPL_SERIAL_PRESENT=y CONFIG_DM_SERIAL=y # CONFIG_SERIAL_RX_BUFFER is not set # CONFIG_SERIAL_PUTS is not set # CONFIG_SERIAL_SEARCH_ALL is not set # CONFIG_SERIAL_PROBE_ALL is not set CONFIG_SPL_DM_SERIAL=y +CONFIG_TPL_DM_SERIAL=y # CONFIG_VPL_DM_SERIAL is not set CONFIG_DEBUG_UART_NS16550=y CONFIG_SPL_DEBUG_UART_BASE=0xff1a0000 +CONFIG_TPL_DEBUG_UART_BASE=0xff1a0000 CONFIG_DEBUG_UART_SHIFT=2 # CONFIG_DEBUG_UART_ANNOUNCE is not set # CONFIG_DEBUG_UART_SKIP_INIT is not set @@ -1935,27 +2096,18 @@ CONFIG_SPI_MEM=y # CONFIG_ALTERA_SPI is not set # CONFIG_APPLE_SPI is not set # CONFIG_ATCSPI200_SPI is not set -# CONFIG_ATMEL_SPI is not set -# CONFIG_BCMSTB_SPI is not set # CONFIG_CORTINA_SFLASH is not set # CONFIG_CADENCE_QSPI is not set -# CONFIG_CF_SPI is not set # CONFIG_CV1800B_SPIF is not set # CONFIG_DESIGNWARE_SPI is not set -# CONFIG_EXYNOS_SPI is not set -# CONFIG_FSL_DSPI is not set # CONFIG_FSL_QSPI is not set # CONFIG_GXP_SPI is not set -# CONFIG_ICH_SPI is not set # CONFIG_IPROC_QSPI is not set -# CONFIG_KIRKWOOD_SPI is not set # CONFIG_MICROCHIP_COREQSPI is not set -# CONFIG_MPC8XXX_SPI is not set # CONFIG_MTK_SNOR is not set # CONFIG_MTK_SNFI_SPI is not set # CONFIG_MTK_SPIM is not set # CONFIG_MVEBU_A3700_SPI is not set -# CONFIG_MXS_SPI is not set # CONFIG_SPI_MXIC is not set # CONFIG_NPCM_FIU_SPI is not set # CONFIG_NPCM_PSPI is not set @@ -1969,17 +2121,11 @@ CONFIG_ROCKCHIP_SPI=y # CONFIG_SOFT_SPI is not set # CONFIG_SPI_SN_F_OSPI is not set # CONFIG_SPI_SUNXI is not set -# CONFIG_TEGRA114_SPI is not set -# CONFIG_TEGRA20_SFLASH is not set -# CONFIG_TEGRA20_SLINK is not set -# CONFIG_TEGRA210_QSPI is not set -# CONFIG_TI_QSPI is not set # CONFIG_XILINX_SPI is not set # CONFIG_ZYNQ_SPI is not set # CONFIG_ZYNQ_QSPI is not set # CONFIG_ZYNQMP_GQSPI is not set -# CONFIG_SH_QSPI is not set -# CONFIG_MXC_SPI is not set +# CONFIG_SPI_STACKED_PARALLEL is not set # # SPMI support @@ -1992,6 +2138,7 @@ CONFIG_ROCKCHIP_SPI=y # CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y +CONFIG_TPL_SYSRESET=y CONFIG_SYSRESET_CMD_RESET=y CONFIG_SYSRESET_CMD_POWEROFF=y # CONFIG_SYSRESET_CV1800B is not set @@ -2027,6 +2174,7 @@ CONFIG_USB_HOST=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_DWC3 is not set # CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set +# CONFIG_USB_XHCI_GENERIC is not set # CONFIG_USB_XHCI_FSL is not set # CONFIG_USB_XHCI_BRCM is not set CONFIG_USB_EHCI_HCD=y @@ -2055,6 +2203,7 @@ CONFIG_USB_DWC3_GENERIC=y # CONFIG_SPL_USB_DWC3_GENERIC is not set # CONFIG_USB_DWC3_AM62 is not set # CONFIG_USB_DWC3_LAYERSCAPE is not set +# CONFIG_USB_DWC3_STI is not set # # PHY Subsystem @@ -2079,6 +2228,7 @@ CONFIG_USB_DWC3_GENERIC=y # # CONFIG_TWL4030_USB is not set # CONFIG_ROCKCHIP_USB2_PHY is not set +# CONFIG_TYPEC_TCPM is not set # # ULPI drivers @@ -2159,6 +2309,7 @@ CONFIG_SIMPLE_PANEL=y # CONFIG_VIDEO_LCD_RENESAS_R61307 is not set # CONFIG_VIDEO_LCD_RENESAS_R69328 is not set # CONFIG_VIDEO_LCD_SAMSUNG_LTL106HL02 is not set +# CONFIG_VIDEO_LCD_SHARP_LQ101R1SX01 is not set # CONFIG_VIDEO_LCD_SSD2828 is not set # CONFIG_VIDEO_LCD_TDO_TL070WSH30 is not set # CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set @@ -2248,7 +2399,6 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536 # CONFIG_UBIFS_SILENCE_MSG is not set # CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set # CONFIG_FS_CRAMFS is not set -# CONFIG_YAFFS2 is not set # CONFIG_FS_SQUASHFS is not set # CONFIG_FS_EROFS is not set @@ -2260,6 +2410,7 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536 # CONFIG_PHYSMEM is not set # CONFIG_BCH is not set # CONFIG_BINMAN_FDT is not set +CONFIG_BINMAN_DTB="" # CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set CONFIG_CHARSET=y # CONFIG_DYNAMIC_CRC_TABLE is not set @@ -2270,12 +2421,16 @@ CONFIG_SPL_LIB_UUID=y # CONFIG_SPL_SEMIHOSTING is not set CONFIG_PRINTF=y CONFIG_SPL_PRINTF=y +CONFIG_TPL_PRINTF=y CONFIG_SPRINTF=y CONFIG_SPL_SPRINTF=y +CONFIG_TPL_SPRINTF=y CONFIG_STRTO=y CONFIG_SPL_STRTO=y +CONFIG_TPL_STRTO=y CONFIG_SYS_HZ=1000 CONFIG_SPL_USE_TINY_PRINTF=y +CONFIG_TPL_USE_TINY_PRINTF=y CONFIG_PANIC_HANG=y CONFIG_REGEX=y CONFIG_LIB_RAND=y @@ -2284,19 +2439,48 @@ CONFIG_SUPPORT_ACPI=y # CONFIG_ACPI is not set # CONFIG_SPL_ACPI is not set # CONFIG_SPL_TINY_MEMSET is not set +CONFIG_TPL_TINY_MEMSET=y # CONFIG_BITREVERSE is not set # CONFIG_TRACE is not set # CONFIG_CIRCBUF is not set CONFIG_CMD_DHRYSTONE=y # +# Alternative crypto libraries +# +CONFIG_LEGACY_HASHING_AND_CRYPTO=y +# CONFIG_MBEDTLS_LIB is not set +CONFIG_LEGACY_HASHING=y +CONFIG_SHA1_LEGACY=y +CONFIG_SHA256_LEGACY=y +CONFIG_MD5_LEGACY=y +CONFIG_LEGACY_CRYPTO=y +CONFIG_SPL_LEGACY_HASHING_AND_CRYPTO=y +# CONFIG_SPL_MBEDTLS_LIB is not set +CONFIG_SPL_LEGACY_HASHING=y +CONFIG_SPL_SHA1_LEGACY=y +CONFIG_SPL_SHA256_LEGACY=y +CONFIG_SPL_LEGACY_CRYPTO=y +CONFIG_TPL_LEGACY_HASHING_AND_CRYPTO=y +# CONFIG_TPL_MBEDTLS_LIB is not set +CONFIG_TPL_LEGACY_HASHING=y + +# # Security support # # CONFIG_AES is not set # CONFIG_ECDSA is not set -# CONFIG_RSA is not set +CONFIG_RSA=y +CONFIG_SPL_RSA=y +CONFIG_SPL_RSA_VERIFY=y +CONFIG_RSA_VERIFY=y +# CONFIG_RSA_VERIFY_WITH_PKEY is not set +# CONFIG_SPL_RSA_VERIFY_WITH_PKEY is not set +CONFIG_RSA_SOFTWARE_EXP=y +# CONFIG_ASYMMETRIC_KEY_TYPE is not set # CONFIG_TPM is not set # CONFIG_SPL_TPM is not set +# CONFIG_TPL_TPM is not set # # Android Verified Boot @@ -2320,7 +2504,9 @@ CONFIG_SPL_SHA256=y CONFIG_MD5=y # CONFIG_SPL_MD5 is not set CONFIG_CRC8=y -# CONFIG_SPL_CRC8 is not set +CONFIG_SPL_CRC8=y +# CONFIG_TPL_CRC8 is not set +CONFIG_CRC16=y # CONFIG_SPL_CRC16 is not set CONFIG_CRC32=y @@ -2337,10 +2523,13 @@ CONFIG_ZLIB=y # CONFIG_ZSTD is not set # CONFIG_SPL_BZIP2 is not set # CONFIG_SPL_LZ4 is not set +# CONFIG_TPL_LZ4 is not set # CONFIG_SPL_LZMA is not set +# CONFIG_TPL_LZMA is not set CONFIG_VPL_LZMA=y # CONFIG_SPL_LZO is not set # CONFIG_SPL_GZIP is not set +# CONFIG_TPL_GZIP is not set # CONFIG_SPL_ZSTD is not set CONFIG_ERRNO_STR=y # CONFIG_HEXDUMP is not set @@ -2349,49 +2538,26 @@ CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_ASSUME_MASK=0x0 CONFIG_SYS_FDT_PAD=0x3000 CONFIG_SPL_OF_LIBFDT=y -CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff +CONFIG_TPL_OF_LIBFDT=y +CONFIG_TPL_OF_LIBFDT_ASSUME_MASK=0xff # # System tables # +# CONFIG_BLOBLIST_TABLES is not set CONFIG_GENERATE_SMBIOS_TABLE=y +# CONFIG_GENERATE_SMBIOS_TABLE_VERBOSE is not set # CONFIG_LIB_RATIONAL is not set # CONFIG_SPL_LIB_RATIONAL is not set CONFIG_SMBIOS=y # CONFIG_SMBIOS_PARSER is not set -CONFIG_EFI_LOADER=y -CONFIG_EFI_BINARY_EXEC=y -CONFIG_EFI_BOOTMGR=y -# CONFIG_EFI_VARIABLE_FILE_STORE is not set -CONFIG_EFI_VARIABLE_NO_STORE=y -# CONFIG_EFI_VARIABLES_PRESEED is not set -CONFIG_EFI_VAR_BUF_SIZE=131072 -# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set -# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set -# CONFIG_EFI_CAPSULE_ON_DISK is not set -CONFIG_EFI_CAPSULE_MAX=15 -CONFIG_EFI_DEVICE_PATH_TO_TEXT=y -CONFIG_EFI_DEVICE_PATH_UTIL=y -CONFIG_EFI_DT_FIXUP=y -CONFIG_EFI_LOADER_HII=y -CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y -CONFIG_EFI_UNICODE_CAPITALIZATION=y -# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set -CONFIG_EFI_PLATFORM_LANG_CODES="en-US" -CONFIG_EFI_HAVE_RUNTIME_RESET=y -CONFIG_EFI_RNG_PROTOCOL=y -CONFIG_EFI_LOAD_FILE2_INITRD=y -CONFIG_EFI_ECPT=y -CONFIG_EFI_EBBR_2_1_CONFORMANCE=y -# CONFIG_EFI_HTTP_BOOT is not set # CONFIG_OPTEE_LIB is not set # CONFIG_OPTEE_IMAGE is not set # CONFIG_BOOTM_OPTEE is not set # CONFIG_TEST_FDTDEC is not set CONFIG_LIB_ELF=y CONFIG_LMB=y -CONFIG_LMB_USE_MAX_REGIONS=y -CONFIG_LMB_MAX_REGIONS=16 +# CONFIG_LMB_ARCH_MEM_MAP is not set # CONFIG_PHANDLE_CHECK_SEQ is not set # @@ -2405,6 +2571,7 @@ CONFIG_LMB_MAX_REGIONS=16 # Tools options # CONFIG_MKIMAGE_DTC_PATH="dtc" +CONFIG_TOOLS_CRC16=y CONFIG_TOOLS_CRC32=y CONFIG_TOOLS_LIBCRYPTO=y CONFIG_TOOLS_KWBIMAGE=y diff --git a/config/u-boot/qemu_arm64_12mb/config/default b/config/u-boot/qemu_arm64_12mb/config/default index 4824cc79..2cd0b94c 100644 --- a/config/u-boot/qemu_arm64_12mb/config/default +++ b/config/u-boot/qemu_arm64_12mb/config/default @@ -1,12 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# U-Boot 2024.10 Configuration +# U-Boot 2025.04 Configuration # # -# Compiler: gcc (Debian 12.2.0-14) 12.2.0 +# Compiler: gcc (Debian 14.2.0-19) 14.2.0 # CONFIG_CREATE_ARCH_SYMLINK=y +CONFIG_HAVE_SETJMP=y CONFIG_SUPPORT_LITTLE_ENDIAN=y CONFIG_SYS_CACHE_SHIFT_6=y CONFIG_64BIT=y @@ -46,6 +47,7 @@ CONFIG_ARM64_CRC32=y CONFIG_COUNTER_FREQUENCY=0 CONFIG_POSITION_INDEPENDENT=y # CONFIG_INIT_SP_RELATIVE is not set +# CONFIG_DRIVER_GICV2 is not set # CONFIG_GIC_V3_ITS is not set # CONFIG_GICV3_SUPPORT_GIC600 is not set CONFIG_STATIC_RELA=y @@ -90,6 +92,7 @@ CONFIG_ARM64_SUPPORT_AARCH32=y # CONFIG_ARCH_OMAP2PLUS is not set # CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MEDIATEK is not set +# CONFIG_ARCH_MMP is not set # CONFIG_ARCH_LPC32XX is not set # CONFIG_ARCH_IMX8 is not set # CONFIG_ARCH_IMX8M is not set @@ -173,10 +176,10 @@ CONFIG_ARCH_QEMU=y # CONFIG_TARGET_PRESIDIO_ASIC is not set # CONFIG_TARGET_XENGUEST_ARM64 is not set # CONFIG_ARCH_GXP is not set -# CONFIG_STATIC_MACH_TYPE is not set CONFIG_TEXT_BASE=0x50000000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_BLOBLIST_SIZE_RELOC=0x2000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SOURCE_FILE="" CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y @@ -184,6 +187,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000 CONFIG_ENV_SIZE=0x40000 # CONFIG_DM_GPIO is not set CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64" +CONFIG_DDR_SI_TEST=y CONFIG_BOARD_SPECIFIC_OPTIONS=y # CONFIG_OF_LIBFDT_OVERLAY is not set CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000 @@ -191,6 +195,9 @@ CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000 CONFIG_SYS_MONITOR_LEN=0 # CONFIG_TARGET_QEMU_ARM_32BIT is not set CONFIG_TARGET_QEMU_ARM_64BIT=y +# CONFIG_TARGET_QEMU_ARM_SBSA is not set +CONFIG_SYS_BOOTM_LEN=0x4000000 +CONFIG_SYS_LOAD_ADDR=0x40200000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ERR_PTR_OFFSET=0x0 CONFIG_PRE_CON_BUF_ADDR=0x40100000 @@ -217,15 +224,7 @@ CONFIG_PSCI_RESET=y CONFIG_ARMV8_CRYPTO=y CONFIG_ARMV8_CE_SHA1=y CONFIG_ARMV8_CE_SHA256=y -# CONFIG_CMD_DEKBLOB is not set -# CONFIG_IMX_CAAM_DEK_ENCAP is not set -# CONFIG_IMX_OPTEE_DEK_ENCAP is not set -# CONFIG_IMX_SECO_DEK_ENCAP is not set -# CONFIG_IMX_ELE_DEK_ENCAP is not set -# CONFIG_CMD_HDMIDETECT is not set -CONFIG_IMX_DCD_ADDR=0x00910000 CONFIG_SYS_MEM_TOP_HIDE=0x0 -CONFIG_SYS_LOAD_ADDR=0x40200000 CONFIG_MTDPARTS_NOR0="64m(u-boot)" CONFIG_MTDPARTS_NOR1="64m(u-boot-env)" @@ -253,7 +252,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set @@ -279,8 +278,6 @@ CONFIG_FDT_64BIT=y # CONFIG_SYS_CUSTOM_LDSCRIPT is not set CONFIG_PLATFORM_ELFENTRY="_start" CONFIG_STACK_SIZE=0x1000000 -CONFIG_SYS_SRAM_BASE=0x0 -CONFIG_SYS_SRAM_SIZE=0x0 # CONFIG_MP is not set CONFIG_HAVE_TEXT_BASE=y # CONFIG_HAVE_SYS_UBOOT_START is not set @@ -295,6 +292,69 @@ CONFIG_SYS_MONITOR_BASE=0x50000000 # # +# UEFI Support +# +CONFIG_EFI_LOADER=y +CONFIG_EFI_BINARY_EXEC=y +# CONFIG_EFI_SECURE_BOOT is not set + +# +# UEFI services +# +CONFIG_EFI_GET_TIME=y +CONFIG_EFI_SET_TIME=y +CONFIG_EFI_HAVE_RUNTIME_RESET=y + +# +# UEFI Variables +# +CONFIG_EFI_VARIABLE_FILE_STORE=y +# CONFIG_EFI_RT_VOLATILE_STORE is not set +# CONFIG_EFI_VARIABLE_NO_STORE is not set +# CONFIG_EFI_VARIABLES_PRESEED is not set +CONFIG_EFI_VAR_BUF_SIZE=131072 +CONFIG_EFI_PLATFORM_LANG_CODES="en-US" + +# +# Capsule support +# +# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set +# CONFIG_EFI_CAPSULE_ON_DISK is not set +CONFIG_EFI_CAPSULE_MAX=15 + +# +# UEFI protocol support +# +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_DEVICE_PATH_UTIL=y +CONFIG_EFI_DT_FIXUP=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_RNG_PROTOCOL=y +CONFIG_EFI_TCG2_PROTOCOL=y +# CONFIG_EFI_TCG2_PROTOCOL_MEASURE_DTB is not set +CONFIG_EFI_LOAD_FILE2_INITRD=y +CONFIG_EFI_IP4_CONFIG2_PROTOCOL=y +CONFIG_EFI_HTTP_PROTOCOL=y + +# +# Misc options +# +# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set +CONFIG_EFI_ECPT=y +CONFIG_EFI_EBBR_2_1_CONFORMANCE=y +# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set + +# +# EFI bootmanager +# +CONFIG_EFI_BOOTMGR=y +CONFIG_EFI_HTTP_BOOT=y +CONFIG_BOOTEFI_HELLO_COMPILE=y +CONFIG_BOOTEFI_TESTAPP_COMPILE=y + +# # Boot images # # CONFIG_ANDROID_BOOT_IMAGE is not set @@ -318,6 +378,7 @@ CONFIG_BOOTSTD=y CONFIG_BOOTSTD_FULL=y CONFIG_BOOTSTD_DEFAULTS=y CONFIG_BOOTSTD_BOOTCOMMAND=y +CONFIG_BOOTSTD_MENU=y CONFIG_BOOTMETH_GLOBAL=y # CONFIG_BOOTMETH_ANDROID is not set # CONFIG_BOOTMETH_CROS is not set @@ -330,12 +391,13 @@ CONFIG_BOOTMETH_VBE=y CONFIG_BOOTMETH_DISTRO=y CONFIG_BOOTMETH_VBE_REQUEST=y CONFIG_BOOTMETH_VBE_SIMPLE=y +# CONFIG_BOOTMETH_VBE_ABREC is not set CONFIG_BOOTMETH_VBE_SIMPLE_OS=y CONFIG_EXPO=y CONFIG_BOOTMETH_SCRIPT=y +# CONFIG_UPL is not set CONFIG_LEGACY_IMAGE_FORMAT=y # CONFIG_MEASURED_BOOT is not set -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_CHROMEOS is not set # CONFIG_CHROMEOS_VBOOT is not set @@ -464,6 +526,7 @@ CONFIG_PCI_INIT_R=y # Security support # CONFIG_HASH=y +# CONFIG_HASH_CRC8 is not set # CONFIG_STACKPROTECTOR is not set # CONFIG_BOARD_RNG_SEED is not set @@ -480,7 +543,10 @@ CONFIG_UPDATE_LOAD_ADDR=0x100000 # # Blob list # -# CONFIG_BLOBLIST is not set +CONFIG_BLOBLIST=y +# CONFIG_BLOBLIST_FIXED is not set +CONFIG_BLOBLIST_ALLOC=y +CONFIG_BLOBLIST_SIZE=0x400 CONFIG_IMAGE_SIGN_INFO=y CONFIG_CMDLINE=y CONFIG_HUSH_PARSER=y @@ -510,6 +576,7 @@ CONFIG_CMD_BDI=y # CONFIG_CMD_BDINFO_EXTRA is not set # CONFIG_CMD_CONFIG is not set CONFIG_CMD_CONSOLE=y +# CONFIG_CMD_UFETCH is not set # CONFIG_CMD_HISTORY is not set # CONFIG_CMD_LICENSE is not set # CONFIG_CMD_PMC is not set @@ -523,8 +590,9 @@ CONFIG_CMD_BOOTM=y CONFIG_CMD_BOOTDEV=y CONFIG_CMD_BOOTFLOW=y CONFIG_CMD_BOOTFLOW_FULL=y -CONFIG_CMD_BOOTFLOW_BOOTDELAY=8 +CONFIG_CMD_BOOTFLOW_BOOTDELAY=30 CONFIG_CMD_BOOTMETH=y +CONFIG_CMD_BOOTSTD=y CONFIG_BOOTM_EFI=y CONFIG_BOOTM_ELF=y CONFIG_CMD_BOOTZ=y @@ -535,17 +603,18 @@ CONFIG_BOOTM_NETBSD=y # CONFIG_BOOTM_OSE is not set CONFIG_BOOTM_PLAN9=y CONFIG_BOOTM_RTEMS=y +# CONFIG_CMD_UPL is not set CONFIG_CMD_VBE=y CONFIG_BOOTM_VXWORKS=y CONFIG_CMD_BOOTEFI=y CONFIG_CMD_BOOTEFI_BINARY=y CONFIG_CMD_BOOTEFI_BOOTMGR=y -CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y CONFIG_CMD_BOOTEFI_HELLO=y CONFIG_CMD_BOOTEFI_SELFTEST=y # CONFIG_CMD_BOOTMENU is not set # CONFIG_CMD_ADTIMG is not set CONFIG_CMD_ELF=y +CONFIG_CMD_ELF_BOOTVX=y # CONFIG_CMD_ELF_FDT_SETUP is not set CONFIG_CMD_FDT=y CONFIG_CMD_GO=y @@ -578,6 +647,7 @@ CONFIG_CMD_NVEDIT_EFI=y # Memory commands # # CONFIG_CMD_BINOP is not set +CONFIG_CMD_BLOBLIST=y CONFIG_CMD_CRC32=y # CONFIG_CRC32_VERIFY is not set # CONFIG_LOOPW is not set @@ -605,7 +675,6 @@ CONFIG_CMD_UNZIP=y # CONFIG_CMD_ARMFLASH is not set # CONFIG_CMD_BCB is not set # CONFIG_CMD_BIND is not set -# CONFIG_CMD_CLK is not set # CONFIG_CMD_DEMO is not set CONFIG_CMD_DFU=y CONFIG_CMD_DM=y @@ -631,7 +700,6 @@ CONFIG_CMD_MTD=y # CONFIG_CMD_MTD_OTP is not set CONFIG_CMD_NVME=y # CONFIG_CMD_ONENAND is not set -# CONFIG_CMD_OSD is not set CONFIG_CMD_PART=y CONFIG_CMD_PCI=y # CONFIG_CMD_PCI_MPS is not set @@ -641,7 +709,6 @@ CONFIG_CMD_POWEROFF=y CONFIG_CMD_SCSI=y # CONFIG_CMD_SDRAM is not set CONFIG_CMD_USB=y -# CONFIG_CMD_USB_SDP is not set # CONFIG_CMD_RKMTD is not set CONFIG_CMD_VIRTIO=y # CONFIG_CMD_WRITE is not set @@ -656,13 +723,8 @@ CONFIG_CMD_SOURCE=y CONFIG_CMD_SETEXPR=y # CONFIG_CMD_SETEXPR_FMT is not set # CONFIG_CMD_XXD is not set - -# -# Android support commands -# CONFIG_CMD_NET=y CONFIG_CMD_BOOTP=y -CONFIG_CMD_DHCP=y # CONFIG_BOOTP_MAY_FAIL is not set CONFIG_BOOTP_BOOTPATH=y # CONFIG_BOOTP_VENDOREX is not set @@ -680,23 +742,24 @@ CONFIG_BOOTP_PXE=y CONFIG_BOOTP_PXE_CLIENTARCH=0x16 # CONFIG_BOOTP_PXE_DHCP_OPTION is not set CONFIG_BOOTP_VCI_STRING="U-Boot.armv8" -CONFIG_CMD_TFTPBOOT=y # CONFIG_CMD_TFTPPUT is not set # CONFIG_CMD_TFTPSRV is not set CONFIG_NET_TFTP_VARS=y # CONFIG_CMD_RARP is not set # CONFIG_CMD_NFS is not set # CONFIG_SYS_DISABLE_AUTOLOAD is not set -CONFIG_CMD_WGET=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y # CONFIG_CMD_CDP is not set # CONFIG_CMD_SNTP is not set -CONFIG_CMD_DNS=y # CONFIG_CMD_LINK_LOCAL is not set # CONFIG_CMD_ETHSW is not set -CONFIG_CMD_PXE=y # CONFIG_CMD_WOL is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_DNS=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_TFTPBOOT=y +CONFIG_CMD_WGET=y +CONFIG_CMD_PXE=y # # Misc commands @@ -787,6 +850,7 @@ CONFIG_CMD_CYCLIC=y # CONFIG_PARTITIONS=y # CONFIG_MAC_PARTITION is not set +# CONFIG_TEGRA_PARTITION is not set CONFIG_DOS_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_AMIGA_PARTITION is not set @@ -812,6 +876,7 @@ CONFIG_OF_HAS_PRIOR_STAGE=y CONFIG_OF_OMIT_DTB=y CONFIG_DEVICE_TREE_INCLUDES="" CONFIG_OF_LIST="qemu-arm64" +CONFIG_OF_OVERLAY_LIST="" # CONFIG_MULTI_DTB_FIT is not set CONFIG_OF_TAG_MIGRATE=y # CONFIG_OF_DTB_PROPS_REMOVE is not set @@ -820,6 +885,7 @@ CONFIG_OF_TAG_MIGRATE=y # Environment # CONFIG_ENV_SUPPORT=y +CONFIG_ENV_CALLBACK_LIST_STATIC="" CONFIG_SAVEENV=y # CONFIG_ENV_OVERWRITE is not set # CONFIG_OVERWRITE_ETHADDR_ONCE is not set @@ -846,17 +912,20 @@ CONFIG_ENV_IS_NOWHERE=y # CONFIG_USE_ETHPRIME is not set # CONFIG_USE_HOSTNAME is not set # CONFIG_VERSION_VARIABLE is not set + +# +# Networking +# +# CONFIG_NO_NET is not set CONFIG_NET=y +# CONFIG_NET_LWIP is not set CONFIG_ARP_TIMEOUT=5000 CONFIG_NET_RETRY_COUNT=5 # CONFIG_PROT_UDP is not set -CONFIG_BOOTDEV_ETH=y # CONFIG_BOOTP_SEND_HOSTNAME is not set -# CONFIG_NET_RANDOM_ETHADDR is not set # CONFIG_NETCONSOLE is not set # CONFIG_IP_DEFRAG is not set # CONFIG_SYS_FAULT_ECHO_LINK_DOWN is not set -CONFIG_TFTP_BLOCKSIZE=1468 # CONFIG_TFTP_PORT is not set CONFIG_TFTP_WINDOWSIZE=1 # CONFIG_TFTP_TSIZE is not set @@ -874,6 +943,10 @@ CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64 CONFIG_PROT_TCP=y # CONFIG_PROT_TCP_SACK is not set # CONFIG_IPV6 is not set +CONFIG_BOOTDEV_ETH=y +# CONFIG_NET_RANDOM_ETHADDR is not set +CONFIG_WGET=y +CONFIG_TFTP_BLOCKSIZE=1468 CONFIG_SYS_RX_ETH_BUFFER=4 # @@ -913,6 +986,7 @@ CONFIG_AHCI_PCI=y # CONFIG_DWC_AHCI is not set # CONFIG_DWC_AHSATA is not set # CONFIG_MTK_AHCI is not set +# CONFIG_AHCI_GENERIC is not set # CONFIG_SUNXI_AHCI is not set # CONFIG_AXI is not set @@ -984,6 +1058,7 @@ CONFIG_DFU_TFTP=y CONFIG_DFU_MTD=y CONFIG_DFU_RAM=y # CONFIG_DFU_VIRT is not set +# CONFIG_DFU_SCSI is not set CONFIG_SET_DFU_ALT_INFO=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x800000 CONFIG_SYS_DFU_MAX_FILE_SIZE=0x800000 @@ -1027,6 +1102,8 @@ CONFIG_ARM_PSCI_FW=y CONFIG_GPIO=y # CONFIG_AT91_GPIO is not set # CONFIG_ASPEED_GPIO is not set +# CONFIG_ASPEED_SGPIO is not set +# CONFIG_ASPEED_G7_GPIO is not set # CONFIG_DA8XX_GPIO is not set # CONFIG_INTEL_BROADWELL_GPIO is not set # CONFIG_IMX_RGPIO2P is not set @@ -1075,6 +1152,8 @@ CONFIG_DM_KEYBOARD=y # LED Support # # CONFIG_LED is not set +# CONFIG_LED_BOOT is not set +# CONFIG_LED_ACTIVITY is not set # CONFIG_LED_STATUS is not set # @@ -1110,7 +1189,6 @@ CONFIG_DM_KEYBOARD=y # CONFIG_WINBOND_W83627 is not set CONFIG_QFW=y CONFIG_QFW_MMIO=y -CONFIG_QFW_SMBIOS=y # CONFIG_FS_LOADER is not set # @@ -1118,7 +1196,6 @@ CONFIG_QFW_SMBIOS=y # # CONFIG_MMC is not set # CONFIG_MMC_BROKEN_CD is not set -# CONFIG_DM_MMC is not set # CONFIG_FSL_ESDHC is not set # CONFIG_FSL_ESDHC_IMX is not set @@ -1251,6 +1328,7 @@ CONFIG_PCI_ENHANCED_ALLOCATION=y CONFIG_PCIE_ECAM_GENERIC=y # CONFIG_PCIE_ECAM_SYNQUACER is not set # CONFIG_PCI_FTPCI100 is not set +# CONFIG_PCIE_CDNS_TI is not set # CONFIG_PCI_PHYTIUM is not set # CONFIG_PCIE_FSL is not set # CONFIG_PCI_MPC85XX is not set @@ -1426,7 +1504,12 @@ CONFIG_PL01X_SERIAL=y # SPMI support # # CONFIG_SPMI is not set -# CONFIG_SYSINFO is not set +CONFIG_SYSINFO=y +# CONFIG_SYSINFO_EXTRA is not set +# CONFIG_SYSINFO_GAZERBEAM is not set +# CONFIG_SYSINFO_SANDBOX is not set +CONFIG_SYSINFO_SMBIOS=y +# CONFIG_SYSINFO_GPIO is not set # # System reset device drivers @@ -1459,6 +1542,7 @@ CONFIG_TPM_V1=y # CONFIG_TPM_LIST_RESOURCES is not set CONFIG_TPM_V2=y CONFIG_TPM2_MMIO=y +CONFIG_TPM2_EVENT_LOG_SIZE=65536 CONFIG_USB=y CONFIG_DM_USB=y # CONFIG_DM_USB_GADGET is not set @@ -1470,6 +1554,7 @@ CONFIG_USB_HOST=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_DWC3 is not set # CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set +# CONFIG_USB_XHCI_GENERIC is not set CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_FSL is not set # CONFIG_USB_XHCI_BRCM is not set @@ -1504,6 +1589,7 @@ CONFIG_USB_EHCI_PCI=y # # CONFIG_TWL4030_USB is not set # CONFIG_ROCKCHIP_USB2_PHY is not set +# CONFIG_TYPEC_TCPM is not set # # ULPI drivers @@ -1578,6 +1664,7 @@ CONFIG_VIDEO_BOCHS_SIZE_Y=1024 # CONFIG_VIDEO_LCD_RENESAS_R61307 is not set # CONFIG_VIDEO_LCD_RENESAS_R69328 is not set # CONFIG_VIDEO_LCD_SAMSUNG_LTL106HL02 is not set +# CONFIG_VIDEO_LCD_SHARP_LQ101R1SX01 is not set # CONFIG_VIDEO_LCD_SSD2828 is not set # CONFIG_VIDEO_LCD_TDO_TL070WSH30 is not set # CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set @@ -1656,7 +1743,6 @@ CONFIG_FS_FAT_MAX_CLUSTSIZE=65536 # CONFIG_UBIFS_SILENCE_MSG is not set # CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set # CONFIG_FS_CRAMFS is not set -# CONFIG_YAFFS2 is not set # CONFIG_FS_SQUASHFS is not set # CONFIG_FS_EROFS is not set @@ -1690,6 +1776,22 @@ CONFIG_SUPPORT_ACPI=y # CONFIG_CMD_DHRYSTONE is not set # +# Alternative crypto libraries +# +# CONFIG_LEGACY_HASHING_AND_CRYPTO is not set +CONFIG_MBEDTLS_LIB=y +CONFIG_MBEDTLS_LIB_CRYPTO=y +CONFIG_SHA1_MBEDTLS=y +CONFIG_SHA256_MBEDTLS=y +CONFIG_SHA256_SMALLER=y +CONFIG_SHA512_MBEDTLS=y +CONFIG_SHA512_SMALLER=y +CONFIG_SHA384_MBEDTLS=y +CONFIG_MD5_MBEDTLS=y +# CONFIG_HKDF_MBEDTLS is not set +CONFIG_MBEDTLS_LIB_X509=y + +# # Security support # # CONFIG_AES is not set @@ -1700,6 +1802,7 @@ CONFIG_RSA_VERIFY=y CONFIG_RSA_SOFTWARE_EXP=y # CONFIG_ASYMMETRIC_KEY_TYPE is not set CONFIG_TPM=y +CONFIG_TPM_PCR_ALLOCATE=y # # Android Verified Boot @@ -1716,6 +1819,7 @@ CONFIG_SHA384=y # CONFIG_SHA_HW_ACCEL is not set CONFIG_MD5=y CONFIG_CRC8=y +CONFIG_CRC16=y CONFIG_CRC32=y # @@ -1731,6 +1835,7 @@ CONFIG_ZLIB=y # CONFIG_ZSTD is not set CONFIG_VPL_LZMA=y # CONFIG_SPL_GZIP is not set +# CONFIG_TPL_GZIP is not set # CONFIG_ERRNO_STR is not set CONFIG_HEXDUMP=y # CONFIG_GETOPT is not set @@ -1741,42 +1846,12 @@ CONFIG_SYS_FDT_PAD=0x3000 # # System tables # +# CONFIG_BLOBLIST_TABLES is not set CONFIG_GENERATE_SMBIOS_TABLE=y +CONFIG_GENERATE_SMBIOS_TABLE_VERBOSE=y # CONFIG_LIB_RATIONAL is not set CONFIG_SMBIOS=y CONFIG_SMBIOS_PARSER=y -CONFIG_EFI_LOADER=y -CONFIG_EFI_BINARY_EXEC=y -CONFIG_EFI_BOOTMGR=y -CONFIG_EFI_VARIABLE_FILE_STORE=y -# CONFIG_EFI_RT_VOLATILE_STORE is not set -# CONFIG_EFI_VARIABLE_NO_STORE is not set -# CONFIG_EFI_VARIABLES_PRESEED is not set -CONFIG_EFI_VAR_BUF_SIZE=131072 -CONFIG_EFI_GET_TIME=y -CONFIG_EFI_SET_TIME=y -# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set -# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set -# CONFIG_EFI_CAPSULE_ON_DISK is not set -CONFIG_EFI_CAPSULE_MAX=15 -CONFIG_EFI_DEVICE_PATH_TO_TEXT=y -CONFIG_EFI_DEVICE_PATH_UTIL=y -CONFIG_EFI_DT_FIXUP=y -CONFIG_EFI_LOADER_HII=y -CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y -CONFIG_EFI_UNICODE_CAPITALIZATION=y -# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set -CONFIG_EFI_PLATFORM_LANG_CODES="en-US" -CONFIG_EFI_HAVE_RUNTIME_RESET=y -CONFIG_EFI_RNG_PROTOCOL=y -CONFIG_EFI_TCG2_PROTOCOL=y -CONFIG_EFI_TCG2_PROTOCOL_EVENTLOG_SIZE=65536 -# CONFIG_EFI_TCG2_PROTOCOL_MEASURE_DTB is not set -CONFIG_EFI_LOAD_FILE2_INITRD=y -# CONFIG_EFI_SECURE_BOOT is not set -CONFIG_EFI_ECPT=y -CONFIG_EFI_EBBR_2_1_CONFORMANCE=y -CONFIG_EFI_HTTP_BOOT=y # CONFIG_OPTEE_LIB is not set # CONFIG_OPTEE_IMAGE is not set # CONFIG_BOOTM_OPTEE is not set @@ -1784,8 +1859,7 @@ CONFIG_EFI_HTTP_BOOT=y CONFIG_LIB_DATE=y CONFIG_LIB_ELF=y CONFIG_LMB=y -CONFIG_LMB_USE_MAX_REGIONS=y -CONFIG_LMB_MAX_REGIONS=16 +# CONFIG_LMB_ARCH_MEM_MAP is not set # CONFIG_PHANDLE_CHECK_SEQ is not set # @@ -1798,6 +1872,7 @@ CONFIG_LMB_MAX_REGIONS=16 # Tools options # CONFIG_MKIMAGE_DTC_PATH="dtc" +CONFIG_TOOLS_CRC16=y CONFIG_TOOLS_CRC32=y CONFIG_TOOLS_LIBCRYPTO=y CONFIG_TOOLS_KWBIMAGE=y diff --git a/include/init.sh b/include/init.sh index b515cebc..1b8432ce 100644 --- a/include/init.sh +++ b/include/init.sh @@ -161,14 +161,13 @@ xbmk_set_env() xbmk_set_version() { - for fv in version versiondate; do - eval "[ ! -f \"\.$fv\" ] || read -r $fv < \"\.$fv\" || :" - done + [ ! -f ".version" ] || read -r version < ".version" || :; : + [ ! -f ".versiondate" ] || read -r versiondate < ".versiondate" || :; : [ -e ".git" ] || [ -f ".version" ] || printf "unknown\n" > ".version" \ || $err "Cannot generate unknown .version file" [ -e ".git" ] || [ -f ".versiondate" ] || printf "1716415872\n" > \ - .versiondate || $err "Cannot generate unknown .versiondate file"; : + ".versiondate" || $err "Can't generate unknown versiondate file"; : version_="$version" [ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \ diff --git a/include/lib.sh b/include/lib.sh index 5e88fa54..7a5f2621 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -24,6 +24,7 @@ mkrom_tarball() mktarball() { + printf "Creating tar archive '%s' from directory '%s'\n" "$2" "$1" [ "${2%/*}" = "$2" ] || x_ mkdir -p "${2%/*}" x_ tar -c "$1" | xz -T$XBMK_THREADS -9e > "$2" || $err "mktarball2, $1" } |