diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:05 +0200 |
| commit | 93c5d36b6520b8caed7cedcc5e4f18c8c68dc25c (patch) | |
| tree | df6d59438d7f035202e90cbd15fee2f21962c4a2 /arch/arm/boards/phytec-som-imx6 | |
| parent | afc0bedfd779e0b6e110427290312da5b0021e22 (diff) | |
| parent | 8c489973200dfd9df9e918453f6de0f6a3b14bf7 (diff) | |
| download | barebox-93c5d36b6520b8caed7cedcc5e4f18c8c68dc25c.tar.gz barebox-93c5d36b6520b8caed7cedcc5e4f18c8c68dc25c.tar.xz | |
Merge branch 'for-next/imx-bootsource'
Diffstat (limited to 'arch/arm/boards/phytec-som-imx6')
| -rw-r--r-- | arch/arm/boards/phytec-som-imx6/board.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c index 1a2d45ec92..34a0fe4183 100644 --- a/arch/arm/boards/phytec-som-imx6/board.c +++ b/arch/arm/boards/phytec-som-imx6/board.c @@ -204,7 +204,7 @@ static int physom_imx6_devices_init(void) environment_path = basprintf("/chosen/environment-nand"); envdev = "NAND flash"; break; - case BOOTSOURCE_SPI: + case BOOTSOURCE_SPI_NOR: environment_path = basprintf("/chosen/environment-spinor"); envdev = "SPI NOR flash"; break; |