Skip to content

Commit

Permalink
ports/itsybitsy3v: Use ao-pins from itsybitsy5v directly
Browse files Browse the repository at this point in the history
Remove itsybitsy3v/ao-pins.h which was #include'ing
../itstybitsy5v/ao-pins.h

Signed-off-by: Keith Packard <keithp@keithp.com>
  • Loading branch information
keith-packard committed Aug 10, 2021
1 parent 6354436 commit 834460c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 24 deletions.
6 changes: 4 additions & 2 deletions chips/avr/snek-avr.defs
Expand Up @@ -14,7 +14,9 @@

SNEK_AO = $(SNEK_ROOT)/ao

SNEK_LOCAL_VPATH = $(SNEK_AVR):$(SNEK_AO)
SNEK_PORT?=.

SNEK_LOCAL_VPATH = $(SNEK_PORT):$(SNEK_AVR):$(SNEK_AO)

SNEK_AVR_SRC = \
snek-io.c \
Expand Down Expand Up @@ -51,7 +53,7 @@ AO_CFLAGS=\
-std=gnu99 $(OPT) -g

AVR_CFLAGS=-DF_CPU=$(AVR_CLOCK) -mmcu=atmega32u4 -g $(SNEK_CFLAGS) -Waddr-space-convert \
-I. -I$(SNEK_AVR) -I$(SNEK_AO) -I$(SNEK_ROOT) $(AO_CFLAGS)
-I. -I$(SNEK_PORT) -I$(SNEK_AVR) -I$(SNEK_AO) -I$(SNEK_ROOT) $(AO_CFLAGS)

CFLAGS = $(AVR_CFLAGS) $(SNEK_CFLAGS)

Expand Down
2 changes: 2 additions & 0 deletions ports/itsybitsy3v/Makefile
Expand Up @@ -17,4 +17,6 @@ PROGNAME=snek-itsybitsy3v
PRODUCT_NAME=SnekItsyBitsy3v
BUILD_INSTALL=0

SNEK_PORT=../itsybitsy5v

include ../itsybitsy5v/Makefile
18 changes: 0 additions & 18 deletions ports/itsybitsy3v/ao-pins.h

This file was deleted.

8 changes: 4 additions & 4 deletions ports/itsybitsy5v/Makefile
Expand Up @@ -36,12 +36,12 @@ SNEK_LOCAL_BUILTINS = \
include $(SNEK_ROOT)/snek-install.defs

ifeq ($(BUILD_INSTALL),1)
INSTALL=snek-itsybitsy-install
INSTALLER=snek-itsybitsy-install
else
INSTALL=
INSTALLER=
endif

all: $(ELF) $(HEX) $(INSTALL)
all: $(ELF) $(HEX) $(INSTALLER)

$(PROG): Makefile $(SNEK_OBJ)
$(CC) $(CFLAGS) -o $@ $(SNEK_OBJ) $(LDFLAGS)
Expand All @@ -65,7 +65,7 @@ endif

clean::
rm -f *.hex *.elf *.map
rm -f ao-product.h $(INSTALL)
rm -f ao-product.h $(INSTALLER)

uninstall::

Expand Down

0 comments on commit 834460c

Please sign in to comment.