drivers/mtd/nand_legacy: Move conditional compilation to Makefile

[platform/kernel/u-boot.git] / board / sandburst / karef / karef.c

diff --git a/board/sandburst/karef/karef.c b/board/sandburst/karef/karef.c
index 7a98f5b..2d71d3b 100644 (file)
--- 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,14 +236,13 @@ int board_early_init_f (void)
  *  checkboard
  *
  *  Dump pertinent info to the console
- *
  ************************************************************************/
 int checkboard (void)
 {
        sys_info_t sysinfo;
        unsigned char brd_rev, brd_id;
        unsigned short sernum;
-       unsigned char scan_rev, scan_id, ofem_rev, ofem_id;
+       unsigned char scan_rev, scan_id, ofem_rev=0, ofem_id=0;
        unsigned char ofem_brd_rev, ofem_brd_id;
        KAREF_FPGA_REGS_ST *karef_ps;
        OFEM_FPGA_REGS_ST *ofem_ps;
@@ -311,12 +305,6 @@ int checkboard (void)
                printf("OFEM Board Rev:\t0x%02X\tID:   0x%02X\n", ofem_brd_id, ofem_brd_rev);
        }
 
-       printf ("\tVCO: %lu MHz\n", sysinfo.freqVCOMhz / 1000000);
-       printf ("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000);
-       printf ("\tPLB: %lu MHz\n", sysinfo.freqPLB / 1000000);
-       printf ("\tOPB: %lu MHz\n", sysinfo.freqOPB / 1000000);
-       printf ("\tEPB: %lu MHz\n", sysinfo.freqEPB / 1000000);
-
        /* Fix the ack in the bme 32 */
        udelay(5000);
        out32(CFG_BME32_BASE + 0x0000000C, 0x00000001);
@@ -326,12 +314,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 +331,11 @@ int misc_init_f (void)
 
        return (0);
 }
+
 /*************************************************************************
  *  misc_init_r
  *
  *  Do nothing.
- *
  ************************************************************************/
 int misc_init_r (void)
 {
@@ -357,7 +343,6 @@ int misc_init_r (void)
        char envstr[255];
        KAREF_FPGA_REGS_ST *karef_ps;
        OFEM_FPGA_REGS_ST *ofem_ps;
-       unsigned char ofem_id;
 
        if(NULL != getenv("secondserial")) {
                puts("secondserial is set, switching to second serial port\n");
@@ -409,20 +394,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 +417,6 @@ void ide_set_reset(int on)
 
 /*************************************************************************
  *  fpga_init
- *
- *
- *
  ************************************************************************/
 void fpga_init(void)
 {
@@ -498,8 +471,6 @@ void fpga_init(void)
        return;
 }
 
-
-
 int karefSetupVars(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        unsigned short sernum;
@@ -560,7 +531,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 +563,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);
-