Commit e632d5c4 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Only include hw i2c drivers if sw i2c is not active

parent 68eb5f7b

src/app/i2cdetect/Makefile.inc

0 → 100644
+2 −0
Original line number Diff line number Diff line 
arch_drivers += ,i2c

drivers += ,lm75

src/arch/arduino-nano/Makefile.inc

+7 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ PORT = /dev/ttyUSB0 
BAUD = 57600



INCLUDES += -Iinclude/arduino-nano

COMMON_FLAGS += -mmcu=${MCU} -DF_CPU=16000000UL

COMMON_FLAGS += -mmcu=${MCU} -DF_CPU=16000000UL -DMULTIPASS_ARCH_arduino_nano

COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C



CC = avr-gcc

CXX = avr-g++
@@ -23,6 +24,11 @@ TARGETS += src/arch/arduino-nano/driver/gpio.cc 
TARGETS += src/arch/arduino-nano/driver/stdout.cc

TARGETS += src/arch/arduino-nano/driver/uptime.cc



ifneq ($(findstring softi2c,${drivers}), )

else ($(findstring i2c,${arch_drivers}), )

	TARGETS += src/arch/arduino-nano/driver/i2c.cc

endif



ifneq ($(findstring stdin,${arch_drivers}), )

	TARGETS += src/arch/arduino-nano/driver/stdin.cc

endif

src/arch/esp8266/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ifeq (${aspectc}, 1) 
endif



INCLUDES += -Iinclude/esp8266 -I${SDK_BASE}/include

COMMON_FLAGS += -nostdlib -mlongcalls -D__ets__ -DICACHE_FLASH

COMMON_FLAGS += -nostdlib -mlongcalls -D__ets__ -DICACHE_FLASH -DMULTIPASS_ARCH_esp8266

CXXFLAGS = -std=c++11

LDFLAGS += -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static

src/arch/msp430fr5969lp/Makefile.inc

+4 −2
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ CPU = 430x 
MCU = msp430fr5969



INCLUDES += -Iinclude/msp430fr5969lp -I/opt/msp430/ti/gcc/include

COMMON_FLAGS += -mcpu=${CPU} -mmcu=${MCU}

COMMON_FLAGS += -mcpu=${CPU} -mmcu=${MCU} -DMULTIPASS_ARCH_msp430fr5969lp

COMMON_FLAGS += -DMULTIPASS_ARCH_HAS_I2C



CC = /opt/msp430/ti/gcc/bin/msp430-elf-gcc

CXX = /opt/msp430/ti/gcc/bin/msp430-elf-g++
@@ -28,7 +29,8 @@ ifneq ($(findstring stdin,${arch_drivers}), ) 
	TARGETS += src/arch/msp430fr5969lp/driver/stdin.cc

endif



ifneq ($(findstring i2c,${arch_drivers}), )

ifneq ($(findstring softi2c,${drivers}), )

else ($(findstring i2c,${arch_drivers}), )

	TARGETS += src/arch/msp430fr5969lp/driver/i2c.cc

endif