From 76c44aeea997044b85442681094d2315ceb1087b Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 14 Oct 2011 12:41:46 -0700 Subject: [PATCH] sconfig: check whether component directory actually exists and add drivers/generic/generic back (empty), since it is used by many devicetree.cb files. Without this patch typos in component names in devicetree.cb cause the component to be silently ignored. Change-Id: I3cfca2725816f0cd7d72139ae53af815009e8ab4 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/270 Tested-by: build bot (Jenkins) Reviewed-by: Peter Stuge --- src/drivers/generic/Kconfig | 1 + src/drivers/generic/Makefile.inc | 1 + src/drivers/generic/generic/Kconfig | 2 ++ src/drivers/generic/generic/Makefile.inc | 1 + util/sconfig/main.c | 7 +++++++ 5 files changed, 12 insertions(+) create mode 100644 src/drivers/generic/generic/Kconfig create mode 100644 src/drivers/generic/generic/Makefile.inc diff --git a/src/drivers/generic/Kconfig b/src/drivers/generic/Kconfig index fac6ee5ab..fbbfeb187 100644 --- a/src/drivers/generic/Kconfig +++ b/src/drivers/generic/Kconfig @@ -1,2 +1,3 @@ source src/drivers/generic/debug/Kconfig +source src/drivers/generic/generic/Kconfig diff --git a/src/drivers/generic/Makefile.inc b/src/drivers/generic/Makefile.inc index 0700a0c7c..08e6cc5b8 100644 --- a/src/drivers/generic/Makefile.inc +++ b/src/drivers/generic/Makefile.inc @@ -1 +1,2 @@ subdirs-y += debug +subdirs-y += generic diff --git a/src/drivers/generic/generic/Kconfig b/src/drivers/generic/generic/Kconfig new file mode 100644 index 000000000..864b878e9 --- /dev/null +++ b/src/drivers/generic/generic/Kconfig @@ -0,0 +1,2 @@ +config DRIVERS_GENERIC_GENERIC + bool diff --git a/src/drivers/generic/generic/Makefile.inc b/src/drivers/generic/generic/Makefile.inc new file mode 100644 index 000000000..b7db25411 --- /dev/null +++ b/src/drivers/generic/generic/Makefile.inc @@ -0,0 +1 @@ +# Empty diff --git a/util/sconfig/main.c b/util/sconfig/main.c index c3448f35b..dab04db32 100755 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -131,6 +131,13 @@ struct device *new_chip(struct device *parent, struct device *bus, char *path) { struct stat st; char *chip_h = malloc(strlen(path)+12); + sprintf(chip_h, "src/%s", path); + if ((stat(chip_h, &st) == -1) && (errno == ENOENT)) { + fprintf(stderr, "ERROR: Chip component %s does not exist.\n", + path); + exit(1); + } + sprintf(chip_h, "src/%s/chip.h", path); if ((stat(chip_h, &st) == -1) && (errno == ENOENT)) new_chip->chiph_exists = 0; -- 2.25.1