I totally realize I changed chips midway and hardcoded a lot of crap, what of it?

avr/Makefile

@@ -5,33 +5,34 @@ HEADER_SUBDIR	= tabby
 CROSS		= avr-
 
 CC		= $(CROSS)gcc
-CFLAGS		= $(CGFLAGS) -Wall -Os -mmcu=atmega32u4 -I$(INCLUDE_PATH)
+CFLAGS		= $(CGFLAGS) -Wall -Os -mmcu=atmega328p -I$(INCLUDE_PATH)
 LDFLAGS		=
 
 OBJCOPY		= $(CROSS)objcopy
-OBJCOPY_FLAGS	= -S -O binary
+OBJCOPY_FLAGS	= -S
 
 AVRDUDE		= avrdude
-AVRDUDE_FLAGS	= -c avr109 -p m32u4 -b 115200 -P $(AVRDUDE_DEVICE)
+AVRDUDE_DEVICE	= /dev/cu.usbmodem1411
+AVRDUDE_FLAGS	= -C ./avrdude.conf -c arduino -p atmega328p -b 115200 -D \
+		  -P $(AVRDUDE_DEVICE)
 
 HEADERS_LOCAL	=
 HEADERS_BUILD	= $(HEADERS_LOCAL) \
 		  $(addprefix $(INCLUDE_PATH)/$(HEADER_SUBDIR)/,$(HEADERS))
 
-NAME		= tabby
-
 HEADERS		= avr/buffer.h avr/uart.h clock.h command.h link.h
 OBJS		= main.o uart.o
 
-IMAGE_ELF	= $(NAME).elf
-IMAGE_BIN	= $(NAME).bin
+IMAGE_NAME	= tabby
+IMAGE_ELF	= $(IMAGE_NAME).elf
+IMAGE_BIN	= $(IMAGE_NAME).bin
 
 RM		= /bin/rm
 
 all: $(IMAGE_BIN)
 
 $(IMAGE_BIN): $(IMAGE_ELF)
-	$(OBJCOPY) $(OBJCOPY_FLAGS) $< $@
+	$(OBJCOPY) $(OBJCOPY_FLAGS) -O binary $< $@
 
 $(IMAGE_ELF): $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) -o $@