diff options
| author | Tom Rini <[email protected]> | 2021-02-08 10:55:51 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-02-08 10:55:51 -0500 |
| commit | e14d5762de1db84cae6d84d59c1e40f3eb26c4c3 (patch) | |
| tree | df6a771bc0dacd2de8c8d42c2bd39e5f5ea12686 /include/env_default.h | |
| parent | a10d06add73ec0bd9e93b4b517fa2068ef1ca132 (diff) | |
| parent | 24a0f8cfe5c85aef5a20baf34ee7b77004b07b04 (diff) | |
Merge git://git.denx.de/u-boot-marvell
- 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_default.h')
| -rw-r--r-- | include/env_default.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/env_default.h b/include/env_default.h index 8a0c3057f0a..ea31a8eddfa 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -19,6 +19,8 @@ env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { { #elif defined(DEFAULT_ENV_INSTANCE_STATIC) static char default_environment[] = { +#elif defined(DEFAULT_ENV_IS_RW) +uchar default_environment[] = { #else const uchar default_environment[] = { #endif |