diff options
author | Tom Rini <trini@konsulko.com> | 2022-12-22 10:33:04 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-12-22 10:33:04 -0500 |
commit | 52d91e1c20b399ddab276e2c03e5788ed5e5fdd2 (patch) | |
tree | 3da0b0377b27eedd5d702c77fbb63a0d905a3f77 /env/embedded.c | |
parent | 14f43797d0a696248c09d298e2f2809dded345ba (diff) | |
parent | 8214b772cf213f1f02e5e33f4a5158f52d9d2c23 (diff) |
Merge branch '2022-12-21-CONFIG-migration-work' into next
- Bring in the second to last big batch of CONFIG migrations and
renames. Of note here we fix a few inconsistencies around the baudrate
tables on some SoCs and now are consistent in hostname/etc handling in
the environment.
Diffstat (limited to 'env/embedded.c')
-rw-r--r-- | env/embedded.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/env/embedded.c b/env/embedded.c index 27fb45bf8c3..7cbe54c56e0 100644 --- a/env/embedded.c +++ b/env/embedded.c @@ -27,7 +27,7 @@ * Generate embedded environment table * inside U-Boot image, if needed. */ -#if defined(ENV_IS_EMBEDDED) || defined(CONFIG_BUILD_ENVCRC) +#if defined(ENV_IS_EMBEDDED) /* * Put the environment in the .text section when we are building * U-Boot proper. The host based program "tools/envcrc" does not need |