* Patch by Rahul Shanbhag, 19 Feb 2004:
Fixes for for OMAP1610 board: - shift some IRQ specific code to platform.S file - remove duplicatewatchdog reset code from start.S * Make Auto-MDIX Support configurable on INCA-IP board * Fix license for mkimage tool
This commit is contained in:
parent
a084f7da88
commit
0c852a2886
|
@ -2,6 +2,15 @@
|
||||||
Changes for U-Boot 1.0.2:
|
Changes for U-Boot 1.0.2:
|
||||||
======================================================================
|
======================================================================
|
||||||
|
|
||||||
|
* Patch by Rahul Shanbhag, 19 Feb 2004:
|
||||||
|
Fixes for for OMAP1610 board:
|
||||||
|
- shift some IRQ specific code to platform.S file
|
||||||
|
- remove duplicatewatchdog reset code from start.S
|
||||||
|
|
||||||
|
* Make Auto-MDIX Support configurable on INCA-IP board
|
||||||
|
|
||||||
|
* Fix license for mkimage tool
|
||||||
|
|
||||||
* Patch by Masami Komiya, 24 Feb 2004:
|
* Patch by Masami Komiya, 24 Feb 2004:
|
||||||
Update NetBootFileXferSize in NFS code
|
Update NetBootFileXferSize in NFS code
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,15 @@ _TEXT_BASE:
|
||||||
platformsetup:
|
platformsetup:
|
||||||
|
|
||||||
|
|
||||||
|
/*------------------------------------------------------*
|
||||||
|
*mask all IRQs by setting all bits in the INTMR default*
|
||||||
|
*------------------------------------------------------*/
|
||||||
|
mov r1, #0xffffffff
|
||||||
|
ldr r0, =REG_IHL1_MIR
|
||||||
|
str r1, [r0]
|
||||||
|
ldr r0, =REG_IHL2_MIR
|
||||||
|
str r1, [r0]
|
||||||
|
|
||||||
/*------------------------------------------------------*
|
/*------------------------------------------------------*
|
||||||
* Set up ARM CLM registers (IDLECT1) *
|
* Set up ARM CLM registers (IDLECT1) *
|
||||||
*------------------------------------------------------*/
|
*------------------------------------------------------*/
|
||||||
|
|
|
@ -133,27 +133,6 @@ reset:
|
||||||
orr r0,r0,#0xd3
|
orr r0,r0,#0xd3
|
||||||
msr cpsr,r0
|
msr cpsr,r0
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* turn off the watchdog, unlock/diable sequence
|
|
||||||
*/
|
|
||||||
mov r1, #0xF5
|
|
||||||
ldr r0, =WDTIM_MODE
|
|
||||||
strh r1, [r0]
|
|
||||||
mov r1, #0xA0
|
|
||||||
strh r1, [r0]
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* mask all IRQs by setting all bits in the INTMR - default
|
|
||||||
*/
|
|
||||||
|
|
||||||
mov r1, #0xffffffff
|
|
||||||
ldr r0, =REG_IHL1_MIR
|
|
||||||
str r1, [r0]
|
|
||||||
ldr r0, =REG_IHL2_MIR
|
|
||||||
str r1, [r0]
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* we do sys-critical inits only at reboot,
|
* we do sys-critical inits only at reboot,
|
||||||
* not when booting from ram!
|
* not when booting from ram!
|
||||||
|
|
|
@ -174,7 +174,9 @@ int inca_switch_initialize(bd_t * bis)
|
||||||
|
|
||||||
inca_init_switch_chip();
|
inca_init_switch_chip();
|
||||||
|
|
||||||
|
#if defined(CONFIG_INCA_IP_SWITCH_AMDIX)
|
||||||
inca_amdix();
|
inca_amdix();
|
||||||
|
#endif
|
||||||
|
|
||||||
sprintf(dev->name, "INCA-IP Switch");
|
sprintf(dev->name, "INCA-IP Switch");
|
||||||
dev->init = inca_switch_init;
|
dev->init = inca_switch_init;
|
||||||
|
@ -623,6 +625,7 @@ static void inca_dma_init(void)
|
||||||
DMA_WRITE_REG(INCA_IP_DMA_DMA_RXISR, 0xFFFFFFFF);
|
DMA_WRITE_REG(INCA_IP_DMA_DMA_RXISR, 0xFFFFFFFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(CONFIG_INCA_IP_SWITCH_AMDIX)
|
||||||
static int inca_amdix(void)
|
static int inca_amdix(void)
|
||||||
{
|
{
|
||||||
u32 regValue = 0;
|
u32 regValue = 0;
|
||||||
|
@ -706,5 +709,6 @@ static int inca_amdix(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif /* CONFIG_INCA_IP_SWITCH_AMDIX */
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -85,7 +85,8 @@
|
||||||
CFG_CMD_ASKENV | \
|
CFG_CMD_ASKENV | \
|
||||||
CFG_CMD_DHCP | \
|
CFG_CMD_DHCP | \
|
||||||
CFG_CMD_ELF | \
|
CFG_CMD_ELF | \
|
||||||
CFG_CMD_JFFS2 )
|
CFG_CMD_JFFS2 | \
|
||||||
|
CFG_CMD_PING )
|
||||||
#include <cmd_confdefs.h>
|
#include <cmd_confdefs.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -143,6 +144,7 @@
|
||||||
|
|
||||||
#define CONFIG_INCA_IP_SWITCH
|
#define CONFIG_INCA_IP_SWITCH
|
||||||
#define CONFIG_NET_MULTI
|
#define CONFIG_NET_MULTI
|
||||||
|
#define CONFIG_INCA_IP_SWITCH_AMDIX
|
||||||
|
|
||||||
#define CFG_JFFS2_FIRST_BANK 1
|
#define CFG_JFFS2_FIRST_BANK 1
|
||||||
#define CFG_JFFS2_NUM_BANKS 1
|
#define CFG_JFFS2_NUM_BANKS 1
|
||||||
|
|
|
@ -1,8 +1,23 @@
|
||||||
/*
|
/*
|
||||||
* (C) Copyright 2000-2003
|
* (C) Copyright 2000-2004
|
||||||
* DENX Software Engineering
|
* DENX Software Engineering
|
||||||
* Wolfgang Denk, wd@denx.de
|
* Wolfgang Denk, wd@denx.de
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||||
|
* MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
Loading…
Reference in New Issue