leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce line lengths to 80 characters max.

Browse Source
This commit is contained in:
Peter Pearse 2007-05-18 16:47:03 +01:00
parent fdda367561
commit 3e3b956906
6 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
board/siemens/SMN42/flash.c Normal file → Executable file
View File

@ -25,7 +25,8 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
static unsigned long flash_addr_table[CFG_MAX_FLASH_BANKS] = CFG_FLASH_BANKS_LIST; static unsigned long flash_addr_table[CFG_MAX_FLASH_BANKS]
= CFG_FLASH_BANKS_LIST;
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
extern int lpc2292_copy_buffer_to_flash(flash_info_t *, ulong); extern int lpc2292_copy_buffer_to_flash(flash_info_t *, ulong);

6
disk/part.c Normal file → Executable file
View File

@ -220,7 +220,8 @@ void init_part (block_dev_desc_t * dev_desc)
} }
int get_partition_info (block_dev_desc_t *dev_desc, int part, disk_partition_t *info) int get_partition_info (block_dev_desc_t *dev_desc, int part
, disk_partition_t *info)
{ {
switch (dev_desc->part_type) { switch (dev_desc->part_type) {
#ifdef CONFIG_MAC_PARTITION #ifdef CONFIG_MAC_PARTITION
@ -326,7 +327,8 @@ void print_part (block_dev_desc_t * dev_desc)
#else /* neither MAC nor DOS nor ISO partition configured */ #else /* neither MAC nor DOS nor ISO partition configured */
# error neither CONFIG_MAC_PARTITION nor CONFIG_DOS_PARTITION nor CONFIG_ISO_PARTITION configured! # error neither CONFIG_MAC_PARTITION nor CONFIG_DOS_PARTITION
# error nor CONFIG_ISO_PARTITION configured!
#endif #endif
#endif /* (CONFIG_COMMANDS & CFG_CMD_IDE) || CONFIG_COMMANDS & CFG_CMD_SCSI) */ #endif /* (CONFIG_COMMANDS & CFG_CMD_IDE) || CONFIG_COMMANDS & CFG_CMD_SCSI) */

15
drivers/enc28j60.c Normal file → Executable file
View File

@ -548,7 +548,10 @@ static void encRx (void)
m_nic_bfs (CTL_REG_ECON2, ENC_ECON2_PKTDEC); m_nic_bfs (CTL_REG_ECON2, ENC_ECON2_PKTDEC);
/* taken from the Linux driver */ /* taken from the Linux driver */
/* Only odd values should be written to ERXRDPTL, see errata B4 pt.13 */ rxbuf_rdpt = (next_pointer_msb << 8 | next_pointer_lsb) - 1; /* Only odd values should be written to ERXRDPTL,
* see errata B4 pt.13
*/
rxbuf_rdpt = (next_pointer_msb << 8 | next_pointer_lsb) - 1;
if ((rxbuf_rdpt < (m_nic_read(CTL_REG_ERXSTH) << 8 | if ((rxbuf_rdpt < (m_nic_read(CTL_REG_ERXSTH) << 8 |
m_nic_read(CTL_REG_ERXSTL))) || (rxbuf_rdpt > m_nic_read(CTL_REG_ERXSTL))) || (rxbuf_rdpt >
(m_nic_read(CTL_REG_ERXNDH) << 8 | (m_nic_read(CTL_REG_ERXNDH) << 8 |
@ -799,13 +802,15 @@ static void encInit (unsigned char *pEthAddr)
/* enable MAC to receive frames */ /* enable MAC to receive frames */
/* added some bits from the Linux driver */ /* added some bits from the Linux driver */
m_nic_write_retry (CTL_REG_MACON1, (ENC_MACON1_MARXEN | ENC_MACON1_TXPAUS | ENC_MACON1_RXPAUS), 10); m_nic_write_retry (CTL_REG_MACON1
,(ENC_MACON1_MARXEN | ENC_MACON1_TXPAUS | ENC_MACON1_RXPAUS)
,10);
/* configure pad, tx-crc and duplex */ /* configure pad, tx-crc and duplex */
/* added a bit from the Linux driver */ /* added a bit from the Linux driver */
m_nic_write_retry (CTL_REG_MACON3, m_nic_write_retry (CTL_REG_MACON3
(ENC_MACON3_PADCFG0 | ENC_MACON3_TXCRCEN | ENC_MACON3_FRMLNEN), ,(ENC_MACON3_PADCFG0 | ENC_MACON3_TXCRCEN | ENC_MACON3_FRMLNEN)
10); ,10);
/* added 4 new lines from the Linux driver */ /* added 4 new lines from the Linux driver */
/* Allow infinite deferals if the medium is continously busy */ /* Allow infinite deferals if the medium is continously busy */

6
fs/fat/fat.c Normal file → Executable file
View File

@ -59,7 +59,8 @@ int disk_read (__u32 startblock, __u32 getsize, __u8 * bufptr)
if (cur_dev == NULL) if (cur_dev == NULL)
return -1; return -1;
if (cur_dev->block_read) { if (cur_dev->block_read) {
return cur_dev->block_read (cur_dev->dev, startblock, getsize, (unsigned long *)bufptr); return cur_dev->block_read (cur_dev->dev
, startblock, getsize, (unsigned long *)bufptr);
} }
return -1; return -1;
} }
@ -996,7 +997,8 @@ file_fat_detectfs(void)
memcpy (vol_label, volinfo.volume_label, 11); memcpy (vol_label, volinfo.volume_label, 11);
vol_label[11] = '\0'; vol_label[11] = '\0';
volinfo.fs_type[5]='\0'; volinfo.fs_type[5]='\0';
printf("Partition %d: Filesystem: %s \"%s\"\n",cur_part,volinfo.fs_type,vol_label); printf("Partition %d: Filesystem: %s \"%s\"\n"
,cur_part,volinfo.fs_type,vol_label);
return 0; return 0;
} }

3
include/configs/SMN42.h Normal file → Executable file
View File

@ -134,7 +134,8 @@
#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ #undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */
#define CFG_LOAD_ADDR 0x81000000 /* default load address for uClinux img is here*/ #define CFG_LOAD_ADDR 0x81000000 /* default load address
* for uClinux img is here*/
#define CFG_SYS_CLK_FREQ 58982400 /* Hz */ #define CFG_SYS_CLK_FREQ 58982400 /* Hz */
#define CFG_HZ 2048 /* decrementer freq in Hz */ #define CFG_HZ 2048 /* decrementer freq in Hz */

4
include/configs/lpc2292sodimm.h Normal file → Executable file
View File

@ -101,7 +101,9 @@
#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ #undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */
#define CFG_LOAD_ADDR 0x00040000 /* default load address for armadillo: kernel img is here*/ #define CFG_LOAD_ADDR 0x00040000 /* default load address for
* armadillo: kernel img is here
*/
#define CFG_SYS_CLK_FREQ 58982400 /* Hz */ #define CFG_SYS_CLK_FREQ 58982400 /* Hz */
#define CFG_HZ 2048 /* decrementer freq in Hz */ #define CFG_HZ 2048 /* decrementer freq in Hz */