diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-05 16:37:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-05 16:37:36 -0500 |
| commit | 28a4516cf154d6f7e738f8e0519b41eccef5af5c (patch) | |
| tree | a05dc64caed8ae10c8cbfa491994374d17206858 /common | |
| parent | 7e5ee346fc4c26c5f96ae13d599cf31d05fa6772 (diff) | |
| parent | 8cc738b9fcb5c1b140c721cb4f994ceb185c4c0c (diff) | |
Merge branch '2019-12-05-master-imports'
- Assorted omapl138_lcdk / da850-evm fixes
- FAT fix, add another pytest as well for FAT.
- Assorted general fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 6 | ||||
| -rw-r--r-- | common/spl/spl.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index e11faae9ee4..c8cb715c3a3 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -485,6 +485,12 @@ config SPL_DMA_SUPPORT the CPU moving the data. Enable this option to build the drivers in drivers/dma as part of an SPL build. +config SPL_DM_GPIO + bool "Support Driver Model GPIO drivers" + depends on SPL_GPIO_SUPPORT && DM_GPIO + help + Enable support for Driver Model based GPIO drivers in SPL. + config SPL_DRIVERS_MISC_SUPPORT bool "Support misc drivers" help diff --git a/common/spl/spl.c b/common/spl/spl.c index d51dbe9942f..24da164b438 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -264,9 +264,9 @@ int spl_parse_image_header(struct spl_image_info *spl_image, spl_image->entry_point = image_get_ep(header); spl_image->size = image_get_data_size(header); } else { - spl_image->entry_point = image_get_load(header); + spl_image->entry_point = image_get_ep(header); /* Load including the header */ - spl_image->load_addr = spl_image->entry_point - + spl_image->load_addr = image_get_load(header) - header_size; spl_image->size = image_get_data_size(header) + header_size; |