filo kconfig - Patchwork

Submitter	baiyin cai
Date	2010-08-17 03:17:25
Message ID	<AANLkTiksq34eL6PLvJkHhmiWDyo5Oxwo368ykHgwxoed@mail.gmail.com>
Download	mbox \| patch
Permalink	/patch/1757/
State	Superseded
Headers	show Return-path: <coreboot-bounces@coreboot.org> Envelope-to: patchwork@coreboot.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=WDzb061Ly4UV6dy04qmkVw1ySnr76ZBz6jcpuabIjKbziuRnrFK8zXEzxR84Ff2aqK b8upJlq8w28a7YejKWIUqeZF390U27sGvz8EqArCRuKoX9T3JQ3b8gEtOErQV/JbPtPF w/gvYS3394BcCM90gWXTvN3Ou7by5N2L6EfNE= MIME-Version: 1.0 Date: Tue, 17 Aug 2010 11:17:25 +0800 Message-ID: <AANLkTiksq34eL6PLvJkHhmiWDyo5Oxwo368ykHgwxoed@mail.gmail.com> From: baiyin cai <caibaiyin.pku@gmail.com> To: coreboot <coreboot@coreboot.org> Content-Type: multipart/mixed; boundary=0016e6506e3262fbec048dfc631f Cc: Marc Jones <marcj303@gmail.com>, wangqingpei@gmail.com Subject: [coreboot] [PATCH] filo kconfig Precedence: list Sender: coreboot-bounces@coreboot.org Errors-To: coreboot-bounces@coreboot.org

Comments

baiyin cai - 2010-08-17 03:17:25

hi all,
   i updated an new patch for filo kconfig. which involves following things:
   1. Using make -C command to replace the old method which use filo/kconfig
to load libpayload .config file.
       it make the code seems much simpler.
   2. The latest filo kconfig did only printf an message the reminder that
lib.config is missing. In
       the new patch,filo will load the default config for libpayload.
   3. Fixing the bug which cause the libpayload building each time the filo
is buiding.

Any consideration is welcome about these filo kconfig.

Signed-off-by: Cai Bai Yin <caibayin.pku@gmail.com>

Jason Wang - 2010-08-17 11:35:37

Acked-by: Wang Qing Pei <wangqingpei@gmail.com>

On Tue, Aug 17, 2010 at 11:17 AM, baiyin cai <caibaiyin.pku@gmail.com>wrote:

> hi all,
>    i updated an new patch for filo kconfig. which involves following
> things:
>    1. Using make -C command to replace the old method which use
> filo/kconfig to load libpayload .config file.
>        it make the code seems much simpler.
>    2. The latest filo kconfig did only printf an message the reminder that
> lib.config is missing. In
>        the new patch,filo will load the default config for libpayload.
>    3. Fixing the bug which cause the libpayload building each time the filo
> is buiding.
>
> Any consideration is welcome about these filo kconfig.
>
> Signed-off-by: Cai Bai Yin <caibayin.pku@gmail.com>
>

Patch

Index: util/kconfig/Makefile
===================================================================
--- util/kconfig/Makefile	(revision 135)
+++ util/kconfig/Makefile	(working copy)
@@ -12,162 +12,119 @@ 
 
 Kconfig := Config.in
 
-FILO_CONFIG := $(src)/.config
 LIB_CONFIG  := $(src)/lib.config
 HAVE_FILO_CONFIG := $(wildcard $(FILO_CONFIG))
 HAVE_LIB_CONFIG := $(wildcard $(LIB_CONFIG))
 
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
+################# xconfig ###########################
 ifneq ($(strip $(HAVE_LIB_CONFIG)),)
 xconfig: prepare $(objk)/qconf
 	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp"
