diff options
Diffstat (limited to 'board/sandburst')
| -rw-r--r-- | board/sandburst/common/ppc440gx_i2c.c | 5 | ||||
| -rw-r--r-- | board/sandburst/common/ppc440gx_i2c.h | 5 | ||||
| -rw-r--r-- | board/sandburst/common/sb_common.c | 36 | ||||
| -rw-r--r-- | board/sandburst/common/sb_common.h | 45 | ||||
| -rw-r--r-- | board/sandburst/karef/karef.c | 32 | ||||
| -rw-r--r-- | board/sandburst/metrobox/metrobox.c | 29 | ||||
| -rw-r--r-- | board/sandburst/metrobox/metrobox.h | 25 |
7 files changed, 52 insertions, 125 deletions
diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c index c3b267c494..858b38cecc 100644 --- a/board/sandburst/common/ppc440gx_i2c.c +++ b/board/sandburst/common/ppc440gx_i2c.c @@ -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 */ diff --git a/board/sandburst/common/ppc440gx_i2c.h b/board/sandburst/common/ppc440gx_i2c.h index e25a3171a7..cd4fc86661 100644 --- a/board/sandburst/common/ppc440gx_i2c.h +++ b/board/sandburst/common/ppc440gx_i2c.h @@ -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 */ diff --git a/board/sandburst/common/sb_common.c b/board/sandburst/common/sb_common.c index 1251bc938b..353041667f 100644 --- a/board/sandburst/common/sb_common.c +++ b/board/sandburst/common/sb_common.c @@ -34,7 +34,7 @@ long int fixed_sdram (void); /************************************************************************* * metrobox_get_master * - * PRI_N - active low signal. If the GPIO pin is low we are the master + * PRI_N - active low signal. If the GPIO pin is low we are the master * ************************************************************************/ int sbcommon_get_master(void) @@ -81,7 +81,7 @@ unsigned short sbcommon_get_serial_number(void) unsigned short sernum; /* Get the board serial number from eeprom */ - /* Initialize I2C */ + /* Initialize I2C */ i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE); /* Read 256 bytes in EEPROM */ @@ -96,7 +96,7 @@ unsigned short sbcommon_get_serial_number(void) /************************************************************************* * sbcommon_fans * - * Spin up fans 2 & 3 to get some air moving. OS will take care + * Spin up fans 2 & 3 to get some air moving. OS will take care * of the rest. This is mostly a precaution... * * Assumes i2c bus 1 is ready. @@ -253,8 +253,8 @@ int testdram (void) /************************************************************************* * fixed sdram init -- doesn't use serial presence detect. * - * Assumes: 128 MB, non-ECC, non-registered - * PLB @ 133 MHz + * Assumes: 128 MB, non-ECC, non-registered + * PLB @ 133 MHz * ************************************************************************/ long int fixed_sdram (void) @@ -264,11 +264,11 @@ long int fixed_sdram (void) /*-------------------------------------------------------------------- * Setup some default *------------------------------------------------------------------*/ - mtsdram (mem_uabba, 0x00000000); /* ubba=0 (default) */ - mtsdram (mem_slio, 0x00000000); /* rdre=0 wrre=0 rarw=0 */ - mtsdram (mem_devopt, 0x00000000); /* dll=0 ds=0 (normal) */ - mtsdram (mem_wddctr, 0x00000000); /* wrcp=0 dcd=0 */ - mtsdram (mem_clktr, 0x40000000); /* clkp=1 (90 deg wr) dcdt=0 */ + mtsdram (mem_uabba, 0x00000000); /* ubba=0 (default) */ + mtsdram (mem_slio, 0x00000000); /* rdre=0 wrre=0 rarw=0 */ + mtsdram (mem_devopt, 0x00000000); /* dll=0 ds=0 (normal) */ + mtsdram (mem_wddctr, 0x00000000); /* wrcp=0 dcd=0 */ + mtsdram (mem_clktr, 0x40000000); /* clkp=1 (90 deg wr) dcdt=0 */ /*-------------------------------------------------------------------- * Setup for board-specific specific mem @@ -276,25 +276,25 @@ long int fixed_sdram (void) /* * Following for CAS Latency = 2.5 @ 133 MHz PLB */ - mtsdram (mem_b0cr, 0x000a4001); /* SDBA=0x000 128MB, Mode 3, enabled */ - mtsdram (mem_tr0, 0x410a4012); /* WR=2 WD=1 CL=2.5 PA=3 CP=4 LD=2 */ - /* RA=10 RD=3 */ + mtsdram (mem_b0cr, 0x000a4001); /* SDBA=0x000 128MB, Mode 3, enabled */ + mtsdram (mem_tr0, 0x410a4012); /* WR=2 WD=1 CL=2.5 PA=3 CP=4 LD=2 */ + /* RA=10 RD=3 */ mtsdram (mem_tr1, 0x8080082f); /* SS=T2 SL=STAGE 3 CD=1 CT=0x02f */ - mtsdram (mem_rtr, 0x08200000); /* Rate 15.625 ns @ 133 MHz PLB */ - mtsdram (mem_cfg1, 0x00000000); /* Self-refresh exit, disable PM */ - udelay (400); /* Delay 200 usecs (min) */ + mtsdram (mem_rtr, 0x08200000); /* Rate 15.625 ns @ 133 MHz PLB */ + mtsdram (mem_cfg1, 0x00000000); /* Self-refresh exit, disable PM */ + udelay (400); /* Delay 200 usecs (min) */ /*-------------------------------------------------------------------- * Enable the controller, then wait for DCEN to complete *------------------------------------------------------------------*/ - mtsdram (mem_cfg0, 0x86000000); /* DCEN=1, PMUD=1, 64-bit */ + mtsdram (mem_cfg0, 0x86000000); /* DCEN=1, PMUD=1, 64-bit */ for (;;) { mfsdram (mem_mcsts, reg); if (reg & 0x80000000) break; } - return (128 * 1024 * 1024); /* 128 MB */ + return (128 * 1024 * 1024); /* 128 MB */ } #endif /* !defined(CONFIG_SPD_EEPROM) */ diff --git a/board/sandburst/common/sb_common.h b/board/sandburst/common/sb_common.h index 8994e42dac..888e4f01eb 100644 --- a/board/sandburst/common/sb_common.h +++ b/board/sandburst/common/sb_common.h @@ -30,38 +30,35 @@ #include <i2c.h> #include "ppc440gx_i2c.h" - - - /* * GPIO Settings */ /* Chassis settings */ -#define SBCOMMON_GPIO_PRI_N 0x00001000 /* 0 = Chassis Master, 1 = Slave */ -#define SBCOMMON_GPIO_SEC_PRES 0x00000800 /* 1 = Other board present */ +#define SBCOMMON_GPIO_PRI_N 0x00001000 /* 0 = Chassis Master, 1 = Slave */ +#define SBCOMMON_GPIO_SEC_PRES 0x00000800 /* 1 = Other board present */ /* Debug LEDs */ -#define SBCOMMON_GPIO_DBGLED_0 0x00000400 -#define SBCOMMON_GPIO_DBGLED_1 0x00000200 -#define SBCOMMON_GPIO_DBGLED_2 0x00100000 -#define SBCOMMON_GPIO_DBGLED_3 0x00000100 +#define SBCOMMON_GPIO_DBGLED_0 0x00000400 +#define SBCOMMON_GPIO_DBGLED_1 0x00000200 +#define SBCOMMON_GPIO_DBGLED_2 0x00100000 +#define SBCOMMON_GPIO_DBGLED_3 0x00000100 -#define SBCOMMON_GPIO_DBGLEDS (SBCOMMON_GPIO_DBGLED_0 | \ - SBCOMMON_GPIO_DBGLED_1 | \ - SBCOMMON_GPIO_DBGLED_2 | \ - SBCOMMON_GPIO_DBGLED_3) +#define SBCOMMON_GPIO_DBGLEDS (SBCOMMON_GPIO_DBGLED_0 | \ + SBCOMMON_GPIO_DBGLED_1 | \ + SBCOMMON_GPIO_DBGLED_2 | \ + SBCOMMON_GPIO_DBGLED_3) -#define SBCOMMON_GPIO_SYS_FAULT 0x00000080 -#define SBCOMMON_GPIO_SYS_OTEMP 0x00000040 -#define SBCOMMON_GPIO_SYS_STATUS 0x00000020 +#define SBCOMMON_GPIO_SYS_FAULT 0x00000080 +#define SBCOMMON_GPIO_SYS_OTEMP 0x00000040 +#define SBCOMMON_GPIO_SYS_STATUS 0x00000020 -#define SBCOMMON_GPIO_SYS_LEDS (SBCOMMON_GPIO_SYS_STATUS) +#define SBCOMMON_GPIO_SYS_LEDS (SBCOMMON_GPIO_SYS_STATUS) -#define SBCOMMON_GPIO_LEDS (SBCOMMON_GPIO_DBGLED_0 | \ - SBCOMMON_GPIO_DBGLED_1 | \ - SBCOMMON_GPIO_DBGLED_2 | \ - SBCOMMON_GPIO_DBGLED_3 | \ - SBCOMMON_GPIO_SYS_STATUS) +#define SBCOMMON_GPIO_LEDS (SBCOMMON_GPIO_DBGLED_0 | \ + SBCOMMON_GPIO_DBGLED_1 | \ + SBCOMMON_GPIO_DBGLED_2 | \ + SBCOMMON_GPIO_DBGLED_3 | \ + SBCOMMON_GPIO_SYS_STATUS) typedef struct ppc440_gpio_regs { volatile unsigned long out; @@ -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__ */ diff --git a/board/sandburst/karef/karef.c b/board/sandburst/karef/karef.c index 7a98f5ba6d..3856a399a5 100644 --- a/board/sandburst/karef/karef.c +++ b/board/sandburst/karef/karef.c @@ -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); - diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c index 2f65d8f2c4..869367daba 100644 --- a/board/sandburst/metrobox/metrobox.c +++ b/board/sandburst/metrobox/metrobox.c @@ -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); - diff --git a/board/sandburst/metrobox/metrobox.h b/board/sandburst/metrobox/metrobox.h index 964dc715b7..cb7a83ce32 100644 --- a/board/sandburst/metrobox/metrobox.h +++ b/board/sandburst/metrobox/metrobox.h @@ -30,19 +30,16 @@ typedef struct metrobox_board_id_s { /* Metrobox Opto-FPGA registers and definitions */ #include "hal_xc_auto.h" -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 */ - volatile unsigned long interrupt_ul; /* Read Only */ - volatile unsigned long mask_ul; /* Read/Write */ - volatile unsigned long scratch_ul; /* Read/Write */ - 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; - - +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 */ + volatile unsigned long interrupt_ul; /* Read Only */ + volatile unsigned long mask_ul; /* Read/Write */ + volatile unsigned long scratch_ul; /* Read/Write */ + 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; #endif /* __METROBOX_H__ */ |