Doug / smarc-fsl-linux-kernel | Embedian Git Server

Commit c63dbbd5268c397f051e0e0f665799ef64a1f3a4

Authored by Linus Torvalds 2012-01-17 06:34:54 +0800

Exists in master and in 6 other branches

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  Kbuild: Use dtc's -d (dependency) option
  dtc: Implement -d option to write out a dependency file
  kbuild: Fix comment in Makefile.lib
  scripts/genksyms: clean lex/yacc generated files
  kbuild: Correctly deal with make options which contain an "s"

Showing 10 changed files Inline Diff

Makefile
arch/arm/boot/Makefile
arch/microblaze/boot/Makefile
arch/openrisc/boot/Makefile
arch/powerpc/boot/Makefile
scripts/Makefile.lib
scripts/dtc/dtc.c
scripts/dtc/srcpos.c
scripts/dtc/srcpos.h
scripts/genksyms/Makefile

Makefile

Diff comments View file @ c63dbbd

arch/arm/boot/Makefile

Diff comments View file @ c63dbbd

 #
 # arch/arm/boot/Makefile
 #
 # This file is included by the global makefile so that you can add your own
 # architecture-specific flags and dependencies.
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
 # for more details.
 #
 # Copyright (C) 1995-2002 Russell King
 #
 MKIMAGE         := $(srctree)/scripts/mkuboot.sh
 ifneq ($(MACHINE),)
 include $(srctree)/$(MACHINE)/Makefile.boot
 endif
 # Note: the following conditions must always be true:
 #   ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)
 #   PARAMS_PHYS must be within 4MB of ZRELADDR
 #   INITRD_PHYS must be in RAM
 ZRELADDR    := $(zreladdr-y)
 PARAMS_PHYS := $(params_phys-y)
 INITRD_PHYS := $(initrd_phys-y)
 export ZRELADDR INITRD_PHYS PARAMS_PHYS
 targets := Image zImage xipImage bootpImage uImage
 ifeq ($(CONFIG_XIP_KERNEL),y)
 $(obj)/xipImage: vmlinux FORCE
 	$(call if_changed,objcopy)
 	@echo '  Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'
 $(obj)/Image $(obj)/zImage: FORCE
 	@echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)'
 	@echo 'Only the xipImage target is available in this case'
 	@false
 else
 $(obj)/xipImage: FORCE
 	@echo 'Kernel not configured for XIP (CONFIG_XIP_KERNEL!=y)'
 	@false
 $(obj)/Image: vmlinux FORCE
 	$(call if_changed,objcopy)
 	@echo '  Kernel: $@ is ready'
 $(obj)/compressed/vmlinux: $(obj)/Image FORCE
 	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
 $(obj)/zImage:	$(obj)/compressed/vmlinux FORCE
 	$(call if_changed,objcopy)
 	@echo '  Kernel: $@ is ready'
 endif
+targets += $(dtb-y)
 # Rule to build device tree blobs
-$(obj)/%.dtb: $(src)/dts/%.dts
+$(obj)/%.dtb: $(src)/dts/%.dts FORCE
-	$(call cmd,dtc)
+	$(call if_changed_dep,dtc)
 $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
 clean-files := *.dtb
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
 		   -C none -a $(LOADADDR) -e $(STARTADDR) \
 		   -n 'Linux-$(KERNELRELEASE)' -d $< $@
 ifeq ($(CONFIG_ZBOOT_ROM),y)
 $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
 else
 $(obj)/uImage: LOADADDR=$(ZRELADDR)
 endif
 $(obj)/uImage: STARTADDR=$(LOADADDR)
 check_for_multiple_loadaddr = \
 if [ $(words $(LOADADDR)) -gt 1 ]; then \
 	echo 'multiple load addresses: $(LOADADDR)'; \
 	echo 'This is incompatible with uImages'; \
 	echo 'Specify LOADADDR on the commandline to build an uImage'; \
 	false; \
 fi
 $(obj)/uImage:	$(obj)/zImage FORCE
 	@$(check_for_multiple_loadaddr)
 	$(call if_changed,uimage)
 	@echo '  Image $@ is ready'
 $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
 	$(Q)$(MAKE) $(build)=$(obj)/bootp $@
 	@:
 $(obj)/bootpImage: $(obj)/bootp/bootp FORCE
 	$(call if_changed,objcopy)
 	@echo '  Kernel: $@ is ready'
 PHONY += initrd FORCE
 initrd:
 	@test "$(INITRD_PHYS)" != "" || \
 	(echo This machine does not support INITRD; exit -1)
 	@test "$(INITRD)" != "" || \
 	(echo You must specify INITRD; exit -1)
 install: $(obj)/Image
 	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
 	$(obj)/Image System.map "$(INSTALL_PATH)"
 zinstall: $(obj)/zImage
 	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
 	$(obj)/zImage System.map "$(INSTALL_PATH)"
 uinstall: $(obj)/uImage
 	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
 	$(obj)/uImage System.map "$(INSTALL_PATH)"
 zi:
 	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
 	$(obj)/zImage System.map "$(INSTALL_PATH)"
 i:
 	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \
 	$(obj)/Image System.map "$(INSTALL_PATH)"
 subdir-	    := bootp compressed

