COMMON: Use __stringify() instead of xstr()

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

diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 3351609980c292740952ba13a3634ac9922d3379..bd5bdbcb4895a6b3dd856af6915104fe9e7d1ed7 100644 (file)
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -29,6 +29,12 @@
 #define CONFIG_CMD_DTT
 #define CONFIG_JFFS2_CMDLINE
 
+/* EEprom support 24C08, 24C16, 24C64 */
+#define CONFIG_SYS_I2C_MULTI_EEPROMS
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3  /* 8 Byte write page */
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
+
 #define CONFIG_ENV_SIZE                0x04000         /* Size of Environment */
 #define CONFIG_FLASH_CFI_MTD
 
@@ -66,27 +72,22 @@
 #define CONFIG_KM_KERNEL_ADDR  0x400000        /* 3968Kbytes */
 #define CONFIG_KM_FDT_ADDR     0x7E0000        /* 128Kbytes */
 
+/* architecture specific default bootargs */
+#define CONFIG_KM_DEF_BOOT_ARGS_CPU            ""
+
 #define CONFIG_KM_DEF_ENV_CPU                                          \
-       "addbootcount=echo \\\\c\0"                                     \
-       "addmtdparts=echo \\\\c\0"                                      \
-       "boot=bootm ${actual_kernel_addr} - ${actual_fdt_addr}\0"       \
+       "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"                   \
        "cramfsloadfdt="                                                \
                "cramfsload ${fdt_addr_r} "                             \
-               "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb && "           \
-               "setenv actual_fdt_addr ${fdt_addr_r}\0"                \
-       "fdt_addr_r=" xstr(CONFIG_KM_FDT_ADDR) "\0"                     \
-       "fdt_file="                                                     \
-               xstr(CONFIG_HOSTNAME) "/"                               \
-               xstr(CONFIG_HOSTNAME) ".dtb\0"                          \
-       "tftpfdt="                                                      \
-               "tftpboot ${fdt_addr_r} ${fdt_file} && "                \
-               "setenv actual_fdt_addr ${fdt_addr_r} \0"               \
+               "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"             \
+       "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0"              \
+       "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.bin\0"           \
        "update="                                                       \
-               "protect off " xstr(BOOTFLASH_START) " +${filesize} && "\
-               "erase " xstr(BOOTFLASH_START) "  +${filesize} && "     \
-               "cp.b ${u-boot_addr_r} " xstr(BOOTFLASH_START)          \
+               "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
+               "erase " __stringify(BOOTFLASH_START) "  +${filesize} && "\
+               "cp.b ${load_addr_r} " __stringify(BOOTFLASH_START)     \
                "  ${filesize} && "                                     \
-               "protect on " xstr(BOOTFLASH_START) "  +${filesize}\0"  \
+               "protect on " __stringify(BOOTFLASH_START) "  +${filesize}\0"\
        ""
 
 #endif /* __CONFIG_KEYMILE_POWERPC_H */