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

Improve the sconfig parser:

Browse Source 
- The device tree must start with a chip (not a device)
- It's more clearly visible at which places chip, device, register and resource can be used.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5526 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi
2010-05-05 13:13:47 +00:00
parent 8d313685b0
commit 8f625f6e93
2 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/sconfig/sconfig.y
View File

@@ -31,19 +31,17 @@ static struct device *cur_parent, *cur_bus;
}
%token CHIP DEVICE REGISTER BOOL BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C APIC APIC_CLUSTER PCI_DOMAIN IRQ DRQ IO NUMBER
%%
devtree: { cur_parent = cur_bus = head; } devchip { postprocess_devtree(); } ;
devtree: { cur_parent = cur_bus = head; } chip { postprocess_devtree(); } ;
devchip: chip | device ;
chipchildren: chipchildren device | chipchildren chip | chipchildren registers | /* empty */ ;
devices: devices devchip | devices registers | ;
devicesorresources: devicesorresources devchip | devicesorresources resource | ;
devicechildren: devicechildren device | devicechildren chip | devicechildren resource | /* empty */ ;
chip: CHIP STRING /* == path */ {
$<device>$ = new_chip(cur_parent, cur_bus, $<string>2);
cur_parent = $<device>$;
}
devices END {
chipchildren END {
cur_parent = $<device>3->parent;
fold_in($<device>3);
add_header($<device>3);
@@ -54,7 +52,7 @@ device: DEVICE BUS NUMBER /* == devnum */ BOOL {
cur_parent = $<device>$;
cur_bus = $<device>$;
}
devicesorresources END {
devicechildren END {
cur_parent = $<device>5->parent;
cur_bus = $<device>5->bus;
fold_in($<device>5);