diff options
| author | Albert ARIBAUD \(3ADEV\) <albert.aribaud@3adev.fr> | 2016-09-26 09:08:06 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-10-06 09:06:16 +0200 |
| commit | ed0c2c0a9ead7d1b5739fc83cf99ac85a16cb979 (patch) | |
| tree | 9437126325051f9ad0fd04eddbbc48c12f9b5afa /include | |
| parent | 303a24435f3e4b39a6b526ca2a32cd0452713153 (diff) | |
tools: mkimage: add support for Vybrid image format
This format can be flashed directly at address 0 of
the NAND FLASH, as it contains all necessary headers.
Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/pcm052.h | 14 | ||||
| -rw-r--r-- | include/image.h | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 7ba8e0a65a..564434ce4e 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -119,9 +119,8 @@ #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=zImage.dtb\0" \ @@ -163,12 +162,11 @@ "nand read ${kernel_addr} kernel; " \ "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; " \ diff --git a/include/image.h b/include/image.h index 64da722649..2b1296c86c 100644 --- a/include/image.h +++ b/include/image.h @@ -278,6 +278,7 @@ enum { IH_TYPE_ZYNQIMAGE, /* Xilinx Zynq Boot Image */ IH_TYPE_ZYNQMPIMAGE, /* Xilinx ZynqMP Boot Image */ IH_TYPE_FPGA, /* FPGA Image */ + IH_TYPE_VYBRIDIMAGE, /* VYBRID .vyb Image */ IH_TYPE_COUNT, /* Number of image types */ }; |