qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-16 14:04:42 +02:00
Code

[brcm63xx] a couple of more fixes to get 6345 booting up to the console handover

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16636 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-06-30 13:45:49 +00:00
parent 6989b4a9bc
commit e4fd15b644
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
View File

@ -67,6 +67,16 @@ static struct board_info __initdata board_96338w = {
}; };
#endif #endif
/*
* known 6345 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6345
static struct board_info __initdata board_96345gw2 = {
.name = "96345GW2",
.expected_cpu_id = 0x6345,
};
#endif
/* /*
* known 6348 boards * known 6348 boards
*/ */
@ -300,6 +310,9 @@ static const struct board_info __initdata *bcm963xx_boards[] = {
&board_96338gw, &board_96338gw,
&board_96338w, &board_96338w,
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
#endif
#ifdef CONFIG_BCM63XX_CPU_6348 #ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r, &board_96348r,
&board_96348gw, &board_96348gw,

3
target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c
View File

@ -288,6 +288,9 @@ static unsigned int detect_memory_size(void)
unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0; unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0;
u32 val; u32 val;
if (BCMCPU_IS_6345())
return (8 * 1024 * 1024);
if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) { if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) {
val = bcm_sdram_readl(SDRAM_CFG_REG); val = bcm_sdram_readl(SDRAM_CFG_REG);
rows = (val & SDRAM_CFG_ROW_MASK) >> SDRAM_CFG_ROW_SHIFT; rows = (val & SDRAM_CFG_ROW_MASK) >> SDRAM_CFG_ROW_SHIFT;

2
target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c
View File

@ -28,8 +28,6 @@ void __init prom_init(void)
/* disable all hardware blocks clock for now */ /* disable all hardware blocks clock for now */
if (BCMCPU_IS_6338()) if (BCMCPU_IS_6338())
mask = CKCTL_6338_ALL_SAFE_EN; mask = CKCTL_6338_ALL_SAFE_EN;
else if (BCMCPU_IS_6345())
mask = CKCTL_6345_UART_EN;
else if (BCMCPU_IS_6348()) else if (BCMCPU_IS_6348())
mask = CKCTL_6348_ALL_SAFE_EN; mask = CKCTL_6348_ALL_SAFE_EN;
else else