Patch set updated: b431050 Remove useless print_a_completion() stub
by Patrick Georgi
Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/118
-gerrit
commit b4310501fa616a4e5267b57adcb06fbc226a5a14
Author: Patrick Georgi <patrick.georgi(a)secunet.com>
Date: Tue Jul 19 16:37:13 2011 +0200
Remove useless print_a_completion() stub
There's a real implementation elsewhere and this one only confuses
things.
Change-Id: I841d9baecbaf298114e508feec89f1b2ea864bb9
Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com>
---
main/filo.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/main/filo.c b/main/filo.c
index c81d458..a8bf372 100644
--- a/main/filo.c
+++ b/main/filo.c
@@ -237,9 +237,4 @@ int main(void)
return 0;
}
-void print_a_completion (char *name)
-{
- // Nothing yet.
-}
-
#endif /* CONFIG_USE_GRUB */
8 years, 6 months
- 1
- 0
Patch set updated: f916d99 Update defconfig to silence build
by Patrick Georgi
Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/117
-gerrit
commit f916d994f716444edc72ec8af0c9020e16f486ea
Author: Patrick Georgi <patrick.georgi(a)secunet.com>
Date: Tue Jul 19 16:35:34 2011 +0200
Update defconfig to silence build
Change-Id: Iecc5fef8df78e66bb80b00d786aa4925f13c823a
Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com>
---
configs/defconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/configs/defconfig b/configs/defconfig
index bee9611..0fe3019 100644
--- a/configs/defconfig
+++ b/configs/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# FILO version: 0.6.0
-# Fri Mar 26 12:50:23 2010
+# Thu Jul 7 11:47:53 2011
#
CONFIG_TARGET_I386=y
@@ -62,5 +62,6 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_DEBUG_PCI is not set
# CONFIG_DEBUG_LINUXLOAD is not set
# CONFIG_DEBUG_IDE is not set
+# CONFIG_DEBUG_USB is not set
# CONFIG_DEBUG_ELTORITO is not set
CONFIG_DEVELOPER_TOOLS=y
8 years, 6 months
- 1
- 0
Patch set updated: ad9b1d8 Adapt filo to libpayload changes
by Patrick Georgi
Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/116
-gerrit
commit ad9b1d81d3f46ccab9e7fc5570b0b8d495386547
Author: Patrick Georgi <patrick.georgi(a)secunet.com>
Date: Fri Jul 22 10:00:38 2011 +0200
Adapt filo to libpayload changes
libpayload comes with CBFS and LZMA support now, and FILO's copy
leads to conflicts (which is what the libpayload copy intends to solve)
Change-Id: I1c70eda7b260d7149c7079cb0d681c274f510ed8
Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com>
---
fs/Makefile.inc | 2 -
fs/cbfs.c | 236 -------------------------------------------------------
fs/fsys_cbfs.c | 2 +-
include/cbfs.h | 173 ----------------------------------------
4 files changed, 1 insertions(+), 412 deletions(-)
diff --git a/fs/Makefile.inc b/fs/Makefile.inc
index 99c0207..4d8650b 100644
--- a/fs/Makefile.inc
+++ b/fs/Makefile.inc
@@ -31,5 +31,3 @@ TARGETS-$(CONFIG_FSYS_SQUASHFS) += fs/fsys_squashfs.o
TARGETS-$(CONFIG_FSYS_SQUASHFS) += fs/squashfs_zlib.o
TARGETS-$(CONFIG_ARTEC_BOOT) += fs/fsys_aboot.o
TARGETS-$(CONFIG_FSYS_CBFS) += fs/fsys_cbfs.o
-TARGETS-$(CONFIG_FSYS_CBFS) += fs/cbfs.o
-TARGETS-$(CONFIG_FSYS_CBFS) += fs/lzma.o
diff --git a/fs/cbfs.c b/fs/cbfs.c
deleted file mode 100644
index 23e0a89..0000000
--- a/fs/cbfs.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008, Jordan Crouse <jordan(a)cosmicpenguin.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
- */
-
-#include <arch/types.h>
-#include <arch/virtual.h>
-#include <cbfs.h>
-
-#define ALIGN(val,by) ((val+by-1)&~(by-1))
-#define cbfs_printf(...) /* printf(__VA_ARGS__) */
-#define printk_spew cbfs_printf
-#define printk_debug cbfs_printf
-#define printk_info cbfs_printf
-#define printk_err cbfs_printf
-
-#ifndef CONFIG_BIG_ENDIAN
-#define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
- ((x&0xff0000) >> 8) | ((x&0xff000000) >> 24) )
-#else
-#define ntohl(x) (x)
-#endif
-
-int cbfs_decompress(int algo, void *src, void *dst, int len)
-{
- switch(algo) {
- case CBFS_COMPRESS_NONE:
- memcpy(dst, src, len);
- return 0;
-
- case CBFS_COMPRESS_LZMA: {
- unsigned long ulzma(unsigned char *src, unsigned char *dst);
- ulzma(src, dst);
- }
- return 0;
-
- default:
- printk_info( "CBFS: Unknown compression type %d\n",
- algo);
- return -1;
- }
-}
-
-int cbfs_check_magic(struct cbfs_file *file)
-{
- return !strcmp(file->magic, CBFS_FILE_MAGIC) ? 1 : 0;
-}
-
-struct cbfs_header *cbfs_master_header(void)
-{
- struct cbfs_header *header;
-
- void *ptr = phys_to_virt((void *)*((unsigned long *) phys_to_virt(CBFS_HEADPTR_ADDR)));
- printk_spew("Check CBFS header at %p\n", ptr);
- header = (struct cbfs_header *) ptr;
-
- printk_spew("magic is %08x\n", ntohl(header->magic));
- if (ntohl(header->magic) != CBFS_HEADER_MAGIC) {
- printk_err("ERROR: No valid CBFS header found!\n");
- return NULL;
- }
-
- printk_spew("Found CBFS header at %p\n", ptr);
- return header;
-}
-
-struct cbfs_file *cbfs_find(const char *name)
-{
- struct cbfs_header *header = cbfs_master_header();
- unsigned long offset;
-
- if (header == NULL)
- return NULL;
- offset = (unsigned long) phys_to_virt(0 - ntohl(header->romsize) + ntohl(header->offset));
-
- int align= ntohl(header->align);
-
- while(1) {
- struct cbfs_file *file = (struct cbfs_file *) offset;
- if (!cbfs_check_magic(file)) return NULL;
- printk_debug("Check %s\n", CBFS_NAME(file));
- if (!strcmp(CBFS_NAME(file), name))
- return file;
-
- int flen = ntohl(file->len);
- int foffset = ntohl(file->offset);
- printk_spew("CBFS: follow chain: %p + %x + %x + align -> ", (void *)offset, foffset, flen);
-
- unsigned long oldoffset = offset;
- offset = ALIGN(offset + foffset + flen, align);
- printk_spew("%p\n", (void *)offset);
- if (virt_to_phys(offset) <= virt_to_phys(oldoffset)) return NULL;
-
- if (offset < (unsigned long)phys_to_virt(0xFFFFFFFF - ntohl(header->romsize)))
- return NULL;
- }
-}
-
-struct cbfs_stage *cbfs_find_file(const char *name, int type)
-{
- struct cbfs_file *file = cbfs_find(name);
-
- if (file == NULL) {
- printk_info( "CBFS: Could not find file %s\n",
- name);
- return NULL;
- }
-
- if (ntohl(file->type) != type) {
- printk_info( "CBFS: File %s is of type %x instead of"
- "type %x\n", name, file->type, type);
-
- return NULL;
- }
-
- return (void *) CBFS_SUBHEADER(file);
-}
-
-void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest)
-{
- char name[17];
- struct cbfs_optionrom *orom;
- u8 *src;
-
- sprintf(name,"pci%04x,%04x.rom", vendor, device);
-
- orom = (struct cbfs_optionrom *)
- cbfs_find_file(name, CBFS_TYPE_OPTIONROM);
-
- if (orom == NULL)
- return NULL;
-
- /* They might have specified a dest address. If so, we can decompress.
- * If not, there's not much hope of decompressing or relocating the rom.
- * in the common case, the expansion rom is uncompressed, we
- * pass 0 in for the dest, and all we have to do is find the rom and
- * return a pointer to it.
- */
-
- /* BUG: the cbfstool is (not yet) including a cbfs_optionrom header */
- src = ((unsigned char *) orom); // + sizeof(struct cbfs_optionrom);
-
- if (! dest)
- return src;
-
- if (cbfs_decompress(ntohl(orom->compression),
- src,
- dest,
- ntohl(orom->len)))
- return NULL;
-
- return dest;
-}
-
-void * cbfs_load_stage(const char *name)
-{
- struct cbfs_stage *stage = (struct cbfs_stage *)
- cbfs_find_file(name, CBFS_TYPE_STAGE);
- /* this is a mess. There is no ntohll. */
- /* for now, assume compatible byte order until we solve this. */
- u32 entry;
-
- if (stage == NULL)
- return (void *) -1;
-
- printk_info("Stage: load %s @ %d/%d bytes, enter @ %llx\n",
- name,
- (u32) stage->load, stage->memlen,
- stage->entry);
- memset((void *) (u32) stage->load, 0, stage->memlen);
-
- if (cbfs_decompress(stage->compression,
- ((unsigned char *) stage) +
- sizeof(struct cbfs_stage),
- (void *) (u32) stage->load,
- stage->len))
- return (void *) -1;
- printk_info("Stage: done loading.\n");
-
- entry = stage->entry;
-// return (void *) ntohl((u32) stage->entry);
- return (void *) entry;
-}
-
-void * cbfs_get_file(const char *name)
-{
- return cbfs_find(name);
-}
-
-int cbfs_execute_stage(const char *name)
-{
- struct cbfs_stage *stage = (struct cbfs_stage *)
- cbfs_find_file(name, CBFS_TYPE_STAGE);
-
- if (stage == NULL)
- return 1;
-
- if (ntohl(stage->compression) != CBFS_COMPRESS_NONE) {
- printk_info( "CBFS: Unable to run %s: Compressed file"
- "Not supported for in-place execution\n", name);
- return 1;
- }
-
- /* FIXME: This isn't right */
- printk_info( "CBFS: run @ %p\n", (void *) ntohl((u32) stage->entry));
- return run_address((void *) ntohl((u32) stage->entry));
-}
-
-/**
- * run_address is passed the address of a function taking no parameters and
- * jumps to it, returning the result.
- * @param f the address to call as a function.
- * returns value returned by the function.
- */
-
-int run_address(void *f)
-{
- int (*v) (void);
- v = f;
- return v();
-}
-
diff --git a/fs/fsys_cbfs.c b/fs/fsys_cbfs.c
index 59c6e35..5c389e9 100644
--- a/fs/fsys_cbfs.c
+++ b/fs/fsys_cbfs.c
@@ -31,7 +31,7 @@ cbfs_mount (void)
return 0;
/* CBFS? */
- if (!cbfs_master_header())
+ if (get_cbfs_header() == (void*)0xffffffff)
return 0;
return 1;
diff --git a/include/cbfs.h b/include/cbfs.h
deleted file mode 100644
index 9d6832c..0000000
--- a/include/cbfs.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net>
- *
- * This file is dual-licensed. You can choose between:
- * - The GNU GPL, version 2, as published by the Free Software Foundation
- * - The revised BSD license (without advertising clause)
- *
- * ---------------------------------------------------------------------------
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
- * ---------------------------------------------------------------------------
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ---------------------------------------------------------------------------
- */
-
-#ifndef _CBFS_H_
-#define _CBFS_H_
-
-/** These are standard values for the known compression
- alogrithms that coreboot knows about for stages and
- payloads. Of course, other LAR users can use whatever
- values they want, as long as they understand them. */
-
-#define CBFS_COMPRESS_NONE 0
-#define CBFS_COMPRESS_LZMA 1
-
-/** These are standard component types for well known
- components (i.e - those that coreboot needs to consume.
- Users are welcome to use any other value for their
- components */
-
-#define CBFS_TYPE_STAGE 0x10
-#define CBFS_TYPE_PAYLOAD 0x20
-#define CBFS_TYPE_OPTIONROM 0x30
-
-/** this is the master cbfs header - it need to be
- located somewhere in the bootblock. Where it
- actually lives is up to coreboot. A pointer to
- this header will live at 0xFFFFFFFc, so we can
- easily find it. */
-
-#define CBFS_HEADER_MAGIC 0x4F524243
-#define CBFS_HEADPTR_ADDR 0xFFFFFFFc
-#define VERSION1 0x31313131
-
-struct cbfs_header {
- u32 magic;
- u32 version;
- u32 romsize;
- u32 bootblocksize;
- u32 align;
- u32 offset;
- u32 pad[2];
-} __attribute__((packed));
-
-/** This is a component header - every entry in the CBFS
- will have this header.
-
- This is how the component is arranged in the ROM:
-
- -------------- <- 0
- component header
- -------------- <- sizeof(struct component)
- component name
- -------------- <- offset
- data
- ...
- -------------- <- offset + len
-*/
-
-#define CBFS_FILE_MAGIC "LARCHIVE"
-
-struct cbfs_file {
- char magic[8];
- u32 len;
- u32 type;
- u32 checksum;
- u32 offset;
-} __attribute__((packed));
-
-/*** Component sub-headers ***/
-
-/* Following are component sub-headers for the "standard"
- component types */
-
-/** This is the sub-header for stage components. Stages are
- loaded by coreboot during the normal boot process */
-
-struct cbfs_stage {
- u32 compression; /** Compression type */
- u64 entry; /** entry point */
- u64 load; /** Where to load in memory */
- u32 len; /** length of data to load */
- u32 memlen; /** total length of object in memory */
-} __attribute__((packed));
-
-/** this is the sub-header for payload components. Payloads
- are loaded by coreboot at the end of the boot process */
-
-struct cbfs_payload_segment {
- u32 type;
- u32 compression;
- u32 offset;
- u64 load_addr;
- u32 len;
- u32 mem_len;
-} __attribute__((packed));
-
-struct cbfs_payload {
- struct cbfs_payload_segment segments;
-};
-
-#define PAYLOAD_SEGMENT_CODE 0x45444F43
-#define PAYLOAD_SEGMENT_DATA 0x41544144
-#define PAYLOAD_SEGMENT_BSS 0x20535342
-#define PAYLOAD_SEGMENT_PARAMS 0x41524150
-#define PAYLOAD_SEGMENT_ENTRY 0x52544E45
-
-struct cbfs_optionrom {
- u32 compression;
- u32 len;
-} __attribute__((packed));
-
-#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file))
-#define CBFS_SUBHEADER(_p) ( (void *) ((((u8 *) (_p)) + ntohl((_p)->offset))) )
-
-void * cbfs_load_stage(const char *name);
-int cbfs_execute_stage(const char *name);
-void * cbfs_get_file(const char *name);
-void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest);
-int run_address(void *f);
-int cbfs_decompress(int algo, void *src, void *dst, int len);
-struct cbfs_stage *cbfs_find_file(const char *name, int type);
-int cbfs_check_magic(struct cbfs_file *file);
-struct cbfs_header *cbfs_master_header(void);
-struct cbfs_file *cbfs_find(const char *name);
-void cbfs_and_run_core(char* filename, unsigned int ebp);
-
-#endif
-
8 years, 6 months
- 1
- 0
New patch to review: 54caffb Fix FILO build system
by Patrick Georgi
Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/177
-gerrit
commit 54caffbbea39033208ace7fa6d0beef741344a7d
Author: Patrick Georgi <patrick(a)georgi-clan.de>
Date: Fri Sep 2 22:44:15 2011 +0200
Fix FILO build system
This change:
- deduplicates a whole lot of stuff in the Kconfig makefile
- simplifies "verbose" support (V=1) to match coreboot's style
- adds libpayload support to more kconfig targets (allyes, allno, defconfig...)
- isolates libpayload build into its own directory to avoid file clashes
Change-Id: Iee682492f64f0f5da2a8702b8fe6f8b02c81b4c5
Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de>
---
Makefile | 56 +++++-----
util/kconfig/Makefile | 285 ++++++++++++++++---------------------------------
2 files changed, 124 insertions(+), 217 deletions(-)
diff --git a/Makefile b/Makefile
index 2e8a9e5..1ebf62e 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,11 @@ HAVE_DOTCONFIG := $(wildcard .config)
BUILD_INFO = ($(shell whoami)@$(shell hostname)) $(shell LANG=C date)
# Make is silent per default, but 'make V=1' will show all compiler calls.
+Q=@
ifneq ($(V),1)
-Q := @
+ifneq ($(Q),)
+.SILENT:
+endif
endif
$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile)))
@@ -114,52 +117,53 @@ 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
- $(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(src)/build install
+ printf "building libpayload.\n"
+ $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build distclean
+ cp lib.config $(LIBCONFIG_PATH)/.config
+ mkdir -p $(LIBCONFIG_PATH)/build
+ $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build oldconfig
+ $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build DESTDIR=$(src)/build install
endif
$(obj)/filo: $(src)/.config $(OBJS) libpayload
- $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC)
+ printf " LD $(subst $(shell pwd)/,,$(@))\n"
+ $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC)
$(TARGET): $(obj)/filo libpayload
- $(Q)cp $(obj)/filo $@
- $(Q)$(NM) $(obj)/filo | sort > $(obj)/filo.map
- $(Q)printf " STRIP $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(STRIP) -s $@
+ cp $(obj)/filo $@
+ $(NM) $(obj)/filo | sort > $(obj)/filo.map
+ printf " STRIP $(subst $(shell pwd)/,,$(@))\n"
+ $(STRIP) -s $@
include util/kconfig/Makefile
$(obj)/%.o: $(src)/%.c libpayload
- $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ printf " CC $(subst $(shell pwd)/,,$(@))\n"
+ $(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
$(obj)/%.S.o: $(src)/%.S
- $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(AS) $(ASFLAGS) -o $@ $<
+ printf " AS $(subst $(shell pwd)/,,$(@))\n"
+ $(AS) $(ASFLAGS) -o $@ $<
endif
$(obj)/version.h: FORCE
- $(Q)echo '#define PROGRAM_NAME "$(PROGRAM_NAME)"' > $@
- $(Q)echo '#define PROGRAM_VERSION "$(PROGRAM_VERSION)"' >> $@
- $(Q)echo '#define PROGRAM_VERSION_FULL "$(PROGRAM_VERSION) $(BUILD_INFO)"' >> $@
- $(Q)echo '#define BUILD_INFO "$(BUILD_INFO)"' >> $@
+ echo '#define PROGRAM_NAME "$(PROGRAM_NAME)"' > $@
+ echo '#define PROGRAM_VERSION "$(PROGRAM_VERSION)"' >> $@
+ echo '#define PROGRAM_VERSION_FULL "$(PROGRAM_VERSION) $(BUILD_INFO)"' >> $@
+ echo '#define BUILD_INFO "$(BUILD_INFO)"' >> $@
prepare:
- $(Q)mkdir -p $(obj)/util/kconfig/lxdialog
- $(Q)mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash
- $(Q)mkdir -p $(obj)/main/grub
+ mkdir -p $(obj)/util/kconfig/lxdialog
+ mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash
+ mkdir -p $(obj)/main/grub
clean:
- $(Q)rm -rf $(obj)/i386 $(obj)/fs $(obj)/drivers $(obj)/main $(obj)/util
+ rm -rf $(obj)/i386 $(obj)/fs $(obj)/drivers $(obj)/main $(obj)/util
distclean: clean
- $(Q)rm -rf build
- $(Q)rm -f .config lib.config .config.old .xcompile ..config.tmp .kconfig.d .tmpconfig*
+ rm -rf build
+ rm -f .config lib.config .config.old .xcompile ..config.tmp .kconfig.d .tmpconfig*
FORCE:
diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile
index d6670fd..64a340c 100644
--- a/util/kconfig/Makefile
+++ b/util/kconfig/Makefile
@@ -2,7 +2,8 @@
# Kernel configuration targets
# These targets are used from top-level makefile
-PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
+PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig
+PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
_OS=$(shell uname -s |cut -c-7)
regex-objs=
@@ -17,206 +18,108 @@ LIB_CONFIG := $(src)/lib.config
HAVE_FILO_CONFIG := $(wildcard $(FILO_CONFIG))
HAVE_LIB_CONFIG := $(wildcard $(LIB_CONFIG))
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
-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)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
+# We don't know how to cope with FILO config being present and
+# libpayload config not.
+$(if $(and $(HAVE_FILO_CONFIG),$(filter 0,$(words $(LIB_CONFIG)))), \
+ FATAL:=1, \
+ FATAL:=0)
+
+LIBPAYLOAD_CONFIG_PRE := echo "Libpayload config for FILO." \
+ $(if $(HAVE_FILO_CONFIG),; mv $(FILO_CONFIG) $(FILO_CONFIG).temp) \
+ $(if $(HAVE_LIB_CONFIG),; mv $(LIB_CONFIG) $(FILO_CONFIG))
+
+LIBPAYLOAD_CONFIG_POST := mv $(FILO_CONFIG) $(LIB_CONFIG) \
+ ; echo "Libpayload config done." \
+ $(if $(HAVE_FILO_CONFIG),; mv $(FILO_CONFIG).temp $(FILO_CONFIG))
+
+ifeq ($(FATAL),1)
+xconfig gconfig menuconfig config oldconfig silentoldconfig:
+ echo "Lost libpayload config file."
+ rm -f $(FILO_CONFIG)
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)printf "Libpayload config done.\n"
- $(Q)$(objk)/qconf $(Kconfig)
-endif
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/qconf $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/qconf $(Kconfig)
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
-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)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)printf "Libpayload config done.\n"
- $(Q)$(objk)/gconf $(Kconfig)
-endif
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/gconf $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/gconf $(Kconfig)
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
-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)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)printf "Libpayload config done.\n"
- $(Q)$(objk)/mconf $(Kconfig)
-endif
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/mconf $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/mconf $(Kconfig)
-ifneq ($(strip $(HAVE_FILO_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)printf "Libpayload config done.\n"
- $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG)
- $(Q)$(objk)/conf $(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)printf "Libpayload config done.\n"
- $(Q)$(objk)/conf $(Kconfig)
-endif
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/conf $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/conf $(Kconfig)
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
-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)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)printf "Libpayload config done.\n"
- $(Q)$(objk)/conf -o $(Kconfig)
-endif
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/conf -o $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/conf -o $(Kconfig)
-ifneq ($(strip $(HAVE_FILO_CONFIG)),)
-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)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)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
-# The symlink is used to repair a deficiency in arch/um
-update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
- $(Q)echo " GEN config"
- $(Q)xgettext --default-domain=linux \
- --add-comments --keyword=_ --keyword=N_ \
- --from-code=UTF-8 \
- --files-from=scripts/kconfig/POTFILES.in \
- --output $(obj)/config.pot
- $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
- $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
- $(Q)(for i in `ls arch/`; \
- do \
- echo " GEN $$i"; \
- $(obj)/kxgettext arch/$$i/Kconfig \
- >> $(obj)/config.pot; \
- done )
- $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
- --output $(obj)/linux.pot
- $(Q)rm -f arch/um/Kconfig.arch
- $(Q)rm -f $(obj)/config.pot
-# --- UNUSED, ignore ----------------------------------------------------------
-
-PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/conf -s $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/conf -s $(Kconfig)
randconfig: prepare $(objk)/conf
- $(Q)$(objk)/conf -r $(Kconfig)
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/conf -r $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/conf -r $(Kconfig)
allyesconfig: prepare $(objk)/conf
- $(Q)$(objk)/conf -y $(Kconfig)
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/conf -y $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/conf -y $(Kconfig)
allnoconfig: prepare $(objk)/conf
- $(Q)$(objk)/conf -n $(Kconfig)
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/conf -n $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/conf -n $(Kconfig)
allmodconfig: prepare $(objk)/conf
- $(Q)$(objk)/conf -m $(Kconfig)
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/conf -m $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/conf -m $(Kconfig)
defconfig: prepare $(objk)/conf
+ $(LIBPAYLOAD_CONFIG_PRE)
ifeq ($(KBUILD_DEFCONFIG),)
- $(Q)$(objk)/conf -d $(Kconfig)
+ $(objk)/conf -D $(LIBCONFIG_PATH)/configs/defconfig $(LIBCONFIG_PATH)/Config.in
else
@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
- $(Q)$(objk)/conf -D $(KBUILD_DEFCONFIG) $(Kconfig)
+ $(objk)/conf -D $(LIBCONFIG_PATH)/$(KBUILD_DEFCONFIG) $(LIBCONFIG_PATH)/Config.in
+endif
+ $(LIBPAYLOAD_CONFIG_POST)
+ifeq ($(KBUILD_DEFCONFIG),)
+ $(objk)/conf -d $(Kconfig)
+else
+ @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
+ $(objk)/conf -D $(KBUILD_DEFCONFIG) $(Kconfig)
endif
%_defconfig: prepare $(objk)/conf
- $(Q)$(objk)/conf -D configs/$@ $(Kconfig)
+ $(LIBPAYLOAD_CONFIG_PRE)
+ $(objk)/conf -D $(LIBCONFIG_PATH)/configs/$@ $(LIBCONFIG_PATH)/Config.in
+ $(LIBPAYLOAD_CONFIG_POST)
+ $(objk)/conf -D configs/$@ $(Kconfig)
+
+endif # "FATAL"
# Help text used by make help
help:
@@ -293,7 +196,7 @@ clean-files += config.pot coreinfo.pot
PHONY += $(objk)/dochecklxdialog
$(addprefix $(obj)/,$(lxdialog)): $(objk)/dochecklxdialog
$(objk)/dochecklxdialog:
- $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)
+ $(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)
always := dochecklxdialog
@@ -438,46 +341,46 @@ endif
$(objk)/qconf: $(patsubst %,$(objk)/%,$(qconf-cxxobjs)) \
$(patsubst %,$(objk)/%,$(qconf-objs))
- $(Q)$(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTLOADLIBES_qconf) -o $@ $^
+ $(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTLOADLIBES_qconf) -o $@ $^
$(objk)/gconf: $(patsubst %,$(objk)/%,$(gconf-objs))
- $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOSTLOADLIBES_gconf) -o $@ $^
+ $(HOSTCC) $(HOSTCFLAGS) $(HOSTLOADLIBES_gconf) -o $@ $^
$(objk)/mconf: $(patsubst %,$(objk)/%,$(mconf-objs))
- $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) -o $@ $^
+ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) -o $@ $^
$(objk)/conf: $(patsubst %,$(objk)/%,$(conf-objs))
- $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^
+ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^
$(objk)/mconf.o: $(srck)/mconf.c
- $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
+ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
$(objk)/conf.o: $(srck)/conf.c
- $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
+ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
$(objk)/regex.o: $(srck)/regex.c
$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -DHAVE_STRING_H -c -o $@ $<
$(objk)/zconf.tab.o: $(objk)/zconf.tab.c $(objk)/lex.zconf.c \
$(objk)/zconf.hash.c
- $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $(objk)/zconf.tab.c
+ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $(objk)/zconf.tab.c
$(objk)/kconfig_load.o: $(srck)/kconfig_load.c $(objk)/lkc_defs.h
- $(Q)$(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
+ $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
$(objk)/qconf.o: $(srck)/qconf.cc $(objk)/qconf.moc $(objk)/lkc_defs.h
- $(Q)$(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTCXXFLAGS_qconf.o) -c -o $@ $<
+ $(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTCXXFLAGS_qconf.o) -c -o $@ $<
$(objk)/gconf.o: $(srck)/gconf.c $(objk)/lkc_defs.h
- $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOSTCFLAGS_gconf.o) -c -o $@ $<
+ $(HOSTCC) $(HOSTCFLAGS) $(HOSTCFLAGS_gconf.o) -c -o $@ $<
$(objk)/%.moc: $(srck)/%.h
- $(Q)$(KC_QT_MOC) -i $< -o $@
+ $(KC_QT_MOC) -i $< -o $@
$(objk)/lkc_defs.h: $(srck)/lkc_proto.h
- $(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
+ sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
$(objk)/lex.zconf.c: $(srck)/lex.zconf.c_shipped
- $(Q)cp $< $@
+ cp $< $@
$(objk)/zconf.hash.c: $(srck)/zconf.hash.c_shipped
- $(Q)cp $< $@
+ cp $< $@
$(objk)/zconf.tab.c: $(srck)/zconf.tab.c_shipped
- $(Q)cp $< $@
+ cp $< $@
$(objk)/lxdialog/lxdialog: $(objk)/dochecklxdialog \
$(patsubst %,$(objk)/lxdialog/%,$(lxdialog))
- $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) \
+ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) \
$(patsubst %,$(objk)/lxdialog/%,$(lxdialog)) -o $@
$(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c
- $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@
+ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@
8 years, 6 months
- 1
- 0