punt unused clean/distclean targets

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

diff --git a/board/innokom/innokom.c b/board/innokom/innokom.c
index 5ee511764ab54fa561afad3fb1f666507e7f76c4..22de7e34059dd6542f4337d5c152f1b4acee5c93 100644 (file)
--- a/board/innokom/innokom.c
+++ b/board/innokom/innokom.c
@@ -24,8 +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)
@@ -41,25 +45,19 @@
  */
 int i2c_init_board(void)
 {
-       int i, icr;
+       int i;
 
-       /* disable I2C controller first, otherwhise it thinks we want to    */
-       /* talk to the slave port...                                        */
-       icr = ICR; ICR &= ~(ICR_SCLE | ICR_IUE);
-       
        /* set gpio pin low _before_ we change direction to output          */
-               GPCR(70) = GPIO_bit(70);
-       
+       writel(GPIO_bit(70), GPCR(70));
+
        /* now toggle between output=low and high-impedance                 */
        for (i = 0; i < 20; i++) {
-               GPDR(70) |= GPIO_bit(70);  /* output */
+               writel(readl(GPDR(70)) | GPIO_bit(70), GPDR(70));  /* output */
                udelay(10);
-               GPDR(70) &= ~GPIO_bit(70); /* input  */
+               writel(readl(GPDR(70)) & ~GPIO_bit(70), GPDR(70)); /* input  */
                udelay(10);
        }
 
-       ICR = icr;
-
        return 0;
 }
 
@@ -70,10 +68,10 @@ int i2c_init_board(void)
 
 int misc_init_r(void)
 {
-       uchar *str;
+       char *str;
 
        /* determine if the software update key is pressed during startup   */
-       if (GPLR0 & 0x00000800) {
+       if (readl(GPLR0) & 0x00000800) {
                printf("using bootcmd_normal (sw-update button not pressed)\n");
                str = getenv("bootcmd_normal");
        } else {
@@ -95,41 +93,31 @@ int misc_init_r(void)
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       /* memory and cpu-speed are setup before relocation */
-       /* so we do _nothing_ here */
+       /* We have RAM, disable cache */
+       dcache_disable();
+       icache_disable();
 
-       /* arch number of Innokom board */
        gd->bd->bi_arch_number = MACH_TYPE_INNOKOM;
-
-       /* adress of boot parameters */
        gd->bd->bi_boot_params = 0xa0000100;
-
-       /* baud rate */
        gd->bd->bi_baudrate = CONFIG_BAUDRATE;
 
        return 0;
 }
 
-
-/**
- * dram_init: - setup dynamic RAM
- *
- * @return: 0 in case of success
- */
-
-int dram_init (void)
+extern void pxa_dram_init(void);
+int dram_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
+       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;
-
-       return 0;
 }
 
-
 /**
  * innokom_set_led: - switch LEDs on or off
  *
@@ -149,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;
 */
        }
 
@@ -190,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