diff options
| author | Konstantin Porotchkin <kostap@marvell.com> | 2018-05-07 12:52:48 +0300 |
|---|---|---|
| committer | Konstantin Porotchkin <kostap@marvell.com> | 2018-07-18 18:48:30 +0300 |
| commit | 255f5c8f8879da6b28a48a01291dd52e99029425 (patch) | |
| tree | 6cf02ef119b8b28f3020bf6643df883158268307 /drivers/io | |
| parent | 34ec7ec3102fc8877618d372c6ee40b26a5acf34 (diff) | |
io: Allow image load to address zero
Remove assert on buffer address equal zero.
Marvell uses address 0x0 for loading BL33,
so this check is irrelevant and breaks the
debug builds on Marvell platforms.
Change-Id: Ie56a51138e2e4ddd8986dd7036797dc2d8b10125
Signed-off-by: Haim Boot <hayim@marvell.com>
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/54589
Diffstat (limited to 'drivers/io')
| -rw-r--r-- | drivers/io/io_fip.c | 1 | ||||
| -rw-r--r-- | drivers/io/io_memmap.c | 3 | ||||
| -rw-r--r-- | drivers/io/io_semihosting.c | 3 | ||||
| -rw-r--r-- | drivers/io/io_storage.c | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c index 17543390..c5ee6a4d 100644 --- a/drivers/io/io_fip.c +++ b/drivers/io/io_fip.c @@ -272,7 +272,6 @@ static int fip_file_read(io_entity_t *entity, uintptr_t buffer, size_t length, uintptr_t backend_handle; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_read != NULL); assert(entity->info != (uintptr_t)NULL); diff --git a/drivers/io/io_memmap.c b/drivers/io/io_memmap.c index bf59d6a5..5595e60a 100644 --- a/drivers/io/io_memmap.c +++ b/drivers/io/io_memmap.c @@ -9,6 +9,7 @@ #include <io_driver.h> #include <io_memmap.h> #include <io_storage.h> +#include <platform_def.h> #include <string.h> #include <utils.h> @@ -169,7 +170,6 @@ static int memmap_block_read(io_entity_t *entity, uintptr_t buffer, size_t pos_after; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_read != NULL); fp = (file_state_t *) entity->info; @@ -197,7 +197,6 @@ static int memmap_block_write(io_entity_t *entity, const uintptr_t buffer, size_t pos_after; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_written != NULL); fp = (file_state_t *) entity->info; diff --git a/drivers/io/io_semihosting.c b/drivers/io/io_semihosting.c index 4abf44f7..9ca0a9dc 100644 --- a/drivers/io/io_semihosting.c +++ b/drivers/io/io_semihosting.c @@ -8,6 +8,7 @@ #include <io_driver.h> #include <io_semihosting.h> #include <io_storage.h> +#include <platform_def.h> #include <semihosting.h> @@ -133,7 +134,6 @@ static int sh_file_read(io_entity_t *entity, uintptr_t buffer, size_t length, long file_handle; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_read != NULL); file_handle = (long)entity->info; @@ -158,7 +158,6 @@ static int sh_file_write(io_entity_t *entity, const uintptr_t buffer, size_t bytes = length; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_written != NULL); file_handle = (long)entity->info; diff --git a/drivers/io/io_storage.c b/drivers/io/io_storage.c index 0918de0a..948f8481 100644 --- a/drivers/io/io_storage.c +++ b/drivers/io/io_storage.c @@ -279,7 +279,7 @@ int io_read(uintptr_t handle, size_t *length_read) { int result = -ENODEV; - assert(is_valid_entity(handle) && (buffer != (uintptr_t)NULL)); + assert(is_valid_entity(handle)); io_entity_t *entity = (io_entity_t *)handle; @@ -299,7 +299,7 @@ int io_write(uintptr_t handle, size_t *length_written) { int result = -ENODEV; - assert(is_valid_entity(handle) && (buffer != (uintptr_t)NULL)); + assert(is_valid_entity(handle)); io_entity_t *entity = (io_entity_t *)handle; |