tools: mkimage: add support for Vybrid image format

[people/ms/u-boot.git] / include / configs / pcm052.h

diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 4e29cf34ab03c34f9fac8801bea54f97efe558b8..564434ce4e7dbedff46377fb32072be210a27289 100644 (file)
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -9,8 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_CACHELINE_SIZE      32
-
 #include <asm/arch/imx-regs.h>
 
 #define CONFIG_VF610
@@ -33,8 +31,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_BAUDRATE                        115200
 
-#undef CONFIG_CMD_IMLS
-
 /* NAND support */
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
@@ -48,7 +44,6 @@
 #define CONFIG_JFFS2_NAND
 
 /* UBI */
-#define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 #define CONFIG_RBTREE
 #define CONFIG_LZO
@@ -58,14 +53,12 @@
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 #define MTDIDS_DEFAULT                 "nand0=NAND"
-#define MTDPARTS_DEFAULT               "mtdparts=NAND:256k(spare)"\
-                                       ",384k(bootloader)"\
+#define MTDPARTS_DEFAULT               "mtdparts=NAND:640k(bootloader)"\
                                        ",128k(env1)"\
                                        ",128k(env2)"\
                                        ",128k(dtb)"\
                                        ",6144k(kernel)"\
-                                       ",65536k(ramdisk)"\
-                                       ",450944k(root)"
+                                       ",-(root)"
 #endif
 
 #define CONFIG_MMC
@@ -78,14 +71,9 @@
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001
 
-#define CONFIG_CMD_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_MII
 #define CONFIG_FEC_MXC
 #define CONFIG_MII
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
@@ -97,7 +85,6 @@
 /* QSPI Configs*/
 
 #ifdef CONFIG_FSL_QSPI
-#define CONFIG_CMD_SF
 #define CONFIG_SPI_FLASH
 #define FSL_QSPI_FLASH_SIZE            (1 << 24)
 #define FSL_QSPI_FLASH_NUM             2
@@ -105,7 +92,6 @@
 #endif
 
 /* I2C Configs */
-#define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC_I2C3
 #define CONFIG_SYS_I2C_MXC
@@ -122,7 +108,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 #define CONFIG_SYS_I2C_EEPROM_BUS 2
 
-#define CONFIG_BOOTDELAY               3
 
 #define CONFIG_LOADADDR                        0x82000000
 
@@ -134,12 +119,11 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
-       "blimg_file=u-boot.imx\0" \
-       "blsec_addr=0x81000000\0" \
-       "blimg_addr=0x81000400\0" \
+       "blimg_file=u-boot.vyb\0" \
+       "blimg_addr=0x81000000\0" \
        "kernel_file=zImage\0" \
        "kernel_addr=0x82000000\0" \
-       "fdt_file=vf610-pcm052.dtb\0" \
+       "fdt_file=zImage.dtb\0" \
        "fdt_addr=0x81000000\0" \
        "ram_file=uRamdisk\0" \
        "ram_addr=0x83000000\0" \
@@ -157,7 +141,7 @@
        "bootargs_net=setenv bootargs ${bootargs} root=/dev/nfs ip=dhcp " \
                "nfsroot=${serverip}:${nfs_root},v3,tcp\0" \
        "bootargs_nand=setenv bootargs ${bootargs} " \
-               "ubi.mtd=6 rootfstype=ubifs root=ubi0:rootfs\0" \
+               "ubi.mtd=5 rootfstype=ubifs root=ubi0:rootfs\0" \
        "bootargs_ram=setenv bootargs ${bootargs} " \
                "root=/dev/ram rw initrd=${ram_addr}\0" \
        "bootargs_mtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
@@ -176,14 +160,13 @@
        "bootcmd_ram=run bootargs_base bootargs_ram bootargs_mtd; " \
                "nand read ${fdt_addr} dtb; " \
                "nand read ${kernel_addr} kernel; " \
-               "nand read ${ram_addr} ramdisk; " \
+               "nand read ${ram_addr} root; " \
                "bootz ${kernel_addr} ${ram_addr} ${fdt_addr}\0" \
-       "update_bootloader_from_tftp=mtdparts default; " \
-               "nand read ${blsec_addr} bootloader; " \
-               "mw.b ${blimg_addr} 0xff 0x5FC00; " \
-               "if tftp ${blimg_addr} ${tftpdir}${blimg_file}; then " \
+       "update_bootloader_from_tftp=if tftp ${blimg_addr} "\
+               "${tftpdir}${blimg_file}; then " \
+               "mtdparts default; " \
                "nand erase.part bootloader; " \
-               "nand write ${blsec_addr} bootloader ${filesize}; fi\0" \
+               "nand write ${blimg_addr} bootloader ${filesize}; fi\0" \
        "update_kernel_from_sd=if fatload mmc 0:2 ${kernel_addr} " \
                "${kernel_file}; " \
                "then mtdparts default; " \
@@ -208,13 +191,11 @@
                "ubi write ${sys_addr} rootfs ${filesize}; fi\0" \
        "update_ramdisk_from_tftp=if tftp ${ram_addr} ${tftpdir}${ram_file}; " \
                "then mtdparts default; " \
-               "nand erase.part ramdisk; " \
-               "nand write ${ram_addr} ramdisk ${filesize}; fi\0"
+               "nand erase.part root; " \
+               "nand write ${ram_addr} root ${filesize}; fi\0"
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size */
@@ -223,7 +204,6 @@
 #define CONFIG_SYS_MAXARGS             16      /* max number of command args */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START       0x80010000
 #define CONFIG_SYS_MEMTEST_END         0x87C00000
 
@@ -267,6 +247,4 @@
 #define CONFIG_ENV_OFFSET_REDUND       0xC0000
 #endif
 
-#define CONFIG_CMD_BOOTZ
-
 #endif