diff --git a/src/config/Options.lb b/src/config/Options.lb
index 714bb46c90..39e4bf81c0 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -172,6 +172,11 @@ define CONFIG_CHIP_CONFIGURE
 	export used
 	comment "Use new chip_configure method for configuring (non-pci) devices"
 end
+define CONFIG_USE_INIT
+	default 0
+	export never
+	comment "Use stage 1 initialization code"
+end
 
 ###############################################
 # ROM image options
@@ -532,6 +537,18 @@ define PCIC0_CFGDATA
 	export used
 	comment "PCI Configuration Data Register"
 end
+define PNP_CFGADDR
+	default none
+	format "0x%x"
+	export used
+	comment "PNP Configuration Address Register"
+end
+define PNP_CFGDATA
+	default none
+	format "0x%x"
+	export used
+	comment "PNP Configuration Data Register"
+end
 define UART0_IO_BASE
 	default none
 	format "0x%x"
diff --git a/src/cpu/ppc/ppc4xx/Config.lb b/src/cpu/ppc/ppc4xx/Config.lb
index 0617c2a790..5a95024929 100644
--- a/src/cpu/ppc/ppc4xx/Config.lb
+++ b/src/cpu/ppc/ppc4xx/Config.lb
@@ -9,11 +9,11 @@ uses DCACHE_RAM_SIZE
 ##
 ## PPC4XX always uses cache ram for initial setup
 ##
-option USE_DCACHE_RAM=1
+default USE_DCACHE_RAM=1
 ## Set dcache ram above linuxbios image
-option DCACHE_RAM_BASE=_RAMBASE+0x100000
+default DCACHE_RAM_BASE=_RAMBASE+0x100000
 ## Dcache size is 16Kb
-option DCACHE_RAM_SIZE=16384
+default DCACHE_RAM_SIZE=16384
 
 initinclude "FAMILY_INIT" cpu/ppc/ppc4xx/ppc4xx.inc
 initobject cache.S