[U-Boot] [PATCH 6/6] ARM: socfpga: abolish CONFIG_SOCFPGA

Masahiro Yamada
2015-04-21T02:09:58Z

CONFIG_SOCFPGA is only referenced by arch/arm/dts/Makefile.
Replace it with CONFIG_ARCH_SOCFPGA.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

arch/arm/dts/Makefile | 2 +-
include/configs/socfpga_common.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 09708d9..8c421b1 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -49,7 +49,7 @@ dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
zynq-zc770-xm013.dtb
dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb

-dtb-$(CONFIG_SOCFPGA) += \
+dtb-$(CONFIG_ARCH_SOCFPGA) += \
socfpga_arria5_socdk.dtb \
socfpga_cyclone5_socdk.dtb \
socfpga_cyclone5_socrates.dtb
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 4872370..0e6232f 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -13,8 +13,6 @@

#define CONFIG_SYS_THUMB_BUILD

-#define CONFIG_SOCFPGA
-
/*
* High level configuration
*/
--
1.9.1