diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-05-17 20:01:54 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2013-06-11 22:01:45 +0200 |
| commit | a166fbca20e40937bf37cc18c389f68e995c1821 (patch) | |
| tree | ca90c9999014f7172aefabf257c9c0d2533aecf4 /arch/powerpc/include/asm/8xx_immap.h | |
| parent | e1208c2fe5e07f9a248cfbf9bbb212aa34ad2806 (diff) | |
| download | blackbird-obmc-uboot-a166fbca20e40937bf37cc18c389f68e995c1821.tar.gz blackbird-obmc-uboot-a166fbca20e40937bf37cc18c389f68e995c1821.zip | |
powerpc: fix 8xx and 82xx type-punning warnings with GCC 4.7
C99's strict aliasing rules are insane to use in low-level code such as a
bootloader, but as Wolfgang has rejected -fno-strict-aliasing in the
past, add a union so that 16-bit accesses can be performed.
Compile-tested only.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/powerpc/include/asm/8xx_immap.h')
| -rw-r--r-- | arch/powerpc/include/asm/8xx_immap.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h index 40679cb2b0..01129ed4f0 100644 --- a/arch/powerpc/include/asm/8xx_immap.h +++ b/arch/powerpc/include/asm/8xx_immap.h @@ -485,7 +485,12 @@ typedef struct comm_proc { * Some processors don't have all of it populated. */ u_char cp_dpmem[0x1C00]; /* BD / Data / ucode */ - u_char cp_dparam[0x400]; /* Parameter RAM */ + + /* Parameter RAM */ + union { + u_char cp_dparam[0x400]; + u16 cp_dparam16[0x200]; + }; } cpm8xx_t; /* Internal memory map. |