arch/microblaze/boot/Makefile

Diff comments View file @ c63dbbd

1	#	1	#
2	# arch/microblaze/boot/Makefile	2	# arch/microblaze/boot/Makefile
3	#	3	#
4		4
5	MKIMAGE := $(srctree)/scripts/mkuboot.sh	5	MKIMAGE := $(srctree)/scripts/mkuboot.sh
6		6
7	obj-y += linked_dtb.o	7	obj-y += linked_dtb.o
8		8
9	targets := linux.bin linux.bin.gz simpleImage.%	9	targets := linux.bin linux.bin.gz simpleImage.%
10		10
11	OBJCOPYFLAGS := -O binary	11	OBJCOPYFLAGS := -O binary
12		12
13	# Ensure system.dtb exists	13	# Ensure system.dtb exists
14	$(obj)/linked_dtb.o: $(obj)/system.dtb	14	$(obj)/linked_dtb.o: $(obj)/system.dtb
15		15
16	# Generate system.dtb from $(DTB).dtb	16	# Generate system.dtb from $(DTB).dtb
17	ifneq ($(DTB),system)	17	ifneq ($(DTB),system)
18	$(obj)/system.dtb: $(obj)/$(DTB).dtb	18	$(obj)/system.dtb: $(obj)/$(DTB).dtb
19	$(call if_changed,cp)	19	$(call if_changed,cp)
20	endif	20	endif
21		21
22	$(obj)/linux.bin: vmlinux FORCE	22	$(obj)/linux.bin: vmlinux FORCE
23	$(call if_changed,objcopy)	23	$(call if_changed,objcopy)
24	$(call if_changed,uimage)	24	$(call if_changed,uimage)
25	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'	25	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
26		26
27	$(obj)/linux.bin.gz: $(obj)/linux.bin FORCE	27	$(obj)/linux.bin.gz: $(obj)/linux.bin FORCE
28	$(call if_changed,gzip)	28	$(call if_changed,gzip)
29	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'	29	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
30		30
31	quiet_cmd_cp = CP $< $@$2	31	quiet_cmd_cp = CP $< $@$2
32	cmd_cp = cat $< >$@$2 \|\| (rm -f $@ && echo false)	32	cmd_cp = cat $< >$@$2 \|\| (rm -f $@ && echo false)
33		33
34	quiet_cmd_strip = STRIP $@	34	quiet_cmd_strip = STRIP $@
35	cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \	35	cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \
36	-K _fdt_start vmlinux -o $@	36	-K _fdt_start vmlinux -o $@
37		37
38	quiet_cmd_uimage = UIMAGE $@.ub	38	quiet_cmd_uimage = UIMAGE $@.ub
39	cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A microblaze -O linux -T kernel \	39	cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A microblaze -O linux -T kernel \
40	-C none -n 'Linux-$(KERNELRELEASE)' \	40	-C none -n 'Linux-$(KERNELRELEASE)' \
41	-a $(CONFIG_KERNEL_BASE_ADDR) -e $(CONFIG_KERNEL_BASE_ADDR) \	41	-a $(CONFIG_KERNEL_BASE_ADDR) -e $(CONFIG_KERNEL_BASE_ADDR) \
42	-d $@ $@.ub	42	-d $@ $@.ub
43		43
44	$(obj)/simpleImage.%: vmlinux FORCE	44	$(obj)/simpleImage.%: vmlinux FORCE
45	$(call if_changed,cp,.unstrip)	45	$(call if_changed,cp,.unstrip)
46	$(call if_changed,objcopy)	46	$(call if_changed,objcopy)
47	$(call if_changed,uimage)	47	$(call if_changed,uimage)
48	$(call if_changed,strip)	48	$(call if_changed,strip)
49	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'	49	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
50		50
51		51
52	# Rule to build device tree blobs	52	# Rule to build device tree blobs
53	DTC_FLAGS := -p 1024	53	DTC_FLAGS := -p 1024
54		54
55	$(obj)/%.dtb: $(src)/dts/%.dts FORCE	55	$(obj)/%.dtb: $(src)/dts/%.dts FORCE
56	$(call cmd,dtc)	56	$(call if_changed_dep,dtc)
57		57
58	clean-files += .dtb simpleImage..unstrip linux.bin.ub	58	clean-files += .dtb simpleImage..unstrip linux.bin.ub
59		59

arch/openrisc/boot/Makefile

