diff options
| author | Stefan Riedmueller <s.riedmueller@phytec.de> | 2019-12-03 15:28:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-06 15:24:20 +0100 |
| commit | e9e329f3811c13b3013420015e916f1de4deb915 (patch) | |
| tree | 0e213d1bd8b0b6d810bf52e75caf879bfcbf2e09 /arch/arm/boards/phytec-som-imx6 | |
| parent | fd2c41fe29e37df94eccf740c46ee531329ffe9a (diff) | |
| download | barebox-e9e329f3811c13b3013420015e916f1de4deb915.tar.gz barebox-e9e329f3811c13b3013420015e916f1de4deb915.tar.xz | |
ARM: boards: phytec-som-imx6: Replace spi by spi-nor in bootsource script
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/phytec-som-imx6')
| -rw-r--r-- | arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/bootsource | 2 | ||||
| -rw-r--r-- | 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 515613b041..fa5f7f26c5 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 3f2ff4bcc8..9c9f0ec381 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" |