Hi Kuldeep, > -----Original Message----- > From: Kuldeep Singh > Sent: Tuesday, March 5, 2019 11:39 AM > To: u-boot@lists.denx.de > Cc: Rajesh Bhagat <rajesh.bha...@nxp.com>; Prabhakar Kushwaha > <prabhakar.kushw...@nxp.com>; Ashish Kumar > <ashish.ku...@nxp.com>; Jagdish Gediya <jagdish.ged...@nxp.com>; > Mingkai Hu <mingkai...@nxp.com>; Ruchika Gupta > <ruchika.gu...@nxp.com>; Kuldeep Singh <kuldeep.si...@nxp.com> > Subject: [PATCH] configs: ls1046: Update mtd-id for QSPI nor in mtdparts > variable > > Updated mtd-id for QSPI nor due to change introduced in mtd/spi. 'Updated' -> 'Update' > > Commit for reference in linux-5.0 > "spi: Add a driver for the Freescale/NXP QuadSPI controller" This is not the correct way to refer a commit. Please correct it. > > Signed-off-by: Kuldeep Singh <kuldeep.si...@nxp.com> > --- > configs/ls1046aqds_qspi_defconfig | 4 ++-- > configs/ls1046aqds_sdcard_qspi_defconfig | 4 ++-- > configs/ls1046ardb_emmc_defconfig | 4 ++-- > configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 4 ++-- > configs/ls1046ardb_qspi_defconfig | 4 ++-- > configs/ls1046ardb_qspi_spl_defconfig | 4 ++-- > configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 4 ++-- > configs/ls1046ardb_sdcard_defconfig | 4 ++-- > configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 4 ++-- > configs/ls1046ardb_tfa_defconfig | 4 ++-- > 10 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/configs/ls1046aqds_qspi_defconfig > b/configs/ls1046aqds_qspi_defconfig > index 4cc19fe7ac..b7a6da2128 100644 > --- a/configs/ls1046aqds_qspi_defconfig > +++ b/configs/ls1046aqds_qspi_defconfig > @@ -10,7 +10,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_QSPI_BOOT=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 > earlycon=uart8250,mmio,0x21c0500 > mtdparts=1550000.quadspi:2m(uboot),14m(free)" > +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 > earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi- > 0:2m(uboot),14m(free)" > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_MISC_INIT_R=y > CONFIG_CMD_BOOTZ=y > @@ -25,7 +25,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:2m(uboot),14m( > free)" > +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi- > 0:2m(uboot),14m(free)" > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart" > CONFIG_ENV_IS_IN_SPI_FLASH=y > diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig > b/configs/ls1046aqds_sdcard_qspi_defconfig > index a7620d23ad..3cd7d344c0 100644 > --- a/configs/ls1046aqds_sdcard_qspi_defconfig > +++ b/configs/ls1046aqds_sdcard_qspi_defconfig > @@ -17,7 +17,7 @@ > CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT_QSPI > " > CONFIG_SD_BOOT=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 > earlycon=uart8250,mmio,0x21c0500 > mtdparts=1550000.quadspi:2m(uboot),14m(free)" > +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 > earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.spi- > 0:2m(uboot),14m(free)" > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_MISC_INIT_R=y > CONFIG_SPL_BOARD_INIT=y > @@ -39,7 +39,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:2m(uboot),14m( > free)" > +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.spi- > 0:2m(uboot),14m(free)" > # CONFIG_SPL_EFI_PARTITION is not set > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart" > diff --git a/configs/ls1046ardb_emmc_defconfig > b/configs/ls1046ardb_emmc_defconfig > index 4b45289869..e8e7e13e61 100644 > --- a/configs/ls1046ardb_emmc_defconfig > +++ b/configs/ls1046ardb_emmc_defconfig > @@ -17,7 +17,7 @@ > CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,EMMC_BOOT" > CONFIG_SD_BOOT=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -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)" > +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)" > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_MISC_INIT_R=y > CONFIG_SPL_BOARD_INIT=y > @@ -36,7 +36,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > 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)" > +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)" > # CONFIG_SPL_EFI_PARTITION is not set > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" > diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig > b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig > index 27309bfa33..326f83229d 100644 > --- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig > +++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig > @@ -12,7 +12,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_QSPI_BOOT=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -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)" > +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)" > CONFIG_MISC_INIT_R=y > CONFIG_CMD_GPT=y > CONFIG_CMD_I2C=y > @@ -23,7 +23,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > 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)" > +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)" > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" > CONFIG_DM=y > diff --git a/configs/ls1046ardb_qspi_defconfig > b/configs/ls1046ardb_qspi_defconfig > index d2850480d6..b5ab6ca228 100644 > --- a/configs/ls1046ardb_qspi_defconfig > +++ b/configs/ls1046ardb_qspi_defconfig > @@ -11,7 +11,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_QSPI_BOOT=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -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)" > +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)" > CONFIG_MISC_INIT_R=y > CONFIG_CMD_GPT=y > CONFIG_CMD_I2C=y > @@ -22,7 +22,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > 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)" > +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)" > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" > CONFIG_ENV_IS_IN_SPI_FLASH=y > diff --git a/configs/ls1046ardb_qspi_spl_defconfig > b/configs/ls1046ardb_qspi_spl_defconfig > index 975cc580bd..4b1d9712f9 100644 > --- a/configs/ls1046ardb_qspi_spl_defconfig > +++ b/configs/ls1046ardb_qspi_spl_defconfig > @@ -18,7 +18,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_QSPI_BOOT=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -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)" > +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)" > CONFIG_MISC_INIT_R=y > CONFIG_SPL_BOARD_INIT=y > CONFIG_SPL_ENV_SUPPORT=y > @@ -38,7 +38,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > 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)" > +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)" > # CONFIG_SPL_EFI_PARTITION is not set > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" > diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig > b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig > index 643a52039a..4e6a6727f6 100644 > --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig > +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig > @@ -17,7 +17,7 @@ > CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL" > CONFIG_SD_BOOT=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -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)" > +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)" > CONFIG_MISC_INIT_R=y > CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y > CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110 > @@ -36,7 +36,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > 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)" > +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)" > # CONFIG_SPL_EFI_PARTITION is not set > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" > diff --git a/configs/ls1046ardb_sdcard_defconfig > b/configs/ls1046ardb_sdcard_defconfig > index a7624967cf..b3da79f9bf 100644 > --- a/configs/ls1046ardb_sdcard_defconfig > +++ b/configs/ls1046ardb_sdcard_defconfig > @@ -17,7 +17,7 @@ > CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL" > CONFIG_SD_BOOT=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -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)" > +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)" > CONFIG_MISC_INIT_R=y > CONFIG_SPL_BOARD_INIT=y > CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y > @@ -35,7 +35,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > 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)" > +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)" > # CONFIG_SPL_EFI_PARTITION is not set > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" > diff --git a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig > b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig > index 93efb5c3a9..c50d5f80d2 100644 > --- a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig > +++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig > @@ -13,7 +13,7 @@ CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -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)" > +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)" > CONFIG_MISC_INIT_R=y > CONFIG_CMD_GPT=y > CONFIG_CMD_I2C=y > @@ -24,7 +24,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > 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)" > +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)" > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" > CONFIG_DM=y > diff --git a/configs/ls1046ardb_tfa_defconfig > b/configs/ls1046ardb_tfa_defconfig > index c86e182459..da8d7f23ed 100644 > --- a/configs/ls1046ardb_tfa_defconfig > +++ b/configs/ls1046ardb_tfa_defconfig > @@ -12,7 +12,7 @@ CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTARGS=y > -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)" > +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)" > CONFIG_MISC_INIT_R=y > CONFIG_CMD_GPT=y > CONFIG_CMD_I2C=y > @@ -23,7 +23,7 @@ CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > CONFIG_CMD_CACHE=y > CONFIG_MP=y > - > 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)" > +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)" > CONFIG_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" > CONFIG_ENV_IS_IN_MMC=y > -- > 2.17.1
Regards, Jagdish _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
