summaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorNigel Kukard <nkukard@lbsd.net>2008-03-29 17:34:23 +0000
committerNigel Kukard <nkukard@lbsd.net>2008-03-29 17:34:23 +0000
commit0c0096201737734b33bee5bc5f5ef45f55cf7884 (patch)
tree66fbc64e125b76a6737caf470d81de6bd2875a6d /toolchain
parent9a193dfbf00928913d4331be7b9d07396421e41c (diff)
downloadbuildroot-novena-0c0096201737734b33bee5bc5f5ef45f55cf7884.tar.gz
buildroot-novena-0c0096201737734b33bee5bc5f5ef45f55cf7884.zip
PentiumPro is not Pentium4 but i686
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/uclibc.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 21411ce6a..af3c5742e 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -357,6 +357,12 @@ endif
ifeq ($(BR2_x86_pentium_mmx),y)
$(SED) 's,# CONFIG_586MMX is not set,CONFIG_586MMX=y,g' $(UCLIBC_DIR)/.oldconfig
endif
+ifeq ($(BR2_x86_i686),y)
+ $(SED) 's,# CONFIG_686 is not set,CONFIG_686=y,g' $(UCLIBC_DIR)/.oldconfig
+endif
+ifeq ($(BR2_x86_pentiumpro),y)
+ $(SED) 's,# CONFIG_686 is not set,CONFIG_686=y,g' $(UCLIBC_DIR)/.oldconfig
+endif
ifeq ($(BR2_x86_pentium2),y)
$(SED) 's,# CONFIG_PENTIUMII is not set,CONFIG_PENTIUMII=y,g' $(UCLIBC_DIR)/.oldconfig
endif
@@ -369,18 +375,12 @@ endif
ifeq ($(BR2_x86_pentium_m),y)
$(SED) 's,# CONFIG_PENTIUM4 is not set,CONFIG_PENTIUM4=y,g' $(UCLIBC_DIR)/.oldconfig
endif
-ifeq ($(BR2_x86_pentiumpro),y)
- $(SED) 's,# CONFIG_PENTIUM4 is not set,CONFIG_PENTIUM4=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
ifeq ($(BR2_x86_nocona),y)
$(SED) 's,# CONFIG_PENTIUM4 is not set,CONFIG_PENTIUM4=y,g' $(UCLIBC_DIR)/.oldconfig
endif
ifeq ($(BR2_x86_core2),y)
$(SED) 's,# CONFIG_PENTIUM4 is not set,CONFIG_PENTIUM4=y,g' $(UCLIBC_DIR)/.oldconfig
endif
-ifeq ($(BR2_x86_i686),y)
- $(SED) 's,# CONFIG_686 is not set,CONFIG_686=y,g' $(UCLIBC_DIR)/.oldconfig
-endif
endif
$(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig