Forráskód Böngészése

iodevs.conf: move iodevs.conf into common/

Tidy up the root directory by moving iodevs.conf into common/
H. Peter Anvin 1 éve
szülő
commit
fcbaca5e17
7 módosított fájl, 7 hozzáadás és 14 törlés
  1. 0 0
      common/iodevs.conf
  2. 1 1
      fpga/Makefile
  3. 1 1
      fpga/scripts/flashsvf.pl
  4. 1 1
      fpga/usb/Makefile
  5. 1 1
      fpga/usb/usb_desc.conf
  6. 2 2
      rv32/Makefile
  7. 1 8
      rv32/ioregsa.pl

+ 0 - 0
iodevs.conf → common/iodevs.conf


+ 1 - 1
fpga/Makefile

@@ -275,7 +275,7 @@ spotless: clean
 	for d in $(SUBDIRS); do $(MAKE) -C $$d spotless; done
 	rm -rf $(outdir) $(mifdir) *.deps *~ \#*~
 
-iodevs.vh: ../iodevs.conf ../tools/iodevs.pl
+iodevs.vh: ../common/iodevs.conf ../tools/iodevs.pl
 	$(PERL) ../tools/iodevs.pl v $< $@
 
 deps: Makefile

+ 1 - 1
fpga/scripts/flashsvf.pl

@@ -5,7 +5,7 @@ use integer;
 
 our %consts;
 
-require '../iodevs.conf';
+require '../../common/iodevs.conf';
 
 my $ramaddr    = $consts{'SDRAM_ADDR'};
 my $flashcmd   = 0xabc80046;

+ 1 - 1
fpga/usb/Makefile

@@ -6,7 +6,7 @@ PERLOPT = -I$(PERLINC)
 TARGETS = usb_desc.v
 ALSO    = usb_desc.bin
 
-includes = ../../iodevs.conf usbparam.vh
+includes = ../../common/iodevs.conf usbparam.vh
 
 all: $(TARGETS) $(ALSO)
 

+ 1 - 1
fpga/usb/usb_desc.conf

@@ -3,7 +3,7 @@
 # Invoked from usbdescgen.pl
 #
 
-require '../../iodevs.conf';
+require '../../common/iodevs.conf';
 require 'hconst.ph';
 
 my %usbparam     = header_const('usbparam.vh');

+ 2 - 2
rv32/Makefile

@@ -177,10 +177,10 @@ abcmem.o: roms.h
 		-fdollars-in-identifiers \
 		-C -P -E $< | $(PERL) -pe 's:^(#.*)$$:/* $$1 */:' > $@
 
-iodevs.h: ../iodevs.conf ../tools/iodevs.pl
+iodevs.h: ../common/iodevs.conf ../tools/iodevs.pl
 	$(PERL) ../tools/iodevs.pl h $< $@
 
-irqtable.h: ../iodevs.conf ../tools/iodevs.pl
+irqtable.h: ../common/iodevs.conf ../tools/iodevs.pl
 	$(PERL) ../tools/iodevs.pl irqh $< $@
 
 clean:

+ 1 - 8
rv32/ioregsa.pl

@@ -51,7 +51,7 @@ while (my $l = <$in>) {
 	my $sym = $1;
 	my $dev = $4;
 	my $size = $sizes{$5};
-	
+
 	if ($2) {
 	    my $v = $3;
 	    my $r = $range{$v};
@@ -72,10 +72,3 @@ while (my $l = <$in>) {
 
 close($in);
 close($out);
-
-		    
-	
-    
-    
-
-