diff --git a/make/compile.mk b/make/compile.mk
index 564e193..73092ac 100644
--- a/make/compile.mk
+++ b/make/compile.mk
@@ -9,18 +9,19 @@ WITH_TLB ?= n
 ENDIANESS ?= eb
 DEBUGGER ?= mips
 
-DEFINES := -DBOARD_$(BOARD)
+DEFINES := -D$(BOARD)
 CCFLAGS := -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics
 CFLAGS := -fno-exceptions -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -nostartfiles -Os
 
 CFLAGS_TLB-y := -DSYS_IO_BASE=0xAC000000 -DSDRAM_BASE=0x80000000 -DFLASH_BASE_IO=0xA4000000 -DFLASH_BASE_MEM=0x88000000
 CFLAGS_TLB-n := -DSYS_IO_BASE=0xA0000000 -DSDRAM_BASE=0x40000000 -DFLASH_BASE_IO=0xA4000000 -DFLASH_BASE_MEM=0x00000000
 
-CFLAGS-eb =-EB
-CFLAGS-el =-EL
+ENDIAN_FLAGS-eb := -EB
+ENDIAN_FLAGS-el := -EL
+ENDIAN_FLAGS := $(ENDIAN_FLAGS-$(ENDIANESS))
 
 CFLAGS += $(CFLAGS_TLB-$(WITH_TLB))
-CFLAGS += $(CFLAGS-$(ENDIANESS))
+CFLAGS += $(ENDIAN_FLAGS)
 CFLAGS += -msoft-float -march=r3000
 CFLAGS += $(CFLAGS-$(BOARD))
 
diff --git a/src/Makefile b/src/Makefile
index fc7481c..1f1d6ca 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,9 +6,6 @@ include ../make/mips_app.mk
 PROG-ml402 = $(addprefix $(BUILD_DIR)/, hello.elf testbench.elf test_irq.elf dhry.elf queens.elf stanford.elf paranoia.elf rmd160_test.elf Bessel.elf whet.elf phrasen.elf dttl.elf richards_benchmark.elf test_exception.elf life.elf r3.elf gunzip.elf basic_math.elf jman_patches.elf jman_patchmeshes.elf jman_polys.elf test_hpi.elf test_vga.elf test_fft.elf)
 PROG-denano = $(addprefix $(BUILD_DIR)/, hello.elf dhry.elf queens.elf stanford.elf paranoia.elf rmd160_test.elf Bessel.elf whet.elf phrasen.elf dttl.elf richards_benchmark.elf test_exception.elf testbench_denano.elf)
 PROG-sim = $(addprefix $(BUILD_DIR)/, hello.elf)
-CFLAGS-sim := -O0
-		  
-CFLAGS += $(CFLAGS-$(BOARD))
 		  
 all: $(PROG-$(BOARD))
 
@@ -25,7 +22,7 @@ $(BUILD_DIR)/test_fft.elf: $(BUILD_DIR) test_fft.c
 	$(OBJCOPY) -O ihex -I binary $@.flash.bin $@.hex
 
 $(BUILD_DIR)/hello.elf: $(BUILD_DIR) hello.c
-	$(CC) $(CFLAGS) -o $@ -Os hello.c $(LIBS) >$@.map
+	$(CC) $(CFLAGS) -o $@ hello.c $(LIBS) >$@.map
 	$(OBJDUMP) -d $@ > $@.dis
 	$(OBJCOPY) $@ -O binary $@.bin
 	$(OBJCOPY) -O srec $@ $@.srec