diff options
| author | Rogier Stam <rogier@unrailed.org> | 2022-02-09 00:27:00 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2022-04-21 12:31:26 +0200 |
| commit | a37b68820c432ff9b0b3dab597d94f7bbfa5d1e2 (patch) | |
| tree | cfdebf25a082a3470bc2b843b61c8e99a25c4a3d /board/Marvell | |
| parent | 83a8e27062d2c24e001426c4c35859e133e2f1d5 (diff) | |
| download | u-boot-a37b68820c432ff9b0b3dab597d94f7bbfa5d1e2.tar.gz u-boot-a37b68820c432ff9b0b3dab597d94f7bbfa5d1e2.tar.bz2 u-boot-a37b68820c432ff9b0b3dab597d94f7bbfa5d1e2.zip | |
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 'board/Marvell')
| -rw-r--r-- | board/Marvell/mvebu_armada-37xx/board.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index 6bfec0cc5b..98e1b36d11 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -328,9 +328,10 @@ int board_network_enable(struct mii_dev *bus) return 0; } -#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_ENV_IS_IN_SPI_FLASH) +#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup(void *blob, struct bd_info *bd) { +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH int ret; int spi_off; int parts_off; @@ -424,6 +425,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; } +#endif return 0; } #endif |