-	$(Q)mv $(LIB_CONFIG) $(FILO_CONFIG)
-	$(Q)$(objk)/qconf $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)cp $(LIB_CONFIG) $(LIBCONFIG_PATH)/.config
+	$(Q)make -C $(LIBCONFIG_PATH) xconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
-	$(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG)
 	$(Q)$(objk)/qconf $(Kconfig)
 else
 xconfig: prepare $(objk)/qconf
 	$(Q)printf "Lost libpayload config file.\n"
-	$(Q)rm -f $(FILO_CONFIG)
-endif
-else
-xconfig: prepare $(objk)/qconf
-	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)$(objk)/qconf $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)make -C $(LIBCONFIG_PATH) xconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
 	$(Q)$(objk)/qconf $(Kconfig)
 endif
 
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
+################ gconfig ############################
 ifneq ($(strip $(HAVE_LIB_CONFIG)),)
 gconfig: prepare $(objk)/gconf
 	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp"
-	$(Q)mv $(LIB_CONFIG) $(FILO_CONFIG)
-	$(Q)$(objk)/gconf $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)cp $(LIB_CONFIG) $(LIBCONFIG_PATH)/.config
+	$(Q)make -C $(LIBCONFIG_PATH) gconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
-	$(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG)
 	$(Q)$(objk)/gconf $(Kconfig)
 else
 gconfig: prepare $(objk)/gconf
 	$(Q)printf "Lost libpayload config file.\n"
-	$(Q)rm -f $(FILO_CONFIG)
-endif
-else
-gconfig: prepare $(objk)/gconf
-	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)$(objk)/gconf $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)make -C $(LIBCONFIG_PATH) gconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
 	$(Q)$(objk)/gconf $(Kconfig)
 endif
 
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
+################### menuconfig ########################
 ifneq ($(strip $(HAVE_LIB_CONFIG)),)
 menuconfig: prepare $(objk)/mconf
 	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp"
-	$(Q)mv $(LIB_CONFIG) $(FILO_CONFIG)
-	$(Q)$(objk)/mconf $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)cp $(LIB_CONFIG) $(LIBCONFIG_PATH)/.config
+	$(Q)make -C $(LIBCONFIG_PATH) menuconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
-	$(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG)
 	$(Q)$(objk)/mconf $(Kconfig)
 else
 menuconfig: prepare $(objk)/mconf
 	$(Q)printf "Lost libpayload config file.\n"
-	$(Q)rm -f $(FILO_CONFIG)
-endif
-else
-menuconfig: prepare $(objk)/mconf
-	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)$(objk)/mconf $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)make -C $(LIBCONFIG_PATH) menuconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
 	$(Q)$(objk)/mconf $(Kconfig)
 endif
 
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
+################## config ############################
 ifneq ($(strip $(HAVE_LIB_CONFIG)),)
 config: prepare $(objk)/conf
 	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp"
-	$(Q)mv $(LIB_CONFIG) $(FILO_CONFIG)
-	$(Q)$(objk)/conf $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)cp $(LIB_CONFIG) $(LIBCONFIG_PATH)/.config
+	$(Q)make -C $(LIBCONFIG_PATH) config
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
-	$(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG)
-	$(Q)$(objk)/conf $(Kconfig)
+	$(Q)$(objk)/qconf $(Kconfig)
 else
 config: prepare $(objk)/conf
 	$(Q)printf "Lost libpayload config file.\n"
-	$(Q)rm -f $(FILO_CONFIG)
-endif
-else
-config: prepare $(objk)/conf
-	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)$(objk)/conf $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)make -C $(LIBCONFIG_PATH) config
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
 	$(Q)$(objk)/conf $(Kconfig)
 endif
 
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
+################# oldconfig #########################
 ifneq ($(strip $(HAVE_LIB_CONFIG)),)
 oldconfig: prepare $(objk)/conf
 	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp"
