diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-08 10:55:51 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-08 10:55:51 -0500 |
| commit | e14d5762de1db84cae6d84d59c1e40f3eb26c4c3 (patch) | |
| tree | df6a771bc0dacd2de8c8d42c2bd39e5f5ea12686 /include/env_internal.h | |
| parent | a10d06add73ec0bd9e93b4b517fa2068ef1ca132 (diff) | |
| parent | 24a0f8cfe5c85aef5a20baf34ee7b77004b07b04 (diff) | |
| download | u-boot-e14d5762de1db84cae6d84d59c1e40f3eb26c4c3.tar.gz | |
Merge git://git.denx.de/u-boot-marvellWIP/08Feb2021
- Espressobin: Set default env values at runtime (Pali)
- Espressobin: Set the maximum slave SPI speed to 40MHz (Pali)
- theadorable: PCIe test code enhancement and early deemphasis
enabling (Stefan)
- pci_mvebu: Disable config access to PCI host bridge ports (Stefan)
- mv_sdhci: parse device-tree entry (Baruch)
Diffstat (limited to 'include/env_internal.h')
| -rw-r--r-- | include/env_internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/env_internal.h b/include/env_internal.h index b26dc6239c..708c833a55 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -111,7 +111,11 @@ typedef struct environment_s { extern env_t embedded_environment; #endif /* ENV_IS_EMBEDDED */ +#ifdef DEFAULT_ENV_IS_RW +extern unsigned char default_environment[]; +#else extern const unsigned char default_environment[]; +#endif #ifndef DO_DEPS_ONLY |