Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed to support bugfix from 0.8.6

Browse Source
This commit is contained in:
Markus Fröschle
2014-12-26 10:33:53 +00:00
parent 8081df42a6
commit 551375c12e
1 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
BaS_gcc/tos/jtagwait/sources/jtagwait.c
View File

@@ -7,12 +7,12 @@
#include "MCF5475.h" #include "MCF5475.h"
#include "driver_vec.h" #include "driver_vec.h"
extern bool _FPGA_JTAG_LOADED; extern long _FPGA_JTAG_LOADED;
extern long _FPGA_JTAG_VALID; extern long _FPGA_JTAG_VALID;
#define VALID_JTAG 0xaffeaffe #define VALID_JTAG 0xaffeaffe
#define FPGA_CONFIG (1 << 2) #define FPGA_CONFIG (1 << 2)
#define FPGA_CONF_DONE (1 << 5) #define FPGA_CONF_DONE (1 << 5)
#define SRAM1_START 0xff101000 #define SRAM1_START 0xff101000
@@ -27,107 +27,107 @@ volatile uint32_t *_VRAM = (uint32_t *) 0xFFF00000;
void wait_for_jtag(void) void wait_for_jtag(void)
{ {
int i; int i;
/* set supervisor stack to end of SRAM1 */ /* set supervisor stack to end of SRAM1 */
__asm__ __volatile__ ( __asm__ __volatile__ (
" move #0x2700,sr\n\t" /* disable interrupts */ " move #0x2700,sr\n\t" /* disable interrupts */
" move.l %[stack],d0\n\t" /* 4KB on-chip core SRAM1 */ " move.l %[stack],d0\n\t" /* 4KB on-chip core SRAM1 */
" move.l d0,sp\n\t" /* set stack pointer */ " move.l d0,sp\n\t" /* set stack pointer */
: :
: [stack] "i" (SAFE_STACK) : [stack] "i" (SAFE_STACK)
: "d0", "cc" /* clobber */ : "d0", "cc" /* clobber */
); );
MCF_EPORT_EPIER = 0x0; /* disable EPORT interrupts */ MCF_EPORT_EPIER = 0x0; /* disable EPORT interrupts */
MCF_INTC_IMRL = 0xffffffff; MCF_INTC_IMRL = 0xffffffff;
MCF_INTC_IMRH = 0xffffffff; /* disable interrupt controller */ MCF_INTC_IMRH = 0xffffffff; /* disable interrupt controller */
MCF_MMU_MMUCR &= ~MCF_MMU_MMUCR_EN; /* disable MMU */ MCF_MMU_MMUCR &= ~MCF_MMU_MMUCR_EN; /* disable MMU */
xprintf("relocated supervisor stack, disabled interrupts and disabled MMU\r\n"); xprintf("relocated supervisor stack, disabled interrupts and disabled MMU\r\n");
/* /*
* configure FEC1L port directions to enable external JTAG configuration download to FPGA * configure FEC1L port directions to enable external JTAG configuration download to FPGA
*/ */
MCF_GPIO_PDDR_FEC1L = 0 | MCF_GPIO_PDDR_FEC1L = 0 |
MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L4; /* bit 4 = LED => output */ MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L4; /* bit 4 = LED => output */
/* all other bits = input */ /* all other bits = input */
/* /*
* configure DSPI_CS3 as GPIO input to avoid the MCU driving against the FPGA blink * configure DSPI_CS3 as GPIO input to avoid the MCU driving against the FPGA blink
*/ */
MCF_PAD_PAR_DSPI &= ~MCF_PAD_PAR_DSPI_PAR_CS3(MCF_PAD_PAR_DSPI_PAR_CS3_DSPICS3); MCF_PAD_PAR_DSPI &= ~MCF_PAD_PAR_DSPI_PAR_CS3(MCF_PAD_PAR_DSPI_PAR_CS3_DSPICS3);
/* /*
* now that GPIO ports have been switched to input, we can poll for FPGA config * now that GPIO ports have been switched to input, we can poll for FPGA config
* started from the JTAG interface (CONF_DONE goes low) and finish (CONF_DONE goes high) * started from the JTAG interface (CONF_DONE goes low) and finish (CONF_DONE goes high)
*/ */
xprintf("waiting for JTAG configuration start\r\n"); xprintf("waiting for JTAG configuration start\r\n");
while ((MCF_GPIO_PPDSDR_FEC1L & FPGA_CONF_DONE)); /* wait for JTAG config load started */ while ((MCF_GPIO_PPDSDR_FEC1L & FPGA_CONF_DONE)); /* wait for JTAG config load started */
xprintf("waiting for JTAG configuration to finish\r\n"); xprintf("waiting for JTAG configuration to finish\r\n");
while (!(MCF_GPIO_PPDSDR_FEC1L & FPGA_CONF_DONE)); /* wait for JTAG config load finished */ while (!(MCF_GPIO_PPDSDR_FEC1L & FPGA_CONF_DONE)); /* wait for JTAG config load finished */
xprintf("JTAG configuration finished.\r\n"); xprintf("JTAG configuration finished.\r\n");
_FPGA_JTAG_LOADED = true; /* indicate jtag loaded FPGA config to BaS */ _FPGA_JTAG_LOADED = 1; /* indicate jtag loaded FPGA config to BaS */
_FPGA_JTAG_VALID = VALID_JTAG; /* set magic word to indicate _FPGA_JTAG_LOADED is valid */ _FPGA_JTAG_VALID = VALID_JTAG; /* set magic word to indicate _FPGA_JTAG_LOADED is valid */
/* wait */ /* wait */
xprintf("wait a little to let things settle...\r\n"); xprintf("wait a little to let things settle...\r\n");
for (i = 0; i < 100000000; i++); for (i = 0; i < 10000000; i++);
xprintf("write byte data to FPGA memory\r\n"); xprintf("write byte data to FPGA memory\r\n");
for (i = 0; i < 512; i++) for (i = 0; i < 512; i++)
{ {
_VRAM[i] = i; _VRAM[i] = i;
} }
hexdump((uint8_t *) _VRAM, 512); hexdump((uint8_t *) _VRAM, 512);
xprintf("wait a little to let things settle...\r\n"); xprintf("wait a little to let things settle...\r\n");
for (i = 0; i < 100000000; i++); for (i = 0; i < 10000000; i++);
__asm__ __volatile__( __asm__ __volatile__(
" jmp (%[bas_start])\n\t" " jmp (%[bas_start])\n\t"
: /* no output */ : /* no output */
: [bas_start] "a" (bas_start) : [bas_start] "a" (bas_start)
: /* clobber not needed */ : /* clobber not needed */
); );
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
printf("\033E\r\nFPGA JTAG configuration support\r\n"); printf("\033E\r\nFPGA JTAG configuration support\r\n");
printf("<C> 2014 M. Fröschle\r\n"); printf("<C> 2014 M. Froeschle\r\n");
printf("You may now savely load a new FPGA configuration through the JTAG interface\r\n" printf("You may now savely load a new FPGA configuration through the JTAG interface\r\n"
"and your Firebee will reboot once finished using that new configuration.\r\n"); "and your Firebee will reboot once finished using that new configuration.\r\n");
if (argc == 2) if (argc == 2)
{ {
/* /*
* we got an argument. This is supposed to be the address that we need to jump to after JTAG * we got an argument. This is supposed to be the address that we need to jump to after JTAG
* configuration has been finished. Meant to support BaS in RAM testing * configuration has been finished. Meant to support BaS in RAM testing
*/ */
char *addr_str = argv[1]; char *addr_str = argv[1];
char *addr = NULL; char *addr = NULL;
char *end = NULL; char *end = NULL;
addr = (char *) strtol(addr_str, &end, 16); addr = (char *) strtol(addr_str, &end, 16);
if (addr != NULL && addr <= (char *) 0xe0000000 && addr >= (char *) 0x10000000) if (addr != NULL && addr <= (char *) 0xe0000000 && addr >= (char *) 0x10000000)
{ {
/* /*
* seems to be a valid address * seems to be a valid address
*/ */
bas_start = (long) addr; bas_start = (long) addr;
printf("BaS start address set to %p\r\n", (void *) bas_start); printf("BaS start address set to %p\r\n", (void *) bas_start);
} }
else else
{ {
printf("\r\nNote: BaS start address %p not valid. Stick to %p.\r\n", addr, (void *) bas_start); printf("\r\nNote: BaS start address %p not valid. Stick to %p.\r\n", addr, (void *) bas_start);
} }
} }
Supexec(wait_for_jtag); Supexec(wait_for_jtag);
return 0; /* just to make the compiler happy, we will never return */ return 0; /* just to make the compiler happy, we will never return */
} }