arm/km: fix u-boot update functionality

[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 0d5ecd558839d0ce7ba0812a12d707a3281e5e45..4da54d56a63f3009e1779096419f47031966c0a2 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -50,17 +50,23 @@
 
 #define CONFIG_MACH_TYPE       MACH_TYPE_KM_KIRKWOOD
 
+#define CONFIG_NAND_ECC_BCH
+#define CONFIG_BCH
+
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
 
 #define CONFIG_CMD_NAND
 #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
 
@@ -87,7 +93,7 @@
 #define CONFIG_KM_DEF_ENV_CPU                                          \
        "boot=bootm ${load_addr_r} - -\0"                               \
        "cramfsloadfdt=true\0"                                          \
-       "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.kwb\0"                  \
+       "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0"           \
        CONFIG_KM_UPDATE_UBOOT                                          \
        ""
 
@@ -158,7 +164,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 */
 
 /*
@@ -181,8 +186,23 @@
 /*
  * I2C related stuff
  */
+#undef CONFIG_I2C_MVTWSI
+#define CONFIG_SYS_I2C
+#define        CONFIG_SYS_I2C_SOFT     /* I2C bit-banged       */
+
 #define        CONFIG_KIRKWOOD_GPIO            /* Enable GPIO Support */
-#if defined(CONFIG_SOFT_I2C)
+#if defined(CONFIG_SYS_I2C_SOFT)
+
+#define CONFIG_SYS_NUM_I2C_BUSES       6
+#define CONFIG_SYS_I2C_MAX_HOPS                1
+#define CONFIG_SYS_I2C_BUSES   {       {0, {I2C_NULL_HOP} }, \
+                                       {0, {{I2C_MUX_PCA9547, 0x70, 1} } }, \
+                                       {0, {{I2C_MUX_PCA9547, 0x70, 2} } }, \
+                                       {0, {{I2C_MUX_PCA9547, 0x70, 3} } }, \
+                                       {0, {{I2C_MUX_PCA9547, 0x70, 4} } }, \
+                                       {0, {{I2C_MUX_PCA9547, 0x70, 5} } }, \
+                               }
+
 #ifndef __ASSEMBLY__
 #include <asm/arch-kirkwood/gpio.h>
 extern void __set_direction(unsigned pin, int high);
@@ -205,6 +225,8 @@ int get_scl(void);
 #define I2C_DELAY      udelay(1)
 #define I2C_SOFT_DECLARATIONS
 
+#define        CONFIG_SYS_I2C_SOFT_SLAVE       0x0
+#define        CONFIG_SYS_I2C_SOFT_SPEED       100000
 #endif
 
 /* EEprom support 24C128, 24C256 valid for environment eeprom */
@@ -234,7 +256,7 @@ int get_scl(void);
 #define CONFIG_SYS_EEPROM_WREN
 #define CONFIG_ENV_OFFSET              0x0 /* no bracets! */
 #define CONFIG_ENV_SIZE                        (0x2000 - CONFIG_ENV_OFFSET)
-#define CONFIG_I2C_ENV_EEPROM_BUS      KM_ENV_BUS "\0"
+#define CONFIG_I2C_ENV_EEPROM_BUS      KM_ENV_BUS
 #define CONFIG_ENV_OFFSET_REDUND       0x2000 /* no bracets! */
 #define CONFIG_ENV_SIZE_REDUND         (CONFIG_ENV_SIZE)
 #endif
@@ -268,16 +290,17 @@ int get_scl(void);
 #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
 #define CONFIG_KM_NEW_ENV                                              \
        "newenv=sf probe 0;"                                            \
-               "sf erase " xstr(CONFIG_ENV_OFFSET) " "                 \
-               xstr(CONFIG_ENV_TOTAL_SIZE)"\0"
+               "sf erase " __stringify(CONFIG_ENV_OFFSET) " "          \
+               __stringify(CONFIG_ENV_TOTAL_SIZE)"\0"
 #else
 #define CONFIG_KM_NEW_ENV                                              \
        "newenv=setenv addr 0x100000 && "                               \
-               "i2c dev 1; mw.b ${addr} 0 4 && "                       \
-               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
-               " ${addr} " xstr(CONFIG_ENV_OFFSET) " 4 && "            \
-               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
-               " ${addr} " xstr(CONFIG_ENV_OFFSET_REDUND) " 4\0"
+               "i2c dev " __stringify(CONFIG_I2C_ENV_EEPROM_BUS) "; "  \
+               "mw.b ${addr} 0 4 && "                                  \
+               "eeprom write " __stringify(CONFIG_SYS_DEF_EEPROM_ADDR) \
+               " ${addr} " __stringify(CONFIG_ENV_OFFSET) " 4 && "     \
+               "eeprom write " __stringify(CONFIG_SYS_DEF_EEPROM_ADDR) \
+               " ${addr} " __stringify(CONFIG_ENV_OFFSET_REDUND) " 4\0"
 #endif
 
 /*
@@ -287,7 +310,6 @@ int get_scl(void);
        CONFIG_KM_DEF_ENV                                               \
        CONFIG_KM_NEW_ENV                                               \
        "arch=arm\0"                                                    \
-       "EEprom_ivm=" KM_IVM_BUS "\0"                                   \
        ""
 
 #if defined(CONFIG_SYS_NO_FLASH)
@@ -317,6 +339,6 @@ int get_scl(void);
 #define CONFIG_CMD_DIAG
 
 /* we do the whole PCIe FPGA config stuff here */
-#define        BOARD_LATE_INIT
+#define        CONFIG_BOARD_LATE_INIT
 
 #endif /* _CONFIG_KM_ARM_H */