From 3ec7c27f36b02a4a89b6df4852a4d46c343b45db Mon Sep 17 00:00:00 2001 From: J Date: Wed, 27 Mar 2019 21:04:53 -0400 Subject: [PATCH] Continue simple cleanups of pinouts and platform split. Still doesn't work, though --- ghdl_lattice.sh | 2 - ram.img | Bin 6504 -> 6264 bytes ram_init.vhd | 444 +++++++++++++++++----------------------- testrom/main_up5k_42s.c | 4 +- up5k.pcf | 18 -- upduino2.pcf | 9 + 6 files changed, 203 insertions(+), 274 deletions(-) delete mode 100644 up5k.pcf create mode 100644 upduino2.pcf diff --git a/ghdl_lattice.sh b/ghdl_lattice.sh index 342f0df..369d19a 100644 --- a/ghdl_lattice.sh +++ b/ghdl_lattice.sh @@ -8,8 +8,6 @@ ghdl -a data_bus_pkg.vhd monitor_pkg.vhd ram_init.vhd lattice_ebr.vhd bus_monit ghdl -a --work=sb_ice40_components_syn clk_sim.vhd -ghdl -a ../disp_drv/disp_drv_pkg.vhd ../disp_drv/disp_drv.vhd - ghdl -a cpu_lattice.vhd lattice_tb.vhd ghdl -e lattice_tb diff --git a/ram.img b/ram.img index 802784f7bf0f945d60f17cc0a49bad41105be1b2..185e570b3e5b58262a52abaab8b1dae9a4d1fddd 100755 GIT binary patch delta 1050 zcmb`FQAkr!7{|YRyt~`goZfk_yMw^(HcTp*yRM`?$Obb)%ncI~*~8|Rt>H_{V2Ch5 z3uX!8>9Ge1AEG3M3q45$`OrgwLlGZ(Frkc|WDhk;sPA}ZzVs5v<;VHX_y5kH@0{;` z)hq1oXUMBV4d6FcL=g#dTP5E2Ak!Pw!gcAX#8k8u>N4K}}b0;s2vMvN=;qcBb^6*_2rNt{d6W(yKNMkBVIosR)ny;!pZz-Q>1?WbU= zpw$>%6K9UqK~`bJYxhW424EF@24RO2D5bI2_W(jW?sov1+!&8ljpL?y6aIxwbF9vo zt{>rAS&ena%pH25pMo$CX`6Mxe2vBiJE#3^auaiJOmF7|#*?PEm^VU=eOxoEV;5oG ztUva!(hOact_Tg-hPp}jrPoBAFjgEIr>m;~zW|_!JVf@91-9bztLVOhF`L9&#I<|q z#LHQMN$M&clSg{Y(0jGWm59_`BH{DqAegf>Q?d+8T3eCd;ICgi(W{;4^$P;9dZmaP?M=+HfP6hN% rT~A+1)ehggJ(>=>Z`@3~uO)MCz0<9?2X%ii5O8-#25{rQTnm2yPv_Py delta 1247 zcmb_bUq};i9RJ?!?&dbp?Y3Pzi`uSHlGS`dMGvk&W*R{l548e!idI_da*G zP&r?f0N};}R{Z$0ip>Dxdc?1l#`_A`T&U69|3CsoY+q1JKq&u7^dAOe#q}f1X4V-Y z0cNit)dEN%l45SMWlu&T%2i` z4u>sZI=gtWbdH&>4_iJMFfN{Br?=$eVdH%3_5Ku}h3kDO7O%Zoc(v(9k1Dq5%xH9( zmP(r1^h_-`8nkpYMfJmsDo%U_Q^q%)@C7ZOj9GYHql!^oyEZImp;ON?U3!N-rXMQ` zood(P)-HR)x|n^-LGMX#MXWmR3a)Fkc$XH0-hpXkL#}&uk}KpEP~0_A;Tg(8zB0^z zghK5b)@&ooU&6SH zoo9fDa}t2>x6%+?Gw9|X0HzpyZl%tWF~d29?*K5P(cA^ZjeHv{BEJP;!`yw+%1M$l zGG%B{0_b(iD!?nA;2cN~ay^VFm81G502!5Ky3;&a;7_o^8!{l=WnH7hYxJ{x4QVsR zOZXaqq9Wvs;$%%^*7#iz-k{VTGFx=+Pc=*#>Eou4Y;Xa9GWaG0Z4O~+H-4=50E`a2 ze+=N@FvdsA2_uh+J7y6Bl$TBwcQUIeC&$HHP6PQ8a;b(mNhhGX>9r*#jPiR()OOK* zXss8~k3em6BpoSjW+ckX?SQ`6RvySuM@z?|-O9%Mxq zR$POK(})X*D`b92q(<{s$10;*UEThTzB x"00000000" ); diff --git a/testrom/main_up5k_42s.c b/testrom/main_up5k_42s.c index d287753..3abcf28 100644 --- a/testrom/main_up5k_42s.c +++ b/testrom/main_up5k_42s.c @@ -124,6 +124,7 @@ main_sh (void) { volatile int i; unsigned int stat = 0x50; +#if 0 KEYPORT = KEY_PRECHARGE; @@ -147,7 +148,6 @@ main_sh (void) for (i=0; lcd_init[i] != 0xff; i++) lcd_inst(lcd_init[i]); putstr ("LCD init\n"); -#if 0 lcd_loc(0, 1); lcd_puts("Hit a Key!"); @@ -162,7 +162,6 @@ main_sh (void) #if 0 lcd_loc(0, 0); lcd_puts(hex(0x123ab678)); -#endif for (i=0; i<8; i++) { lcd_data( (1<<(i+0 )) | @@ -170,6 +169,7 @@ main_sh (void) (1<<(i+16)) | (1<<(i+24))); } +#endif for (i=0; i<800; i++) {} led(stat); for (i=0; i<800; i++) {} diff --git a/up5k.pcf b/up5k.pcf deleted file mode 100644 index 579f6d0..0000000 --- a/up5k.pcf +++ /dev/null @@ -1,18 +0,0 @@ - -#set_io led[0] 39 -#set_io led[1] 40 -#set_io led[2] 41 -#set_io led[3] 44 -#set_io led[4] 45 -#set_io led[5] 46 -#set_io led[6] 47 -#set_io led[7] 48 - -set_io led[0] 26 -set_io led[1] 27 -set_io led[2] 32 -set_io led[3] 35 -set_io led[4] 31 -set_io led[5] 37 -set_io led[6] 34 -set_io led[7] 43 diff --git a/upduino2.pcf b/upduino2.pcf new file mode 100644 index 0000000..daef512 --- /dev/null +++ b/upduino2.pcf @@ -0,0 +1,9 @@ + +set_io led[0] 26 +set_io led[1] 27 +set_io led[2] 32 +set_io led[3] 35 +set_io led[4] 31 +set_io led[5] 37 +set_io led[6] 34 +set_io led[7] 43