michaelh/zephyr
1
0
Fork 0
Code Releases Activity

gen_idt: remove int_vec_alloc bitfield from output

Browse source 
This is no longer used.

Change-Id: I6536076ae3510d66eb26c49d89b865dc82e91e33
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2016-10-21 10:30:21 -07:00 • committed by Anas Nashif
commit 238fe1f60f
2 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -843,17 +843,14 @@ quiet_cmd_gen_idt = SIDT $@
( \ ( \
$(OBJCOPY) -I $(OUTPUT_FORMAT) -O binary -j intList $< isrList.bin && \ $(OBJCOPY) -I $(OUTPUT_FORMAT) -O binary -j intList $< isrList.bin && \
$(GENIDT) -i isrList.bin -n $(CONFIG_IDT_NUM_VECTORS) -o staticIdt.bin \ $(GENIDT) -i isrList.bin -n $(CONFIG_IDT_NUM_VECTORS) -o staticIdt.bin \
-b int_vector_alloc.bin -m irq_int_vector_map.bin \ -m irq_int_vector_map.bin \
-l $(CONFIG_MAX_IRQ_LINES) $(GENIDT_EXTRA_ARGS) && \ -l $(CONFIG_MAX_IRQ_LINES) $(GENIDT_EXTRA_ARGS) && \
$(OBJCOPY) -I binary -B $(OUTPUT_ARCH) -O $(OUTPUT_FORMAT) \ $(OBJCOPY) -I binary -B $(OUTPUT_ARCH) -O $(OUTPUT_FORMAT) \
--rename-section .data=staticIdt staticIdt.bin staticIdt.o && \ --rename-section .data=staticIdt staticIdt.bin staticIdt.o && \
$(OBJCOPY) -I binary -B $(OUTPUT_ARCH) -O $(OUTPUT_FORMAT) \
--rename-section .data=int_vector_alloc int_vector_alloc.bin \
int_vector_alloc.o && \
$(OBJCOPY) -I binary -B $(OUTPUT_ARCH) -O $(OUTPUT_FORMAT) \ $(OBJCOPY) -I binary -B $(OUTPUT_ARCH) -O $(OUTPUT_FORMAT) \
--rename-section .data=irq_int_vector_map irq_int_vector_map.bin \ --rename-section .data=irq_int_vector_map irq_int_vector_map.bin \
irq_int_vector_map.o && \ irq_int_vector_map.o && \
rm staticIdt.bin irq_int_vector_map.bin int_vector_alloc.bin isrList.bin\ rm staticIdt.bin irq_int_vector_map.bin isrList.bin \
) )
staticIdt.o: $(TMP_ELF) staticIdt.o: $(TMP_ELF)
@ -862,8 +859,8 @@ staticIdt.o: $(TMP_ELF)
quiet_cmd_lnk_elf = LINK $@ quiet_cmd_lnk_elf = LINK $@
cmd_lnk_elf = \ cmd_lnk_elf = \
( \ ( \
$(CC) -T linker.cmd @$(KERNEL_NAME).lnk staticIdt.o int_vector_alloc.o \ $(CC) -T linker.cmd @$(KERNEL_NAME).lnk staticIdt.o \
irq_int_vector_map.o -o $@; \ irq_int_vector_map.o -o $@; \
${OBJCOPY} --change-section-address intList=${CONFIG_PHYS_LOAD_ADDR} $@ elf.tmp;\ ${OBJCOPY} --change-section-address intList=${CONFIG_PHYS_LOAD_ADDR} $@ elf.tmp;\
$(OBJCOPY) -R intList elf.tmp $@; \ $(OBJCOPY) -R intList elf.tmp $@; \
rm elf.tmp \ rm elf.tmp \

17
scripts/gen_idt/gen_idt.c
View file

@ -99,7 +99,6 @@ static struct genidt_entry_s generated_entry[MAX_NUM_VECTORS];
enum { enum {
IFILE = 0, /* input file */ IFILE = 0, /* input file */
OFILE, /* output file */ OFILE, /* output file */
BFILE, /* allocated interrupt vector bitmap file */
MFILE, /* irq to interrupt vector mapping file */ MFILE, /* irq to interrupt vector mapping file */
NUSERFILES, /* number of user-provided file names */ NUSERFILES, /* number of user-provided file names */
EXECFILE = NUSERFILES, /* for name of executable */ EXECFILE = NUSERFILES, /* for name of executable */
@ -144,11 +143,8 @@ static void get_options(int argc, char *argv[])
char *endptr; char *endptr;
int ii, opt; int ii, opt;
while ((opt = getopt(argc, argv, "hb:i:o:m:n:vl:d")) != -1) { while ((opt = getopt(argc, argv, "hi:o:m:n:vl:d")) != -1) {
switch (opt) { switch (opt) {
case 'b':
filenames[BFILE] = optarg;
break;
case 'i': case 'i':
filenames[IFILE] = optarg; filenames[IFILE] = optarg;
break; break;
@ -234,9 +230,6 @@ static void open_files(void)
fds[OFILE] = open(filenames[OFILE], O_WRONLY | O_BINARY | fds[OFILE] = open(filenames[OFILE], O_WRONLY | O_BINARY |
O_TRUNC | O_CREAT, O_TRUNC | O_CREAT,
S_IWUSR | S_IRUSR); S_IWUSR | S_IRUSR);
fds[BFILE] = open(filenames[BFILE], O_WRONLY | O_BINARY | O_CREAT |
O_TRUNC | O_BINARY,
S_IWUSR | S_IRUSR);
fds[MFILE] = open(filenames[MFILE], O_WRONLY | O_BINARY | O_CREAT | fds[MFILE] = open(filenames[MFILE], O_WRONLY | O_BINARY | O_CREAT |
O_TRUNC | O_BINARY, O_TRUNC | O_BINARY,
S_IWUSR | S_IRUSR); S_IWUSR | S_IRUSR);
@ -562,14 +555,6 @@ static void generate_interrupt_vector_bitmap(void)
supplied_entry[i].vector_id = (index * 32) + bit; supplied_entry[i].vector_id = (index * 32) + bit;
} }
bytes_to_write = num_elements * sizeof(unsigned int);
bytes_written = write(fds[BFILE], interrupt_vector_bitmap, bytes_to_write);
if (bytes_written != bytes_to_write) {
fprintf(stderr, "Failed to write all data to '%s'.\n",
filenames[BFILE]);
clean_exit(-1);
}
bytes_to_write = num_irq_lines; bytes_to_write = num_irq_lines;
bytes_written = write(fds[MFILE], map_irq_to_vector_id, bytes_to_write); bytes_written = write(fds[MFILE], map_irq_to_vector_id, bytes_to_write);
if (bytes_written != bytes_to_write) { if (bytes_written != bytes_to_write) {