Last minute fixes / cleanup.

This commit is contained in:
wdenk 2004-02-12 15:11:57 +00:00
parent b2daeb8e0f
commit 198ea9e294
3 changed files with 9 additions and 8 deletions

View File

@ -9,11 +9,11 @@
static const unsigned char pci_irq_swizzle[2][PCI_MAX_DEVICES] = { static const unsigned char pci_irq_swizzle[2][PCI_MAX_DEVICES] = {
#ifdef CONFIG_ZUMA_V2 #ifdef CONFIG_ZUMA_V2
{0, 0, 0, 0, 0, 0, 0, 29,[8...PCI_MAX_DEVICES - 1] = 0}, {0, 0, 0, 0, 0, 0, 0, 29,[8 ... PCI_MAX_DEVICES - 1] = 0},
{0, 0, 0, 0, 0, 0, 0, 28,[8...PCI_MAX_DEVICES - 1] = 0} {0, 0, 0, 0, 0, 0, 0, 28,[8 ... PCI_MAX_DEVICES - 1] = 0}
#else /* EVB??? This is a guess */ #else /* EVB??? This is a guess */
{0, 0, 0, 0, 0, 0, 0, 27, 27,[9...PCI_MAX_DEVICES - 1] = 0}, {0, 0, 0, 0, 0, 0, 0, 27, 27,[9 ... PCI_MAX_DEVICES - 1] = 0},
{0, 0, 0, 0, 0, 0, 0, 29, 29,[9...PCI_MAX_DEVICES - 1] = 0} {0, 0, 0, 0, 0, 0, 0, 29, 29,[9 ... PCI_MAX_DEVICES - 1] = 0}
#endif #endif
}; };

View File

@ -2,7 +2,7 @@
* (C) Copyright 2001 * (C) Copyright 2001
* Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net
* *
* (C) Copyright 2001 * (C) Copyright 2001-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* (C) Copyright 2003 * (C) Copyright 2003
@ -80,6 +80,7 @@ void flash_print_info (flash_info_t * info);
void flash_unprotect_sectors (FPWV * addr); void flash_unprotect_sectors (FPWV * addr);
int flash_erase (flash_info_t * info, int s_first, int s_last); int flash_erase (flash_info_t * info, int s_first, int s_last);
int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt); int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt);
void flash_unlock(flash_info_t * info);
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
@ -118,7 +119,7 @@ unsigned long flash_init (void)
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
flash_unlock(flash_info_t * info) void flash_unlock(flash_info_t * info)
{ {
int j; int j;
for (j=2;j<CFG_MAX_FLASH_SECT;j++){ for (j=2;j<CFG_MAX_FLASH_SECT;j++){

View File

@ -71,12 +71,12 @@ extern int spi_chipsel_cnt;
static unsigned int bin2bcd (unsigned int n); static unsigned int bin2bcd (unsigned int n);
static unsigned char bcd2bin (unsigned char c); static unsigned char bcd2bin (unsigned char c);
static unsigned char rtc_read (unsigned char reg);
static void rtc_write (unsigned char reg, unsigned char val);
/* ************************************************************************* */ /* ************************************************************************* */
#ifdef CONFIG_SXNI855T /* !!! SHOULD BE CHANGED TO NEW CODE !!! */ #ifdef CONFIG_SXNI855T /* !!! SHOULD BE CHANGED TO NEW CODE !!! */
static unsigned char rtc_read (unsigned char reg);
static void rtc_write (unsigned char reg, unsigned char val);
static void soft_spi_send (unsigned char n); static void soft_spi_send (unsigned char n);
static unsigned char soft_spi_read (void); static unsigned char soft_spi_read (void);
static void init_spi (void); static void init_spi (void);