c64/pi1541
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Travis CI is having trouble with a build target of "1+"

Browse source
This commit is contained in:
Stephen White 2020-01-25 17:56:52 +11:00
parent 94f3476102
commit 40b5feb576
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -12,7 +12,7 @@ matrix:
include: include:
- env: RASPPI=0 - env: RASPPI=0
- env: RASPPI=1 - env: RASPPI=1
- env: RASPPI=1+ - env: RASPPI=1Plus
- env: RASPPI=2 - env: RASPPI=2
- env: RASPPI=3 - env: RASPPI=3

12
Makefile.rules
View file

@ -3,6 +3,9 @@ ifneq ($(V),1)
Q := @ Q := @
endif endif
#use RASPPI = 1 Raspberry 1B (26 IOports)
#use RASPPI = 1Plus to Raspberry 1B+ (40 I/OPorts)
RASPPI ?= 3 RASPPI ?= 3
PREFIX ?= arm-none-eabi- PREFIX ?= arm-none-eabi-
@ -12,17 +15,14 @@ AS = $(CC)
LD = $(PREFIX)ld LD = $(PREFIX)ld
AR = $(PREFIX)ar AR = $(PREFIX)ar
#Changed RASPPI = 1 to Raspberry 1B (26 IOports) A.Buch 02.Jan. 2020
#Added RASPPI = 1+ to Rasüberry 1B+ (40 I/OPorts)
ifeq ($(strip $(RASPPI)),0) ifeq ($(strip $(RASPPI)),0)
ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPIZERO=1 -DEXPERIMENTALZERO=1 ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPIZERO=1 -DEXPERIMENTALZERO=1
CFLAGS += -DRPIZERO=1 -DRASPPI=1 CFLAGS += -DRPIZERO=1 -DRASPPI=1
else ifeq ($(strip $(RASPPI)),1) else ifeq ($(strip $(RASPPI)),1)
ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DEXPERIMENTALZERO=1 ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DEXPERIMENTALZERO=1
CFLAGS += -DRASPPI=1 CFLAGS += -DRASPPI=1
else ifeq ($(strip $(RASPPI)),1+) else ifeq ($(strip $(RASPPI)),1Plus)
ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPIBPLUS=1 ARCH ?= -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -DRPIBPLUS=1 -DEXPERIMENTALZERO=1
CFLAGS += -DRPIBPLUS=1 -DRASPPI=1 CFLAGS += -DRPIBPLUS=1 -DRASPPI=1
else ifeq ($(strip $(RASPPI)),2) else ifeq ($(strip $(RASPPI)),2)
ARCH ?= -march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -marm -DRPI2=1 -DEXPERIMENTALZERO=1 ARCH ?= -march=armv7-a -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -marm -DRPI2=1 -DEXPERIMENTALZERO=1
@ -31,7 +31,7 @@ else ifeq ($(strip $(RASPPI)),3)
ARCH ?= -march=armv8-a+crc -mtune=cortex-a53 -mfpu=crypto-neon-fp-armv8 -mfloat-abi=hard -marm -DRPI3=1 ARCH ?= -march=armv8-a+crc -mtune=cortex-a53 -mfpu=crypto-neon-fp-armv8 -mfloat-abi=hard -marm -DRPI3=1
CFLAGS += -DRPI3=1 CFLAGS += -DRPI3=1
else else
$(error RASPPI must be one of: 0, 1, 1+, 2, 3) $(error RASPPI must be one of: 0, 1, 1Plus, 2, 3)
endif endif
AFLAGS += $(ARCH) AFLAGS += $(ARCH)