FPGA/oh
1
0
Fork 0
mirror of https://github.com/aolofsson/oh.git synced 2025-01-17 20:02:53 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/parallella/oh

Browse Source
This commit is contained in:
Andreas Olofsson 2015-11-11 00:30:58 -05:00
commit 69d481b8f0
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
elink/include/elink_regs.h
View File

@ -2,7 +2,6 @@
#define ELINK_REGS_H
// New Epiphany system registers
//TODO: This should be dynamic???
typedef enum {
ELINK_BASE = 0x81000000,
ELINK_RESET = ELINK_BASE + 0xF0200,
@ -26,4 +25,26 @@ typedef enum {
ELINK_RXMMU = ELINK_BASE + 0xE8000,
} elink_regs_id_t;
typedef enum {
E_REG_LINKMODE = 0xF0300,
E_REG_TXCFG = 0xF0304,
E_REG_RXCFG = 0xF0308,
E_REG_GPIOCFG = 0xF030C,
} epiphany_regs_id_t;
//FOR LEGACY ONLY!
typedef enum {
E_SYS_BASE = 0x70000000,
E_SYS_RESET = E_SYS_BASE + 0x0040,
E_SYS_CFGTX = E_SYS_BASE + 0x0044,
E_SYS_CFGRX = E_SYS_BASE + 0x0048,
E_SYS_CFGCLK = E_SYS_BASE + 0x004c,
E_SYS_COREID = E_SYS_BASE + 0x0050,
E_SYS_VERSION = E_SYS_BASE + 0x0054,
E_SYS_GPIOIN = E_SYS_BASE + 0x0058,
E_SYS_GPIOOUT = E_SYS_BASE + 0x005c
} e_sys_reg_id_t;
#endif

26
elink/sw/src/e-access.c
View File

@ -7,8 +7,9 @@
#include "elink_regs.h"
#define EPIPHANY_BASE 0x80800000
#define ELINK_BASE 0x81000000
#define ELINK_VERSION 0x0
#define ELINK_BASE 0x81000000 //Not used for now
#define ELINK_VERSION 0x1 //Set to 0 for 2015.1 version
//Set to 1 for 2015.12 version
#define COREADDR(a,b) ((a << 26) | ( b << 20))
@ -77,7 +78,8 @@ int e_debug_read(unsigned addr, unsigned *data) {
char *ptr;
//Debug
//printf("read addr=%08x data=%08x\n", addr, *data);
printf("read addr=%08x data=%08x\n", addr, *data);
fflush(stdout);
//Map device into memory
ret = e_debug_map(addr, (void **)&ptr, &offset);
@ -99,8 +101,8 @@ int e_debug_write(unsigned addr, unsigned data) {
char *ptr;
//Debug
//printf("write addr=%08x data=%08x\n", addr, data);
printf("write addr=%08x data=%08x\n", addr, data);
fflush(stdout);
//Map device into memory
ret = e_debug_map(addr, (void **)&ptr, &offset);
@ -228,16 +230,8 @@ void e_debug_init(int version){
e_debug_write(E_SYS_CFGTX, data);//set ctrlmode back to normal
usleep(1000);
}
else{
//Reduce Epiphany Elink TX to half speed
data = 0x51;
e_debug_write(ELINK_TXCFG, data);
usleep(1000);
data = 0x1;//divide east lclk by 4
e_debug_write((EPIPHANY_BASE + COREADDR(2,3) + E_REG_LINKMODE), data);
usleep(1000);
data = 0x1;
e_debug_write(E_SYS_CFGTX, data);
usleep(1000);
else{
//Do nothing! Access should be raw, no side effects!
//Keep the old one there for now, too long a recipe
}
}