From 16fd5a99e1a8c433077e70c1a48e42cc01bf7d29 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 15 Aug 2006 21:02:55 +0000 Subject: 2006-08-15 Kolja Waschk * linkcmds.c, linkcmds.h, memory.c, memory.h, sample.ptf: New files. * bridges.c: corrected detection of bridged connections * clocks.c: removed a printf * linkcmds.[ch] new files, added output of linker script * Makefile.am: added new files * memory.[ch]: new files, detection of memory in SOPC configuration * nios2gen.c: updated command line parsing and output control * output.[ch]: improved output of BSP header file * ptf.[ch]: added ptf_dump_ptf_item and small fixes * sample.ptf: new file, sample configuration for nios2gen * README: updated --- tools/cpu/nios2/output.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/cpu/nios2/output.c') diff --git a/tools/cpu/nios2/output.c b/tools/cpu/nios2/output.c index e957e430a7..d9f368d05c 100644 --- a/tools/cpu/nios2/output.c +++ b/tools/cpu/nios2/output.c @@ -150,11 +150,12 @@ void fwrite_header_file( FILE *file, struct ptf *cfg, device_desc *devices, cloc struct ptf aclass = { section, "CLASS", 0, 0, 0 }; struct ptf_item matchaclass = { 1, &aclass }; - struct ptf header = { item, "HEADER", 0, 0, 0 }; - struct ptf_item matchheader = { 1, &header }; + struct ptf bspsect = { section, "BSPHEADER", 0, 0, 0 }; + struct ptf leadtext = { item, "LEADTEXT", 0, 0, 0 }; + struct ptf_item matchleadtext = { 2, &bspsect, &leadtext }; struct ptf epilog = { item, "EPILOG", 0, 0, 0 }; - struct ptf_item matchepilog = { 1, &epilog }; + struct ptf_item matchepilog = { 2, &bspsect, &epilog }; out_desc dinfo; @@ -162,7 +163,7 @@ void fwrite_header_file( FILE *file, struct ptf *cfg, device_desc *devices, cloc dinfo.clocks = clocks; dinfo.devices = devices; - ptf_match(cfg, &matchheader, fwrite_value, file); + ptf_match(cfg, &matchleadtext, fwrite_value, file); if(clocks) { @@ -177,7 +178,7 @@ void fwrite_header_file( FILE *file, struct ptf *cfg, device_desc *devices, cloc { for(dinfo.dev = devices; dinfo.dev; dinfo.dev=dinfo.dev->next) { - fprintf(file, "\n"); + /* fprintf(file, "\n#define SOPC_HAS_%s 1\n", dinfo.dev->cfgname); */ p = ptf_find(dinfo.dev->ptf, &pi, item, "class", 0); if(p) @@ -191,5 +192,4 @@ void fwrite_header_file( FILE *file, struct ptf *cfg, device_desc *devices, cloc ptf_match(cfg, &matchepilog, fwrite_value, file); } - -- cgit v1.2.3