diff --git a/util/compareboard/compareboard b/util/compareboard/compareboard
index 17295675d2..e27fff4890 100755
--- a/util/compareboard/compareboard
+++ b/util/compareboard/compareboard
@@ -23,15 +23,32 @@ mkdir -p $A
 sort coreboot-builds/$BOARDPATH/fallback/ldoptions > $A/old
 sort build/ldoptions > $A/new
 
-if [ `grep -c "^CONFIG_NORTHBRIDGE_AMD" $A/new` -eq 0 ]; then
+if [ `grep -c "^CONFIG_NORTHBRIDGE_AMD_AMDFAM10" $A/new` -eq 0 ]; then
 	sed \
-		-e "/^CONFIG_C[BD]B / d" \
 		-e "/^CONFIG_AMDMCT / d" \
+		-e "/^CONFIG_C[BD]B / d" \
+		-e "/^CONFIG_EXT_CONF_SUPPORT / d" \
+		-e "/^CONFIG_EXT_RT_TBL_SUPPORT / d" \
 		-e "/^CONFIG_HT3_SUPPORT / d" \
-		-e "/^CONFIG_HT_CHAIN_UNITID_BASE / d" \
-		-e "/^CONFIG_HT_CHAIN_END_UNITID_BASE / d" \
+		$A/old > $A/old.tmp && mv $A/old.tmp $A/old
+fi
+
+if [ `grep -c "^CONFIG_NORTHBRIDGE_AMD_AMDK8" $A/new` -eq 0 ]; then
+	sed \
 		-e "/^CONFIG_K8_HT_FREQ_1G_SUPPORT / d" \
 		-e "/^CONFIG_K8_MEM_BANK_B_ONLY / d" \
+		$A/old > $A/old.tmp && mv $A/old.tmp $A/old
+fi
+
+if [ `grep -c "^CONFIG_NORTHBRIDGE_AMD_AMDFAM10" $A/new` -eq 0 -a `grep -c "^CONFIG_NORTHBRIDGE_AMD_AMDK8" $A/new` -eq 0 ]; then
+	sed \
+		-e "/^CONFIG_APIC_ID_OFFSET / d" \
+		-e "/^CONFIG_CPU_SOCKET_TYPE / d" \
+		-e "/^CONFIG_DIMM_SUPPORT / d" \
+		-e "/^CONFIG_HT_CHAIN_UNITID_BASE / d" \
+		-e "/^CONFIG_HT_CHAIN_END_UNITID_BASE / d" \
+		-e "/^CONFIG_HW_MEM_HOLE_SIZE_AUTO_INC / d" \
+		-e "/^CONFIG_HW_MEM_HOLE_SIZEK / d" \
 		-e "/^CONFIG_MEM_TRAIN_SEQ / d" \
 		-e "/^CONFIG_SB_HT_CHAIN_ON_BUS0 / d" \
 		-e "/^CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY / d" \