diff --git a/targets/arima/hdama/Config.kernelimage.lb b/targets/arima/hdama/Config.kernelimage.lb
index d5a465985c..236d606719 100644
--- a/targets/arima/hdama/Config.kernelimage.lb
+++ b/targets/arima/hdama/Config.kernelimage.lb
@@ -14,7 +14,7 @@ uses CONFIG_UDELAY_TSC
 uses CPU_FIXUP
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_HAVE_HARD_RESET
 uses i586
 uses i686
diff --git a/targets/emulation/qemu-x86/Config-car.lb b/targets/emulation/qemu-x86/Config-car.lb
index 00b2200b2e..1d2032e0b9 100644
--- a/targets/emulation/qemu-x86/Config-car.lb
+++ b/targets/emulation/qemu-x86/Config-car.lb
@@ -11,7 +11,7 @@ option CONFIG_USE_PRINTK_IN_CAR=1
 
 option CC="gcc -m32"
 
-option CONFIG_HAVE_PIRQ_TABLE=1
+option CONFIG_GENERATE_PIRQ_TABLE=1
 option CONFIG_IRQ_SLOT_COUNT=6
 
 romimage "fallback" 
diff --git a/targets/emulation/qemu-x86/Config-lab.lb b/targets/emulation/qemu-x86/Config-lab.lb
index d68ffd9f0b..34786e5498 100644
--- a/targets/emulation/qemu-x86/Config-lab.lb
+++ b/targets/emulation/qemu-x86/Config-lab.lb
@@ -9,7 +9,7 @@ option CONFIG_PRECOMPRESSED_PAYLOAD=1
 
 option CC="gcc -m32"
 
-option CONFIG_HAVE_PIRQ_TABLE=1
+option CONFIG_GENERATE_PIRQ_TABLE=1
 option CONFIG_IRQ_SLOT_COUNT=6
 
 romimage "fallback" 
diff --git a/targets/emulation/qemu-x86/Config.OLPC.lb b/targets/emulation/qemu-x86/Config.OLPC.lb
index 1b240f7ed6..718fd8d284 100644
--- a/targets/emulation/qemu-x86/Config.OLPC.lb
+++ b/targets/emulation/qemu-x86/Config.OLPC.lb
@@ -9,7 +9,7 @@ option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
 option CC="gcc -m32"
 
-option CONFIG_HAVE_PIRQ_TABLE=1
+option CONFIG_GENERATE_PIRQ_TABLE=1
 option CONFIG_IRQ_SLOT_COUNT=6
 
 romimage "fallback" 
diff --git a/targets/emulation/qemu-x86/Config.lb b/targets/emulation/qemu-x86/Config.lb
index a05e815e86..51442147e5 100644
--- a/targets/emulation/qemu-x86/Config.lb
+++ b/targets/emulation/qemu-x86/Config.lb
@@ -7,7 +7,7 @@ option CONFIG_ROM_SIZE=512*1024
 
 option CC="gcc -m32"
 
-option CONFIG_HAVE_PIRQ_TABLE=1
+option CONFIG_GENERATE_PIRQ_TABLE=1
 option CONFIG_IRQ_SLOT_COUNT=6
 option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=9
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=9
diff --git a/targets/iei/juki-511p/Config.lb b/targets/iei/juki-511p/Config.lb
index 6b8eddad86..bcccf92f7c 100644
--- a/targets/iei/juki-511p/Config.lb
+++ b/targets/iei/juki-511p/Config.lb
@@ -23,7 +23,7 @@ mainboard iei/juki-511p
 
 option CONFIG_ROM_SIZE=256*1024
 
-option CONFIG_HAVE_PIRQ_TABLE=1
+option CONFIG_GENERATE_PIRQ_TABLE=1
 
 option CONFIG_COMPRESS=0
 option CONFIG_PRECOMPRESSED_PAYLOAD=0
diff --git a/targets/iwill/dk8s2/Config.lb b/targets/iwill/dk8s2/Config.lb
index cbc45b248f..ff9aeb468e 100644
--- a/targets/iwill/dk8s2/Config.lb
+++ b/targets/iwill/dk8s2/Config.lb
@@ -21,7 +21,7 @@ option CONFIG_HAVE_FALLBACK_BOOT=1
 ###
 ### Build code to export a programmable irq routing table
 ###
-option CONFIG_HAVE_PIRQ_TABLE=1
+option CONFIG_GENERATE_PIRQ_TABLE=1
 option CONFIG_IRQ_SLOT_COUNT=12
 #
 ###
diff --git a/targets/iwill/dk8x/Config.lb b/targets/iwill/dk8x/Config.lb
index bbc7b71d37..54bd4a1f01 100644
--- a/targets/iwill/dk8x/Config.lb
+++ b/targets/iwill/dk8x/Config.lb
@@ -21,7 +21,7 @@ option CONFIG_HAVE_FALLBACK_BOOT=1
 ###
 ### Build code to export a programmable irq routing table
 ###
-option CONFIG_HAVE_PIRQ_TABLE=1
+option CONFIG_GENERATE_PIRQ_TABLE=1
 option CONFIG_IRQ_SLOT_COUNT=12
 #
 ###
diff --git a/targets/msi/ms7135/Config.lb b/targets/msi/ms7135/Config.lb
index 2d8ea4928a..6d9b215853 100644
--- a/targets/msi/ms7135/Config.lb
+++ b/targets/msi/ms7135/Config.lb
@@ -26,7 +26,7 @@ mainboard msi/ms7135
 option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
 
-option CONFIG_HAVE_PIRQ_TABLE=1
+option CONFIG_GENERATE_PIRQ_TABLE=1
 option CONFIG_CONSOLE_VGA=1
 option CONFIG_PCI_ROM_RUN=1
 
diff --git a/targets/tyan/s1846/Config.lb b/targets/tyan/s1846/Config.lb
index aeaac814e2..9a2c030f60 100644
--- a/targets/tyan/s1846/Config.lb
+++ b/targets/tyan/s1846/Config.lb
@@ -27,7 +27,7 @@ option CONFIG_MAINBOARD_VENDOR = "Tyan"
 option CONFIG_MAINBOARD_PART_NUMBER = "S1846"
 
 # TODO: Add/fix PIRQ table.
-option CONFIG_HAVE_PIRQ_TABLE = 0
+option CONFIG_GENERATE_PIRQ_TABLE = 0
 
 option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
 option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9