microblaze: Remove generic platform

All microblaze platforms are using the same configuration
that's why there is no reason to use generic platform.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/microblaze/platform/Kconfig.platform b/arch/microblaze/platform/Kconfig.platform
index db1aa5c22cea5b941c057034e62886a6a0b467fe..1b3d8c8491018734b3cca9f5ecd5441e52f8c8b2 100644 (file)
--- a/arch/microblaze/platform/Kconfig.platform
+++ b/arch/microblaze/platform/Kconfig.platform
@@ -5,18 +5,6 @@
 #
 
 menu "Platform options"
-choice
-       prompt "Platform"
-       default PLATFORM_MICROBLAZE_AUTO
-       help
-         Choose which hardware board/platform you are targeting.
-
-config PLATFORM_GENERIC
-       bool "Generic"
-       help
-         Choose this option for the Generic platform.
-
-endchoice
 
 config OPT_LIB_FUNCTION
        bool "Optimalized lib function"
@@ -37,8 +25,45 @@ config OPT_LIB_ASM
          Allows turn on optimalized library function (memcpy and memmove).
          Function are written in asm code.
 
-if PLATFORM_GENERIC=y
-       source "arch/microblaze/platform/generic/Kconfig.auto"
-endif
+# Definitions for MICROBLAZE0
+comment "Definitions for MICROBLAZE0"
+
+config KERNEL_BASE_ADDR
+       hex "Physical address where Linux Kernel is"
+       default "0x90000000"
+       help
+         BASE Address for kernel
+
+config XILINX_MICROBLAZE0_FAMILY
+       string "Targeted FPGA family"
+       default "virtex5"
+
+config XILINX_MICROBLAZE0_USE_MSR_INSTR
+       int "USE_MSR_INSTR range (0:1)"
+       default 0
+
+config XILINX_MICROBLAZE0_USE_PCMP_INSTR
+       int "USE_PCMP_INSTR range (0:1)"
+       default 0
+
+config XILINX_MICROBLAZE0_USE_BARREL
+       int "USE_BARREL range (0:1)"
+       default 0
+
+config XILINX_MICROBLAZE0_USE_DIV
+       int "USE_DIV range (0:1)"
+       default 0
+
+config XILINX_MICROBLAZE0_USE_HW_MUL
+       int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)"
+       default 0
+
+config XILINX_MICROBLAZE0_USE_FPU
+       int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)"
+       default 0
+
+config XILINX_MICROBLAZE0_HW_VER
+       string "Core version number"
+       default 7.10.d
 
 endmenu

diff --git a/arch/microblaze/platform/Makefile b/arch/microblaze/platform/Makefile
index ea1b75cc57758817f6b7e434fbfcad4c008146cb..5bcb631b80b6b0a7ea32ecb5ea66762bf7f9c458 100644 (file)
--- a/arch/microblaze/platform/Makefile
+++ b/arch/microblaze/platform/Makefile
@@ -1,6 +1,5 @@
 #
 # Makefile for arch/microblaze/platform directory
 #
-#obj-$(CONFIG_PLATFORM_GENERIC) += generic/
 
 obj-y  += platform.o

diff --git a/arch/microblaze/platform/generic/Kconfig.auto b/arch/microblaze/platform/generic/Kconfig.auto
deleted file mode 100644 (file)
index 25a6f01..0000000
--- a/arch/microblaze/platform/generic/Kconfig.auto
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# (C) Copyright 2007 Michal Simek
-#
-# Michal SIMEK <monstr@monstr.eu>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-# Definitions for MICROBLAZE0
-comment "Definitions for MICROBLAZE0"
-
-config KERNEL_BASE_ADDR
-       hex "Physical address where Linux Kernel is"
-       default "0x90000000"
-       help
-         BASE Address for kernel
-
-config XILINX_MICROBLAZE0_FAMILY
-       string "Targeted FPGA family"
-       default "virtex5"
-
-config XILINX_MICROBLAZE0_USE_MSR_INSTR
-       int "USE_MSR_INSTR range (0:1)"
-       default 0
-
-config XILINX_MICROBLAZE0_USE_PCMP_INSTR
-       int "USE_PCMP_INSTR range (0:1)"
-       default 0
-
-config XILINX_MICROBLAZE0_USE_BARREL
-       int "USE_BARREL range (0:1)"
-       default 0
-
-config XILINX_MICROBLAZE0_USE_DIV
-       int "USE_DIV range (0:1)"
-       default 0
-
-config XILINX_MICROBLAZE0_USE_HW_MUL
-       int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)"
-       default 0
-
-config XILINX_MICROBLAZE0_USE_FPU
-       int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)"
-       default 0
-
-config XILINX_MICROBLAZE0_HW_VER
-       string "Core version number"
-       default 7.10.d

diff --git a/arch/microblaze/platform/generic/Makefile b/arch/microblaze/platform/generic/Makefile
deleted file mode 100644 (file)
index 9a8b1bd..0000000
--- a/arch/microblaze/platform/generic/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Empty Makefile to keep make clean happy
-#