diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-25 12:32:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-25 12:32:56 -0400 |
| commit | 82f2a144917d6cc5f8a9a49b1a1a15b0fb5742d5 (patch) | |
| tree | 0b42c7680119067fd1d171f482d34ca0975f67a1 /arch/arm/include/asm | |
| parent | 1b80e79586b0b777afa6a905961000c8495828cc (diff) | |
| parent | 0e6e34ac8dbb597a34e1eca4fb640c3eb5e52467 (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/spl.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h index ca9a4f99ad..a0f33b05b5 100644 --- a/arch/arm/include/asm/arch-sunxi/spl.h +++ b/arch/arm/include/asm/arch-sunxi/spl.h @@ -18,6 +18,10 @@ #define SPL_ADDR 0x0 #endif +/* The low 8-bits of the 'boot_media' field in the SPL header */ +#define SUNXI_BOOTED_FROM_MMC0 0 +#define SUNXI_BOOTED_FROM_SPI 3 + /* boot head definition from sun4i boot code */ struct boot_file_head { uint32_t b_instruction; /* one intruction jumping to real code */ @@ -45,7 +49,9 @@ struct boot_file_head { uint8_t spl_signature[4]; }; uint32_t fel_script_address; - uint32_t reserved; /* padding, align to 32 bytes */ + uint32_t reserved1[3]; + uint32_t boot_media; /* written here by the boot ROM */ + uint32_t reserved2[5]; /* padding, align to 64 bytes */ }; #define is_boot0_magic(addr) (memcmp((void *)addr, BOOT0_MAGIC, 8) == 0) |