ARM: remove tnetv107x board support

This is still a non-generic board.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Chan-Taek Park <c-park@ti.com>
Acked-by: Marek Vasut <marex@denx.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2259c081cc117feffbf2636d9624071d1a6455ee..95437661932ae3bfe5cfc743cd6bb1a69d273f46 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -130,10 +130,6 @@ config TARGET_INTEGRATORCP_CM920T
        bool "Support integratorcp_cm920t"
        select CPU_ARM920T
 
-config TARGET_A320EVB
-       bool "Support a320evb"
-       select CPU_ARM920T
-
 config ARCH_AT91
        bool "Atmel AT91"
 
@@ -145,14 +141,6 @@ config TARGET_SCB9328
        bool "Support scb9328"
        select CPU_ARM920T
 
-config TARGET_CM4008
-       bool "Support cm4008"
-       select CPU_ARM920T
-
-config TARGET_CM41XX
-       bool "Support cm41xx"
-       select CPU_ARM920T
-
 config TARGET_VCMA9
        bool "Support VCMA9"
        select CPU_ARM920T
@@ -385,9 +373,9 @@ config TARGET_RPI
        bool "Support rpi"
        select CPU_ARM1176
 
-config TARGET_TNETV107X_EVM
-       bool "Support tnetv107x_evm"
-       select CPU_ARM1176
+config TARGET_RPI_2
+       bool "Support rpi_2"
+       select CPU_V7
 
 config TARGET_INTEGRATORAP_CM946ES
        bool "Support integratorap_cm946es"
@@ -804,7 +792,7 @@ source "arch/arm/cpu/arm1176/bcm2835/Kconfig"
 
 source "arch/arm/cpu/armv7/exynos/Kconfig"
 
-source "arch/arm/cpu/armv7/highbank/Kconfig"
+source "arch/arm/mach-highbank/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
 
@@ -832,7 +820,7 @@ source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/cpu/armv7/uniphier/Kconfig"
 
-source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
+source "arch/arm/mach-versatile/Kconfig"
 
 source "arch/arm/cpu/armv7/zynq/Kconfig"
 
@@ -860,8 +848,6 @@ source "board/broadcom/bcm28155_ap/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
 source "board/broadcom/bcmnsp/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
-source "board/cm4008/Kconfig"
-source "board/cm41xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_fx6/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
@@ -871,7 +857,6 @@ source "board/denx/m28evk/Kconfig"
 source "board/denx/m53evk/Kconfig"
 source "board/embest/mx6boards/Kconfig"
 source "board/esg/ima3-mx53/Kconfig"
-source "board/faraday/a320evb/Kconfig"
 source "board/freescale/ls2085a/Kconfig"
 source "board/freescale/ls1021aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"
@@ -921,6 +906,7 @@ source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/pxa255_idp/Kconfig"
 source "board/raspberrypi/rpi/Kconfig"
+source "board/raspberrypi/rpi_2/Kconfig"
 source "board/samsung/smdk2410/Kconfig"
 source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/scb9328/Kconfig"
@@ -945,7 +931,6 @@ source "board/ti/am335x/Kconfig"
 source "board/ti/am43xx/Kconfig"
 source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
-source "board/ti/tnetv107xevm/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/tqc/tqma6/Kconfig"

diff --git a/arch/arm/cpu/arm1176/Makefile b/arch/arm/cpu/arm1176/Makefile
index deec4274477551b17b13b8e1b601892246d2641c..480e1304891dc69606e358610d553b64edd5309d 100644 (file)
--- a/arch/arm/cpu/arm1176/Makefile
+++ b/arch/arm/cpu/arm1176/Makefile
@@ -10,3 +10,5 @@
 
 extra-y        = start.o
 obj-y  = cpu.o
+
+obj-$(CONFIG_BCM2835) += bcm2835/

diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index d206251d7fb85dea96ddfd4e32c4bb51bd2b7841..766d7123e5338960913e75d1a4f56921abb2c082 100644 (file)
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -12,6 +12,10 @@ The list should be sorted in reverse chronological order.
 
 Board            Arch        CPU            Commit      Removed     Last known maintainer/contact
 =================================================================================================
+tnetv107x        arm         arm1176        -           -           Chan-Taek Park <c-park@ti.com>
+a320evb          arm         arm920t        -           -           Po-Yu Chuang <ratbert@faraday-tech.com>
+cm4008           arm         arm920t        -           -           Greg Ungerer <greg.ungerer@opengear.com>
+cm41xx           arm         arm920t        -           -
 dkb              arm         arm926ejs      -           -           Lei Wen <leiwen@marvell.com>
 jadecpu          arm         arm926ejs      -           -           Matthias Weisser <weisserm@arcor.de>
 icecube_5200     powerpc     mpc5xxx        37b608a5    2015-01-23  Wolfgang Denk <wd@denx.de>

diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index efad1432d607392584659efc5b822a9c5ce8473b..482a4bd5be316a44a57381c46e1269ee8d61580b 100644 (file)
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -5,12 +5,13 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-$(CONFIG_AT91SAM9_WATCHDOG)                += at91sam9_wdt.o
-obj-$(CONFIG_BFIN_WATCHDOG)            += bfin_wdt.o
-obj-$(CONFIG_DESIGNWARE_WATCHDOG)      += designware_wdt.o
-obj-$(CONFIG_FTWDT010_WATCHDOG)                += ftwdt010_wdt.o
-obj-$(CONFIG_IMX_WATCHDOG)             += imx_watchdog.o
-obj-$(CONFIG_OMAP_WATCHDOG)            += omap_wdt.o
-obj-$(CONFIG_S5P)                      += s5p_wdt.o
-obj-$(CONFIG_TNETV107X_WATCHDOG)       += tnetv107x_wdt.o
-obj-$(CONFIG_XILINX_TB_WATCHDOG)       += xilinx_tb_wdt.o
+obj-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o
+obj-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o
+ifneq (,$(filter $(SOC), mx31 mx35 mx5 mx6 vf610 ls102xa))
+obj-y += imx_watchdog.o
+endif
+obj-$(CONFIG_S5P)               += s5p_wdt.o
+obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o
+obj-$(CONFIG_BFIN_WATCHDOG)  += bfin_wdt.o
+obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
+obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o