3 files changed, 27 insertions, 46 deletions
diff --git a/src/config/Config.lb b/src/config/Config.lb
index 70b3dc9630..c9c03bb604 100644
--- a/src/config/Config.lb
+++ b/src/config/Config.lb
@@ -32,40 +32,40 @@ makerule linuxbios.strip
 	action	"$(OBJCOPY) -O binary linuxbios linuxbios.strip"
 end
 
-makerule linuxbios_c.o   
+makerule linuxbios_ram.o
 	depends	"$(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)" 
 	action	"$(CC) -nostdlib -r -o $@ c_start.o $(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)"
 end
 
-makerule linuxbios_c  
-	depends	"linuxbios_c.o $(TOP)/src/config/linuxbios_c.ld ldoptions" 
-	action	"$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_c.ld linuxbios_c.o"
-	action 	"$(CROSS_COMPILE)nm -n linuxbios_c | sort > linuxbios_c.map"
+makerule linuxbios_ram
+	depends	"linuxbios_ram.o $(TOP)/src/config/linuxbios_ram.ld ldoptions" 
+	action	"$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_ram.ld linuxbios_ram.o"
+	action 	"$(CROSS_COMPILE)nm -n linuxbios_ram | sort > linuxbios_ram.map"
 end
 
 ##
-## By default compress the C part of linuxbios
+## By default compress the part of linuxbios that runs from RAM
 ##
-makedefine LINUXBIOS_PAYLOAD-$(CONFIG_COMPRESS):=linuxbios_payload.nrv2b
-makedefine LINUXBIOS_PAYLOAD-$(CONFIG_UNCOMPRESSED):=linuxbios_payload.bin
+makedefine LINUXBIOS_RAM-$(CONFIG_COMPRESS):=linuxbios_ram.nrv2b
+makedefine LINUXBIOS_RAM-$(CONFIG_UNCOMPRESSED):=linuxbios_ram.bin
 
-makerule linuxbios_payload.bin 
-	depends	"linuxbios_c" 
+makerule linuxbios_ram.bin 
+	depends	"linuxbios_ram" 
 	action	"$(OBJCOPY) -O binary $< $@"
 end
 
-makerule linuxbios_payload.nrv2b 
-	depends	"linuxbios_payload.bin nrv2b" 
+makerule linuxbios_ram.nrv2b 
+	depends	"linuxbios_ram.bin nrv2b" 
 	action	"./nrv2b e $< $@"
 end
 
-makerule linuxbios_payload   
-	depends	"$(LINUXBIOS_PAYLOAD-1)" 
-	action	"cp $(LINUXBIOS_PAYLOAD-1) linuxbios_payload"
+makerule linuxbios_ram.rom
+	depends	"$(LINUXBIOS_RAM-1)" 
+	action	"cp $(LINUXBIOS_RAM-1) linuxbios_ram.rom"
 end
 
 makerule linuxbios   
-	depends	"crt0.o $(INIT-OBJECTS) linuxbios_payload ldscript.ld" 
+	depends	"crt0.o $(INIT-OBJECTS) linuxbios_ram.rom ldscript.ld"
 	action	"$(CC) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o $(INIT-OBJECTS)"
 	action	"$(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map"
 end
@@ -155,7 +155,7 @@ makerule clean
 	action	"rm -f ldscript.ld"
 	action	"rm -f a.out *.s *.l *.o *.E *.inc"
 	action	"rm -f TAGS tags romcc"
-	action	"rm -f docipl buildrom chips.c *chip.c linuxbios_c* linuxbios_pay*"
+	action	"rm -f docipl buildrom chips.c *chip.c linuxbios_ram* linuxbios_pay*"
 	action	"rm -f build_opt_tbl option_table.c crt0.S"
 end
 
diff --git a/src/config/Options.lb b/src/config/Options.lb
index d3800976d4..eb6736f5de 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -61,35 +61,10 @@ define ARCH
 	export always
 	comment "Default architecture is i386, options are alpha and ppc"
 end
-define k7
-	default none
-	export used
-	comment "We're a k7"
-end
-define k8
-	default none
-	export used
-	comment "We're a k8"
-end
-define i586
-	default none
-	export used
-	comment "We're a 586"
-end
-define i686
-	default none
-	export used
-	comment "We're a 686"
-end
-define i786
-	default none
-	export used
-	comment "We're a 786"
-end
-define CPU_FIXUP
-	default none
-	export used
-	comment "Do CPU fixups"
+define HAVE_MOVNTI
+	default 0
+	export always
+	comment "This cpu supports the MOVNTI directive"
 end
 
 ###############################################
@@ -702,6 +677,12 @@ end
 # Misc options
 ###############################################
 
+define CONFIG_GDB_STUB
+	default 0
+	export used
+	comment "Compile in gdb stub support?"
+end
+
 define HAVE_INIT_TIMER
 	default 0
 	export always
diff --git a/src/config/linuxbios_c.ld b/src/config/linuxbios_ram.ld
index 6fa311fc0e..6fa311fc0e 100644
--- a/src/config/linuxbios_c.ld
+++ b/src/config/linuxbios_ram.ld