summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Mosberger <davidm@hpl.hp.com>2005-01-27 23:34:05 -0800
committerTony Luck <tony.luck@intel.com>2005-01-27 23:34:05 -0800
commit8dd45bac7d75d8cdcdf6bd2c04c95fbd439c1897 (patch)
treeb0d4bfb294ceb0c682960fee346f9d68a6ac4fa8
parentfba284a6a0277de29523e44dfed7f60bf72fcf41 (diff)
[IA64] Remove Merced B-step support
Remove left-over support for Merced B-step CPUs as suggested by Jim Wilson. Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/Kconfig8
-rw-r--r--arch/ia64/Makefile2
-rw-r--r--arch/ia64/configs/bigsur_defconfig1
3 files changed, 0 insertions, 11 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index eb071b50d21c..a337879e981d 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -158,14 +158,6 @@ config IA64_BRL_EMU
depends on ITANIUM
default y
-config ITANIUM_BSTEP_SPECIFIC
- bool "Itanium B-step specific code"
- depends on ITANIUM
- help
- Select this option to build a kernel for an Itanium prototype system
- with a B-step CPU. You have a B-step CPU if the "revision" field in
- /proc/cpuinfo has a value in the range from 1 to 4.
-
# align cache-sensitive data to 128 bytes
config IA64_L1_CACHE_SHIFT
int
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index c0b3d95d0f81..f9bd88ada708 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -46,8 +46,6 @@ ifeq ($(GCC_VERSION),0304)
cflags-$(CONFIG_MCKINLEY) += -mtune=mckinley
endif
-cflags-$(CONFIG_ITANIUM_BSTEP_SPECIFIC) += -mb-step
-
CFLAGS += $(cflags-y)
head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig
index 74756c01591b..b95fcf86ea00 100644
--- a/arch/ia64/configs/bigsur_defconfig
+++ b/arch/ia64/configs/bigsur_defconfig
@@ -73,7 +73,6 @@ CONFIG_ITANIUM=y
CONFIG_IA64_PAGE_SIZE_16KB=y
# CONFIG_IA64_PAGE_SIZE_64KB is not set
CONFIG_IA64_BRL_EMU=y
-# CONFIG_ITANIUM_BSTEP_SPECIFIC is not set
CONFIG_IA64_L1_CACHE_SHIFT=6
# CONFIG_NUMA is not set
# CONFIG_VIRTUAL_MEM_MAP is not set