build: some clean ups

diff --git a/Makefile b/Makefile
index 588475b..ff00850 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
 TARGET ?= PicoDrive
-CFLAGS += -Wall -ggdb -falign-functions=2
+CFLAGS += -Wall -g
 CFLAGS += -I.
 ifndef DEBUG
 CFLAGS += -O3 -DNDEBUG
 endif
-#CFLAGS += -DEVT_LOG
-#CFLAGS += -DDRC_CMP
-#cpu_cmp = 1
-#drc_debug = 7
-#profile = 1
 
+# This is actually needed, bevieve me.
+# If you really have to disable this, set NO_ALIGN_FUNCTIONS elsewhere.
+ifndef NO_ALIGN_FUNCTIONS
+CFLAGS += -falign-functions=2
+endif
 
 all: config.mak target_
 
@@ -48,11 +48,6 @@ endif
 
 -include Makefile.local
 
-ifneq "$(use_cyclone)" "1"
-# due to CPU stop flag access
-asm_cdmemory = 0
-endif
-
 ifeq "$(PLATFORM)" "opendingux"
 opk: $(TARGET).opk
 

diff --git a/pico/cd/memory_arm.S b/pico/cd/memory_arm.S
index 23f0b94..fe82ecb 100644 (file)
--- a/pico/cd/memory_arm.S
+++ b/pico/cd/memory_arm.S
@@ -59,7 +59,6 @@
 .extern s68k_poll_detect
 .extern pcd_pcm_write
 .extern pcd_pcm_read
-.extern PicoCpuCS68k
 .extern PicoRead8_io
 .extern PicoRead16_io
 .extern PicoWrite8_io