Coding style cleanup
This commit is contained in:
parent
6bdf430660
commit
3d078ce6d7
|
@ -2,6 +2,8 @@
|
|||
Changes for U-Boot 1.1.4:
|
||||
======================================================================
|
||||
|
||||
* Coding style cleanup
|
||||
|
||||
* Add support for Silicon Turnkey eXpress XTc (mpc87x/88x) board.
|
||||
Patch by Dan Malek and Pantelis Antoniou, 15 Aug 2005
|
||||
|
||||
|
|
|
@ -39,8 +39,6 @@
|
|||
|
||||
#ifdef CONFIG_I2C_BUS1
|
||||
|
||||
|
||||
|
||||
#define IIC_OK 0
|
||||
#define IIC_NOK 1
|
||||
#define IIC_NOK_LA 2 /* Lost arbitration */
|
||||
|
@ -511,5 +509,4 @@ U_BOOT_CMD(
|
|||
"\n -discover valid I2C chip addresses\n"
|
||||
);
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* CONFIG_I2C_BUS1 */
|
||||
|
|
|
@ -34,11 +34,8 @@
|
|||
#endif
|
||||
#include <i2c.h>
|
||||
|
||||
|
||||
#ifdef CONFIG_HARD_I2C
|
||||
|
||||
|
||||
|
||||
#define I2C_BUS1_BASE_ADDR (CFG_PERIPHERAL_BASE + 0x00000500)
|
||||
#define I2C_REGISTERS_BUS1_BASE_ADDRESS I2C_BUS1_BASE_ADDR
|
||||
#define IIC_MDBUF1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICMDBUF)
|
||||
|
@ -64,4 +61,4 @@ int i2c_write1 (uchar chip, uint addr, int alen, uchar * buffer, int len);
|
|||
uchar i2c_reg_read1(uchar i2c_addr, uchar reg);
|
||||
void i2c_reg_write1(uchar i2c_addr, uchar reg, uchar val);
|
||||
|
||||
#endif
|
||||
#endif /* CONFIG_HARD_I2C */
|
||||
|
|
|
@ -30,9 +30,6 @@
|
|||
#include <i2c.h>
|
||||
#include "ppc440gx_i2c.h"
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* GPIO Settings
|
||||
*/
|
||||
|
@ -71,13 +68,9 @@ typedef struct ppc440_gpio_regs {
|
|||
volatile unsigned long in;
|
||||
} __attribute__((packed)) ppc440_gpio_regs_t;
|
||||
|
||||
|
||||
|
||||
|
||||
int sbcommon_get_master(void);
|
||||
int sbcommon_secondary_present(void);
|
||||
unsigned short sbcommon_get_serial_number(void);
|
||||
void sbcommon_fans(void);
|
||||
|
||||
|
||||
#endif /* __SBCOMMON_H__ */
|
||||
|
|
|
@ -33,8 +33,6 @@
|
|||
#include "../common/sb_common.h"
|
||||
#include "../common/ppc440gx_i2c.h"
|
||||
|
||||
|
||||
|
||||
void fpga_init (void);
|
||||
|
||||
KAREF_BOARD_ID_ST board_id_as[] =
|
||||
|
@ -53,13 +51,11 @@ KAREF_BOARD_ID_ST ofem_board_id_as[] =
|
|||
{"Reserved"},
|
||||
};
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
* board_early_init_f
|
||||
*
|
||||
* Setup chip selects, initialize the Opto-FPGA, initialize
|
||||
* interrupt polarity and triggers.
|
||||
*
|
||||
************************************************************************/
|
||||
int board_early_init_f (void)
|
||||
{
|
||||
|
@ -196,7 +192,6 @@ int board_early_init_f (void)
|
|||
mtebc(pb7cr, EBC_BXCR_BAS_ENCODE(0x48500000) |
|
||||
EBC_BXCR_BS_1MB | EBC_BXCR_BU_RW | EBC_BXCR_BW_32BIT);
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------+
|
||||
* Setup the interrupt controller polarities, triggers, etc.
|
||||
+-------------------------------------------------------------------*/
|
||||
|
@ -241,7 +236,6 @@ int board_early_init_f (void)
|
|||
* checkboard
|
||||
*
|
||||
* Dump pertinent info to the console
|
||||
*
|
||||
************************************************************************/
|
||||
int checkboard (void)
|
||||
{
|
||||
|
@ -326,12 +320,10 @@ int checkboard (void)
|
|||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
* misc_init_f
|
||||
*
|
||||
* Initialize I2C bus one to gain access to the fans
|
||||
*
|
||||
************************************************************************/
|
||||
int misc_init_f (void)
|
||||
{
|
||||
|
@ -345,11 +337,11 @@ int misc_init_f (void)
|
|||
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
* misc_init_r
|
||||
*
|
||||
* Do nothing.
|
||||
*
|
||||
************************************************************************/
|
||||
int misc_init_r (void)
|
||||
{
|
||||
|
@ -409,20 +401,11 @@ int misc_init_r (void)
|
|||
printf("fakeled is set. use 'setenv fakeled ; setenv bootdelay 5 ; saveenv' to recover\n");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
* ide_set_reset
|
||||
*
|
||||
*
|
||||
*
|
||||
************************************************************************/
|
||||
#ifdef CONFIG_IDE_RESET
|
||||
void ide_set_reset(int on)
|
||||
|
@ -441,9 +424,6 @@ void ide_set_reset(int on)
|
|||
|
||||
/*************************************************************************
|
||||
* fpga_init
|
||||
*
|
||||
*
|
||||
*
|
||||
************************************************************************/
|
||||
void fpga_init(void)
|
||||
{
|
||||
|
@ -498,8 +478,6 @@ void fpga_init(void)
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int karefSetupVars(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
unsigned short sernum;
|
||||
|
@ -560,7 +538,6 @@ int karefSetupVars(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
return(1);
|
||||
}
|
||||
|
||||
|
||||
int karefRecover(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
unsigned short sernum;
|
||||
|
@ -593,15 +570,8 @@ int karefRecover(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
return(1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
U_BOOT_CMD(kasetup, 1, 1, karefSetupVars,
|
||||
"kasetup - Set environment to factory defaults\n", NULL);
|
||||
|
||||
U_BOOT_CMD(karecover, 1, 1, karefRecover,
|
||||
"karecover - Set environment to allow for fs recovery\n", NULL);
|
||||
|
||||
|
|
|
@ -32,8 +32,6 @@
|
|||
#include "../common/ppc440gx_i2c.h"
|
||||
#include "../common/sb_common.h"
|
||||
|
||||
|
||||
|
||||
void fpga_init (void);
|
||||
|
||||
METROBOX_BOARD_ID_ST board_id_as[] =
|
||||
|
@ -43,13 +41,11 @@ METROBOX_BOARD_ID_ST board_id_as[] =
|
|||
{"Reserved"}, /* Reserved for future use */
|
||||
};
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
* board_early_init_f
|
||||
*
|
||||
* Setup chip selects, initialize the Opto-FPGA, initialize
|
||||
* interrupt polarity and triggers.
|
||||
*
|
||||
************************************************************************/
|
||||
int board_early_init_f (void)
|
||||
{
|
||||
|
@ -186,7 +182,6 @@ int board_early_init_f (void)
|
|||
mtebc(pb7cr, EBC_BXCR_BAS_ENCODE(0x48500000) |
|
||||
EBC_BXCR_BS_1MB | EBC_BXCR_BU_RW | EBC_BXCR_BW_32BIT);
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------+
|
||||
* Setup the interrupt controller polarities, triggers, etc.
|
||||
+-------------------------------------------------------------------*/
|
||||
|
@ -226,12 +221,10 @@ int board_early_init_f (void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
* checkboard
|
||||
*
|
||||
* Dump pertinent info to the console
|
||||
*
|
||||
************************************************************************/
|
||||
int checkboard (void)
|
||||
{
|
||||
|
@ -295,12 +288,10 @@ int checkboard (void)
|
|||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
* misc_init_f
|
||||
*
|
||||
* Initialize I2C bus one to gain access to the fans
|
||||
*
|
||||
************************************************************************/
|
||||
int misc_init_f (void)
|
||||
{
|
||||
|
@ -314,11 +305,11 @@ int misc_init_f (void)
|
|||
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
* misc_init_r
|
||||
*
|
||||
* Do nothing.
|
||||
*
|
||||
************************************************************************/
|
||||
int misc_init_r (void)
|
||||
{
|
||||
|
@ -384,13 +375,8 @@ int misc_init_r (void)
|
|||
return (0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*************************************************************************
|
||||
* ide_set_reset
|
||||
*
|
||||
*
|
||||
*
|
||||
************************************************************************/
|
||||
#ifdef CONFIG_IDE_RESET
|
||||
void ide_set_reset(int on)
|
||||
|
@ -408,9 +394,6 @@ void ide_set_reset(int on)
|
|||
|
||||
/*************************************************************************
|
||||
* fpga_init
|
||||
*
|
||||
*
|
||||
*
|
||||
************************************************************************/
|
||||
void fpga_init(void)
|
||||
{
|
||||
|
@ -462,8 +445,6 @@ void fpga_init(void)
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int metroboxSetupVars(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
unsigned short sernum;
|
||||
|
@ -524,7 +505,6 @@ int metroboxSetupVars(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
return(1);
|
||||
}
|
||||
|
||||
|
||||
int metroboxRecover(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
unsigned short sernum;
|
||||
|
@ -556,15 +536,8 @@ int metroboxRecover(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
return(1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
U_BOOT_CMD(mbsetup, 1, 1, metroboxSetupVars,
|
||||
"mbsetup - Set environment to factory defaults\n", NULL);
|
||||
|
||||
U_BOOT_CMD(mbrecover, 1, 1, metroboxRecover,
|
||||
"mbrecover - Set environment to allow for fs recovery\n", NULL);
|
||||
|
||||
|
|
|
@ -30,8 +30,7 @@ typedef struct metrobox_board_id_s {
|
|||
|
||||
/* Metrobox Opto-FPGA registers and definitions */
|
||||
#include "hal_xc_auto.h"
|
||||
typedef struct opto_fpga_regs_s
|
||||
{
|
||||
typedef struct opto_fpga_regs_s {
|
||||
volatile unsigned long revision_ul; /* Read Only */
|
||||
volatile unsigned long reset_ul; /* Read/Write */
|
||||
volatile unsigned long status_ul; /* Read Only */
|
||||
|
@ -41,8 +40,6 @@ typedef struct opto_fpga_regs_s
|
|||
volatile unsigned long scrmask_ul; /* Read/Write */
|
||||
volatile unsigned long control_ul; /* Read/Write */
|
||||
volatile unsigned long boardinfo_ul; /* Read Only */
|
||||
} OPTO_FPGA_REGS_ST __attribute__((packed)), *OPTO_FPGA_REGS_PST;
|
||||
|
||||
|
||||
} OPTO_FPGA_REGS_ST __attribute__ ((packed)), *OPTO_FPGA_REGS_PST;
|
||||
|
||||
#endif /* __METROBOX_H__ */
|
||||
|
|
Loading…
Reference in New Issue