From a960c7c446dd7946a2f92427794f86f4728e00d6 Mon Sep 17 00:00:00 2001 From: Alexey 'Cluster' Avdyukhin Date: Tue, 15 Sep 2020 11:30:26 +0300 Subject: Fixed merge conflicts --- CoolGirl_rev3.x/CoolGirl.qsf | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/CoolGirl_rev3.x/CoolGirl.qsf b/CoolGirl_rev3.x/CoolGirl.qsf index b201198..26349c5 100644 --- a/CoolGirl_rev3.x/CoolGirl.qsf +++ b/CoolGirl_rev3.x/CoolGirl.qsf @@ -77,8 +77,8 @@ set_location_assignment PIN_12 -to ppu_rd_out set_location_assignment PIN_142 -to ppu_addr_out[10] set_location_assignment PIN_143 -to ppu_addr_out[11] set_location_assignment PIN_1 -to ppu_addr_out[12] -set_location_assignment PIN_111 -to ppu_addr_in[12] -set_location_assignment PIN_110 -to ppu_addr_in[13] +set_location_assignment PIN_110 -to ppu_addr_in[12] +set_location_assignment PIN_109 -to ppu_addr_in[13] set_location_assignment PIN_3 -to ppu_wr_out set_location_assignment PIN_5 -to ppu_addr_out[14] set_location_assignment PIN_6 -to ppu_addr_out[15] @@ -89,21 +89,23 @@ set_location_assignment PIN_140 -to ppu_addr_in[8] set_location_assignment PIN_141 -to ppu_addr_in[4] set_location_assignment PIN_8 -to ppu_addr_in[3] set_location_assignment PIN_144 -to ppu_addr_out[17] -set_location_assignment PIN_113 -to ppu_addr_in[10] -set_location_assignment PIN_112 -to ppu_addr_in[11] -set_location_assignment PIN_107 -to ppu_not_a13 -set_location_assignment PIN_106 -to ppu_ciram_ce -set_location_assignment PIN_109 -to ppu_ciram_a10 -set_location_assignment PIN_105 -to ppu_wr_in -set_location_assignment PIN_104 -to irq -set_location_assignment PIN_103 -to cpu_rw_in +set_location_assignment PIN_112 -to ppu_addr_in[10] +set_location_assignment PIN_111 -to ppu_addr_in[11] +set_location_assignment PIN_97 -to ppu_not_a13 +set_location_assignment PIN_96 -to ppu_ciram_ce +set_location_assignment PIN_101 -to ppu_ciram_a10 +set_location_assignment PIN_20 -to ppu_rd_in +set_location_assignment PIN_95 -to ppu_wr_in +set_location_assignment PIN_94 -to irq +set_location_assignment PIN_93 -to cpu_rw_in set_location_assignment PIN_91 -to romsel -set_location_assignment PIN_29 -to sram_we -set_location_assignment PIN_27 -to sram_ce +set_location_assignment PIN_104 -to sram_we +set_location_assignment PIN_107 -to sram_ce set_location_assignment PIN_78 -to cpu_addr_in[14] set_location_assignment PIN_77 -to cpu_addr_in[13] set_location_assignment PIN_44 -to flash_ce set_location_assignment PIN_43 -to flash_oe +set_location_assignment PIN_75 -to cpu_addr_in[1] set_location_assignment PIN_76 -to cpu_addr_in[0] set_location_assignment PIN_88 -to cpu_data_in[0] set_location_assignment PIN_73 -to cpu_addr_in[3] @@ -124,7 +126,8 @@ set_location_assignment PIN_58 -to cpu_addr_in[9] set_location_assignment PIN_57 -to cpu_addr_in[10] set_location_assignment PIN_55 -to cpu_addr_in[11] set_location_assignment PIN_53 -to cpu_addr_in[12] -set_location_assignment PIN_30 -to sram_addr_out[13] +set_location_assignment PIN_105 -to sram_addr_out[13] +set_location_assignment PIN_106 -to sram_addr_out[14] set_location_assignment PIN_11 -to ppu_addr_in[9] set_location_assignment PIN_89 -to m2 set_location_assignment PIN_4 -to ppu_addr_out[13] -- cgit v1.2.3