Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 626f3875e733dbd2f81cd0b749475e02a0ebb079

Authored by Kuldeep Singh
Committed by Prabhakar Kushwaha
1 parent e1a2ed7180
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

configs: ls1046: Update mtd-id for QSPI nor in mtdparts variable 

Update mtd-id for QSPI nor due to change introduced in mtd/spi in
linux 5.0. commit 84d043185dbe
  ("spi: Add a driver for the Freescale/NXP QuadSPI controller")

This modification is only for linux kernel version >= 5.0. To use
bootargs for kernel < 5.0, use the following bootargs
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0
earlycon=uart8250,mmio,0x21c0500
mtdparts=1550000.quadspi:2m(uboot),14m(free)"

CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:2m(uboot),14m(free)"

Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>

Showing 10 changed files with 20 additions and 20 deletions Side-by-side Diff

configs/ls1046aqds_qspi_defconfig
Diff comments   View file @ 626f387
... ... @@ -10,7 +10,7 @@
10 10 CONFIG_QSPI_BOOT=y
11 11 CONFIG_BOOTDELAY=10
12 12 CONFIG_USE_BOOTARGS=y
13   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:2m(uboot),14m(free)"
  13 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:2m(uboot),14m(free)"
14 14 # CONFIG_USE_BOOTCOMMAND is not set
15 15 CONFIG_MISC_INIT_R=y
16 16 CONFIG_CMD_BOOTZ=y
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_CMD_USB=y
26 26 CONFIG_CMD_CACHE=y
27 27 CONFIG_MP=y
28   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:2m(uboot),14m(free)"
  28 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:2m(uboot),14m(free)"
29 29 CONFIG_OF_CONTROL=y
30 30 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
31 31 CONFIG_ENV_IS_IN_SPI_FLASH=y
configs/ls1046aqds_sdcard_qspi_defconfig
Diff comments   View file @ 626f387
... ... @@ -17,7 +17,7 @@
17 17 CONFIG_SD_BOOT=y
18 18 CONFIG_BOOTDELAY=10
19 19 CONFIG_USE_BOOTARGS=y
20   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:2m(uboot),14m(free)"
  20 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:2m(uboot),14m(free)"
21 21 # CONFIG_USE_BOOTCOMMAND is not set
22 22 CONFIG_MISC_INIT_R=y
23 23 CONFIG_SPL_TEXT_BASE=0x10000000
... ... @@ -40,7 +40,7 @@
40 40 CONFIG_CMD_USB=y
41 41 CONFIG_CMD_CACHE=y
42 42 CONFIG_MP=y
43   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:2m(uboot),14m(free)"
  43 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:2m(uboot),14m(free)"
