diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-17 11:32:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-17 11:32:22 -0400 |
| commit | c3f43185eeb9e600c6cc0e7721f52c749e14c666 (patch) | |
| tree | b79e54432f4da8bc868c411791a704d8c4a2cb19 /arch | |
| parent | c3e8aa1a9ed5f6db7345b23a2f8f136e987ebd4d (diff) | |
| parent | 88369d33e322e0cdfbb1f0c33021ad424578619e (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
- Drop zipitz2 board (Tom)
- Add DEPRECATED option (Tom)
- Mark legacy or non-dm drivers as DEPRECATED (Jagan)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/Kconfig | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index e574b0d441..28afe39801 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -101,6 +101,7 @@ config SANDBOX imply CMD_IOTRACE imply CMD_LZMADEC imply CMD_SATA + imply CMD_SF imply CMD_SF_TEST imply CRC32_VERIFY imply FAT_WRITE @@ -147,6 +148,7 @@ config X86 imply CMD_IO imply CMD_IRQ imply CMD_PCI + imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT imply DM_ETH diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 01ff57cf1b..0e82cf1583 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1410,10 +1410,6 @@ config TARGET_H2200 bool "Support h2200" select CPU_PXA -config TARGET_ZIPITZ2 - bool "Support zipitz2" - select CPU_PXA - config TARGET_COLIBRI_PXA270 bool "Support colibri_pxa270" select CPU_PXA @@ -1727,7 +1723,6 @@ source "board/woodburn/Kconfig" source "board/xilinx/Kconfig" source "board/xilinx/zynq/Kconfig" source "board/xilinx/zynqmp/Kconfig" -source "board/zipitz2/Kconfig" source "arch/arm/Kconfig.debug" |