From 7e8c9aa271f13f67e4fc4968d2bf6fb8e5b229d7 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 8 Apr 2010 11:37:43 +0000 Subject: Replace sconfig with a C implementation. (smaller, faster, standard parser generator, no more python) Provide precompiled parser, so bison and flex are optional dependencies. Adapt Makefile and abuild (which uses some sconfig file as a magic path) to match. Drop python as dependency from README, and add bison and flex as optional dependencies Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5373 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2a7eac954b..cdc9a5be61 100644 --- a/Makefile +++ b/Makefile @@ -37,9 +37,6 @@ export src := src export srck := $(top)/util/kconfig export obj ?= build export objk := $(obj)/util/kconfig -export sconfig := $(top)/util/sconfig -export yapps2_py := $(sconfig)/yapps2.py -export config_g := $(sconfig)/config.g export KERNELVERSION := 4.0 @@ -109,7 +106,7 @@ PLATFORM-y += src/arch/$(ARCHDIR-y) src/cpu src/mainboard/$(MAINBOARDDIR) TARGETS-y := BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbridge src/superio src/drivers -BUILD-y += util/cbfstool +BUILD-y += util/cbfstool util/sconfig BUILD-$(CONFIG_ARCH_X86) += src/pc80 ifneq ($(CONFIG_LOCALVERSION),"") @@ -150,16 +147,11 @@ $(obj)/config.h: CBFSTOOL:=$(obj)/util/cbfstool/cbfstool -$(obj)/mainboard/$(MAINBOARDDIR)/config.py: $(yapps2_py) $(config_g) - mkdir -p $(obj)/mainboard/$(MAINBOARDDIR) - python $(yapps2_py) $(config_g) $(obj)/mainboard/$(MAINBOARDDIR)/config.py - - # needed objects that every mainboard uses # Creation of these is architecture and mainboard independent -$(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devicetree.cb $(obj)/mainboard/$(MAINBOARDDIR)/config.py +$(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devicetree.cb $(obj)/util/sconfig/sconfig mkdir -p $(obj)/mainboard/$(MAINBOARDDIR) - (PYTHONPATH=$(top)/util/sconfig python $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(MAINBOARDDIR) $(top) $(obj)/mainboard/$(MAINBOARDDIR)) + $(obj)/util/sconfig/sconfig $(MAINBOARDDIR) $(obj)/mainboard/$(MAINBOARDDIR) objs:=$(obj)/mainboard/$(MAINBOARDDIR)/static.o initobjs:= @@ -334,7 +326,6 @@ clean-for-update: doxygen-clean rm -f $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.* $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.* rm -f $(obj)/cpu/x86/smm/smm_bin.c $(obj)/cpu/x86/smm/smm.* $(obj)/cpu/x86/smm/smm rmdir -p $(alldirs) 2>/dev/null >/dev/null || true - $(MAKE) -C util/sconfig clean clean: clean-for-update rm -f $(obj)/coreboot* .ccwrap -- cgit v1.2.3