diff options
| author | Rogier Stam | 2022-02-09 00:27:00 +0100 |
|---|---|---|
| committer | Stefan Roese | 2022-04-21 12:31:26 +0200 |
| commit | a37b68820c432ff9b0b3dab597d94f7bbfa5d1e2 (patch) | |
| tree | cfdebf25a082a3470bc2b843b61c8e99a25c4a3d /arch/arm/dts | |
| parent | 83a8e27062d2c24e001426c4c35859e133e2f1d5 (diff) | |
arm: mvebu: Fix Espressobin build for configs where ENV is not in SPI
When storing the UBoot Environment in for example EXT4,
the U-Boot build is broken for several reasons:
1. armada-385-turris-omnia-u-boot.dtsi will not allow
CONFIG_ENV_OFFSET and CONFIG_ENV_SIZE to be undefined
2. armada-37xx/board.c ft_board_setup function does not
exist if CONFIG_ENV_IS_IN_SPI_FLASH is not defined
This commit changes these files so that selecting a
different location for the environment is possible.
Signed-off-by: Rogier Stam <rogier@unrailed.org>
Reviewed-by: Pali Rohár <pali@kernel.org>
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi index 3ff76c94629..008787e664c 100644 --- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi @@ -38,6 +38,7 @@ }; }; +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH &spi0 { u-boot,dm-pre-reloc; @@ -56,6 +57,7 @@ }; }; }; +#endif &uart0 { u-boot,dm-pre-reloc; |