Merge branch 'at91' of git://git.denx.de/u-boot-atmel

[u-boot] / include / configs / otc570.h

diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index 8e27ebae9e8716582cdcdb06cce361fc5611f2a6..4a1cedec0fe8dfdb9f46a74a1faafd3af42ca240 100644 (file)
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -35,6 +35,7 @@
 #define CONFIG_OTC570                  1       /* Board is esd OTC570 */
 #define CONFIG_ARM926EJS               1       /* This is an ARM926EJS Core */
 #define CONFIG_AT91SAM9263             1       /* It's an AT91SAM9263 SoC */
+#define CONFIG_SYS_AT91_MAIN_CLOCK     16000000/* 16.0 MHz crystal */
 #define CONFIG_SYS_HZ                  1000    /* decrementer freq */
 #define CONFIG_DISPLAY_BOARDINFO       1
 #define CONFIG_DISPLAY_CPUINFO         1       /* display cpu info and speed */
@@ -102,6 +103,7 @@
        at91_set_pio_output(AT91_PIO_PORTB, 4, 0); \
        at91_set_pio_output(AT91_PIO_PORTB, 5, 0); \
 }
+#define I2C_SOFT_DECLARATIONS
 /* Configure data pin as output */
 #define I2C_ACTIVE             at91_set_pio_output(AT91_PIO_PORTB, 4, 0)
 /* Configure data pin as input */
@@ -130,7 +132,6 @@
  * Command line configuration.
  */
 #include <config_cmd_default.h>
-#undef CONFIG_CMD_AUTOSCRIPT
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_IMLS