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/configs/mvebu_armada-37xx.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/configs/mvebu_armada-37xx.h')
-rw-r--r-- | include/configs/mvebu_armada-37xx.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 0d585606a7..2ad4325eaf 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -58,6 +58,11 @@ #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ /* + * Environment + */ +#define DEFAULT_ENV_IS_RW /* required for configuring default fdtfile= */ + +/* * Ethernet Driver configuration */ #define CONFIG_ARP_TIMEOUT 200 @@ -87,6 +92,15 @@ #include <config_distro_bootcmd.h> +/* filler for default values filled by board_early_init_f() */ +#define ENV_RW_FILLER \ + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for ethaddr= */ \ + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for eth1addr= */ \ + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for eth2addr= */ \ + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for eth3addr= */ \ + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for fdtfile= */ \ + "" + /* fdt_addr and kernel_addr are needed for existing distribution boot scripts */ #define CONFIG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x6d00000\0" \ @@ -96,6 +110,7 @@ "kernel_addr=0x7000000\0" \ "kernel_addr_r=0x7000000\0" \ "ramdisk_addr_r=0xa000000\0" \ - BOOTENV + BOOTENV \ + ENV_RW_FILLER #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */ |