diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-05-15 10:27:32 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-05-15 10:27:32 +0200 |
| commit | e7f9350525d73233d4eaf1793f8fe618e9fd4910 (patch) | |
| tree | 153366c61e17af4ecdd9f10be520f707d525157d /include/configs/am335x_evm.h | |
| parent | 50c8d66d33651d7fca6a082a1eea6e537401a2f4 (diff) | |
| parent | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (diff) | |
| download | u-boot-e7f9350525d73233d4eaf1793f8fe618e9fd4910.tar.gz u-boot-e7f9350525d73233d4eaf1793f8fe618e9fd4910.tar.xz u-boot-e7f9350525d73233d4eaf1793f8fe618e9fd4910.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/am335x_evm.h')
| -rw-r--r-- | include/configs/am335x_evm.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 036c609582..762f6d2e4b 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -301,6 +301,7 @@ #endif /* USB Device Firmware Update support */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_DFU_FUNCTION #define CONFIG_DFU_MMC #define CONFIG_CMD_DFU @@ -309,10 +310,10 @@ "boot part 0 1;" \ "rootfs part 0 2;" \ "MLO fat 0 1;" \ - "MLO.raw mmc 100 100;" \ - "u-boot.img.raw mmc 300 400;" \ - "spl-os-args.raw mmc 80 80;" \ - "spl-os-image.raw mmc 900 2000;" \ + "MLO.raw mmc 0x100 0x100;" \ + "u-boot.img.raw mmc 0x300 0x400;" \ + "spl-os-args.raw mmc 0x80 0x80;" \ + "spl-os-image.raw mmc 0x900 0x2000;" \ "spl-os-args fat 0 1;" \ "spl-os-image fat 0 1;" \ "u-boot.img fat 0 1;" \ @@ -343,6 +344,7 @@ DFU_ALT_INFO_MMC \ DFU_ALT_INFO_RAM \ DFU_ALT_INFO_NAND +#endif /* * Default to using SPI for environment, etc. |