summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-08-05 18:15:06 -0600
committerMartin Roth <martinroth@google.com>2016-08-08 19:16:02 +0200
commitc9c27bb14e7acb8a1df39561662b0fab725266bd (patch)
tree7d30145a44c0487b05a7ca1c2b70687250c6cd4c
parent824255ea28ccc52c7ecd4365d743c3895d1ae8c0 (diff)
downloadcoreboot-c9c27bb14e7acb8a1df39561662b0fab725266bd.tar.xz
sconfig: Remove mainboard chip.h support
The mainboard chip.h files were (mostly) removed long ago. Change-Id: I1d5a9381945427c96868fa17756e6ecabb1048b2 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/16080 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--Makefile.inc2
-rw-r--r--util/sconfig/main.c23
2 files changed, 4 insertions, 21 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 4d7fd694f0..7252bccf35 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -457,7 +457,7 @@ DEVICETREE_STATIC_C := $(obj)/mainboard/$(MAINBOARDDIR)/static.c
$(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(objutil)/sconfig/sconfig
@printf " SCONFIG $(subst $(src)/,,$(<))\n"
mkdir -p $(dir $(DEVICETREE_STATIC_C))
- $(objutil)/sconfig/sconfig $(MAINBOARDDIR) $(DEVICETREE_FILE) $(DEVICETREE_STATIC_C)
+ $(objutil)/sconfig/sconfig $(DEVICETREE_FILE) $(DEVICETREE_STATIC_C)
ramstage-y+=$(DEVICETREE_STATIC_C)
romstage-y+=$(DEVICETREE_STATIC_C)
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index a4271aa0cf..9bf2db1476 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -40,11 +40,7 @@ static struct device mainboard = {
.id = 0,
.chip = &mainboard,
.type = chip,
-#ifdef MAINBOARDS_HAVE_CHIP_H
- .chiph_exists = 1,
-#else
.chiph_exists = 0,
-#endif
.children = &root
};
@@ -538,34 +534,24 @@ static void inherit_subsystem_ids(FILE *file, struct device *dev)
static void usage(void)
{
- printf("usage: sconfig vendor/mainboard devicetree_file output_file\n");
+ printf("usage: sconfig devicetree_file output_file\n");
exit (1);
}
enum {
- MAINBOARD_ARG = 1,
- DEVICEFILE_ARG,
+ DEVICEFILE_ARG = 1,
OUTPUTFILE_ARG};
-#define ARG_COUNT 4
+#define ARG_COUNT 3
int main(int argc, char** argv) {
if (argc != ARG_COUNT)
usage();
- char *mainboard = argv[MAINBOARD_ARG];
char *devtree = argv[DEVICEFILE_ARG];
char *outputc = argv[OUTPUTFILE_ARG];
headers.next = 0;
-#ifdef MAINBOARDS_HAVE_CHIP_H
- if (scan_mode == STATIC_MODE) {
- headers.next = malloc(sizeof(struct header));
- headers.next->name = malloc(strlen(mainboard)+12);
- headers.next->next = 0;
- sprintf(headers.next->name, "mainboard/%s", mainboard);
- }
-#endif
FILE *filec = fopen(devtree, "r");
if (!filec) {
@@ -619,9 +605,6 @@ int main(int argc, char** argv) {
walk_device_tree(autogen, &root, pass0, NULL);
fprintf(autogen, "\n/* pass 1 */\n"
"ROMSTAGE_CONST struct device * ROMSTAGE_CONST last_dev = &%s;\n", lastdev->name);
-#ifdef MAINBOARDS_HAVE_CHIP_H
- fprintf(autogen, "static ROMSTAGE_CONST struct mainboard_config ROMSTAGE_CONST mainboard_info_0;\n");
-#endif
walk_device_tree(autogen, &root, pass1, NULL);
fclose(autogen);