diff --git a/BaS_gcc/Makefile b/BaS_gcc/Makefile
index 7582da2..7f31cf1 100644
--- a/BaS_gcc/Makefile
+++ b/BaS_gcc/Makefile
@@ -116,10 +116,12 @@ lib: $(LIBBAS)
 			bas.lk bas.map ram.lk ram.map basflash.lk basflash.map depend 
 
 $(FLASH_EXEC): TARGET_ADDRESS=0xe0000000
+$(FLASH_EXEC): MACHINE=MACHINE_M5484LITE
 $(FLASH_EXEC): LDCFILE=bas.lk
 $(FLASH_EXEC): MAPFILE=bas.map
 
 $(RAM_EXEC): TARGET_ADDRESS=0x1ff00000
+$(RAM_EXEC): MACHINE=MACHINE_M5484LITE
 $(RAM_EXEC): LDCFILE=ram.lk
 $(RAM_EXEC): MAPFILE=ram.map
 
@@ -129,7 +131,7 @@ $(BASFLASH_EXEC): MAPFILE=basflash.map
 
 # the final link stage (BaS in RAM and BaS in flash)
 $(FLASH_EXEC) $(RAM_EXEC): $(LIBBAS) $(LDCSRC)
-	$(CPP) $(INCLUDE) -P -DTARGET_ADDRESS=$(TARGET_ADDRESS) -DFORMAT=$(FORMAT) -DMACHINE_M5484LITE $(LDCSRC) -o $(LDCFILE)
+	$(CPP) $(INCLUDE) -P -DTARGET_ADDRESS=$(TARGET_ADDRESS) -DFORMAT=$(FORMAT) -D$(MACHINE) $(LDCSRC) -o $(LDCFILE)
 	$(LD) --oformat $(FORMAT) -Map $(MAPFILE) --cref -T $(LDCFILE) -o $@
 ifeq ($(COMPILE_ELF),Y)
 	$(OBJCOPY) -O srec $@ $@.s19
diff --git a/BaS_gcc/bas.lk.in b/BaS_gcc/bas.lk.in
index bd0bb0f..81bc402 100644
--- a/BaS_gcc/bas.lk.in
+++ b/BaS_gcc/bas.lk.in
@@ -25,7 +25,9 @@ SECTIONS
 
 		objs/sysinit.o(.text)
 		objs/fault_vectors.o(.text)
+#ifdef MACHINE_FIREBEE
 		objs/init_fpga.o(.text)
+#endif /* MACHINE_FIREBEE */
 		objs/wait.o(.text)
 		objs/exceptions.o(.text)
 		objs/illegal_instruction.o(.text)
@@ -72,7 +74,7 @@ SECTIONS
 #endif
 	} > bas_rom
 
-#if (TARGET_ADDRESS == 0xe0000000)
+#if (TARGET_ADDRESS == BOOTFLASH_BASE_ADDRESS)
 	/* BaS in RAM */
 	.bas :
 		/*
@@ -115,17 +117,17 @@ SECTIONS
 	__FASTRAM               = 0x10000000;
 	__TARGET_ADDRESS		= TARGET_ADDRESS;
 	
-#if TARGET_ADDRESS == 0xe0000000
+#if TARGET_ADDRESS == BOOTFLASH_BASE_ADDRESS
 	__FASTRAM_END           = __BAS_IN_RAM;
 #else
 	__FASTRAM_END			= TARGET_ADDRESS;
 #endif
 
 	/* Init CS0 (BootFLASH @ E000_0000 - E07F_FFFF 8Mbytes) */
-	___BOOT_FLASH           = 0xe0000000;
- 	___BOOT_FLASH_SIZE      = 0x00800000;
+	___BOOT_FLASH           = BOOTFLASH_BASE_ADDRESS;
+ 	___BOOT_FLASH_SIZE      = BOOTFLASH_SIZE;
 
-#if TARGET_ADDRESS == 0xe0000000
+#if TARGET_ADDRESS == BOOTFLASH_BASE_ADDRESS
 	/* BaS */
 	__BAS_LMA               = LOADADDR(.bas);
 	__BAS_IN_RAM            = ADDR(.bas);
diff --git a/BaS_gcc/sources/pci.c b/BaS_gcc/sources/pci.c
index 337f08b..6d76bbf 100644
--- a/BaS_gcc/sources/pci.c
+++ b/BaS_gcc/sources/pci.c
@@ -1,7 +1,7 @@
 /*
  * pci.c
  *
- * * Purpose:		PCI configuration for the Coldfire builtin PCI bridge.
+ * Purpose:		PCI configuration for the Coldfire builtin PCI bridge.
  *
  * Notes:
  *
diff --git a/BaS_gcc/sources/sysinit.c b/BaS_gcc/sources/sysinit.c
index 4d80f58..cfad54e 100644
--- a/BaS_gcc/sources/sysinit.c
+++ b/BaS_gcc/sources/sysinit.c
@@ -805,7 +805,9 @@ void initialize_hardware(void) {
 		init_slt();
 		init_fbcs();
 		init_ddram();
+#ifdef MACHINE_FIREBEE
 		init_fpga();
+#endif /* MACHINE_FIREBEE */
 
 		/* Validate ST RAM */
 		* (volatile uint32_t *) 0x42e = STRAM_END;	/* phystop TOS system variable */
@@ -940,7 +942,9 @@ void initialize_hardware(void) {
 	init_eport();
 	init_xlbus_arbiter();
 	init_pci();
+#ifdef MACHINE_FIREBEE
 	init_fpga();
+#endif /* MACHINE_FIREBEE */
 	init_pll();
 	init_video_ddr();
 	dvi_on();