diff --git a/include/target.mk b/include/target.mk
index 8c427c0c4ffe97ac2ca7d22cc4a4c9ee28b472e0..c27e9d3354ec016b3d5c2d7ce1628da4a49b2555 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -214,6 +214,7 @@ ifeq ($(DUMP),1)
   ifeq ($(ARCH),i386)
     CPU_TYPE ?= i486
     CPU_CFLAGS_i486 = -march=i486
+    CPU_CFLAGS_geode = -march=geode -mmmx -m3dnow
   endif
   ifneq ($(findstring arm,$(ARCH)),)
     CPU_TYPE ?= xscale
diff --git a/target/linux/x86/alix2/target.mk b/target/linux/x86/alix2/target.mk
index 561aba6bcf5b0901dd420c21b47321b821666cb7..fce9c90972633cbcb8ad1e640b0348946db4db99 100644
--- a/target/linux/x86/alix2/target.mk
+++ b/target/linux/x86/alix2/target.mk
@@ -22,8 +22,7 @@ DEFAULT_PACKAGES += \
 LINUX_VERSION:=3.10.12
 CS5535_MASK:=0x0b000042
 
-CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \
-	-fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer
+CPU_TYPE := geode
 
 define Target/Description
 	Build firmware images for PCEngines alix2 board
diff --git a/target/linux/x86/geos/target.mk b/target/linux/x86/geos/target.mk
index 5e057b32549fcbf3d3932d675c2625e1da087cd9..7e4670212a01b62fb23139e5ea916411cea01429 100644
--- a/target/linux/x86/geos/target.mk
+++ b/target/linux/x86/geos/target.mk
@@ -24,8 +24,7 @@ DEFAULT_PACKAGES += \
 LINUX_VERSION:=3.8.13
 CS5535_MASK:=0x0E000048
 
-CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \
-        -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer
+CPU_TYPE := geode
 
 define Target/Description
     Build firmware images for Traverse Geos board
diff --git a/target/linux/x86/net5501/target.mk b/target/linux/x86/net5501/target.mk
index 13948d87b332564be56740734fafaa22ffa7c45d..e8a2bd81c851a37427145bae19f1c466fa8e8b94 100644
--- a/target/linux/x86/net5501/target.mk
+++ b/target/linux/x86/net5501/target.mk
@@ -22,8 +22,7 @@ DEFAULT_PACKAGES += kmod-crypto-hw-geode kmod-crypto-ocf \
 
 CS5535_MASK:=0x01000040
 
-CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \
-	  -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer
+CPU_TYPE := geode
 
 define Target/Description
 	Build firmware images for Soekris net5501 board
diff --git a/target/linux/x86/rdc/target.mk b/target/linux/x86/rdc/target.mk
index e38f5e200667cf96614e15094fdd72be2205140f..7475103e5dc010b008bee9032f73377253acaaf1 100644
--- a/target/linux/x86/rdc/target.mk
+++ b/target/linux/x86/rdc/target.mk
@@ -1,6 +1,5 @@
 BOARDNAME:=RDC R-321x
 FEATURES:=squashfs pci usb gpio pcmcia
-CFLAGS:=-Os -pipe -march=i486 -mtune=i486
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
 DEFAULT_PACKAGES += kmod-llc kmod-stp kmod-bridge kmod-8021q \
diff --git a/target/linux/x86/thincan/target.mk b/target/linux/x86/thincan/target.mk
index cd127a4823337c37739f138871f18729e7c49f9d..6fc2f97007edd4931fd3e1b6fd8215eaadf49f94 100644
--- a/target/linux/x86/thincan/target.mk
+++ b/target/linux/x86/thincan/target.mk
@@ -1,7 +1,7 @@
 DEVICE_TYPE:=terminal
 BOARDNAME:=Artec ThinCan
 
-CFLAGS := -O2 -pipe -march=geode -mtune=geode -funit-at-a-time
+CPU_TYPE := geode
 
 DEFAULT_PACKAGES:=\
 	base-files \