Diff comments View file @ c63dbbd

1		1
2		2
3	ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""'	3	ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""'
4	BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_OPENRISC_BUILTIN_DTB)).dtb.o	4	BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_OPENRISC_BUILTIN_DTB)).dtb.o
5	else	5	else
6	BUILTIN_DTB :=	6	BUILTIN_DTB :=
7	endif	7	endif
8	obj-y += $(BUILTIN_DTB)	8	obj-y += $(BUILTIN_DTB)
9		9
10	clean-files := *.dtb.S	10	clean-files := *.dtb.S
11		11
12	#DTC_FLAGS ?= -p 1024	12	#DTC_FLAGS ?= -p 1024
13		13
14	$(obj)/%.dtb: $(src)/dts/%.dts	14	$(obj)/%.dtb: $(src)/dts/%.dts FORCE
15	$(call cmd,dtc)	15	$(call if_changed_dep,dtc)
16		16

arch/powerpc/boot/Makefile

Diff comments View file @ c63dbbd

scripts/Makefile.lib

Diff comments View file @ c63dbbd

scripts/dtc/dtc.c

Diff comments View file @ c63dbbd

 /*
  * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
  *
  *
  * 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; either version 2 of the
  * License, or (at your option) any later version.
  *
  *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *                                                                   USA
  */
 #include "dtc.h"
 #include "srcpos.h"
 #include "version_gen.h"
 /*
  * Command line options
  */
 int quiet;		/* Level of quietness */
 int reservenum;		/* Number of memory reservation slots */
 int minsize;		/* Minimum blob size */
 int padsize;		/* Additional padding to blob */
 int phandle_format = PHANDLE_BOTH;	/* Use linux,phandle or phandle properties */
 static void fill_fullpaths(struct node *tree, const char *prefix)
 {
 	struct node *child;
 	const char *unit;
 	tree->fullpath = join_path(prefix, tree->name);
 	unit = strchr(tree->name, '@');
 	if (unit)
 		tree->basenamelen = unit - tree->name;
 	else
 		tree->basenamelen = strlen(tree->name);
 	for_each_child(tree, child)
 		fill_fullpaths(child, tree->fullpath);
 }
 static void  __attribute__ ((noreturn)) usage(void)
 {
 	fprintf(stderr, "Usage:\n");
 	fprintf(stderr, "\tdtc [options] <input file>\n");
 	fprintf(stderr, "\nOptions:\n");
 	fprintf(stderr, "\t-h\n");
 	fprintf(stderr, "\t\tThis help text\n");
 	fprintf(stderr, "\t-q\n");
 	fprintf(stderr, "\t\tQuiet: -q suppress warnings, -qq errors, -qqq all\n");
 	fprintf(stderr, "\t-I <input format>\n");
 	fprintf(stderr, "\t\tInput formats are:\n");
 	fprintf(stderr, "\t\t\tdts - device tree source text\n");
 	fprintf(stderr, "\t\t\tdtb - device tree blob\n");
 	fprintf(stderr, "\t\t\tfs - /proc/device-tree style directory\n");
 	fprintf(stderr, "\t-o <output file>\n");
 	fprintf(stderr, "\t-O <output format>\n");
 	fprintf(stderr, "\t\tOutput formats are:\n");
 	fprintf(stderr, "\t\t\tdts - device tree source text\n");
 	fprintf(stderr, "\t\t\tdtb - device tree blob\n");
 	fprintf(stderr, "\t\t\tasm - assembler source\n");
 	fprintf(stderr, "\t-V <output version>\n");
 	fprintf(stderr, "\t\tBlob version to produce, defaults to %d (relevant for dtb\n\t\tand asm output only)\n", DEFAULT_FDT_VERSION);
+	fprintf(stderr, "\t-d <output dependency file>\n");
 	fprintf(stderr, "\t-R <number>\n");
 	fprintf(stderr, "\t\tMake space for <number> reserve map entries (relevant for \n\t\tdtb and asm output only)\n");
 	fprintf(stderr, "\t-S <bytes>\n");
 	fprintf(stderr, "\t\tMake the blob at least <bytes> long (extra space)\n");
 	fprintf(stderr, "\t-p <bytes>\n");
 	fprintf(stderr, "\t\tAdd padding to the blob of <bytes> long (extra space)\n");
 	fprintf(stderr, "\t-b <number>\n");
 	fprintf(stderr, "\t\tSet the physical boot cpu\n");
 	fprintf(stderr, "\t-f\n");
 	fprintf(stderr, "\t\tForce - try to produce output even if the input tree has errors\n");
 	fprintf(stderr, "\t-s\n");
 	fprintf(stderr, "\t\tSort nodes and properties before outputting (only useful for\n\t\tcomparing trees)\n");
 	fprintf(stderr, "\t-v\n");
 	fprintf(stderr, "\t\tPrint DTC version and exit\n");
 	fprintf(stderr, "\t-H <phandle format>\n");
 	fprintf(stderr, "\t\tphandle formats are:\n");
 	fprintf(stderr, "\t\t\tlegacy - \"linux,phandle\" properties only\n");
 	fprintf(stderr, "\t\t\tepapr - \"phandle\" properties only\n");
 	fprintf(stderr, "\t\t\tboth - Both \"linux,phandle\" and \"phandle\" properties\n");
 	exit(3);
 }
 int main(int argc, char *argv[])
 {
 	struct boot_info *bi;
 	const char *inform = "dts";
 	const char *outform = "dts";
 	const char *outname = "-";
+	const char *depname = NULL;
 	int force = 0, check = 0, sort = 0;
 	const char *arg;
 	int opt;
 	FILE *outf = NULL;
 	int outversion = DEFAULT_FDT_VERSION;
 	long long cmdline_boot_cpuid = -1;
 	quiet      = 0;
 	reservenum = 0;
 	minsize    = 0;
 	padsize    = 0;
-	while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:vH:s")) != EOF) {
+	while ((opt = getopt(argc, argv, "hI:O:o:V:d:R:S:p:fcqb:vH:s"))
+			!= EOF) {
 		switch (opt) {
 		case 'I':
 			inform = optarg;
 			break;
 		case 'O':
 			outform = optarg;
 			break;
 		case 'o':
 			outname = optarg;
 			break;
 		case 'V':
 			outversion = strtol(optarg, NULL, 0);
 			break;
+		case 'd':
+			depname = optarg;
+			break;
 		case 'R':
 			reservenum = strtol(optarg, NULL, 0);
 			break;
 		case 'S':
 			minsize = strtol(optarg, NULL, 0);
 			break;
 		case 'p':
 			padsize = strtol(optarg, NULL, 0);
 			break;
 		case 'f':
 			force = 1;
 			break;
 		case 'c':
 			check = 1;
 			break;
 		case 'q':
 			quiet++;
 			break;
 		case 'b':
 			cmdline_boot_cpuid = strtoll(optarg, NULL, 0);
 			break;
 		case 'v':
 			printf("Version: %s\n", DTC_VERSION);
 			exit(0);
 		case 'H':
 			if (streq(optarg, "legacy"))
 				phandle_format = PHANDLE_LEGACY;
 			else if (streq(optarg, "epapr"))
 				phandle_format = PHANDLE_EPAPR;
 			else if (streq(optarg, "both"))
 				phandle_format = PHANDLE_BOTH;
 			else
 				die("Invalid argument \"%s\" to -H option\n",
 				    optarg);
 			break;
 		case 's':
 			sort = 1;
 			break;
 		case 'h':
 		default:
 			usage();
 		}
 	}
 	if (argc > (optind+1))
 		usage();
 	else if (argc < (optind+1))
 		arg = "-";
 	else
 		arg = argv[optind];
 	/* minsize and padsize are mutually exclusive */
 	if (minsize && padsize)
 		die("Can't set both -p and -S\n");
 	if (minsize)
 		fprintf(stderr, "DTC: Use of \"-S\" is deprecated; it will be removed soon, use \"-p\" instead\n");
 	fprintf(stderr, "DTC: %s->%s  on file \"%s\"\n",
 		inform, outform, arg);
+	if (depname) {
+		depfile = fopen(depname, "w");
+		if (!depfile)
+			die("Couldn't open dependency file %s: %s\n", depname,
+			    strerror(errno));
+		fprintf(depfile, "%s:", outname);
+	}
 	if (streq(inform, "dts"))
 		bi = dt_from_source(arg);
 	else if (streq(inform, "fs"))
 		bi = dt_from_fs(arg);
 	else if(streq(inform, "dtb"))
 		bi = dt_from_blob(arg);
 	else
 		die("Unknown input format \"%s\"\n", inform);
+	if (depfile) {
+		fputc('\n', depfile);
+		fclose(depfile);
+	}
 	if (cmdline_boot_cpuid != -1)
 		bi->boot_cpuid_phys = cmdline_boot_cpuid;
 	fill_fullpaths(bi->dt, "");
 	process_checks(force, bi);
 	if (sort)
 		sort_tree(bi);
 	if (streq(outname, "-")) {
 		outf = stdout;
 	} else {
 		outf = fopen(outname, "w");
 		if (! outf)
 			die("Couldn't open output file %s: %s\n",
 			    outname, strerror(errno));
 	}
 	if (streq(outform, "dts")) {
 		dt_to_source(outf, bi);
 	} else if (streq(outform, "dtb")) {
 		dt_to_blob(outf, bi, outversion);
 	} else if (streq(outform, "asm")) {
 		dt_to_asm(outf, bi, outversion);
 	} else if (streq(outform, "null")) {
 		/* do nothing */
 	} else {
 		die("Unknown output format \"%s\"\n", outform);
 	}
 	exit(0);
 }

