diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 23:03:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 23:03:44 -0400 |
| commit | 88c7a0a8c2ce6b503ff5d5509effb2a9f844993e (patch) | |
| tree | e3c57d6e9c0cdeb438ba8f96c19f93fe14336654 /board/keymile/km_arm | |
| parent | 60f38d82c45fef55ac04ee52b234e6dd07e31935 (diff) | |
| parent | 193a1e9f196b7fb7e913a70936c8a49060a1859c (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Various improvements to Keymile boards - mostly DT conversation
(Pascal & Holger)
- Removal of now unsupported Keymile boards (Pascal & Holger)
- Small MVEBU PCI fix (Marek)
- Turris Omnia defconfig update (Marek)
- Misc Allied Telesis defconfig updates (Chris)
Diffstat (limited to 'board/keymile/km_arm')
| -rw-r--r-- | board/keymile/km_arm/Kconfig | 31 | ||||
| -rw-r--r-- | board/keymile/km_arm/MAINTAINERS | 1 |
2 files changed, 31 insertions, 1 deletions
diff --git a/board/keymile/km_arm/Kconfig b/board/keymile/km_arm/Kconfig index 19c1db3bc2..be6b162815 100644 --- a/board/keymile/km_arm/Kconfig +++ b/board/keymile/km_arm/Kconfig @@ -1,3 +1,32 @@ +menu "KM ARM Options" + depends on ARM + +config KM_FPGA_CONFIG + bool "FPGA Configuration" + default n + help + Include capability to change FPGA configuration. + +config KM_ENV_IS_IN_SPI_NOR + bool "Environment in SPI NOR" + default n + help + Put the U-Boot environment in the SPI NOR flash. + +config KM_PIGGY4_88E6061 + bool "Piggy via Switch 88E6061" + default n + help + The Piggy4 board is connected via a Marvell 88E6061 switch. + +config KM_PIGGY4_88E6352 + bool "Piggy via Switch 88E6352" + default n + help + The Piggy4 board is connected via a Marvell 88E6352 switch. + +endmenu + if TARGET_KM_KIRKWOOD config SYS_BOARD @@ -13,6 +42,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_LATE_INIT select DM + select DM_ETH + select DM_SERIAL select DM_SPI select DM_SPI_FLASH imply CMD_CRAMFS diff --git a/board/keymile/km_arm/MAINTAINERS b/board/keymile/km_arm/MAINTAINERS index d156e8574b..d80589ded7 100644 --- a/board/keymile/km_arm/MAINTAINERS +++ b/board/keymile/km_arm/MAINTAINERS @@ -11,4 +11,3 @@ F: configs/kmnusa_defconfig F: configs/kmsugp1_defconfig F: configs/kmsuv31_defconfig F: configs/mgcoge3un_defconfig -F: configs/portl2_defconfig |