Commit 85c9262d authored by Miles Bader's avatar Miles Bader Committed by Linus Torvalds

[PATCH] Add support for ROM kernel on v850 AS85EP1 target

parent 8629b059
...@@ -44,8 +44,10 @@ extern char _intv_copy_dst_start; ...@@ -44,8 +44,10 @@ extern char _intv_copy_dst_start;
void __init mach_early_init (void) void __init mach_early_init (void)
{ {
#ifndef CONFIG_ROM_KERNEL
const u32 *src; const u32 *src;
register u32 *dst asm ("ep"); register u32 *dst asm ("ep");
#endif
AS85EP1_CSC(0) = 0x0403; AS85EP1_CSC(0) = 0x0403;
AS85EP1_BCT(0) = 0xB8B8; AS85EP1_BCT(0) = 0xB8B8;
...@@ -53,25 +55,28 @@ void __init mach_early_init (void) ...@@ -53,25 +55,28 @@ void __init mach_early_init (void)
AS85EP1_BCC = 0x0012; AS85EP1_BCC = 0x0012;
AS85EP1_ASC = 0; AS85EP1_ASC = 0;
AS85EP1_LBS = 0x00A9; AS85EP1_LBS = 0x00A9;
AS85EP1_RFS(1) = 0x8205;
AS85EP1_RFS(3) = 0x8205;
AS85EP1_SCR(1) = 0x20A9;
AS85EP1_SCR(3) = 0x20A9;
AS85EP1_PORT_PMC(6) = 0xFF; /* A20-25, A0,A1 $BM-8z(B */ AS85EP1_PORT_PMC(6) = 0xFF; /* A20-25, A0,A1 $BM-8z(B */
AS85EP1_PORT_PMC(7) = 0x0E; /* CS1,2,3 $BM-8z(B */ AS85EP1_PORT_PMC(7) = 0x0E; /* CS1,2,3 $BM-8z(B */
AS85EP1_PORT_PMC(9) = 0xFF; /* D16-23 $BM-8z(B */ AS85EP1_PORT_PMC(9) = 0xFF; /* D16-23 $BM-8z(B */
AS85EP1_PORT_PMC(10) = 0xFF; /* D24-31 $BM-8z(B */ AS85EP1_PORT_PMC(10) = 0xFF; /* D24-31 $BM-8z(B */
AS85EP1_IRAMM = 0x3; /* $BFbB"L?Na(BRAM$B$O!V(Bwrite-mode$B!W$K$J$j$^$9(B */ AS85EP1_RFS(1) = 0x800c;
AS85EP1_RFS(3) = 0x800c;
AS85EP1_SCR(1) = 0x20A9;
AS85EP1_SCR(3) = 0x20A9;
/* The early chip we have is buggy, so that writing the interrupt #ifndef CONFIG_ROM_KERNEL
/* The early chip we have is buggy, and writing the interrupt
vectors into low RAM may screw up, so for non-ROM kernels, we vectors into low RAM may screw up, so for non-ROM kernels, we
only rely on the reset vector being downloaded, and copy the only rely on the reset vector being downloaded, and copy the
rest of the interrupt vectors into place here. The specific bug rest of the interrupt vectors into place here. The specific bug
is that writing address N, where (N & 0x10) == 0x10, will _also_ is that writing address N, where (N & 0x10) == 0x10, will _also_
write to address (N - 0x10). We avoid this (effectively) by write to address (N - 0x10). We avoid this (effectively) by
writing in 16-byte chunks backwards from the end. */ writing in 16-byte chunks backwards from the end. */
AS85EP1_IRAMM = 0x3; /* $BFbB"L?Na(BRAM$B$O!V(Bwrite-mode$B!W$K$J$j$^$9(B */
src = (u32 *)(((u32)&_intv_copy_src_end - 1) & ~0xF); src = (u32 *)(((u32)&_intv_copy_src_end - 1) & ~0xF);
dst = (u32 *)&_intv_copy_dst_start dst = (u32 *)&_intv_copy_dst_start
+ (src - (u32 *)&_intv_copy_src_start); + (src - (u32 *)&_intv_copy_src_start);
...@@ -83,6 +88,7 @@ void __init mach_early_init (void) ...@@ -83,6 +88,7 @@ void __init mach_early_init (void)
} while (src > (u32 *)&_intv_copy_src_start); } while (src > (u32 *)&_intv_copy_src_start);
AS85EP1_IRAMM = 0x0; /* $BFbB"L?Na(BRAM$B$O!V(Bread-mode$B!W$K$J$j$^$9(B */ AS85EP1_IRAMM = 0x0; /* $BFbB"L?Na(BRAM$B$O!V(Bread-mode$B!W$K$J$j$^$9(B */
#endif /* !CONFIG_ROM_KERNEL */
nb85e_intc_disable_irqs (); nb85e_intc_disable_irqs ();
} }
...@@ -107,16 +113,20 @@ void __init mach_get_physical_ram (unsigned long *ram_start, ...@@ -107,16 +113,20 @@ void __init mach_get_physical_ram (unsigned long *ram_start,
*ram_len = RAM_END - RAM_START; *ram_len = RAM_END - RAM_START;
} }
/* Convenience macros. */
#define SRAM_END (SRAM_ADDR + SRAM_SIZE)
#define SDRAM_END (SDRAM_ADDR + SDRAM_SIZE)
void __init mach_reserve_bootmem () void __init mach_reserve_bootmem ()
{ {
extern char _root_fs_image_start, _root_fs_image_end; extern char _root_fs_image_start, _root_fs_image_end;
u32 root_fs_image_start = (u32)&_root_fs_image_start; u32 root_fs_image_start = (u32)&_root_fs_image_start;
u32 root_fs_image_end = (u32)&_root_fs_image_end; u32 root_fs_image_end = (u32)&_root_fs_image_end;
/* We can't use the space between SRAM and SDRAM, so prevent the if (SDRAM_ADDR < RAM_END && SDRAM_ADDR > RAM_START)
kernel from trying. */ /* We can't use the space between SRAM and SDRAM, so
reserve_bootmem (SRAM_ADDR + SRAM_SIZE, prevent the kernel from trying. */
SDRAM_ADDR - (SRAM_ADDR + SRAM_SIZE)); reserve_bootmem (SRAM_END, SDRAM_ADDR - SRAM_END);
/* Reserve the memory used by the root filesystem image if it's /* Reserve the memory used by the root filesystem image if it's
in RAM. */ in RAM. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment