Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 749423270082e4850687de76c1742d34da1af607

Authored by Ashish Kumar
Committed by Prabhakar Kushwaha
1 parent 4da0e52c9d
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: Unset CONFIG_SPI_FLASH_BAR, move CONFIG_FSL_QSPI to defconfig 

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>

Showing 15 changed files with 28 additions and 1 deletions Side-by-side Diff

configs/ls1012a2g5rdb_qspi_defconfig
Diff comments   View file @ 7494232
... ... @@ -36,6 +36,7 @@
36 36 CONFIG_FSL_ESDHC=y
37 37 CONFIG_DM_SPI_FLASH=y
38 38 CONFIG_SPI_FLASH=y
  39 +# CONFIG_SPI_FLASH_BAR is not set
39 40 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
40 41 CONFIG_FSL_PFE=y
41 42 CONFIG_DM_ETH=y
... ... @@ -43,6 +44,7 @@
43 44 CONFIG_SYS_NS16550=y
44 45 CONFIG_SPI=y
45 46 CONFIG_DM_SPI=y
  47 +CONFIG_FSL_QSPI=y
46 48 CONFIG_USB=y
47 49 CONFIG_DM_USB=y
48 50 CONFIG_USB_XHCI_HCD=y
configs/ls1012a2g5rdb_tfa_defconfig
Diff comments   View file @ 7494232
... ... @@ -36,6 +36,7 @@
36 36 CONFIG_FSL_ESDHC=y
37 37 CONFIG_DM_SPI_FLASH=y
38 38 CONFIG_SPI_FLASH=y
  39 +# CONFIG_SPI_FLASH_BAR is not set
39 40 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
40 41 CONFIG_FSL_PFE=y
41 42 CONFIG_DM_ETH=y
... ... @@ -43,6 +44,7 @@
43 44 CONFIG_SYS_NS16550=y
44 45 CONFIG_SPI=y
45 46 CONFIG_DM_SPI=y
  47 +CONFIG_FSL_QSPI=y
46 48 CONFIG_USB=y
47 49 CONFIG_DM_USB=y
48 50 CONFIG_USB_XHCI_HCD=y
configs/ls1012afrdm_qspi_defconfig
Diff comments   View file @ 7494232
... ... @@ -32,6 +32,7 @@
32 32 # CONFIG_MMC is not set
33 33 CONFIG_DM_SPI_FLASH=y
34 34 CONFIG_SPI_FLASH=y
  35 +# CONFIG_SPI_FLASH_BAR is not set
35 36 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
36 37 CONFIG_FSL_PFE=y
37 38 CONFIG_DM_ETH=y
... ... @@ -43,6 +44,7 @@
43 44 CONFIG_SYS_NS16550=y
44 45 CONFIG_SPI=y
45 46 CONFIG_DM_SPI=y
  47 +CONFIG_FSL_QSPI=y
46 48 CONFIG_USB=y
47 49 CONFIG_DM_USB=y
48 50 CONFIG_USB_XHCI_HCD=y
configs/ls1012afrdm_tfa_defconfig
Diff comments   View file @ 7494232
... ... @@ -32,6 +32,7 @@
32 32 # CONFIG_MMC is not set
33 33 CONFIG_DM_SPI_FLASH=y
34 34 CONFIG_SPI_FLASH=y
  35 +# CONFIG_SPI_FLASH_BAR is not set
35 36 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
36 37 CONFIG_FSL_PFE=y
37 38 CONFIG_DM_ETH=y
... ... @@ -43,6 +44,7 @@
43 44 CONFIG_SYS_NS16550=y
44 45 CONFIG_SPI=y
45 46 CONFIG_DM_SPI=y
  47 +CONFIG_FSL_QSPI=y
46 48 CONFIG_USB=y
47 49 CONFIG_DM_USB=y
48 50 CONFIG_USB_XHCI_HCD=y
configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
Diff comments   View file @ 7494232
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_DM_MMC=y
34 34 CONFIG_DM_SPI_FLASH=y
35 35 CONFIG_SPI_FLASH=y
  36 +# CONFIG_SPI_FLASH_BAR is not set
36 37 CONFIG_SPI_FLASH_WINBOND=y
37 38 CONFIG_FSL_PFE=y
38 39 CONFIG_DM_ETH=y
... ... @@ -45,6 +46,7 @@
45 46 CONFIG_SYS_NS16550=y
46 47 CONFIG_SPI=y
47 48 CONFIG_DM_SPI=y
  49 +CONFIG_FSL_QSPI=y
48 50 CONFIG_USB=y
49 51 CONFIG_DM_USB=y
50 52 CONFIG_USB_XHCI_HCD=y
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
Diff comments   View file @ 7494232
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_DM_MMC=y
34 34 CONFIG_DM_SPI_FLASH=y
35 35 CONFIG_SPI_FLASH=y
  36 +# CONFIG_SPI_FLASH_BAR is not set
36 37 CONFIG_SPI_FLASH_WINBOND=y
37 38 CONFIG_FSL_PFE=y
38 39 CONFIG_DM_ETH=y
... ... @@ -45,6 +46,7 @@
45 46 CONFIG_SYS_NS16550=y
46 47 CONFIG_SPI=y
47 48 CONFIG_DM_SPI=y
  49 +CONFIG_FSL_QSPI=y
48 50 CONFIG_USB=y
49 51 CONFIG_DM_USB=y
50 52 CONFIG_USB_XHCI_HCD=y
configs/ls1012afrwy_tfa_defconfig
Diff comments   View file @ 7494232
... ... @@ -34,6 +34,7 @@
34 34 CONFIG_DM_MMC=y
35 35 CONFIG_DM_SPI_FLASH=y
36 36 CONFIG_SPI_FLASH=y
  37 +# CONFIG_SPI_FLASH_BAR is not set
37 38 CONFIG_SPI_FLASH_WINBOND=y
38 39 CONFIG_FSL_PFE=y
39 40 CONFIG_DM_ETH=y
... ... @@ -46,6 +47,7 @@
46 47 CONFIG_SYS_NS16550=y
47 48 CONFIG_SPI=y
48 49 CONFIG_DM_SPI=y
  50 +CONFIG_FSL_QSPI=y
49 51 CONFIG_USB=y
50 52 CONFIG_DM_USB=y
51 53 CONFIG_USB_XHCI_HCD=y
configs/ls1012aqds_qspi_defconfig
Diff comments   View file @ 7494232
... ... @@ -53,6 +53,7 @@
53 53 CONFIG_SF_DEFAULT_BUS=1
54 54 CONFIG_SF_DEFAULT_MODE=0
55 55 CONFIG_SF_DEFAULT_SPEED=10000000
  56 +# CONFIG_SPI_FLASH_BAR is not set
56 57 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
57 58 CONFIG_FSL_PFE=y
58 59 CONFIG_DM_ETH=y
... ... @@ -67,6 +68,7 @@
67 68 CONFIG_SPI=y
68 69 CONFIG_DM_SPI=y
69 70 CONFIG_FSL_DSPI=y
  71 +CONFIG_FSL_QSPI=y
70 72 CONFIG_USB=y
71 73 CONFIG_DM_USB=y
72 74 CONFIG_USB_XHCI_HCD=y
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
Diff comments   View file @ 7494232
... ... @@ -45,6 +45,7 @@
45 45 CONFIG_SF_DEFAULT_BUS=1
46 46 CONFIG_SF_DEFAULT_MODE=0
47 47 CONFIG_SF_DEFAULT_SPEED=10000000
  48 +# CONFIG_SPI_FLASH_BAR is not set
48 49 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
49 50 CONFIG_FSL_PFE=y
50 51 CONFIG_DM_ETH=y
... ... @@ -59,6 +60,7 @@
59 60 CONFIG_SPI=y
60 61 CONFIG_DM_SPI=y
61 62 CONFIG_FSL_DSPI=y
  63 +CONFIG_FSL_QSPI=y
62 64 CONFIG_USB=y
63 65 CONFIG_DM_USB=y
64 66 CONFIG_USB_XHCI_HCD=y
configs/ls1012aqds_tfa_defconfig
Diff comments   View file @ 7494232
... ... @@ -53,6 +53,7 @@
53 53 CONFIG_SF_DEFAULT_BUS=1
54 54 CONFIG_SF_DEFAULT_MODE=0
55 55 CONFIG_SF_DEFAULT_SPEED=10000000
  56 +# CONFIG_SPI_FLASH_BAR is not set
56 57 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
57 58 CONFIG_FSL_PFE=y
58 59 CONFIG_DM_ETH=y
... ... @@ -67,6 +68,7 @@
67 68 CONFIG_SPI=y
68 69 CONFIG_DM_SPI=y
69 70 CONFIG_FSL_DSPI=y
  71 +CONFIG_FSL_QSPI=y
70 72 CONFIG_USB=y
71 73 CONFIG_DM_USB=y
72 74 CONFIG_USB_XHCI_HCD=y
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
Diff comments   View file @ 7494232
... ... @@ -38,6 +38,7 @@
38 38 CONFIG_FSL_ESDHC=y
39 39 CONFIG_DM_SPI_FLASH=y
40 40 CONFIG_SPI_FLASH=y
  41 +# CONFIG_SPI_FLASH_BAR is not set
41 42 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
42 43 CONFIG_E1000=y
43 44 CONFIG_PCI=y
... ... @@ -49,6 +50,7 @@
49 50 CONFIG_SPI=y
50 51 CONFIG_DM_SPI=y
51 52 CONFIG_FSL_DSPI=y
  53 +CONFIG_FSL_QSPI=y
52 54 CONFIG_USB=y
53 55 CONFIG_DM_USB=y
54 56 CONFIG_USB_XHCI_HCD=y
configs/ls1012ardb_qspi_defconfig
Diff comments   View file @ 7494232
... ... @@ -37,6 +37,7 @@
37 37 CONFIG_FSL_ESDHC=y
38 38 CONFIG_DM_SPI_FLASH=y
39 39 CONFIG_SPI_FLASH=y
  40 +# CONFIG_SPI_FLASH_BAR is not set
40 41 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
41 42 CONFIG_FSL_PFE=y
42 43 CONFIG_DM_ETH=y
... ... @@ -50,6 +51,7 @@
50 51 CONFIG_SPI=y
51 52 CONFIG_DM_SPI=y
52 53 CONFIG_FSL_DSPI=y
  54 +CONFIG_FSL_QSPI=y
53 55 CONFIG_USB=y
54 56 CONFIG_DM_USB=y
55 57 CONFIG_USB_XHCI_HCD=y
configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
Diff comments   View file @ 7494232
... ... @@ -38,6 +38,7 @@
38 38 CONFIG_FSL_ESDHC=y
39 39 CONFIG_DM_SPI_FLASH=y
40 40 CONFIG_SPI_FLASH=y
  41 +# CONFIG_SPI_FLASH_BAR is not set
41 42 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
42 43 CONFIG_E1000=y
43 44 CONFIG_PCI=y
... ... @@ -49,6 +50,7 @@
49 50 CONFIG_SPI=y
50 51 CONFIG_DM_SPI=y
51 52 CONFIG_FSL_DSPI=y
  53 +CONFIG_FSL_QSPI=y
52 54 CONFIG_USB=y
53 55 CONFIG_DM_USB=y
54 56 CONFIG_USB_XHCI_HCD=y
configs/ls1012ardb_tfa_defconfig
Diff comments   View file @ 7494232
... ... @@ -37,6 +37,7 @@
37 37 CONFIG_FSL_ESDHC=y
38 38 CONFIG_DM_SPI_FLASH=y
39 39 CONFIG_SPI_FLASH=y
  40 +# CONFIG_SPI_FLASH_BAR is not set
40 41 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
41 42 CONFIG_FSL_PFE=y
42 43 CONFIG_DM_ETH=y
... ... @@ -50,6 +51,7 @@
50 51 CONFIG_SPI=y
51 52 CONFIG_DM_SPI=y
52 53 CONFIG_FSL_DSPI=y
  54 +CONFIG_FSL_QSPI=y
53 55 CONFIG_USB=y
54 56 CONFIG_DM_USB=y
55 57 CONFIG_USB_XHCI_HCD=y
include/configs/ls1012a_common.h
Diff comments   View file @ 7494232
... ... @@ -43,7 +43,6 @@
43 43 #define CONFIG_FSL_SPI_INTERFACE
44 44 #define CONFIG_SF_DATAFLASH
45 45  
46   -#define CONFIG_FSL_QSPI
47 46 #define QSPI0_AMBA_BASE 0x40000000
48 47 #define CONFIG_SPI_FLASH_SPANSION
49 48