GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Roth 2016-08-05 18:15:06 -06:00
parent 824255ea28
commit c9c27bb14e
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc
View File

@ -457,7 +457,7 @@ DEVICETREE_STATIC_C := $(obj)/mainboard/$(MAINBOARDDIR)/static.c
$(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(objutil)/sconfig/sconfig $(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(objutil)/sconfig/sconfig
@printf " SCONFIG $(subst $(src)/,,$(<))\n" @printf " SCONFIG $(subst $(src)/,,$(<))\n"
mkdir -p $(dir $(DEVICETREE_STATIC_C)) 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) ramstage-y+=$(DEVICETREE_STATIC_C)
romstage-y+=$(DEVICETREE_STATIC_C) romstage-y+=$(DEVICETREE_STATIC_C)

23
util/sconfig/main.c
View File

@ -40,11 +40,7 @@ static struct device mainboard = {
.id = 0, .id = 0,
.chip = &mainboard, .chip = &mainboard,
.type = chip, .type = chip,
#ifdef MAINBOARDS_HAVE_CHIP_H
.chiph_exists = 1,
#else
.chiph_exists = 0, .chiph_exists = 0,
#endif
.children = &root .children = &root
}; };
@ -538,34 +534,24 @@ static void inherit_subsystem_ids(FILE *file, struct device *dev)
static void usage(void) static void usage(void)
{ {
printf("usage: sconfig vendor/mainboard devicetree_file output_file\n"); printf("usage: sconfig devicetree_file output_file\n");
exit (1); exit (1);
} }
enum { enum {
MAINBOARD_ARG = 1, DEVICEFILE_ARG = 1,
DEVICEFILE_ARG,
OUTPUTFILE_ARG}; OUTPUTFILE_ARG};
#define ARG_COUNT 4 #define ARG_COUNT 3
int main(int argc, char** argv) { int main(int argc, char** argv) {
if (argc != ARG_COUNT) if (argc != ARG_COUNT)
usage(); usage();
char *mainboard = argv[MAINBOARD_ARG];
char *devtree = argv[DEVICEFILE_ARG]; char *devtree = argv[DEVICEFILE_ARG];
char *outputc = argv[OUTPUTFILE_ARG]; char *outputc = argv[OUTPUTFILE_ARG];
headers.next = 0; 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"); FILE *filec = fopen(devtree, "r");
if (!filec) { if (!filec) {
@ -619,9 +605,6 @@ int main(int argc, char** argv) {
walk_device_tree(autogen, &root, pass0, NULL); walk_device_tree(autogen, &root, pass0, NULL);
fprintf(autogen, "\n/* pass 1 */\n" fprintf(autogen, "\n/* pass 1 */\n"
"ROMSTAGE_CONST struct device * ROMSTAGE_CONST last_dev = &%s;\n", lastdev->name); "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); walk_device_tree(autogen, &root, pass1, NULL);
fclose(autogen); fclose(autogen);