44 44 # CONFIG_SPL_EFI_PARTITION is not set
45 45 CONFIG_OF_CONTROL=y
46 46 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart"
configs/ls1046ardb_emmc_defconfig
Diff comments   View file @ 626f387
... ... @@ -17,7 +17,7 @@
17 17 CONFIG_SD_BOOT=y
18 18 CONFIG_BOOTDELAY=10
19 19 CONFIG_USE_BOOTARGS=y
20   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  20 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
21 21 # CONFIG_USE_BOOTCOMMAND is not set
22 22 CONFIG_MISC_INIT_R=y
23 23 CONFIG_SPL_TEXT_BASE=0x10000000
... ... @@ -37,7 +37,7 @@
37 37 CONFIG_CMD_USB=y
38 38 CONFIG_CMD_CACHE=y
39 39 CONFIG_MP=y
40   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  40 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
41 41 # CONFIG_SPL_EFI_PARTITION is not set
42 42 CONFIG_OF_CONTROL=y
43 43 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
Diff comments   View file @ 626f387
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_QSPI_BOOT=y
13 13 CONFIG_BOOTDELAY=10
14 14 CONFIG_USE_BOOTARGS=y
15   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  15 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
16 16 CONFIG_MISC_INIT_R=y
17 17 CONFIG_CMD_GPT=y
18 18 CONFIG_CMD_I2C=y
... ... @@ -23,7 +23,7 @@
23 23 CONFIG_CMD_USB=y
24 24 CONFIG_CMD_CACHE=y
25 25 CONFIG_MP=y
26   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  26 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
27 27 CONFIG_OF_CONTROL=y
28 28 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
29 29 CONFIG_DM=y
configs/ls1046ardb_qspi_defconfig
Diff comments   View file @ 626f387
... ... @@ -11,7 +11,7 @@
11 11 CONFIG_QSPI_BOOT=y
12 12 CONFIG_BOOTDELAY=10
13 13 CONFIG_USE_BOOTARGS=y
14   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  14 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
15 15 CONFIG_MISC_INIT_R=y
16 16 CONFIG_CMD_GPT=y
17 17 CONFIG_CMD_I2C=y
... ... @@ -22,7 +22,7 @@
22 22 CONFIG_CMD_USB=y
23 23 CONFIG_CMD_CACHE=y
24 24 CONFIG_MP=y
25   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  25 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
26 26 CONFIG_OF_CONTROL=y
27 27 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
28 28 CONFIG_ENV_IS_IN_SPI_FLASH=y
configs/ls1046ardb_qspi_spl_defconfig
Diff comments   View file @ 626f387
... ... @@ -18,7 +18,7 @@
18 18 CONFIG_QSPI_BOOT=y
19 19 CONFIG_BOOTDELAY=10
20 20 CONFIG_USE_BOOTARGS=y
21   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  21 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
22 22 CONFIG_MISC_INIT_R=y
23 23 CONFIG_SPL_TEXT_BASE=0x10000000
24 24 CONFIG_SPL_BOARD_INIT=y
... ... @@ -39,7 +39,7 @@
39 39 CONFIG_CMD_USB=y
40 40 CONFIG_CMD_CACHE=y
41 41 CONFIG_MP=y
42   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  42 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
43 43 # CONFIG_SPL_EFI_PARTITION is not set
44 44 CONFIG_OF_CONTROL=y
45 45 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
Diff comments   View file @ 626f387
... ... @@ -17,7 +17,7 @@
17 17 CONFIG_SD_BOOT=y
18 18 CONFIG_BOOTDELAY=10
19 19 CONFIG_USE_BOOTARGS=y
20   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  20 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
21 21 CONFIG_MISC_INIT_R=y
22 22 CONFIG_SPL_TEXT_BASE=0x10000000
23 23 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
... ... @@ -37,7 +37,7 @@
37 37 CONFIG_CMD_USB=y
38 38 CONFIG_CMD_CACHE=y
39 39 CONFIG_MP=y
40   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  40 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
41 41 # CONFIG_SPL_EFI_PARTITION is not set
42 42 CONFIG_OF_CONTROL=y
43 43 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
configs/ls1046ardb_sdcard_defconfig
Diff comments   View file @ 626f387
... ... @@ -17,7 +17,7 @@
17 17 CONFIG_SD_BOOT=y
18 18 CONFIG_BOOTDELAY=10
19 19 CONFIG_USE_BOOTARGS=y
20   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  20 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
21 21 CONFIG_MISC_INIT_R=y
22 22 CONFIG_SPL_TEXT_BASE=0x10000000
23 23 CONFIG_SPL_BOARD_INIT=y
... ... @@ -36,7 +36,7 @@
36 36 CONFIG_CMD_USB=y
37 37 CONFIG_CMD_CACHE=y
38 38 CONFIG_MP=y
39   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  39 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
40 40 # CONFIG_SPL_EFI_PARTITION is not set
41 41 CONFIG_OF_CONTROL=y
42 42 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
Diff comments   View file @ 626f387
... ... @@ -13,7 +13,7 @@
13 13 CONFIG_OF_BOARD_SETUP=y
14 14 CONFIG_BOOTDELAY=10
15 15 CONFIG_USE_BOOTARGS=y
16   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  16 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
17 17 CONFIG_MISC_INIT_R=y
18 18 CONFIG_CMD_GPT=y
19 19 CONFIG_CMD_I2C=y
... ... @@ -24,7 +24,7 @@
24 24 CONFIG_CMD_USB=y
25 25 CONFIG_CMD_CACHE=y
26 26 CONFIG_MP=y
27   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  27 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
28 28 CONFIG_OF_CONTROL=y
29 29 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
30 30 CONFIG_DM=y
configs/ls1046ardb_tfa_defconfig
Diff comments   View file @ 626f387
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_OF_BOARD_SETUP=y
13 13 CONFIG_BOOTDELAY=10
14 14 CONFIG_USE_BOOTARGS=y
15   -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  15 +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
16 16 CONFIG_MISC_INIT_R=y
17 17 CONFIG_CMD_GPT=y
18 18 CONFIG_CMD_I2C=y
... ... @@ -23,7 +23,7 @@
23 23 CONFIG_CMD_USB=y
24 24 CONFIG_CMD_CACHE=y
25 25 CONFIG_MP=y
26   -CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
  26 +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi-0:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)"
27 27 CONFIG_OF_CONTROL=y
28 28 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
29 29 CONFIG_ENV_IS_IN_MMC=y