From 4db675e259d12877bd8c27451fa05d9125dd9cd0 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 2 Feb 2014 17:47:17 +0100 Subject: [PATCH 1/2] Some fine tuning after the recent general modularization. --- cpu/6502/Makefile.6502 | 9 +++------ cpu/6502/Makefile.customrules-6502 | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cpu/6502/Makefile.6502 b/cpu/6502/Makefile.6502 index dc90fac9d..59ad3bc07 100644 --- a/cpu/6502/Makefile.6502 +++ b/cpu/6502/Makefile.6502 @@ -48,13 +48,13 @@ CONTIKI_CPU_SOURCEFILES += log.c error.c unload.c config.c ctk-mouse.c \ CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c petsciiconv.c cfs-posix-dir.c \ $(CONTIKI_TARGET_SOURCEFILES) $(CONTIKI_CPU_SOURCEFILES) +MODULES += core/ctk core/net/ip core/net/ipv4 core/net/ipv6 + ifdef ETHERNET CONTIKI_SOURCEFILES += $(ETHERNET)-eth.S CFLAGS += -DETHERNET=$(ETHERNET) endif -### Compiler definitions - AS = ca65 CC = cl65 LD = ld65 @@ -64,9 +64,6 @@ AR = ar65 # The apps coming with Contiki run even on a 0x100 byte stack. ASFLAGS = -t $(TARGET) -CFLAGS += -t $(TARGET) -Or -W -unused-param,-unused-var,-const-comparison +CFLAGS += -t $(TARGET) -Or -W -unused-param LDFLAGS = $(STARTADDR_FLAG) -t $(TARGET) -m contiki-$(TARGET).map -D __STACKSIZE__=0x200 AROPTS = a - -## Default modules -MODULES += core/net/ipv4 core/ctk core/net core/net/ip diff --git a/cpu/6502/Makefile.customrules-6502 b/cpu/6502/Makefile.customrules-6502 index ce810a352..b2835a1ff 100644 --- a/cpu/6502/Makefile.customrules-6502 +++ b/cpu/6502/Makefile.customrules-6502 @@ -1,5 +1,3 @@ -### Compilation rules - .SUFFIXES: CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 From ee3050897a683d52c9c7c147acceafa6f5d1c690 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 2 Feb 2014 17:59:06 +0100 Subject: [PATCH 2/2] Some fine tuning after the recent general modularization. --- cpu/6502/Makefile.6502 | 2 ++ cpu/6502/Makefile.customrules-6502 | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/6502/Makefile.6502 b/cpu/6502/Makefile.6502 index 59ad3bc07..e043ab9d0 100644 --- a/cpu/6502/Makefile.6502 +++ b/cpu/6502/Makefile.6502 @@ -37,6 +37,8 @@ endif all: cs8900a.eth lan91c96.eth w5100.eth +.SUFFIXES: + CONTIKI_TARGET_DIRS = . lib sys CONTIKI_CPU_DIRS = . lib sys ctk net diff --git a/cpu/6502/Makefile.customrules-6502 b/cpu/6502/Makefile.customrules-6502 index b2835a1ff..80b22294e 100644 --- a/cpu/6502/Makefile.customrules-6502 +++ b/cpu/6502/Makefile.customrules-6502 @@ -1,5 +1,3 @@ -.SUFFIXES: - CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 $(OBJECTDIR)/%.o: %.c | $(OBJECTDIR) $(TRACE_CC)