diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
| commit | 5939afc9611e8ba4a86b96e67670b765ee27668e (patch) | |
| tree | 369402e0305a7b8f9f905baec6387bfd9683ba71 /board/siemens | |
| parent | d7ae932152ddf58125a05f4eb28596d9b31bdb1e (diff) | |
| parent | ec1fa18561f818bee252da2c331d371ad26037d2 (diff) | |
Merge branch '2019-08-11-master-imports'
- environment cleanup
- HiKey 960 support
- Some PCI fixes
Diffstat (limited to 'board/siemens')
| -rw-r--r-- | board/siemens/common/board.c | 1 | ||||
| -rw-r--r-- | board/siemens/common/factoryset.c | 2 | ||||
| -rw-r--r-- | board/siemens/draco/board.c | 1 | ||||
| -rw-r--r-- | board/siemens/pxm2/board.c | 2 | ||||
| -rw-r--r-- | board/siemens/rut/board.c | 1 | ||||
| -rw-r--r-- | board/siemens/taurus/taurus.c | 2 |
6 files changed, 6 insertions, 3 deletions
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c index 622bde5f9f..676935a843 100644 --- a/board/siemens/common/board.c +++ b/board/siemens/common/board.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c index 96615424f6..049a65ff77 100644 --- a/board/siemens/common/factoryset.c +++ b/board/siemens/common/factoryset.c @@ -8,7 +8,7 @@ #if !defined(CONFIG_SPL_BUILD) #include <common.h> -#include <environment.h> +#include <env.h> #include <i2c.h> #include <asm/io.h> #include <asm/arch/cpu.h> diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c index 95b89dac0e..a6840b895b 100644 --- a/board/siemens/draco/board.c +++ b/board/siemens/draco/board.c @@ -13,6 +13,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c index 1b9e83e248..30f0902701 100644 --- a/board/siemens/pxm2/board.c +++ b/board/siemens/pxm2/board.c @@ -13,7 +13,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c index 25e2ed22a6..539ecef22c 100644 --- a/board/siemens/rut/board.c +++ b/board/siemens/rut/board.c @@ -11,6 +11,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spi.h> #include <spl.h> diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 6ea97eb4e8..1cf1f9e1f7 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -14,7 +14,7 @@ #include <command.h> #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <asm/io.h> #include <asm/arch/at91sam9260_matrix.h> #include <asm/arch/at91sam9_smc.h> |