sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop mainboard chip.h

Browse Source 
mainboard_config never worked right, at least not since we've had sconfig.
Hence, drop mainboard/<vendor>/<device>/chip.h and fix up the mainboards that
tried to use it anyways.

Change-Id: I7cd403ea188d8a9fd4c1ad15479fa88e02ab8e83
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1359
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer
2012-07-26 12:46:48 -07:00
committed by Ronald G. Minnich
parent efff733ad8
commit 188e3c2ff0
348 changed files with 21 additions and 3343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
util/sconfig/main.c
View File

@ -45,7 +45,11 @@ 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
};
@ -561,12 +565,14 @@ int main(int argc, char** argv) {
}
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) {
@ -610,8 +616,11 @@ int main(int argc, char** argv) {
walk_device_tree(autogen, &root, inherit_subsystem_ids, NULL);
fprintf(autogen, "\n/* pass 0 */\n");
walk_device_tree(autogen, &root, pass0, NULL);
fprintf(autogen, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\n"
"struct device *last_dev = &%s;\n", lastdev->name);
fprintf(autogen, "\n/* pass 1 */\n"
"struct device *last_dev = &%s;\n", lastdev->name);
#ifdef MAINBOARDS_HAVE_CHIP_H
fprintf(autogen, "struct mainboard_config mainboard_info_0;\n");
#endif
walk_device_tree(autogen, &root, pass1, NULL);
} else if (scan_mode == BOOTBLOCK_MODE) {