Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'

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

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 4741278606741123213ffaf6011684a3c3951b9a..2e3b1826242398bdd9adc895b4812b3d6b4053a3 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -55,7 +55,6 @@
 #include "asm/arch/config.h"
 
 #define CONFIG_SYS_TEXT_BASE   0x04000000      /* code address after reloc */
-#define CONFIG_ENV_SIZE                (128 << 10)     /* NAND chip block size */
 #define CONFIG_SYS_MEMTEST_START 0x00400000    /* 4M */
 #define CONFIG_SYS_MEMTEST_END 0x007fffff      /*(_8M -1) */
 #define CONFIG_SYS_LOAD_ADDR   0x00800000      /* default load adr- 8M */
@@ -68,18 +67,17 @@
 #define CONFIG_KM_CRAMFS_ADDR  0x2400000
 #define CONFIG_KM_KERNEL_ADDR  0x2000000       /* 4096KBytes */
 
+/* architecture specific default bootargs */
+#define CONFIG_KM_DEF_BOOT_ARGS_CPU                                    \
+               "bootcountaddr=${bootcountaddr} ${mtdparts}"
+
 #define CONFIG_KM_DEF_ENV_CPU                                          \
-       "addbootcount="                                                 \
-               "setenv bootargs ${bootargs} "                          \
-               "bootcountaddr=${bootcountaddr}\0"                      \
-       "addmtdparts=setenv bootargs ${bootargs} ${mtdparts}\0"         \
-       "boot=bootm ${actual_kernel_addr} - -\0"                        \
+       "boot=bootm ${load_addr_r} - -\0"                               \
        "cramfsloadfdt=true\0"                                          \
+       "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.kwb\0"                  \
        CONFIG_KM_DEF_ENV_UPDATE                                        \
        ""
 
-#define CONFIG_KM_ARCH_DBG_FILE                "scripts/debug-arm-env.txt"
-
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 #define CONFIG_MISC_INIT_R
 
@@ -197,6 +195,12 @@ int get_scl(void);
 
 #endif
 
+/* EEprom support 24C128, 24C256 valid for environment eeprom */
+#define CONFIG_SYS_I2C_MULTI_EEPROMS
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      6 /* 64 Byte write page */
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
+
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 
@@ -208,9 +212,8 @@ int get_scl(void);
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_EEPROM_WREN
 #define CONFIG_ENV_OFFSET              0x0 /* no bracets! */
-#undef CONFIG_ENV_SIZE
 #define CONFIG_ENV_SIZE                        (0x2000 - CONFIG_ENV_OFFSET)
-#define CONFIG_I2C_ENV_EEPROM_BUS      "pca9547:70:d\0"
+#define CONFIG_I2C_ENV_EEPROM_BUS      KM_ENV_BUS "\0"
 
 /* offset redund: (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
@@ -231,7 +234,7 @@ int get_scl(void);
 #define        CONFIG_KM_DEF_ENV_UPDATE                                        \
        "update="                                                       \
                "spi on;sf probe 0;sf erase 0 50000;"                   \
-               "sf write ${u-boot_addr_r} 0 ${filesize};"              \
+               "sf write ${load_addr_r} 0 ${filesize};"                \
                "spi off\0"
 
 /*
@@ -245,7 +248,7 @@ int get_scl(void);
                " ${addr} " xstr(CONFIG_ENV_OFFSET) " 4 && "            \
                "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
                " ${addr} " xstr(CONFIG_ENV_OFFSET_REDUND) " 4\0"       \
-       "rootpath=/opt/eldk/arm\0"                                      \
+       "arch=arm\0"                                                    \
        "EEprom_ivm=" KM_IVM_BUS "\0"                                   \
        ""