Browse Source

Fixing some json classic.
and sys/src/.gitignore for new generated files
after inclusion of RISCV architecture and the fix
for inadecuate places for amd64 name.

Change-Id: I413e785f9b94b4c23a70d9794ab49d75c5c17e82

Elbing Miss 8 years ago
parent
commit
1485e3c2f2
3 changed files with 4 additions and 4 deletions
  1. 2 2
      sys/src/9/.gitignore
  2. 1 1
      sys/src/9/amd64/clean.json
  3. 1 1
      sys/src/9/boot/bootconf.json

+ 2 - 2
sys/src/9/.gitignore

@@ -1,13 +1,13 @@
 /amd64/init.h
 /amd64/init
 /amd64/systab.c
-/boot/bootamd64cpu.c
+/boot/bootcpu.c
 /amd64/tags
 /amd64/amd64l.h
 /amd64/harvey
 /amd64/harvey.32bit
 /amd64/harvey.asm
-/amd64/amd64cpu.c
+/amd64/cpu.c
 /amd64/errstr.h
 /amd64/ksyms.map
 /amd64/nvram

+ 1 - 1
sys/src/9/amd64/clean.json

@@ -1,7 +1,7 @@
 {
 	"clean": {
 		"Pre": [
-			"rm -f *.o *.root.c *.out errstr.h init.h init ../boot/libboot.a ../boot/*.o boot*.c"
+			"rm -f *.o *.root.c *.out errstr.h init.h init ../boot/libboot.a ../boot/*.o boot*.c cpu.c"
 		]
 	}
 }

+ 1 - 1
sys/src/9/boot/bootconf.json

@@ -15,7 +15,7 @@
 		],
 		"Post": [
 			"rm *.o *.a",
-			"data2c ramfs_bootcpu_ ../boot/bootcpu.elf.out >> cpu.c"
+			"data2c ramfs_bootcpu_ ../boot/bootcpu.elf.out >> ../$ARCH/cpu.c"
 		],
 		"Program": "bootcpu.elf.out",
 		"Projects": [