diff options
author | Vineet Gupta <vgupta@synopsys.com> | 2013-01-22 06:21:50 -0500 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2013-02-15 12:46:13 -0500 |
commit | 93ad700de2abc111c50bb961c150a9968d5b3982 (patch) | |
tree | fd24278dd85307a402db187d6e3278ba4b389c2c /arch/arc/Kconfig | |
parent | 53d98958f585517f362733a1dbdb69e2dc5153a3 (diff) |
ARC: Fold boards sub-menu into platform/SoC menu
This is more natural and is now doable since the choice constructs are
gone.
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arc/Kconfig')
-rw-r--r-- | arch/arc/Kconfig | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 3fdd6a53e5d6..ac173687c056 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig | |||
@@ -82,18 +82,11 @@ source "kernel/Kconfig.freezer" | |||
82 | 82 | ||
83 | menu "ARC Architecture Configuration" | 83 | menu "ARC Architecture Configuration" |
84 | 84 | ||
85 | menu "ARC Platform/SoC" | 85 | menu "ARC Platform/SoC/Board" |
86 | |||
87 | config ARC_PLAT_FPGA_LEGACY | ||
88 | bool "\"Legacy\" ARC FPGA dev platform" | ||
89 | help | ||
90 | Support for ARC development platforms, provided by Synopsys. | ||
91 | These are based on FPGA or ISS. e.g. | ||
92 | - ARCAngel4 | ||
93 | - ML509 | ||
94 | - MetaWare ISS | ||
95 | 86 | ||
87 | source "arch/arc/plat-arcfpga/Kconfig" | ||
96 | #New platform adds here | 88 | #New platform adds here |
89 | |||
97 | endmenu | 90 | endmenu |
98 | 91 | ||
99 | menu "ARC CPU Configuration" | 92 | menu "ARC CPU Configuration" |
@@ -338,12 +331,6 @@ config ARC_HAS_RTSC | |||
338 | 331 | ||
339 | endmenu # "ARC CPU Configuration" | 332 | endmenu # "ARC CPU Configuration" |
340 | 333 | ||
341 | menu "Platform Board Configuration" | ||
342 | |||
343 | source "arch/arc/plat-arcfpga/Kconfig" | ||
344 | |||
345 | #New platform adds here | ||
346 | |||
347 | config LINUX_LINK_BASE | 334 | config LINUX_LINK_BASE |
348 | hex "Linux Link Address" | 335 | hex "Linux Link Address" |
349 | default "0x80000000" | 336 | default "0x80000000" |
@@ -357,8 +344,6 @@ config LINUX_LINK_BASE | |||
357 | Linux needs to be scooted a bit. | 344 | Linux needs to be scooted a bit. |
358 | If you don't know what the above means, leave this setting alone. | 345 | If you don't know what the above means, leave this setting alone. |
359 | 346 | ||
360 | endmenu # "Platform Board Configuration" | ||
361 | |||
362 | config ARC_CURR_IN_REG | 347 | config ARC_CURR_IN_REG |
363 | bool "Dedicate Register r25 for current_task pointer" | 348 | bool "Dedicate Register r25 for current_task pointer" |
364 | default y | 349 | default y |