diff options
| author | Simon Glass <sjg@chromium.org> | 2015-03-03 15:02:58 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-04 19:55:04 (GMT) |
| commit | fc8fdc76e72e4ea57a7257e7054ca1a3b0966d34 (patch) | |
| tree | 5cd4181b750219493709bfd781c728ea6ae4b8e4 /arch/arm/include/asm/spl.h | |
| parent | 24a6bc010e7ce00a91c795562058044e9f9d5dc0 (diff) | |
| download | u-boot-fc8fdc76e72e4ea57a7257e7054ca1a3b0966d34.tar.xz | |
arm: spl: Avoid setting up a duplicate global data structure
This is already set up in crt0.S. We don't need a new structure and don't
really want one in the 'data' section of the image, since it will be empty
and crt0.S's changes will be ignored.
As an interim measure, remove it only if CONFIG_DM is not defined. This
allows us to press ahead with driver model in SPL and allow the stragglers
to catch up.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/include/asm/spl.h')
| -rw-r--r-- | arch/arm/include/asm/spl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h index 17b6f54..6db405d 100644 --- a/arch/arm/include/asm/spl.h +++ b/arch/arm/include/asm/spl.h @@ -37,6 +37,8 @@ void spl_board_load_image(void); /* Linker symbols. */ extern char __bss_start[], __bss_end[]; +#ifndef CONFIG_DM extern gd_t gdata; +#endif #endif |