Macintosh-HW/NuBusFPGA
1
0
Fork 0
mirror of https://github.com/rdolbeau/NuBusFPGA.git synced 2024-12-23 01:30:32 +00:00
Code Issues Projects Releases Wiki Activity

rename blit to blit_goblin

Browse Source
This commit is contained in:
Romain Dolbeau 2022-07-23 12:58:13 +02:00
parent abdb178089
commit d70ba3e434
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nubus-to-ztex-gateware/blit.c → nubus-to-ztex-gateware/blit_goblin.c
View File

@ -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 -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.lds -nostartfiles blit.s ~/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.raw ~/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 #ifndef BASE_FB

0
nubus-to-ztex-gateware/blit.lds → nubus-to-ztex-gateware/blit_goblin.lds
View File

8
nubus-to-ztex-gateware/blit.sh → nubus-to-ztex-gateware/blit_goblin.sh
View File

@ -21,8 +21,8 @@ ARCH=rv32im_zba_zbb_zbt
PARAM="-DBASE_FB=${BASE_FB}" PARAM="-DBASE_FB=${BASE_FB}"
if test "x$1" != "xASM"; then 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 fi
$GCC $OPT -c -o blit.o $PARAM -march=$ARCH -mabi=ilp32 -mstrict-align -fno-builtin-memset -nostdlib -ffreestanding -nostartfiles blit.s && $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 $PARAM -march=$ARCH -mabi=ilp32 -T blit.lds -nostartfiles blit.o && $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 blit.raw $OBJCOPY -O binary -j .text -j .rodata blit_goblin blit_goblin.raw

2
nubus-to-ztex-gateware/nubus_to_fpga_soc.py
View File

@ -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_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_i", master=self.goblin_accel.ibus)
self.bus.add_master(name="goblin_accel_r5_d", master=self.goblin_accel.dbus) 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_data = soc_core.get_mem_data(goblin_rom_file, "little")
goblin_rom_len = 4*len(goblin_rom_data); goblin_rom_len = 4*len(goblin_rom_data);
rounded_goblin_rom_len = 2**log2_int(goblin_rom_len, False) rounded_goblin_rom_len = 2**log2_int(goblin_rom_len, False)