softpll-unify: makefile changes (no effect at this point)

This fixes the makefile to build either wrc.bin or rt_cpu.bin, using the obj-y convention. At this point Kconfig can't select rt_cpu.bin, and nothing changes in the ouput binary, in all configurations. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

softpll-unify: makefile changes (no effect at this point)
This fixes the makefile to build either wrc.bin or rt_cpu.bin, using the obj-y convention. At this point Kconfig can't select rt_cpu.bin, and nothing changes in the ouput binary, in all configurations. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
1fd12733 · Alessandro Rubini · 16bc0c8a · 1fd12733 · 1fd12733 · 1fd12733
Commit 1fd12733 authored Dec 15, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 15 deletions

.gitignore .gitignore +2 -3

Makefile Makefile +15 -9

dev.mk dev/dev.mk +3 -1

lib.mk lib/lib.mk +1 -1

shell.mk shell/shell.mk +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,8 @@
 *.mif
 *.*~
 *~
-wrc_disasm.S
-wrc.ram
-wrc.vhd
+*_disasm.S
+*.vhd

 *.cmd
 *.o

--- a/Makefile
+++ b/Makefile
@@ -18,16 +18,20 @@ PPSI = ppsi

 # we miss CONFIG_ARCH_LM32 as we have no other archs by now
 obj-y = arch/lm32/crt0.o arch/lm32/irq.o
-LDS = arch/lm32/ram.ld
+LDS-$(CONFIG_WR_NODE)   = arch/lm32/ram.ld
+LDS-$(CONFIG_WR_SWITCH) = arch/lm32/ram-wrs.ld

-obj-y += wrc_main.o
+obj-$(CONFIG_WR_NODE)   += wrc_main.o
+obj-$(CONFIG_WR_SWITCH) += wrs_main.o
+obj-$(CONFIG_WR_SWITCH) += ipc/minipc-mem-server.o ipc/rt_ipc.o 

 # our linker script is preprocessed, so have a rule here
 %.ld: %.ld.S $(AUTOCONF)
 	$(CC) -include $(AUTOCONF) -E -P $*.ld.S -o $@


-cflags-y =	-ffreestanding -include $(AUTOCONF) -Iinclude/std -Iinclude -I. -Isoftpll
+cflags-y =	-ffreestanding -include $(AUTOCONF) -Iinclude/std -Iinclude \
+			-I. -Isoftpll -Iipc
 cflags-y +=	-I$(CURDIR)/pp_printf

 cflags-$(CONFIG_PTP_NOPOSIX) += \
@@ -80,7 +84,7 @@ obj-$(CONFIG_PPSI) += \

 CFLAGS_PLATFORM  = -mmultiply-enabled -mbarrel-shift-enabled
 LDFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled \
-	-nostdlib -T $(LDS)
+	-nostdlib -T $(LDS-y)

 include shell/shell.mk
 include lib/lib.mk
@@ -88,10 +92,10 @@ include pp_printf/printf.mk
 include dev/dev.mk
 include softpll/softpll.mk

-obj-y += check-error.o
+obj-$(CONFIG_WR_NODE) += check-error.o

-obj-y += sdb-lib/libsdbfs.a
-cflags-y += -Isdb-lib
+obj-$(CONFIG_WR_NODE) += sdb-lib/libsdbfs.a
+cflags-$(CONFIG_WR_NODE) += -Isdb-lib

 CFLAGS = $(CFLAGS_PLATFORM) $(cflags-y) -Wall \
 	-ffunction-sections -fdata-sections -Os \
@@ -102,7 +106,9 @@ LDFLAGS = $(LDFLAGS_PLATFORM) \

 OBJS = $(obj-y)

-OUTPUT = wrc
+OUTPUT-$(CONFIG_WR_NODE)   = wrc
+OUTPUT-$(CONFIG_WR_SWITCH) = rt_cpu
+OUTPUT := $(OUTPUT-y)

 REVISION=$(shell git describe --dirty --always)

@@ -129,7 +135,7 @@ $(obj-ppsi):
 sdb-lib/libsdbfs.a:
 	$(MAKE) -C sdb-lib

-$(OUTPUT).elf: $(LDS) $(AUTOCONF) gitmodules $(OUTPUT).o config.o
+$(OUTPUT).elf: $(LDS-y) $(AUTOCONF) gitmodules $(OUTPUT).o config.o
 	$(CC) $(CFLAGS) -DGIT_REVISION=\"$(REVISION)\" -c revision.c
 	${CC} -o $@ revision.o config.o $(OUTPUT).o $(LDFLAGS)
 	${OBJDUMP} -d $(OUTPUT).elf > $(OUTPUT)_disasm.S

--- a/dev/dev.mk
+++ b/dev/dev.mk
-obj-y += \
+obj-$(CONFIG_WR_NODE) += \
 	dev/endpoint.o \
 	dev/ep_pfilter.o \
 	dev/i2c.o \
@@ -9,6 +9,8 @@ obj-y += \
 	dev/sdb.o \
 	dev/rxts_calibrator.o

+obj-$(CONFIG_WR_SWITCH) += dev/timer-wrs.o dev/ad9516.o
+
 obj-$(CONFIG_LEGACY_EEPROM) += dev/eeprom.o
 obj-$(CONFIG_SDB_EEPROM) += dev/sdb-eeprom.o


--- a/lib/lib.mk
+++ b/lib/lib.mk
 obj-y += lib/util.o lib/atoi.o
 obj-y += lib/usleep.o
-obj-y += lib/net.o
+obj-$(CONFIG_WR_NODE) += lib/net.o

 obj-$(CONFIG_ETHERBONE) += lib/arp.o lib/icmp.o lib/ipv4.o lib/bootp.o
--- a/shell/shell.mk
+++ b/shell/shell.mk
-obj-y += \
+obj-$(CONFIG_WR_NODE) += \
 	shell/shell.o \
 	shell/cmd_version.o \
 	shell/cmd_pll.o \