diff options
author | Michal Simek <michal.simek@xilinx.com> | 2014-04-07 07:03:24 -0400 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2014-04-07 07:45:20 -0400 |
commit | ed85ed697d8d66f4b3284d7a8a3dc7002c966178 (patch) | |
tree | 81610b2389ae559b4533c3f48ea1b6df3767b0d8 /arch/microblaze | |
parent | 252133887984b758bb817e3931075293f695fb91 (diff) |
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>
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/platform/Kconfig.platform | 55 | ||||
-rw-r--r-- | arch/microblaze/platform/Makefile | 1 | ||||
-rw-r--r-- | arch/microblaze/platform/generic/Kconfig.auto | 61 | ||||
-rw-r--r-- | arch/microblaze/platform/generic/Makefile | 3 |
4 files changed, 40 insertions, 80 deletions
diff --git a/arch/microblaze/platform/Kconfig.platform b/arch/microblaze/platform/Kconfig.platform index db1aa5c22cea..1b3d8c849101 100644 --- a/arch/microblaze/platform/Kconfig.platform +++ b/arch/microblaze/platform/Kconfig.platform | |||
@@ -5,18 +5,6 @@ | |||
5 | # | 5 | # |
6 | 6 | ||
7 | menu "Platform options" | 7 | menu "Platform options" |
8 | choice | ||
9 | prompt "Platform" | ||
10 | default PLATFORM_MICROBLAZE_AUTO | ||
11 | help | ||
12 | Choose which hardware board/platform you are targeting. | ||
13 | |||
14 | config PLATFORM_GENERIC | ||
15 | bool "Generic" | ||
16 | help | ||
17 | Choose this option for the Generic platform. | ||
18 | |||
19 | endchoice | ||
20 | 8 | ||
21 | config OPT_LIB_FUNCTION | 9 | config OPT_LIB_FUNCTION |
22 | bool "Optimalized lib function" | 10 | bool "Optimalized lib function" |
@@ -37,8 +25,45 @@ config OPT_LIB_ASM | |||
37 | Allows turn on optimalized library function (memcpy and memmove). | 25 | Allows turn on optimalized library function (memcpy and memmove). |
38 | Function are written in asm code. | 26 | Function are written in asm code. |
39 | 27 | ||
40 | if PLATFORM_GENERIC=y | 28 | # Definitions for MICROBLAZE0 |
41 | source "arch/microblaze/platform/generic/Kconfig.auto" | 29 | comment "Definitions for MICROBLAZE0" |
42 | endif | 30 | |
31 | config KERNEL_BASE_ADDR | ||
32 | hex "Physical address where Linux Kernel is" | ||
33 | default "0x90000000" | ||
34 | help | ||
35 | BASE Address for kernel | ||
36 | |||
37 | config XILINX_MICROBLAZE0_FAMILY | ||
38 | string "Targeted FPGA family" | ||
39 | default "virtex5" | ||
40 | |||
41 | config XILINX_MICROBLAZE0_USE_MSR_INSTR | ||
42 | int "USE_MSR_INSTR range (0:1)" | ||
43 | default 0 | ||
44 | |||
45 | config XILINX_MICROBLAZE0_USE_PCMP_INSTR | ||
46 | int "USE_PCMP_INSTR range (0:1)" | ||
47 | default 0 | ||
48 | |||
49 | config XILINX_MICROBLAZE0_USE_BARREL | ||
50 | int "USE_BARREL range (0:1)" | ||
51 | default 0 | ||
52 | |||
53 | config XILINX_MICROBLAZE0_USE_DIV | ||
54 | int "USE_DIV range (0:1)" | ||
55 | default 0 | ||
56 | |||
57 | config XILINX_MICROBLAZE0_USE_HW_MUL | ||
58 | int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)" | ||
59 | default 0 | ||
60 | |||
61 | config XILINX_MICROBLAZE0_USE_FPU | ||
62 | int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)" | ||
63 | default 0 | ||
64 | |||
65 | config XILINX_MICROBLAZE0_HW_VER | ||
66 | string "Core version number" | ||
67 | default 7.10.d | ||
43 | 68 | ||
44 | endmenu | 69 | endmenu |
diff --git a/arch/microblaze/platform/Makefile b/arch/microblaze/platform/Makefile index ea1b75cc5775..5bcb631b80b6 100644 --- a/arch/microblaze/platform/Makefile +++ b/arch/microblaze/platform/Makefile | |||
@@ -1,6 +1,5 @@ | |||
1 | # | 1 | # |
2 | # Makefile for arch/microblaze/platform directory | 2 | # Makefile for arch/microblaze/platform directory |
3 | # | 3 | # |
4 | #obj-$(CONFIG_PLATFORM_GENERIC) += generic/ | ||
5 | 4 | ||
6 | obj-y += platform.o | 5 | obj-y += platform.o |
diff --git a/arch/microblaze/platform/generic/Kconfig.auto b/arch/microblaze/platform/generic/Kconfig.auto deleted file mode 100644 index 25a6f019e94d..000000000000 --- a/arch/microblaze/platform/generic/Kconfig.auto +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | # | ||
2 | # (C) Copyright 2007 Michal Simek | ||
3 | # | ||
4 | # Michal SIMEK <monstr@monstr.eu> | ||
5 | # | ||
6 | # This program is free software; you can redistribute it and/or | ||
7 | # modify it under the terms of the GNU General Public License as | ||
8 | # published by the Free Software Foundation; either version 2 of | ||
9 | # the License, or (at your option) any later version. | ||
10 | # | ||
11 | # This program is distributed in the hope that it will be useful, | ||
12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | # GNU General Public License for more details. | ||
15 | # | ||
16 | # You should have received a copy of the GNU General Public License | ||
17 | # along with this program; if not, write to the Free Software | ||
18 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, | ||
19 | # MA 02111-1307 USA | ||
20 | # | ||
21 | |||
22 | # Definitions for MICROBLAZE0 | ||
23 | comment "Definitions for MICROBLAZE0" | ||
24 | |||
25 | config KERNEL_BASE_ADDR | ||
26 | hex "Physical address where Linux Kernel is" | ||
27 | default "0x90000000" | ||
28 | help | ||
29 | BASE Address for kernel | ||
30 | |||
31 | config XILINX_MICROBLAZE0_FAMILY | ||
32 | string "Targeted FPGA family" | ||
33 | default "virtex5" | ||
34 | |||
35 | config XILINX_MICROBLAZE0_USE_MSR_INSTR | ||
36 | int "USE_MSR_INSTR range (0:1)" | ||
37 | default 0 | ||
38 | |||
39 | config XILINX_MICROBLAZE0_USE_PCMP_INSTR | ||
40 | int "USE_PCMP_INSTR range (0:1)" | ||
41 | default 0 | ||
42 | |||
43 | config XILINX_MICROBLAZE0_USE_BARREL | ||
44 | int "USE_BARREL range (0:1)" | ||
45 | default 0 | ||
46 | |||
47 | config XILINX_MICROBLAZE0_USE_DIV | ||
48 | int "USE_DIV range (0:1)" | ||
49 | default 0 | ||
50 | |||
51 | config XILINX_MICROBLAZE0_USE_HW_MUL | ||
52 | int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)" | ||
53 | default 0 | ||
54 | |||
55 | config XILINX_MICROBLAZE0_USE_FPU | ||
56 | int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)" | ||
57 | default 0 | ||
58 | |||
59 | config XILINX_MICROBLAZE0_HW_VER | ||
60 | string "Core version number" | ||
61 | default 7.10.d | ||
diff --git a/arch/microblaze/platform/generic/Makefile b/arch/microblaze/platform/generic/Makefile deleted file mode 100644 index 9a8b1bd3fa6d..000000000000 --- a/arch/microblaze/platform/generic/Makefile +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | # | ||
2 | # Empty Makefile to keep make clean happy | ||
3 | # | ||