Skip to content

P
PPSi
Commit bf4eb4d1 authored by Aurelio Colosimo's avatar Aurelio Colosimo
Browse files
Options

default compilation set to gnu-linux, no diag, no extension 

Revert "spec architecture set as default (easier for SPEC development)"
This reverts commit 6f5ed695.

Revert "FULL_DIAG set as default"
This reverts commit e8fba2d4.

standard protocol (with no extension) set back as default compilation
parent 4d2f1af4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
Makefile
View file @ bf4eb4d1
...@@ -35,7 +35,8 @@ include diag/Makefile ...@@ -35,7 +35,8 @@ include diag/Makefile
#include proto-standard/Makefile #include proto-standard/Makefile
# including the extension Makefile, if an extension is there # including the extension Makefile, if an extension is there
PROTO_EXT ?= whiterabbit # Uncomment the following line for whiterabbit extension
# PROTO_EXT ?= whiterabbit
ifdef PROTO_EXT ifdef PROTO_EXT
include proto-ext-$(PROTO_EXT)/Makefile include proto-ext-$(PROTO_EXT)/Makefile
else else
...@@ -49,9 +50,9 @@ else ...@@ -49,9 +50,9 @@ else
CFLAGS += -DPPSI_SLAVE CFLAGS += -DPPSI_SLAVE
endif endif
# Include arch code, the default is spec # Include arch code, the default is hosted GNU/Linux stuff
# we need this -I so <arch/arch.h> can be found # we need this -I so <arch/arch.h> can be found
ARCH ?= spec ARCH ?= gnu-linux
CFLAGS += -Iarch-$(ARCH)/include CFLAGS += -Iarch-$(ARCH)/include
include arch-$(ARCH)/Makefile include arch-$(ARCH)/Makefile
......
compile_all_spec
View file @ bf4eb4d1
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
export CROSS_COMPILE=/opt/lm32/bin/lm32-elf- export CROSS_COMPILE=/opt/lm32/bin/lm32-elf-
echo $CROSS_COMPILE echo $CROSS_COMPILE
make clean;make WRMODE=slave HAS_FULL_DIAG=y && mv ppsi.bin ppsi_slave.bin_ make clean;make WRMODE=slave HAS_FULL_DIAG=y && ARCH=spec && mv ppsi.bin ppsi_slave.bin_
make clean;make WRMODE=master HAS_FULL_DIAG=y && mv ppsi.bin ppsi_master.bin make clean;make WRMODE=master HAS_FULL_DIAG=y && ARCH=spec && mv ppsi.bin ppsi_master.bin
mv ppsi_slave.bin_ ppsi_slave.bin mv ppsi_slave.bin_ ppsi_slave.bin
diag/Makefile
View file @ bf4eb4d1
# Alessandro Rubini for CERN, 2011 -- public domain # Alessandro Rubini for CERN, 2011 -- public domain
# Diagnostics: we have tree levels: none, full and limited # Diagnostics: we have tree levels: none, full and limited
# set HAS_FULL_DIAG as default (mainly for debugging purpose)
HAS_FULL_DIAG ?= y
# full: use a complete printf and the diag code # full: use a complete printf and the diag code
OBJ-$(HAS_FULL_DIAG) += diag/diag-yes.o diag/diag-printf.o diag/printf-full.o OBJ-$(HAS_FULL_DIAG) += diag/diag-yes.o diag/diag-printf.o diag/printf-full.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment