A merge error ended up repeating a similar sentence twice. Fix it.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: - Add new patch to fix README merge error
README | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/README b/README index 0a0f528..298e8d6 100644 --- a/README +++ b/README @@ -3849,12 +3849,9 @@ Configuration Settings: The memory will be freed (or in fact just forgotton) when U-Boot relocates itself.
- Pre-relocation malloc() is only supported on sandbox + Pre-relocation malloc() is only supported on ARM and sandbox at present but is fairly easy to enable for other archs.
- Pre-relocation malloc() is only supported on ARM at present - but is fairly easy to enable for other archs. - - CONFIG_SYS_BOOTM_LEN: Normally compressed uImages are limited to an uncompressed size of 8 MBytes. If this is not enough,