Configuration Enhancements

.gitignore

@@ -0,0 +1,16 @@
+.*.swp
+.*.swo
+*.i
+*.o
+*.a
+*.bin
+pcb/*.b[^r][^d]
+pcb/*.p[^c][^b]
+rgb-test
+am335x/pasm/pasm
+.*.d
+*~
+*~
+bin/*
+*.dtbo
+.DS_Store

Makefile

@@ -1,57 +1,25 @@
-#CROSS_COMPILE?=arm-arago-linux-gnueabi-
-
-LIBDIR_APP_LOADER?=../../app_loader/lib
-INCDIR_APP_LOADER?=../../app_loader/include
-BINDIR?=.
-
-CFLAGS += \
-	-std=c99 \
-	-Wall \
-	-I$(INCDIR_APP_LOADER) \
-	-D__DEBUG \
-	-O2 \
-	-mtune=cortex-a8 \
-	-march=armv7-a \
-
-LDFLAGS += \
-	-L$(LIBDIR_APP_LOADER) \
-	-lprussdrv \
-	-lpthread \
-
-PASM := ../../utils/pasm_2
-OBJDIR=obj
-TARGET=$(BINDIR)/ws281x
-
-_DEPS = 
-DEPS = $(patsubst %,$(INCDIR_APP_LOADER)/%,$(_DEPS))
-
-_OBJ = ws281x.o
-OBJ = $(patsubst %,$(OBJDIR)/%,$(_OBJ))
-
-$(OBJDIR)/%.o: %.c $(DEPS)
-	@mkdir -p obj
-	$(CROSS_COMPILE)gcc $(CFLAGS) -c -o $@ $< 
-
-all: $(TARGET) ws281x.bin
-$(TARGET): $(OBJ)
-	$(CROSS_COMPILE)gcc $(CFLAGS) -o $@ $^ $(LDFLAGS)
-
-ws281x.bin: ws281x.p ws281x.hp
-	$(CPP) - < $< | grep -v '^#' | sed 's/;/\n/g' > $<.i
-	$(PASM) -V3 -b $<.i
+#########
+#
+# Top level Makefile.
+# Mostly just recurse into subdirectories.
+
+SUBDIR-y += dts
+SUBDIR-y += src/ledscape
+SUBDIR-y += src/script
+SUBDIR-y += src/ledgames
+SUBDIR-y += src/ledgames/rsrc
+
+all: 
+	for dir in $(SUBDIR-y); do \
+		$(MAKE) -C $$dir || exit 1; \
+	done
 
+clean:
+	for dir in $(SUBDIR-y); do \
+		$(MAKE) -C $$dir clean; \
+	done
 
-.PHONY: clean
 
-clean:
-	rm -rf $(OBJDIR)/ *~  $(INCDIR_APP_LOADER)/*~  $(TARGET) ../bin/ws281x.bin ws281x.bin
+firmware:
+	echo CAPE-BONE-OCTO > /sys/devices/bone_capemgr.8/slots
 
-SLOT_FILE=/sys/devices/bone_capemgr.8/slots
-dts: LEDscape.dts
-	@SLOT="`grep LEDSCAPE $(SLOT_FILE) | cut -d: -f1`"; \
-	if [ ! -z "$$SLOT" ]; then \
-		echo "Removing slot $$SLOT"; \
-		echo -$$SLOT > $(SLOT_FILE); \
-	fi
-	dtc -O dtb -o /lib/firmware/BB-LEDSCAPE-00A0.dtbo -b 0 -@ LEDscape.dts
-	echo BB-LEDSCAPE > $(SLOT_FILE)

Makefile.common

@@ -0,0 +1,180 @@
+#########
+#
+# Common build targets
+#
+#
+
+TOP ?= ../..
+OBJDIR ?= $(TOP)/obj
+LIBDIR ?= $(TOP)/lib
+BINDIR ?= $(TOP)/bin
+
+all: \
+	$(TARGETS-y) \
+	$(foreach O,$(BIN-y),$(BINDIR)/$O) \
+	$(foreach O,$(LIB-y),$(LIBDIR)/$O) \
+
+ifeq ($(shell uname -m),armv7l)
+# We are on the BeagleBone Black itself;
+# do not cross compile.
+export CROSS_COMPILE:=
+
+else
+# We are not on the BeagleBone and might be cross compiling.
+# If the environment does not set CROSS_COMPILE, set our
+# own.  Install a cross compiler with something like:
+#
+# sudo apt-get install gcc-arm-linux-gnueabi
+#
+export CROSS_COMPILE?=arm-linux-gnueabi-
+endif
+
+GENERIC_CFLAGS += \
+	-g \
+	-W \
+	-Wall \
+	-D_BSD_SOURCE \
+	-Wp,-MMD,$(dir $@).$(notdir $@).d \
+	-Wp,-MT,$@ \
+	-I. \
+	-I$(TOP)/src/ledscape \
+	-O0 \
+	-mtune=cortex-a8 \
+	-march=armv7-a \
+
+CFLAGS += \
+	-std=c99 \
+	$(GENERIC_CFLAGS) \
+
+CPPFLAGS += \
+	$(GENERIC_CFLAGS) \
+	-std=c++11
+
+LDFLAGS += \
+
+LDLIBS += \
+	-L$(LIBDIR) \
+	-lledscape \
+	-lpthread \
+	-lm \
+	-lpng \
+	-lSDL \
+	-lSDL_mixer
+
+COMPILE.c-o = $(CROSS_COMPILE)gcc $(CFLAGS) -c -o $@ $< 
+COMPILE.cc-o = $(CROSS_COMPILE)g++ $(CPPFLAGS) -c -o $@ $< 
+COMPILE.cpp-o = $(CROSS_COMPILE)g++ $(CPPFLAGS) -c -o $@ $< 
+COMPILE.a = $(CROSS_COMPILE)ar crv $@ $^ 
+COMPILE.link = $(CROSS_COMPILE)g++ $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+$(OBJDIR)/%.o: %.c
+	$(COMPILE.c-o)
+$(OBJDIR)/%.o: %.cpp
+	$(COMPILE.cpp-o)
+$(OBJDIR)/%.o: %.cc
+	$(COMPILE.cc-o)
+
+$(LIBDIR)/%.a:
+	$(RM) $@
+	$(COMPILE.a)
+
+$(BINDIR)/%:
+	$(COMPILE.link)
+
+
+#####
+#
+# The TI "app_loader" is the userspace library for talking to
+# the PRU and mapping memory between it and the ARM.
+#
+APP_LOADER_DIR ?= $(TOP)/am335x/app_loader
+APP_LOADER_LIB := $(APP_LOADER_DIR)/lib/libprussdrv.a
+CFLAGS += -I$(APP_LOADER_DIR)/include
+LDLIBS += $(APP_LOADER_LIB)
+
+
+#####
+#
+# The TI PRU assembler looks like it has macros and includes,
+# but it really doesn't.  So instead we use cpp to pre-process the
+# file and then strip out all of the directives that it adds.
+# PASM also doesn't handle multiple statements per line, so we
+# insert hard newline characters for every ; in the file.
+#
+PASM_DIR ?= $(TOP)/am335x/pasm
+PASM := $(PASM_DIR)/pasm
+
+$(LIBDIR)/%.bin: %.p $(PASM)
+	$(CPP) - < $< | perl -p -e 's/^#.*//; s/;/\n/g; s/BYTE\((\d+)\)/t\1/g' > /tmp/$(basename $<).i
+	$(PASM) -V3 -b /tmp/$(basename $<).i $(basename $@)
+	$(RM) /tmp/$(basename $<).i
+
+#
+# Generate a target for each of the binaries, with dependencies on
+# object files for that source.
+#
+$(foreach O,$(BIN-y),\
+	$(eval $(BINDIR)/$O: $(foreach s,$($O.srcs),$(OBJDIR)/$(basename $s).o) $(LIBDIR)/libledscape.a))
+
+$(foreach O,$(LIB-y),\
+	$(eval $(LIBDIR)/$O: $(foreach s,$($(basename $O).srcs),$(OBJDIR)/$(basename $s).o) $(APP_LOADER_LIB)))
+
+#$(TARGETS):
+	#$(COMPILE.link)
+
+
+.PHONY: clean
+
+# Include all of the generated dependency files
+-include $(OBJDIR)/.*.o.d
+
+clean:
+	rm -rf \
+		$(OBJDIR)/*.o \
+		$(LIBDIR)/*.a \
+		$(OBJDIR)/.*.o.d \
+		$(LIBDIR)/*.bin \
+
+
+###########
+# 
+# The correct way to reserve the GPIO pins on the BBB is with the
+# capemgr and a Device Tree file.  But it doesn't work.
+#
+SLOT_FILE=/sys/devices/bone_capemgr.9/slots
+DTS=CAPE-BONE-OCTO
+DTB=/lib/firmware/$(DTS)-00A0.dtbo
+GPIODTS=GPIO
+GPIODTB=/lib/firmware/$(GPIODTS)-00A0.dtbo
+
+dts: LEDscape.dts
+	@SLOT="`grep LEDSCAPE $(SLOT_FILE) | cut -d: -f1`"; \
+	if [ ! -z "$$SLOT" ]; then \
+		echo "Removing slot $$SLOT"; \
+		echo -$$SLOT > $(SLOT_FILE); \
+	fi
+	dtc -O dtb -o /lib/firmware/BB-LEDSCAPE-00A0.dtbo -b 0 -@ LEDscape.dts
+	echo BB-LEDSCAPE > $(SLOT_FILE)
+
+
+
+firmware: $(DTB) $(GPIODTB)
+
+$(DTB): cape-bone-octo.dts FORCE
+	dtc -O dtb -o $@ -b 0 -@ $<
+
+$(GPIODTB): gpio.dts FORCE
+	dtc -O dtb -o $@ -b 0 -@ $<
+
+FORCE:
+
+###########
+# 
+# PRU Libraries and PRU assembler are build from their own trees.
+# 
+$(APP_LOADER_LIB):
+	$(MAKE) -C $(APP_LOADER_DIR)/interface
+
+$(PASM):
+	$(MAKE) -C $(PASM_DIR)
+