Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / include / configs / km / km_arm.h

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 1a5f04bc74f3ee45d88b882f3a958e60b1bd23fb..44d5373968cfef9439e7fcca1b2452b1f816c56c 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -57,10 +57,14 @@
 #define CONFIG_CMD_SF
 #define CONFIG_SOFT_I2C                /* I2C bit-banged       */
 
+/* SPI NOR Flash default params, used by sf commands */
+#define CONFIG_SF_DEFAULT_SPEED                8100000
+#define CONFIG_SF_DEFAULT_MODE         SPI_MODE_3
+
 #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
 #define CONFIG_ENV_SPI_BUS             0
 #define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          5000000
+#define CONFIG_ENV_SPI_MAX_HZ          8100000
 #define CONFIG_ENV_SPI_MODE            SPI_MODE_3
 #endif
 
@@ -158,7 +162,6 @@
 #define CONFIG_ARCH_MISC_INIT          /* call arch_misc_init() */
 #define CONFIG_DISPLAY_CPUINFO         /* Display cpu info */
 #define CONFIG_NR_DRAM_BANKS   4
-#define CONFIG_STACKSIZE       0x00100000      /* regular stack- 1M */
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
 
 /*
@@ -192,6 +195,7 @@ int get_sda(void);
 int get_scl(void);
 #define KM_KIRKWOOD_SDA_PIN    8
 #define KM_KIRKWOOD_SCL_PIN    9
+#define KM_KIRKWOOD_SOFT_I2C_GPIOS     0x0300
 #define KM_KIRKWOOD_ENV_WP     38
 
 #define I2C_ACTIVE     __set_direction(KM_KIRKWOOD_SDA_PIN, 0)
@@ -306,6 +310,8 @@ int get_scl(void);
 #define CONFIG_KM_RESERVED_PRAM 0x801000
 /* address for the bootcount (taken from end of RAM) */
 #define BOOTCOUNT_ADDR          (CONFIG_KM_RESERVED_PRAM)
+/* Use generic bootcount RAM driver */
+#define CONFIG_BOOTCOUNT_RAM
 
 /* enable POST tests */
 #define CONFIG_POST    (CONFIG_SYS_POST_MEM_REGIONS)