summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-sunxi/spl.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-07-15 14:44:01 (GMT)
committerTom Rini <trini@konsulko.com>2016-07-15 14:44:01 (GMT)
commit1f9ef0dca0a1315f0a216808ade8946bcc54e2b4 (patch)
tree681b36952636ee3b649e70f426ea4b9c024c397e /arch/arm/include/asm/arch-sunxi/spl.h
parent926fbcc08327bd0ffb9964765e6573c432957998 (diff)
parentb7073965a343fca2bcde4195fbba664c98f309d8 (diff)
downloadu-boot-1f9ef0dca0a1315f0a216808ade8946bcc54e2b4.tar.xz
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/include/asm/arch-sunxi/spl.h')
-rw-r--r--arch/arm/include/asm/arch-sunxi/spl.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h
index ec73379..5d7ab55 100644
--- a/arch/arm/include/asm/arch-sunxi/spl.h
+++ b/arch/arm/include/asm/arch-sunxi/spl.h
@@ -51,7 +51,14 @@ struct boot_file_head {
uint8_t spl_signature[4];
};
uint32_t fel_script_address;
- uint32_t reserved1[3];
+ /*
+ * If the fel_uEnv_length member below is set to a non-zero value,
+ * it specifies the size (byte count) of data at fel_script_address.
+ * At the same time this indicates that the data is in uEnv.txt
+ * compatible format, ready to be imported via "env import -t".
+ */
+ uint32_t fel_uEnv_length;
+ uint32_t reserved1[2];
uint32_t boot_media; /* written here by the boot ROM */
uint32_t reserved2[5]; /* padding, align to 64 bytes */
};