PentiumPro is not Pentium4 but i686

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 21411ce6a4831065e91e2e4d56495562f8971b83..af3c5742e2b0a3ff8a592b2a3106d6f6568c36e7 100644 (file)
--- 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