scripts/dtc/srcpos.c

Diff comments View file @ c63dbbd

 /*
  * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
  *
  * 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; either version 2 of the
  * License, or (at your option) any later version.
  *
  *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *                                                                   USA
  */
 #define _GNU_SOURCE
 #include <stdio.h>
 #include "dtc.h"
 #include "srcpos.h"
 static char *dirname(const char *path)
 {
 	const char *slash = strrchr(path, '/');
 	if (slash) {
 		int len = slash - path;
 		char *dir = xmalloc(len + 1);
 		memcpy(dir, path, len);
 		dir[len] = '\0';
 		return dir;
 	}
 	return NULL;
 }
+FILE *depfile; /* = NULL */
 struct srcfile_state *current_srcfile; /* = NULL */
 /* Detect infinite include recursion. */
 #define MAX_SRCFILE_DEPTH     (100)
 static int srcfile_depth; /* = 0 */
 FILE *srcfile_relative_open(const char *fname, char **fullnamep)
 {
 	FILE *f;
 	char *fullname;
 	if (streq(fname, "-")) {
 		f = stdin;
 		fullname = xstrdup("<stdin>");
 	} else {
 		if (!current_srcfile || !current_srcfile->dir
 		    || (fname[0] == '/'))
 			fullname = xstrdup(fname);
 		else
 			fullname = join_path(current_srcfile->dir, fname);
 		f = fopen(fullname, "r");
 		if (!f)
 			die("Couldn't open \"%s\": %s\n", fname,
 			    strerror(errno));
 	}
+	if (depfile)
+		fprintf(depfile, " %s", fullname);
 	if (fullnamep)
 		*fullnamep = fullname;
 	else
 		free(fullname);
 	return f;
 }
 void srcfile_push(const char *fname)
 {
 	struct srcfile_state *srcfile;
 	if (srcfile_depth++ >= MAX_SRCFILE_DEPTH)
 		die("Includes nested too deeply");
 	srcfile = xmalloc(sizeof(*srcfile));
 	srcfile->f = srcfile_relative_open(fname, &srcfile->name);
 	srcfile->dir = dirname(srcfile->name);
 	srcfile->prev = current_srcfile;
 	srcfile->lineno = 1;
 	srcfile->colno = 1;
 	current_srcfile = srcfile;
 }
 int srcfile_pop(void)
 {
 	struct srcfile_state *srcfile = current_srcfile;
 	assert(srcfile);
 	current_srcfile = srcfile->prev;
 	if (fclose(srcfile->f))
 		die("Error closing \"%s\": %s\n", srcfile->name,
 		    strerror(errno));
 	/* FIXME: We allow the srcfile_state structure to leak,
 	 * because it could still be referenced from a location
 	 * variable being carried through the parser somewhere.  To
 	 * fix this we could either allocate all the files from a
 	 * table, or use a pool allocator. */
 	return current_srcfile ? 1 : 0;
 }
 /*
  * The empty source position.
  */
 struct srcpos srcpos_empty = {
 	.first_line = 0,
 	.first_column = 0,
 	.last_line = 0,
 	.last_column = 0,
 	.file = NULL,
 };
 #define TAB_SIZE      8
 void srcpos_update(struct srcpos *pos, const char *text, int len)
 {
 	int i;
 	pos->file = current_srcfile;
 	pos->first_line = current_srcfile->lineno;
 	pos->first_column = current_srcfile->colno;
 	for (i = 0; i < len; i++)
 		if (text[i] == '\n') {
 			current_srcfile->lineno++;
 			current_srcfile->colno = 1;
 		} else if (text[i] == '\t') {
 			current_srcfile->colno =
 				ALIGN(current_srcfile->colno, TAB_SIZE);
 		} else {
 			current_srcfile->colno++;
 		}
 	pos->last_line = current_srcfile->lineno;
 	pos->last_column = current_srcfile->colno;
 }
 struct srcpos *
 srcpos_copy(struct srcpos *pos)
 {
 	struct srcpos *pos_new;
 	pos_new = xmalloc(sizeof(struct srcpos));
 	memcpy(pos_new, pos, sizeof(struct srcpos));
 	return pos_new;
 }
 void
 srcpos_dump(struct srcpos *pos)
 {
 	printf("file        : \"%s\"\n",
 	       pos->file ? (char *) pos->file : "<no file>");
 	printf("first_line  : %d\n", pos->first_line);
 	printf("first_column: %d\n", pos->first_column);
 	printf("last_line   : %d\n", pos->last_line);
 	printf("last_column : %d\n", pos->last_column);
 	printf("file        : %s\n", pos->file->name);
 }
 char *
 srcpos_string(struct srcpos *pos)
 {
 	const char *fname = "<no-file>";
 	char *pos_str;
 	int rc;
 	if (pos)
 		fname = pos->file->name;
 	if (pos->first_line != pos->last_line)
 		rc = asprintf(&pos_str, "%s:%d.%d-%d.%d", fname,
 			      pos->first_line, pos->first_column,
 			      pos->last_line, pos->last_column);
 	else if (pos->first_column != pos->last_column)
 		rc = asprintf(&pos_str, "%s:%d.%d-%d", fname,
 			      pos->first_line, pos->first_column,
 			      pos->last_column);
 	else
 		rc = asprintf(&pos_str, "%s:%d.%d", fname,
 			      pos->first_line, pos->first_column);
 	if (rc == -1)
 		die("Couldn't allocate in srcpos string");
 	return pos_str;
 }
 void
 srcpos_verror(struct srcpos *pos, char const *fmt, va_list va)
 {
        const char *srcstr;
        srcstr = srcpos_string(pos);
        fprintf(stdout, "Error: %s ", srcstr);
        vfprintf(stdout, fmt, va);
        fprintf(stdout, "\n");
 }
 void
 srcpos_error(struct srcpos *pos, char const *fmt, ...)
 {
 	va_list va;
 	va_start(va, fmt);
 	srcpos_verror(pos, fmt, va);
 	va_end(va);
 }
 void
 srcpos_warn(struct srcpos *pos, char const *fmt, ...)
 {
 	const char *srcstr;
 	va_list va;
 	va_start(va, fmt);
 	srcstr = srcpos_string(pos);
 	fprintf(stderr, "Warning: %s ", srcstr);
 	vfprintf(stderr, fmt, va);
 	fprintf(stderr, "\n");
 	va_end(va);
 }

