commit b6b8aaa754030c2c354518c3b3c2f0d1800b7963
author Michal Simek <michal.simek@xilinx.com> Wed May 01 18:05:56 2013 +0200
committer Michal Simek <michal.simek@xilinx.com> Mon May 06 10:41:30 2013 +0200
tree aa90d9289407d75f664b96cc614ba94ab84bb4a0
parent 6ff890dc6f44fdd5baa04d7b51f765837a57b3ef

fpga: Remove all CONFIG_SYS_* fpga related options

All these macros are completely unused by any code.
CONFIG_FPGA is not a bitfield anymore.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@ti.com>

include/configs/MERGERBOX.h

diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h
index c296e3c..30fb6c2 100644
--- a/include/configs/MERGERBOX.h
+++ b/include/configs/MERGERBOX.h
@@ -606,7 +606,7 @@
  * FPGA
  */
 #define CONFIG_FPGA_COUNT	1
-#define CONFIG_FPGA		CONFIG_SYS_ALTERA_CYCLON2
+#define CONFIG_FPGA
 #define CONFIG_FPGA_ALTERA
 #define CONFIG_FPGA_CYCLON2