diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-19 08:41:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-19 08:41:04 -0400 |
| commit | dd3dfa50d88cffeb244485594a7bf18c58ae6d63 (patch) | |
| tree | 4822b046ae604b14ca81cffb5a79599ee5d1c78d /include | |
| parent | 83befb446664af32ce18f0e42e99a353e6622e58 (diff) | |
| parent | a675eb14bd4a827c97afd8a44210aff81ee8095a (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Marvell SheevaPlug: Convert Ethernet and SATA to Driver Model (Tony)
- Zyxel NSA310S NAS: Convert to Driver Model (Tony)
- Turris_omnia: Add `u-boot-env` NOR partition (Marek)
- Turris_omnia: Fixup MTD partitions in Linux' DTB (Marek)
- Espressobin: Enable 'mtd' command and define SPI NOR partitions (Pali)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mvebu_armada-37xx.h | 5 | ||||
| -rw-r--r-- | include/configs/nsa310s.h | 10 | ||||
| -rw-r--r-- | include/configs/sheevaplug.h | 9 |
3 files changed, 9 insertions, 15 deletions
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index a2bea2947d..c8c34d7d92 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -58,11 +58,6 @@ #define CONFIG_SYS_I2C_SLAVE 0x0 /* - * SPI Flash configuration - */ -#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ - -/* * Environment */ #define DEFAULT_ENV_IS_RW /* required for configuring default fdtfile= */ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index e38c65a485..23cf94ec99 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* + * Copyright (C) 2015, 2021 Tony Dinh <mibodhi@gmail.com> * Copyright (C) 2015 * Gerald Kerma <dreagle@doukki.net> - * Tony Dinh <mibodhi@gmail.com> * Luka Perkov <luka.perkov@sartura.hr> */ @@ -46,10 +46,10 @@ #endif /* CONFIG_CMD_NET */ /* SATA driver configuration */ -#ifdef CONFIG_IDE -#define __io -#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET -#endif /* CONFIG_IDE */ +#ifdef CONFIG_SATA +#define CONFIG_SYS_SATA_MAX_DEVICE 1 +#define CONFIG_LBA48 +#endif /* CONFIG_SATA */ /* RTC driver configuration */ #ifdef CONFIG_CMD_DATE diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 41ba799659..e28f98458e 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -53,10 +53,9 @@ /* * SATA driver configuration */ -#ifdef CONFIG_IDE -#define __io -#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET -#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET -#endif /* CONFIG_IDE */ +#ifdef CONFIG_SATA +#define CONFIG_SYS_SATA_MAX_DEVICE 2 +#define CONFIG_LBA48 +#endif /* CONFIG_SATA */ #endif /* _CONFIG_SHEEVAPLUG_H */ |