scripts/dtc/srcpos.h

Diff comments View file @ c63dbbd

 /*
  * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
  *
  * 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; either version 2 of the
  * License, or (at your option) any later version.
  *
  *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *                                                                   USA
  */
 #ifndef _SRCPOS_H_
 #define _SRCPOS_H_
 #include <stdio.h>
 struct srcfile_state {
 	FILE *f;
 	char *name;
 	char *dir;
 	int lineno, colno;
 	struct srcfile_state *prev;
 };
+extern FILE *depfile; /* = NULL */
 extern struct srcfile_state *current_srcfile; /* = NULL */
 FILE *srcfile_relative_open(const char *fname, char **fullnamep);
 void srcfile_push(const char *fname);
 int srcfile_pop(void);
 struct srcpos {
     int first_line;
     int first_column;
     int last_line;
     int last_column;
     struct srcfile_state *file;
 };
 #define YYLTYPE struct srcpos
 #define YYLLOC_DEFAULT(Current, Rhs, N)						\
 	do {									\
 		if (N) {							\
 			(Current).first_line = YYRHSLOC(Rhs, 1).first_line;	\
 			(Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\
 			(Current).last_line = YYRHSLOC(Rhs, N).last_line;	\
 			(Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
 			(Current).file = YYRHSLOC(Rhs, N).file;			\
 		} else {							\
 			(Current).first_line = (Current).last_line =		\
 				YYRHSLOC(Rhs, 0).last_line;			\
 			(Current).first_column = (Current).last_column =	\
 				YYRHSLOC(Rhs, 0).last_column;			\
 			(Current).file = YYRHSLOC (Rhs, 0).file;		\
 		}								\
 	} while (0)
 /*
  * Fictional source position used for IR nodes that are
  * created without otherwise knowing a true source position.
  * For example,constant definitions from the command line.
  */
 extern struct srcpos srcpos_empty;
 extern void srcpos_update(struct srcpos *pos, const char *text, int len);
 extern struct srcpos *srcpos_copy(struct srcpos *pos);
 extern char *srcpos_string(struct srcpos *pos);
 extern void srcpos_dump(struct srcpos *pos);
 extern void srcpos_verror(struct srcpos *pos, char const *, va_list va)
      __attribute__((format(printf, 2, 0)));
 extern void srcpos_error(struct srcpos *pos, char const *, ...)
      __attribute__((format(printf, 2, 3)));
 extern void srcpos_warn(struct srcpos *pos, char const *, ...)
      __attribute__((format(printf, 2, 3)));
 #endif /* _SRCPOS_H_ */

scripts/genksyms/Makefile

Diff comments View file @ c63dbbd

 hostprogs-y	:= genksyms
 always		:= $(hostprogs-y)
 genksyms-objs	:= genksyms.o parse.tab.o lex.lex.o
 # -I needed for generated C source (shipped source)
 HOSTCFLAGS_parse.tab.o := -I$(src)
 HOSTCFLAGS_lex.lex.o := -I$(src)
 # dependencies on generated files need to be listed explicitly
 $(obj)/lex.lex.o: $(obj)/keywords.hash.c $(obj)/parse.tab.h
+clean-files	:= keywords.hash.c lex.lex.c parse.tab.c parse.tab.h

1	VERSION = 3	1	VERSION = 3
2	PATCHLEVEL = 2	2	PATCHLEVEL = 2
3	SUBLEVEL = 0	3	SUBLEVEL = 0
4	EXTRAVERSION =	4	EXTRAVERSION =
5	NAME = Saber-toothed Squirrel	5	NAME = Saber-toothed Squirrel
6		6
7	# DOCUMENTATION	7	# DOCUMENTATION
8	# To see a list of typical targets execute "make help"	8	# To see a list of typical targets execute "make help"
9	# More info can be located in ./README	9	# More info can be located in ./README
10	# Comments in this file are targeted only to the developer, do not	10	# Comments in this file are targeted only to the developer, do not
11	# expect to learn how to build the kernel reading this file.	11	# expect to learn how to build the kernel reading this file.
12		12
13	# Do not:	13	# Do not:
14	# o use make's built-in rules and variables	14	# o use make's built-in rules and variables
15	# (this increases performance and avoids hard-to-debug behaviour);	15	# (this increases performance and avoids hard-to-debug behaviour);
16	# o print "Entering directory ...";	16	# o print "Entering directory ...";
17	MAKEFLAGS += -rR --no-print-directory	17	MAKEFLAGS += -rR --no-print-directory
18		18
19	# Avoid funny character set dependencies	19	# Avoid funny character set dependencies
20	unexport LC_ALL	20	unexport LC_ALL
21	LC_COLLATE=C	21	LC_COLLATE=C
22	LC_NUMERIC=C	22	LC_NUMERIC=C
23	export LC_COLLATE LC_NUMERIC	23	export LC_COLLATE LC_NUMERIC
24		24
25	# We are using a recursive build, so we need to do a little thinking	25	# We are using a recursive build, so we need to do a little thinking
26	# to get the ordering right.	26	# to get the ordering right.
27	#	27	#
28	# Most importantly: sub-Makefiles should only ever modify files in	28	# Most importantly: sub-Makefiles should only ever modify files in
29	# their own directory. If in some directory we have a dependency on	29	# their own directory. If in some directory we have a dependency on
30	# a file in another dir (which doesn't happen often, but it's often	30	# a file in another dir (which doesn't happen often, but it's often
31	# unavoidable when linking the built-in.o targets which finally	31	# unavoidable when linking the built-in.o targets which finally
32	# turn into vmlinux), we will call a sub make in that other dir, and	32	# turn into vmlinux), we will call a sub make in that other dir, and
33	# after that we are sure that everything which is in that other dir	33	# after that we are sure that everything which is in that other dir
34	# is now up to date.	34	# is now up to date.
35	#	35	#
36	# The only cases where we need to modify files which have global	36	# The only cases where we need to modify files which have global
37	# effects are thus separated out and done before the recursive	37	# effects are thus separated out and done before the recursive
38	# descending is started. They are now explicitly listed as the	38	# descending is started. They are now explicitly listed as the
39	# prepare rule.	39	# prepare rule.
40		40

1	# Makefile for making ELF bootable images for booting on CHRP	1	# Makefile for making ELF bootable images for booting on CHRP
2	# using Open Firmware.	2	# using Open Firmware.
3	#	3	#
4	# Geert Uytterhoeven September 1997	4	# Geert Uytterhoeven September 1997
5	#	5	#
6	# Based on coffboot by Paul Mackerras	6	# Based on coffboot by Paul Mackerras
7	# Simplified for ppc64 by Todd Inglett	7	# Simplified for ppc64 by Todd Inglett
8	#	8	#
9	# NOTE: this code is built for 32 bit in ELF32 format even though	9	# NOTE: this code is built for 32 bit in ELF32 format even though
10	# it packages a 64 bit kernel. We do this to simplify the	10	# it packages a 64 bit kernel. We do this to simplify the
11	# bootloader and increase compatibility with OpenFirmware.	11	# bootloader and increase compatibility with OpenFirmware.
12	#	12	#
13	# To this end we need to define BOOTCC, etc, as the tools	13	# To this end we need to define BOOTCC, etc, as the tools
14	# needed to build the 32 bit image. That's normally the same	14	# needed to build the 32 bit image. That's normally the same
15	# compiler for the rest of the kernel, with the -m32 flag added.	15	# compiler for the rest of the kernel, with the -m32 flag added.
16	# To make it easier to setup a cross compiler,	16	# To make it easier to setup a cross compiler,
17	# CROSS32_COMPILE is setup as a prefix just like CROSS_COMPILE	17	# CROSS32_COMPILE is setup as a prefix just like CROSS_COMPILE
18	# in the toplevel makefile.	18	# in the toplevel makefile.
19		19
20	all: $(obj)/zImage	20	all: $(obj)/zImage
21		21
22	BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \	22	BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
23	-fno-strict-aliasing -Os -msoft-float -pipe \	23	-fno-strict-aliasing -Os -msoft-float -pipe \
24	-fomit-frame-pointer -fno-builtin -fPIC -nostdinc \	24	-fomit-frame-pointer -fno-builtin -fPIC -nostdinc \
25	-isystem $(shell $(CROSS32CC) -print-file-name=include)	25	-isystem $(shell $(CROSS32CC) -print-file-name=include)
26	BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc	26	BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
27		27
28	ifdef CONFIG_DEBUG_INFO	28	ifdef CONFIG_DEBUG_INFO
29	BOOTCFLAGS += -g	29	BOOTCFLAGS += -g
30	endif	30	endif
31		31
32	ifeq ($(call cc-option-yn, -fstack-protector),y)	32	ifeq ($(call cc-option-yn, -fstack-protector),y)
33	BOOTCFLAGS += -fno-stack-protector	33	BOOTCFLAGS += -fno-stack-protector
34	endif	34	endif
35		35
36	BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)	36	BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)
37		37
38	DTC_FLAGS ?= -p 1024	38	DTC_FLAGS ?= -p 1024
39		39
40	$(obj)/4xx.o: BOOTCFLAGS += -mcpu=405	40	$(obj)/4xx.o: BOOTCFLAGS += -mcpu=405

