summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2011-10-14 12:41:46 -0700
committerPeter Stuge <peter@stuge.se>2011-10-19 03:31:21 +0200
commit76c44aeea997044b85442681094d2315ceb1087b (patch)
treeb47f03e3e77113c7bf373e7c83322692c745cbb6
parent6a113331339dbddca16a832dca26fa3dd68de48b (diff)
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 <reinauer@google.com> Reviewed-on: http://review.coreboot.org/270 Tested-by: build bot (Jenkins) Reviewed-by: Peter Stuge <peter@stuge.se>
-rw-r--r--src/drivers/generic/Kconfig1
-rw-r--r--src/drivers/generic/Makefile.inc1
-rw-r--r--src/drivers/generic/generic/Kconfig2
-rw-r--r--src/drivers/generic/generic/Makefile.inc1
-rwxr-xr-xutil/sconfig/main.c7
5 files changed, 12 insertions, 0 deletions
diff --git a/src/drivers/generic/Kconfig b/src/drivers/generic/Kconfig
index fac6ee5ab4..fbbfeb1872 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 0700a0c7c4..08e6cc5b8d 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 0000000000..864b878e9a
--- /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 0000000000..b7db25411d
--- /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 c3448f35b5..dab04db321 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;