diff options
| author | danh-arm <dan.handley@arm.com> | 2016-02-26 09:47:05 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-02-26 09:47:05 +0000 |
| commit | 1a4fdb36e9c0b6df25644a5d428c7742bd7895b7 (patch) | |
| tree | ce9e1b227eee4a0960e9a15ccaa988194abc18c4 /include/plat/common/common_def.h | |
| parent | d698ee7f8c4c9ce8ce42fb5e3c2fccdcb70b9ba9 (diff) | |
| parent | 843ddee4aab78dfb940121f5ec28b52f7be5b28a (diff) | |
Merge pull request #533 from yatharth-arm/yk/genfw-1292
Fix the inconsistencies in bl1_tbbr_image_descs[]
Diffstat (limited to 'include/plat/common/common_def.h')
| -rw-r--r-- | include/plat/common/common_def.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/plat/common/common_def.h b/include/plat/common/common_def.h index 916720c5..9fac9fa2 100644 --- a/include/plat/common/common_def.h +++ b/include/plat/common/common_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -72,11 +72,12 @@ #define BL2_IMAGE_DESC { \ .image_id = BL2_IMAGE_ID, \ - .image_info.h.version = VERSION_1, \ - .image_info.h.attr = SET_EXEC_STATE(EXECUTABLE),\ + SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, \ + VERSION_1, image_info_t, 0), \ .image_info.image_base = BL2_BASE, \ - .ep_info.h.attr = SET_SEC_STATE(SECURE), \ - .ep_info.pc = BL2_BASE \ + SET_STATIC_PARAM_HEAD(ep_info, PARAM_EP, \ + VERSION_1, entry_point_info_t, SECURE | EXECUTABLE),\ + .ep_info.pc = BL2_BASE, \ } #endif /* __COMMON_DEF_H__ */ |