minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-18 08:32:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Miscellanious spc1920 related cleanups

Browse Source
This commit is contained in:
Markus Klotzbuecher 2007-01-09 14:57:13 +01:00 committed by Markus Klotzbuecher
parent e4c2d37adc
commit 5921e5313f
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/spc1920/hpi.c
View File

@ -40,7 +40,6 @@
#include "pld.h" #include "pld.h"
#include "hpi.h" #include "hpi.h"
#include "spc1920.h" /* led function */
#define _NOT_USED_ 0xFFFFFFFF #define _NOT_USED_ 0xFFFFFFFF

14
board/spc1920/spc1920.c
View File

@ -220,10 +220,20 @@ int board_early_init_f(void)
immap->im_ioport.iop_pdpar &= ~(0x0040); immap->im_ioport.iop_pdpar &= ~(0x0040);
immap->im_ioport.iop_pddir |= 0x0040; immap->im_ioport.iop_pddir |= 0x0040;
immap->im_ioport.iop_pddat |= 0x0040; immap->im_ioport.iop_pddat |= 0x0040;
#endif #endif
/* Enable PD10 (COM2_EN) */ /*
* Enable console on SMC1. This requires turning on
* the com2_en signal and SMC1_DISABLE
*/
/* SMC1_DISABLE: PB17 */
immap->im_cpm.cp_pbodr &= ~0x4000;
immap->im_cpm.cp_pbpar &= ~0x4000;
immap->im_cpm.cp_pbdir |= 0x4000;
immap->im_cpm.cp_pbdat &= ~0x4000;
/* COM2_EN: PD10 */
immap->im_ioport.iop_pdpar &= ~0x0020; immap->im_ioport.iop_pdpar &= ~0x0020;
immap->im_ioport.iop_pddir &= ~0x4000; immap->im_ioport.iop_pddir &= ~0x4000;
immap->im_ioport.iop_pddir |= 0x0020; immap->im_ioport.iop_pddir |= 0x0020;

11
include/configs/spc1920.h
View File

@ -51,12 +51,12 @@
#define CFG_8xx_CPUCLK_MIN 40000000 #define CFG_8xx_CPUCLK_MIN 40000000
#define CFG_8xx_CPUCLK_MAX 133000000 #define CFG_8xx_CPUCLK_MAX 133000000
#define CFG_RESET_ADDRESS 0xf8000000 #define CFG_RESET_ADDRESS 0xC0000000
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_LAST_STAGE_INIT
#if 0
#if 1
#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ #define CONFIG_BOOTDELAY -1 /* autoboot disabled */
#else #else
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
@ -89,7 +89,6 @@
| CFG_CMD_JFFS2 \ | CFG_CMD_JFFS2 \
| CFG_CMD_PING \ | CFG_CMD_PING \
| CFG_CMD_DHCP \ | CFG_CMD_DHCP \
| CFG_CMD_IMMAP \
| CFG_CMD_I2C \ | CFG_CMD_I2C \
| CFG_CMD_MII) | CFG_CMD_MII)
/* & ~( CFG_CMD_NET)) */ /* & ~( CFG_CMD_NET)) */
@ -248,7 +247,7 @@
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
* PCMCIA config., multi-function pin tri-state * PCMCIA config., multi-function pin tri-state
*/ */
#define CFG_SIUMCR (SIUMCR_DBGC00 | SIUMCR_DBPC00 | SIUMCR_MLRC01) #define CFG_SIUMCR (SIUMCR_FRC)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* TBSCR - Time Base Status and Control 11-26 * TBSCR - Time Base Status and Control 11-26
@ -393,7 +392,7 @@
#endif /* CONFIG_SPC1920_HPI_TEST */ #endif /* CONFIG_SPC1920_HPI_TEST */
/* /*
* PLD CS5 * PLD CS5
*/ */
#define CFG_SPC1920_PLD_BASE 0x80000000 #define CFG_SPC1920_PLD_BASE 0x80000000
#define CFG_PRELIM_OR5_AM 0xfff00000 #define CFG_PRELIM_OR5_AM 0xfff00000