-	$(Q)mv $(LIB_CONFIG) $(FILO_CONFIG)
-	$(Q)$(objk)/conf -o $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)cp $(LIB_CONFIG) $(LIBCONFIG_PATH)/.config
+	$(Q)make -C $(LIBCONFIG_PATH) oldconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
-	$(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG)
 	$(Q)$(objk)/conf -o $(Kconfig)
 else
 oldconfig: prepare $(objk)/conf
 	$(Q)printf "Lost libpayload config file.\n"
-	$(Q)rm -f $(FILO_CONFIG)
-endif
-else
-oldconfig: prepare $(objk)/conf
-	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)$(objk)/conf -o $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv .config $(LIB_CONFIG)
+	$(Q)make -C $(LIBCONFIG_PATH) oldconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
 	$(Q)$(objk)/conf -o $(Kconfig)
 endif
 
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
+################ silentoldconfig ####################
 ifneq ($(strip $(HAVE_LIB_CONFIG)),)
 silentoldconfig: prepare $(objk)/conf
 	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp"
-	$(Q)mv $(LIB_CONFIG) $(FILO_CONFIG)
-	$(Q)$(objk)/conf -s $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv $(FILO_CONFIG) $(LIB_CONFIG)
+	$(Q)cp $(LIB_CONFIG) $(LIBCONFIG_PATH)/.config
+	$(Q)make -C $(LIBCONFIG_PATH) silentoldconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
-	$(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG)
 	$(Q)$(objk)/conf -s $(Kconfig)
 else
 silentoldconfig: prepare $(objk)/conf
 	$(Q)printf "Lost libpayload config file.\n"
-	$(Q)rm -f $(FILO_CONFIG)
-endif
-else
-silentoldconfig: prepare $(objk)/conf
-	$(Q)printf "Libpayload config for FILO.\n"
-	$(Q)$(objk)/conf -s $(LIBCONFIG_PATH)/Config.in
-	$(Q)mv .config $(LIB_CONFIG)
+	$(Q)make -C $(LIBCONFIG_PATH) xconfig
+	$(Q)cp $(LIBCONFIG_PATH)/.config $(LIB_CONFIG)
 	$(Q)printf "Libpayload config done.\n"
 	$(Q)$(objk)/conf -s $(Kconfig)
-
 endif
 
+
 # --- UNUSED, ignore ----------------------------------------------------------
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
Index: Makefile
===================================================================
--- Makefile	(revision 135)
+++ Makefile	(working copy)
@@ -105,7 +105,7 @@ 
 
 HAVE_LIBCONFIG := $(wildcard $(LIBCONFIG_PATH))
 
-all: prepare $(obj)/version.h $(TARGET)
+all: prepare libpayload $(obj)/version.h $(TARGET)
 
 
 HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD))
@@ -113,19 +113,15 @@ 
 libpayload:
 	@printf "Found Libpayload $(LIBPAYLOAD).\n"
 else
-libpayload: $(src)/$(LIB_CONFIG)
-	$(Q)printf "building libpayload.\n"
-	$(Q)make -C $(LIBCONFIG_PATH) distclean
-	$(Q)cp lib.config $(LIBCONFIG_PATH)/.config
-	$(Q)make -C $(LIBCONFIG_PATH) oldconfig
+libpayload:
 	$(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(src)/build install
 endif
 
-$(obj)/filo: $(src)/.config $(OBJS)  libpayload
+$(obj)/filo: $(src)/.config $(OBJS)
 	$(Q)printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)$(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC)
 
-$(TARGET): $(obj)/filo libpayload
+$(TARGET): $(obj)/filo
 	$(Q)cp $(obj)/filo $@
 	$(Q)$(NM) $(obj)/filo | sort > $(obj)/filo.map
 	$(Q)printf "  STRIP   $(subst $(shell pwd)/,,$(@))\n"
@@ -133,7 +129,7 @@ 
 
 include util/kconfig/Makefile
 
-$(obj)/%.o: $(src)/%.c libpayload
+$(obj)/%.o: $(src)/%.c 
 	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)$(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $<

Patchwork filo kconfig

Comments

Patch