diff --git a/nubus-to-ztex-gateware/blit.c b/nubus-to-ztex-gateware/blit_goblin.c similarity index 99% rename from nubus-to-ztex-gateware/blit.c rename to nubus-to-ztex-gateware/blit_goblin.c index 1c6f9a8..79a0be5 100644 --- a/nubus-to-ztex-gateware/blit.c +++ b/nubus-to-ztex-gateware/blit_goblin.c @@ -1,7 +1,7 @@ /* - ~/LITEX/riscv64-unknown-elf-gcc-10.1.0-2020.08.2-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -Os -S blit.c -march=rv32ib -mabi=ilp32 -mstrict-align -fno-builtin-memset -nostdlib -ffreestanding -nostartfiles - ~/LITEX/riscv64-unknown-elf-gcc-10.1.0-2020.08.2-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -Os -o blit -march=rv32ib -mabi=ilp32 -T blit.lds -nostartfiles blit.s - ~/LITEX/riscv64-unknown-elf-gcc-10.1.0-2020.08.2-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-objcopy -O binary -j .text blit blit.raw + ~/LITEX/riscv64-unknown-elf-gcc-10.1.0-2020.08.2-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -Os -S blit_goblin.c -march=rv32ib -mabi=ilp32 -mstrict-align -fno-builtin-memset -nostdlib -ffreestanding -nostartfiles + ~/LITEX/riscv64-unknown-elf-gcc-10.1.0-2020.08.2-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -Os -o blit -march=rv32ib -mabi=ilp32 -T blit_goblin.lds -nostartfiles blit_goblin.s + ~/LITEX/riscv64-unknown-elf-gcc-10.1.0-2020.08.2-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-objcopy -O binary -j .text blit blit_goblin.raw */ #ifndef BASE_FB diff --git a/nubus-to-ztex-gateware/blit.lds b/nubus-to-ztex-gateware/blit_goblin.lds similarity index 100% rename from nubus-to-ztex-gateware/blit.lds rename to nubus-to-ztex-gateware/blit_goblin.lds diff --git a/nubus-to-ztex-gateware/blit.sh b/nubus-to-ztex-gateware/blit_goblin.sh similarity index 50% rename from nubus-to-ztex-gateware/blit.sh rename to nubus-to-ztex-gateware/blit_goblin.sh index 958d709..c783a5f 100755 --- a/nubus-to-ztex-gateware/blit.sh +++ b/nubus-to-ztex-gateware/blit_goblin.sh @@ -21,8 +21,8 @@ ARCH=rv32im_zba_zbb_zbt PARAM="-DBASE_FB=${BASE_FB}" if test "x$1" != "xASM"; then - $GCC $OPT -S -o blit.s $PARAM -march=$ARCH -mabi=ilp32 -mstrict-align -fno-builtin-memset -nostdlib -ffreestanding -nostartfiles blit.c + $GCC $OPT -S -o blit_goblin.s $PARAM -march=$ARCH -mabi=ilp32 -mstrict-align -fno-builtin-memset -nostdlib -ffreestanding -nostartfiles blit_goblin.c fi -$GCC $OPT -c -o blit.o $PARAM -march=$ARCH -mabi=ilp32 -mstrict-align -fno-builtin-memset -nostdlib -ffreestanding -nostartfiles blit.s && -$GCCLINK $OPT -o blit $PARAM -march=$ARCH -mabi=ilp32 -T blit.lds -nostartfiles blit.o && -$OBJCOPY -O binary -j .text -j .rodata blit blit.raw +$GCC $OPT -c -o blit_goblin.o $PARAM -march=$ARCH -mabi=ilp32 -mstrict-align -fno-builtin-memset -nostdlib -ffreestanding -nostartfiles blit_goblin.s && +$GCCLINK $OPT -o blit_goblin $PARAM -march=$ARCH -mabi=ilp32 -T blit_goblin.lds -nostartfiles blit_goblin.o && +$OBJCOPY -O binary -j .text -j .rodata blit_goblin blit_goblin.raw diff --git a/nubus-to-ztex-gateware/nubus_to_fpga_soc.py b/nubus-to-ztex-gateware/nubus_to_fpga_soc.py index 77a5114..0815115 100644 --- a/nubus-to-ztex-gateware/nubus_to_fpga_soc.py +++ b/nubus-to-ztex-gateware/nubus_to_fpga_soc.py @@ -403,7 +403,7 @@ class NuBusFPGA(SoCCore): self.bus.add_slave("goblin_accel", self.goblin_accel.bus, SoCRegion(origin=self.mem_map.get("goblin_accel", None), size=0x1000, cached=False)) self.bus.add_master(name="goblin_accel_r5_i", master=self.goblin_accel.ibus) self.bus.add_master(name="goblin_accel_r5_d", master=self.goblin_accel.dbus) - goblin_rom_file = "blit.raw" + goblin_rom_file = "blit_goblin.raw" goblin_rom_data = soc_core.get_mem_data(goblin_rom_file, "little") goblin_rom_len = 4*len(goblin_rom_data); rounded_goblin_rom_len = 2**log2_int(goblin_rom_len, False)