jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Cleanedup toolchain

Browse Source 
Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/


git-svn-id: http://moon:8086/svn/vhdl/trunk@381 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2009-03-14 17:19:29 +00:00
parent 5f24a7e1dc
commit 58f704112c
15 changed files with 184 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/CPUs/MIPS/bsp/examples/bootloader/Makefile
-2
View File
@@ -1,5 +1,3 @@
ROM_WORDADDR_WIDTH=11
CFLAGS=-Os -I. -I../ -msoft-float -march=r3000
LFLAGS=-M -T bootloader.ld
LIB_DIRS=-L $(MIPS_TOOLS_PREFIX)/mipsel-elf/lib -L $(MIPS_TOOLS_PREFIX)/lib/gcc/mipsel-elf/$(MIPS_GCC_VER)
lib/CPUs/MIPS/bsp/examples/bootloader/bootloader.ld
+1 -1
View File
@@ -16,7 +16,7 @@ sys_timer_sec = 0xA000000C;
SECTIONS
{
.stext ORIGIN(rom) :
.init ORIGIN(rom) :
{
start = ALIGN(4);
entry = ALIGN(4);
lib/CPUs/MIPS/bsp/examples/bootloader/bootloader_with_flash.c
+36 -19
View File
@@ -9,12 +9,17 @@ typedef struct _ssrec_t
UINT8 *data;
} srec_t;
typedef struct _sflash_alloc_tbl_t
{
UINT32 images[16];
} flash_alloc_tbl_t;
typedef struct _sflash_img_hdr_t
{
UINT8 magic[4];
UINT32 target_addr;
UINT32 img_offset;
UINT32 target_base;
UINT32 img_base;
UINT32 img_size;
UINT32 hdr_next;
UINT8 img_name[128];
@@ -207,7 +212,8 @@ void PrintCPUinfo(void)
#define MAX_IMG_SIZE (1024*1024) // bytes
#define SDRAM_BASE 0x40000000
#define FLASH_OFFSET 0x00000000
#define FLASHIO_OFFSET 0x00000000
#define FLASH_BASE 0x00000000
int main(int argc, char *argv[])
{
@@ -222,10 +228,11 @@ int main(int argc, char *argv[])
volatile UINT32 *pReg = (UINT32*)sys_led_port;
volatile UINT32 *pBtn = (UINT32*)sys_gpio0;
volatile UINT32 *pDip = (UINT32*)sys_gpio1;
volatile UINT8 *pMem;
volatile UINT32 *pROM32;
volatile UINT32 *pMem32;
volatile UINT32 *pFlash = (UINT32*)sys_flash_io;
volatile UINT32 *pFlashIO = (UINT32*)sys_flash_io;
volatile UINT32 *pUSB = (UINT32*)sys_usb_data;
volatile UINT8 *ram8 = (UINT8*)SDRAM_BASE;
@@ -237,20 +244,20 @@ int main(int argc, char *argv[])
// ----------------------------------------------------------
ram32 = (UINT32*)(SDRAM_BASE);
pFlash = (UINT32*)(sys_flash_io + FLASH_OFFSET);
pFlashIO = (UINT32*)(sys_flash_io + FLASHIO_OFFSET);
if (!*pBtn)
{
sputs("\n\n");
sputs("Booting from flash...");
sputs("Booting application from flash...");
pImg_hdr = (flash_img_hdr_t*)pFlash;
ram32 = (UINT32*)pImg_hdr->target_addr;
pFlash = (UINT32*)(sys_flash_io + pImg_hdr->img_offset);
pImg_hdr = (flash_img_hdr_t*)pFlashIO;
ram32 = (UINT32*)pImg_hdr->target_base;
pFlashIO = (UINT32*)(sys_flash_io + pImg_hdr->img_base);
img_size = pImg_hdr->img_size;
for (i=0; i < img_size/4; i++)
ram32[i] = pFlash[i];
ram32[i] = pFlashIO[i];
sputs("done\n\n");
@@ -259,6 +266,17 @@ int main(int argc, char *argv[])
else
{
sputs("\n\n");
if (*pDip)
{
sputs("Booting stage 2 from flash.\n");
Jump_to((void*)FLASH_BASE);
}
sputs("Reading HEX-Record from UART..");
if (flash_find(&flash, sys_flash_io) < 0)
{
sputs("Cannot find flash device. Exit now!\n\n");
@@ -269,8 +287,6 @@ int main(int argc, char *argv[])
for (i=0; i < MAX_IMG_SIZE/4; i++)
ram32[i] = 0;
sputs("\n\n");
sputs("Booting from UART..");
while(1)
{
@@ -299,13 +315,14 @@ int main(int argc, char *argv[])
img_hdr.magic[1] = 'F';
img_hdr.magic[2] = 'I';
img_hdr.magic[3] = '1';
img_hdr.target_addr = srec.addr;
img_hdr.target_base = srec.addr;
img_hdr.img_size = haddr - srec.addr;
img_hdr.img_offset = FLASH_OFFSET + sizeof(flash_img_hdr_t);
img_hdr.hdr_next = FLASH_OFFSET;
img_hdr.img_base = FLASHIO_OFFSET + sizeof(flash_img_hdr_t);
img_hdr.hdr_next = flash_get_nextblock(&flash, img_hdr.img_base + img_hdr.img_size);
sputs("Next free flash offset: ");print_word(img_hdr.hdr_next); sputs("\n");
sputs("Flash erase...");
result = flash_erase(&flash, FLASH_OFFSET, img_hdr.img_size + sizeof(flash_img_hdr_t));
result = flash_erase(&flash, FLASHIO_OFFSET, img_hdr.img_size + sizeof(flash_img_hdr_t));
if (result < 0)
{
sputs("failed!\n");
@@ -314,13 +331,13 @@ int main(int argc, char *argv[])
sputs("done\n");
sputs("Flash write...");
result = flash_program(&flash, FLASH_OFFSET, (UINT8*)&img_hdr, sizeof(flash_img_hdr_t));
result = flash_program(&flash, FLASHIO_OFFSET, (UINT8*)&img_hdr, sizeof(flash_img_hdr_t));
if (result < 0)
{
sputs("failed!\n");
break;
}
result = flash_program(&flash, img_hdr.img_offset, (UINT8*)ram32, img_hdr.img_size);
result = flash_program(&flash, img_hdr.img_base, (UINT8*)ram32, img_hdr.img_size);
if (result < 0)
{
sputs("failed!\n");
@@ -329,7 +346,7 @@ int main(int argc, char *argv[])
sputs("done\n");
sputs("Flash verify...");
result = flash_verify(&flash, img_hdr.img_offset, (UINT8*)ram32, img_hdr.img_size);
result = flash_verify(&flash, img_hdr.img_base, (UINT8*)ram32, img_hdr.img_size);
if (result < 0)
{
sputs("failed!\n");
lib/CPUs/MIPS/bsp/examples/bootloader/init_boot.S
+2 -191
View File
@@ -1,6 +1,7 @@
.file "init.S"
.text
.section .init,"ax"
.align 2
.globl _init
.extern end
@@ -12,197 +13,7 @@ _init:
la $26, sys_uart_baud
addiu $27, $0, baudrate
sb $27, 0($26)
# set stack pointer
la $sp, stack_ptr
j $jmain
# TEST
li $26, +5
beqz $26, _terminate
li $26, -5
beqz $26, _terminate
li $26, 0
beqz $26, $_L11
nop
j _terminate
nop
$_L11:
li $26, +5
li $27, +6
beq $26, $27, _terminate
li $26, -5
beq $26, $27, _terminate
li $26, 0
beq $26, $27, _terminate
li $26, +6
beq $26, $27, $_L12
nop
j _terminate
nop
$_L12:
li $26, -5
bgez $26, _terminate
li $26, +5
bgez $26, $_L13
nop
j _terminate
$_L13: li $26, 0
bgez $26, $_L14
nop
j _terminate
$_L14:
li $26, -5
bgtz $26, _terminate
li $26, 0
bgtz $26, _terminate
li $26, +5
bgtz $26, $_L15
nop
j _terminate
$_L15:
li $26, +5
blez $26, _terminate
li $26, 0
blez $26, $_L16
nop
j _terminate
$_L16: li $26, -5
blez $26, $_L17
nop
j _terminate
$_L17:
li $26, +5
bltz $26, _terminate
li $26, 0
bltz $26, _terminate
li $26, -5
bltz $26, $_L18
nop
j _terminate
$_L18:
li $26, +5
li $27, +6
bne $26, $27, $_L19
nop
j _terminate
$_L19: li $26, -5
bne $26, $27, $_L20
nop
j _terminate
$_L20: li $26, -6
bne $26, $27, $_L21
nop
j _terminate
$_L21: li $26, 0
bne $26, $27, $_L22
nop
j _terminate
$_L22: li $26, +6
bne $26, $27, _terminate
li $26, +5
bnez $26, $_L23
nop
j _terminate
$_L23: li $26, -5
bnez $26, $_L24
nop
j _terminate
$_L24: li $26, 0
bnez $26, _terminate
jr $ra
$_L25:
li $27, +5
sltiu $26,$27,+6
sltiu $26,$27,-6
li $27, -5
sltiu $26,$27,+6
sltiu $26,$27,-6
li $27, +6
sltiu $26,$27,+5
sltiu $26,$27,-5
li $27, -6
sltiu $26,$27,+5
sltiu $26,$27,-5
li $27, +5
slti $26,$27,+6
slti $26,$27,-6
li $27, -5
slti $26,$27,+6
slti $26,$27,-6
li $27, +6
slti $26,$27,+5
slti $26,$27,-5
li $27, -6
slti $26,$27,+5
slti $26,$27,-5
li $26, +5
li $27, +6
sltu $26,$26,$27
li $26, +5
li $27, -6
sltu $26,$26,$27
li $26, -5
li $27, +6
sltu $26,$26,$27
li $26, -5
li $27, -6
sltu $26,$26,$27
li $26, +6
li $27, +5
sltu $26,$26,$27
li $26, +6
li $27, -5
sltu $26,$26,$27
li $26, -6
li $27, +5
sltu $26,$26,$27
li $26, -6
li $27, -5
sltu $26,$26,$27
li $26, +5
li $27, +6
slt $26,$26,$27
li $26, +5
li $27, -6
slt $26,$26,$27
li $26, -5
li $27, +6
slt $26,$26,$27
li $26, -5
li $27, -6
slt $26,$26,$27
li $26, +6
li $27, +5
slt $26,$26,$27
li $26, +6
li $27, -5
slt $26,$26,$27
li $26, -6
li $27, +5
slt $26,$26,$27
li $26, -6
li $27, -5
slt $26,$26,$27
# TEST
# jump main
$jmain: la $26, main
jalr $26
_terminate:
nop
j _terminate
nop
.set reorder
lib/CPUs/MIPS/bsp/examples/bootloader/startup_boot.S
+14 -2
View File
@@ -1,12 +1,16 @@
.file "startup.S"
.section .stext,"ax"
.text
.section .init,"ax"
.extern _init
.align 2
_start:
.set noreorder
# set stack pointer
la $sp, stack_ptr
# Set Kernel mode
li $26, 0x1040000C
mtc0 $26, $12
@@ -19,7 +23,15 @@ _start:
# jump init
la $26, _init
jr $26
jalr $26
nop
la $26, main
jalr $26
nop
_terminate:
nop
j _terminate
nop
.set reorder