punt unused clean/distclean targets

[u-boot] / board / innokom / innokom.c

diff --git a/board/innokom/innokom.c b/board/innokom/innokom.c
index 7d2702f658215b934b765ba18603d1c265557974..22de7e34059dd6542f4337d5c152f1b4acee5c93 100644 (file)
--- a/board/innokom/innokom.c
+++ b/board/innokom/innokom.c
@@ -24,7 +24,12 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/mach-types.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SHOW_BOOT_PROGRESS
 # define SHOW_BOOT_PROGRESS(arg)        show_boot_progress(arg)
@@ -32,50 +37,86 @@
 # define SHOW_BOOT_PROGRESS(arg)
 #endif
 
-/*
- * Miscelaneous platform dependent initialisations
+/**
+ * i2c_init_board - reset i2c bus. When the board is powercycled during a
+ * bus transfer it might hang; for details see doc/I2C_Edge_Conditions.
+ * The Innokom board has GPIO70 connected to SCLK which can be toggled
+ * until all chips think that their current cycles are finished.
  */
+int i2c_init_board(void)
+{
+       int i;
+
+       /* set gpio pin low _before_ we change direction to output          */
+       writel(GPIO_bit(70), GPCR(70));
+
+       /* now toggle between output=low and high-impedance                 */
+       for (i = 0; i < 20; i++) {
+               writel(readl(GPDR(70)) | GPIO_bit(70), GPDR(70));  /* output */
+               udelay(10);
+               writel(readl(GPDR(70)) & ~GPIO_bit(70), GPDR(70)); /* input  */
+               udelay(10);
+       }
+
+       return 0;
+}
 
 
 /**
- * board_init: - setup some data structures
- *
- * @return: 0 in case of success
+ * misc_init_r: - misc initialisation routines
  */
 
-int board_init (void)
+int misc_init_r(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       /* memory and cpu-speed are setup before relocation */
-       /* so we do _nothing_ here */
-
-       /* arch number of Innokom board */
-       gd->bd->bi_arch_number = 258;
+       char *str;
+
+       /* determine if the software update key is pressed during startup   */
+       if (readl(GPLR0) & 0x00000800) {
+               printf("using bootcmd_normal (sw-update button not pressed)\n");
+               str = getenv("bootcmd_normal");
+       } else {
+               printf("using bootcmd_update (sw-update button pressed)\n");
+               str = getenv("bootcmd_update");
+       }
 
-       /* adress of boot parameters */
-       gd->bd->bi_boot_params = 0xa0000100;
+       setenv("bootcmd",str);
 
        return 0;
 }
 
 
 /**
- * dram_init: - setup dynamic RAM
+ * board_init: - setup some data structures
  *
  * @return: 0 in case of success
  */
 
-int dram_init (void)
+int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
+       /* We have RAM, disable cache */
+       dcache_disable();
+       icache_disable();
 
-       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-       gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+       gd->bd->bi_arch_number = MACH_TYPE_INNOKOM;
+       gd->bd->bi_boot_params = 0xa0000100;
+       gd->bd->bi_baudrate = CONFIG_BAUDRATE;
+
+       return 0;
+}
 
+extern void pxa_dram_init(void);
+int dram_init(void)
+{
+       pxa_dram_init();
+       gd->ram_size = PHYS_SDRAM_1_SIZE;
        return 0;
 }
 
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+       gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+}
 
 /**
  * innokom_set_led: - switch LEDs on or off
@@ -96,18 +137,18 @@ void innokom_set_led(int led, int state)
                        break;
 
                case 1: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED1;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED1;
-                        }
-                        break;
+                               GPCR0 |= CSB226_USER_LED1;
+                       } else if (state==0) {
+                               GPSR0 |= CSB226_USER_LED1;
+                       }
+                       break;
 
                case 2: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED2;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED2;
-                        }
-                        break;
+                               GPCR0 |= CSB226_USER_LED2;
+                       } else if (state==0) {
+                               GPSR0 |= CSB226_USER_LED2;
+                       }
+                       break;
 */
        }
 
@@ -137,3 +178,13 @@ void show_boot_progress (int status)
        return;
 }
 
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+       int rc = 0;
+#ifdef CONFIG_SMC91111
+       rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
+#endif
+       return rc;
+}
+#endif