Merge branch 'evk1100-prep'

[platform/kernel/u-boot.git] / include / configs / kmeter1.h

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 49a801f..f7fc6c5 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -33,6 +33,7 @@
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
 
+#undef CONFIG_SYS_I2C_INIT_BOARD
 #define CONFIG_MISC_INIT_R     1
 /*
  * System Clock Setup
@@ -319,15 +320,6 @@
 
 /* EEprom support */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
-#define CONFIG_SYS_I2C_MULTI_EEPROMS   1
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10
-
-/* Support the IVM EEprom */
-#define        CONFIG_SYS_IVM_EEPROM_ADR       0x50
-#define CONFIG_SYS_IVM_EEPROM_MAX_LEN  0x400
-#define CONFIG_SYS_IVM_EEPROM_PAGE_LEN 0x100
 
 /* I2C SYSMON (LM75, AD7414 is almost compatible)                      */
 #define CONFIG_DTT_LM75                1       /* ON Semi's LM75               */
@@ -457,47 +449,17 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        CONFIG_KM_DEF_ENV                                               \
-       "netdev=eth0\0"                                                 \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
-       "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=${serverip}:${rootpath}\0"                     \
-       "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "addip=setenv bootargs ${bootargs} "                            \
-               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
-               ":${hostname}:${netdev}:off panic=1\0"                  \
-       "addtty=setenv bootargs ${bootargs}"                            \
-               " console=ttyS0,${baudrate}\0"                          \
-       "fdt_addr=f0080000\0"                                           \
-       "kernel_addr=f00a0000\0"                                        \
-       "ramdisk_addr=f03a0000\0"                                       \
-       "kernel_addr_r=400000\0"                                        \
-       "fdt_addr_r=800000\0"                                           \
-       "ramdisk_addr_r=810000\0"                                       \
-       "flash_self=run ramargs addip addtty;"                          \
-               "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"    \
-       "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm ${kernel_addr} - ${fdt_addr}\0"                  \
-       "net_nfs=tftp ${kernel_addr_r} ${boot_file}; "                  \
-               "tftp ${fdt_addr_r} ${fdt_file}; "                      \
-               "run nfsargs addip addtty;"                             \
-               "bootm ${kernel_addr_r} - ${fdt_addr_r}\0"              \
-       "fdt_file=/tftpboot/kmeter1/kmeter1.dtb\0"                      \
-       "boot_file=/tftpboot/kmeter1/uImage\0"                          \
+       "addcon=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "ramdisk_file=/tftpboot/kmeter1/uRamdisk\0"                     \
-       "u-boot=/tftpboot/kmeter1/u-boot.bin\0"                         \
-       "loadaddr=" MK_STR(CONFIG_SYS_LOAD_ADDR) "\0"                   \
-       "load=tftp $loadaddr ${u-boot}\0"                               \
-       "update=protect off " MK_STR(TEXT_BASE) " +$filesize;"          \
-               "erase " MK_STR(TEXT_BASE) " +$filesize;"               \
-               "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize;"       \
-               "protect on " MK_STR(TEXT_BASE) " +$filesize;"          \
-               "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize;"      \
-               "setenv filesize;saveenv\0"                             \
-       "upd=run load update\0"                                         \
        "loadram=tftp ${ramdisk_addr_r} ${ramdisk_file}\0"              \
        "loadfdt=tftp ${fdt_addr_r} ${fdt_file}\0"                      \
-       "loadkernel=tftp ${kernel_addr_r} ${boot_file}\0"               \
+       "loadkernel=tftp ${kernel_addr_r} ${bootfile}\0"                \
        "unlock=yes\0"                                                  \
+       "fdt_addr=F0080000\0"                                           \
+       "kernel_addr=F00a0000\0"                                        \
+       "ramdisk_addr=F03a0000\0"                                       \
+       "ramdisk_addr_r=F10000\0"                                       \
        "EEprom_ivm=pca9547:70:9\0"                                     \
        "dtt_bus=pca9547:70:a\0"                                        \
        "mtdids=nor0=app \0"                                            \