diff options
| author | Tom Rini | 2020-10-14 13:51:56 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-10-14 13:51:56 -0400 |
| commit | 0f35d96bfd8565da2c5ba0f540827fff0e82eb32 (patch) | |
| tree | 753688442ed5b0dbed5f5e56c0c56398775ed6f8 /include | |
| parent | 6731c5a5ef30e1581e3042b11893627f42949cd7 (diff) | |
| parent | 8369886b401d85e49d52ff5f877cf14b1619bd43 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Octeon TX: Add NAND driver (Suneel)
- Octeon TX: Add NIC driver driver (Suneel)
- Octeon TX2: Add NIC driver driver (Suneel)
- Armada 8040: Add iEi Puzzle-M80 board support (Luka)
- Armada A37xx SPI: Add support for CS-GPIO (George)
- Espressobin: Use Linux model/compatible strings (Andre)
- Espressobin: Add armada-3720-espressobin-emmc.dts from Linux (Andre)
- Armada A37xx: Small cleanup of config header (Pali)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mvebu_armada-37xx.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 27428d5a0f5..0d585606a73 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -17,8 +17,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_64M /* Increase max gunzip size */ -/* auto boot */ - #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } @@ -57,11 +55,8 @@ /* * SPI Flash configuration */ - #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ -/* Environment in SPI NOR flash */ - /* * Ethernet Driver configuration */ @@ -70,8 +65,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3) -/* USB ethernet */ - /* * SATA/SCSI/AHCI configuration */ |