Commit 198ea9e294e38cea49f9f2d9b911bdfdd20e48dc
1 parent
b2daeb8e0f
Exists in
master
and in
55 other branches
Last minute fixes / cleanup.
Showing 3 changed files with 9 additions and 8 deletions Side-by-side Diff
board/evb64260/pci.c
| ... | ... | @@ -9,11 +9,11 @@ |
| 9 | 9 | |
| 10 | 10 | static const unsigned char pci_irq_swizzle[2][PCI_MAX_DEVICES] = { |
| 11 | 11 | #ifdef CONFIG_ZUMA_V2 |
| 12 | - {0, 0, 0, 0, 0, 0, 0, 29,[8...PCI_MAX_DEVICES - 1] = 0}, | |
| 13 | - {0, 0, 0, 0, 0, 0, 0, 28,[8...PCI_MAX_DEVICES - 1] = 0} | |
| 12 | + {0, 0, 0, 0, 0, 0, 0, 29,[8 ... PCI_MAX_DEVICES - 1] = 0}, | |
| 13 | + {0, 0, 0, 0, 0, 0, 0, 28,[8 ... PCI_MAX_DEVICES - 1] = 0} | |
| 14 | 14 | #else /* EVB??? This is a guess */ |
| 15 | - {0, 0, 0, 0, 0, 0, 0, 27, 27,[9...PCI_MAX_DEVICES - 1] = 0}, | |
| 16 | - {0, 0, 0, 0, 0, 0, 0, 29, 29,[9...PCI_MAX_DEVICES - 1] = 0} | |
| 15 | + {0, 0, 0, 0, 0, 0, 0, 27, 27,[9 ... PCI_MAX_DEVICES - 1] = 0}, | |
| 16 | + {0, 0, 0, 0, 0, 0, 0, 29, 29,[9 ... PCI_MAX_DEVICES - 1] = 0} | |
| 17 | 17 | #endif |
| 18 | 18 | }; |
| 19 | 19 |
board/omap1610inn/flash.c
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | * (C) Copyright 2001 |
| 3 | 3 | * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net |
| 4 | 4 | * |
| 5 | - * (C) Copyright 2001 | |
| 5 | + * (C) Copyright 2001-2004 | |
| 6 | 6 | * Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
| 7 | 7 | * |
| 8 | 8 | * (C) Copyright 2003 |
| ... | ... | @@ -80,6 +80,7 @@ |
| 80 | 80 | void flash_unprotect_sectors (FPWV * addr); |
| 81 | 81 | int flash_erase (flash_info_t * info, int s_first, int s_last); |
| 82 | 82 | int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt); |
| 83 | +void flash_unlock(flash_info_t * info); | |
| 83 | 84 | |
| 84 | 85 | /*----------------------------------------------------------------------- |
| 85 | 86 | */ |
| ... | ... | @@ -118,7 +119,7 @@ |
| 118 | 119 | |
| 119 | 120 | /*----------------------------------------------------------------------- |
| 120 | 121 | */ |
| 121 | -flash_unlock(flash_info_t * info) | |
| 122 | +void flash_unlock(flash_info_t * info) | |
| 122 | 123 | { |
| 123 | 124 | int j; |
| 124 | 125 | for (j=2;j<CFG_MAX_FLASH_SECT;j++){ |
rtc/ds1306.c
| ... | ... | @@ -71,12 +71,12 @@ |
| 71 | 71 | |
| 72 | 72 | static unsigned int bin2bcd (unsigned int n); |
| 73 | 73 | static unsigned char bcd2bin (unsigned char c); |
| 74 | -static unsigned char rtc_read (unsigned char reg); | |
| 75 | -static void rtc_write (unsigned char reg, unsigned char val); | |
| 76 | 74 | |
| 77 | 75 | /* ************************************************************************* */ |
| 78 | 76 | #ifdef CONFIG_SXNI855T /* !!! SHOULD BE CHANGED TO NEW CODE !!! */ |
| 79 | 77 | |
| 78 | +static unsigned char rtc_read (unsigned char reg); | |
| 79 | +static void rtc_write (unsigned char reg, unsigned char val); | |
| 80 | 80 | static void soft_spi_send (unsigned char n); |
| 81 | 81 | static unsigned char soft_spi_read (void); |
| 82 | 82 | static void init_spi (void); |