Makefile: use .config and include/config/autoconf.h

This has been verified to properly obey the new CONFIG_ETHERBONE settin. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Makefile: use .config and include/config/autoconf.h
This has been verified to properly obey the new CONFIG_ETHERBONE settin. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
3bb5f9df · Alessandro Rubini · 92a9048e · 3bb5f9df
Commit 3bb5f9df authored Oct 15, 2012 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 9 deletions

Makefile Makefile +6 -9

No files found.
--- a/Makefile
+++ b/Makefile
 # choose your board here.
 BOARD = spec

-# Uncomment to enable Etherbone support (will soon be a Kconfig variable)
-# CONFIG_ETHERBONE=y
-
-
 # and don't touch the rest unless you know what you're doing.
 CROSS_COMPILE ?= lm32-elf-

@@ -13,6 +9,8 @@ OBJDUMP =	$(CROSS_COMPILE)objdump
 OBJCOPY =	$(CROSS_COMPILE)objcopy
 SIZE =		$(CROSS_COMPILE)size

+-include $(CURDIR)/.config
+
 OBJS_WRC = 	wrc_main.o \
 		wrc_ptp.o \
 		monitor/monitor.o
@@ -24,10 +22,7 @@ INCLUDE_DIRS = -I$(PTP_NOPOSIX)/wrsw_hal \
 		-I$(PTP_NOPOSIX)/softpll \
 		-Iinclude

-# Will soon be managed by Kconfig
-ifdef CONFIG_ETHERBONE
-CFLAGS_EB = -DCONFIG_ETHERBONE=1
-endif
+CFLAGS = -include $(CURDIR)/include/generated/autoconf.h

 CFLAGS_PTPD  = -ffreestanding \
 	-DPTPD_FREESTANDING \
@@ -69,7 +64,7 @@ include sockitowm/sockitowm.mk
 include dev/dev.mk


-CFLAGS = $(CFLAGS_PLATFORM) $(CFLAGS_EB) $(CFLAGS_PTPD) $(INCLUDE_DIRS) \
+CFLAGS += $(CFLAGS_PLATFORM) $(CFLAGS_EB) $(CFLAGS_PTPD) $(INCLUDE_DIRS) \
 	-ffunction-sections -fdata-sections -Os -Iinclude \
 	-include include/trace.h \
 	$(PTPD_CFLAGS) -I$(PTP_NOPOSIX)/PTPWRd -I. -Isoftpll
@@ -121,3 +116,5 @@ silentoldconfig:

 scripts_basic config %config:
 	$(MAKE) -f Makefile.kconfig $@
+
+.config: silentoldconfig