[PATCH] ARM: boards: phytec-som-imx6: Replace spi by spi-nor in bootsource script

[PATCH] ARM: boards: phytec-som-imx6: Replace spi by spi-nor in bootsource script

[Stefan Riedmueller]

Commit 7802c6f891b7 ("ARM: i.MX6: boot: Return BOOTSOURCE_SPI_NOR, not
BOOTSOURCE_SPI") changed the returned boot source for SPI NOR on i.MX 6
from SPI to SPI_NOR. This needs to be accounted for in the bootsource
scripts.

Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
 .../phytec-som-imx6/defaultenv-physom-imx6-phycore/init/bootsource      | 2 +-
 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/bootsource b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/bootsource
index 515613b04161..fa5f7f26c5a7 100644
--- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/bootsource
+++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/bootsource
@@ -12,7 +12,7 @@ if [ $bootsource = mmc ]; then
 	fi
 elif [ $bootsource = nand ]; then
 	global.boot.default="nand spi emmc mmc net"
-elif [ $bootsource = spi ]; then
+elif [ $bootsource = spi-nor ]; then
 	global.boot.default="spi nand emmc mmc net"
 elif [ $bootsource = net ]; then
 	global.boot.default="net nand spi emmc mmc"
diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource
index 3f2ff4bcc836..9c9f0ec3810f 100644
--- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource
+++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource
@@ -8,7 +8,7 @@ if [ $bootsource = mmc ]; then
 	global.boot.default="mmc nand spi net"
 elif [ $bootsource = nand ]; then
 	global.boot.default="nand spi mmc net"
-elif [ $bootsource = spi ]; then
+elif [ $bootsource = spi-nor ]; then
 	global.boot.default="spi nand mmc net"
 elif [ $bootsource = net ]; then
 	global.boot.default="net nand spi mmc"
-- 
2.7.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: boards: phytec-som-imx6: Replace spi by spi-nor in bootsource script

[Sascha Hauer]

On Tue, Dec 03, 2019 at 03:28:59PM +0100, Stefan Riedmueller wrote:
> Commit 7802c6f891b7 ("ARM: i.MX6: boot: Return BOOTSOURCE_SPI_NOR, not
> BOOTSOURCE_SPI") changed the returned boot source for SPI NOR on i.MX 6
> from SPI to SPI_NOR. This needs to be accounted for in the bootsource
> scripts.
> 
> Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
> ---
>  .../phytec-som-imx6/defaultenv-physom-imx6-phycore/init/bootsource      | 2 +-
>  arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox