diff options
| author | Tom Rini <[email protected]> | 2015-08-14 13:43:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2015-08-14 16:27:16 -0400 |
| commit | 632093b566569329bc6e5b0893bdca01de905314 (patch) | |
| tree | ddd8cb84789bf0bc60a566fd8d33ff138d6861e9 /include/asm-generic | |
| parent | 61dfa65e405f2713dfc8090ed8147ec33b003717 (diff) | |
| parent | 236efe36be6d1c544f9477f10fdf38a17cd7a869 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/global_data.h | 3 | ||||
| -rw-r--r-- | include/asm-generic/u-boot.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 21552650025..cc369fcdfb9 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -99,7 +99,8 @@ typedef struct global_data { int pcidelay_done; #endif struct udevice *cur_serial_dev; /* current serial device */ - struct arch_global_data arch; /* architecture-specific data */ + /* arch-specific data */ + struct arch_global_data arch __attribute__((aligned(16))); } gd_t; #endif diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h index c918049386e..9f3351d602e 100644 --- a/include/asm-generic/u-boot.h +++ b/include/asm-generic/u-boot.h @@ -130,8 +130,8 @@ typedef struct bd_info { ulong bi_boot_params; /* where this board expects params */ #ifdef CONFIG_NR_DRAM_BANKS struct { /* RAM configuration */ - ulong start; - ulong size; + phys_addr_t start; + phys_size_t size; } bi_dram[CONFIG_NR_DRAM_BANKS]; #endif /* CONFIG_NR_DRAM_BANKS */ } bd_t; |