1	# Backward compatibility	1	# Backward compatibility
2	asflags-y += $(EXTRA_AFLAGS)	2	asflags-y += $(EXTRA_AFLAGS)
3	ccflags-y += $(EXTRA_CFLAGS)	3	ccflags-y += $(EXTRA_CFLAGS)
4	cppflags-y += $(EXTRA_CPPFLAGS)	4	cppflags-y += $(EXTRA_CPPFLAGS)
5	ldflags-y += $(EXTRA_LDFLAGS)	5	ldflags-y += $(EXTRA_LDFLAGS)
6		6
7	#	7	#
8	# flags that take effect in sub directories	8	# flags that take effect in sub directories
9	export KBUILD_SUBDIR_ASFLAGS := $(KBUILD_SUBDIR_ASFLAGS) $(subdir-asflags-y)	9	export KBUILD_SUBDIR_ASFLAGS := $(KBUILD_SUBDIR_ASFLAGS) $(subdir-asflags-y)
10	export KBUILD_SUBDIR_CCFLAGS := $(KBUILD_SUBDIR_CCFLAGS) $(subdir-ccflags-y)	10	export KBUILD_SUBDIR_CCFLAGS := $(KBUILD_SUBDIR_CCFLAGS) $(subdir-ccflags-y)
11		11
12	# Figure out what we need to build from the various variables	12	# Figure out what we need to build from the various variables
13	# ===========================================================================	13	# ===========================================================================
14		14
15	# When an object is listed to be built compiled-in and modular,	15	# When an object is listed to be built compiled-in and modular,
16	# only build the compiled-in version	16	# only build the compiled-in version
17		17
18	obj-m := $(filter-out $(obj-y),$(obj-m))	18	obj-m := $(filter-out $(obj-y),$(obj-m))
19		19
20	# Libraries are always collected in one lib file.	20	# Libraries are always collected in one lib file.
21	# Filter out objects already built-in	21	# Filter out objects already built-in
22		22
23	lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))	23	lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
24		24
25		25
26	# Handle objects in subdirs	26	# Handle objects in subdirs
27	# ---------------------------------------------------------------------------	27	# ---------------------------------------------------------------------------
28	# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o	28	# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
29	# and add the directory to the list of dirs to descend into: $(subdir-y)	29	# and add the directory to the list of dirs to descend into: $(subdir-y)
30	# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)	30	# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
31	# and add the directory to the list of dirs to descend into: $(subdir-m)	31	# and add the directory to the list of dirs to descend into: $(subdir-m)
32		32
33	# Determine modorder.	33	# Determine modorder.
34	# Unfortunately, we don't have information about ordering between -y	34	# Unfortunately, we don't have information about ordering between -y
35	# and -m subdirs. Just put -y's first.	35	# and -m subdirs. Just put -y's first.
36	modorder := $(patsubst %/,%/modules.order, $(filter %/, $(obj-y)) $(obj-m:.o=.ko))	36	modorder := $(patsubst %/,%/modules.order, $(filter %/, $(obj-y)) $(obj-m:.o=.ko))
37		37
38	__subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y)))	38	__subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y)))
39	subdir-y += $(__subdir-y)	39	subdir-y += $(__subdir-y)
40	__subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m)))	40	__subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m)))