Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 24357dfd2aec4118b9178d8bf639fb8fc02e1859

Authored by Bin Meng
1 parent b7c6baef28
Exists in smarc_8mq_lf_v2020.04 and in 17 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-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.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

x86: Switch all boards to use DM SCSI 

After MMC is converted to DM, convert to use DM SCSI as well for all
x86 boards and imply BLK for both MMC and SCSI drivers.

CONFIG_SCSI_DEV_LIST is no longer used. Clean them up.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

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

... ... @@ -95,12 +95,14 @@
95 95 select PCI
96 96 select TIMER
97 97 select X86_TSC_TIMER
  98 + imply BLK
98 99 imply DM_ETH
99 100 imply DM_GPIO
100 101 imply DM_KEYBOARD
101 102 imply DM_MMC
102 103 imply DM_RTC
103 104 imply DM_SERIAL
  105 + imply DM_SCSI
104 106 imply DM_SPI
105 107 imply DM_SPI_FLASH
106 108 imply DM_USB
arch/x86/cpu/baytrail/Kconfig
Diff comments   View file @ 24357df
... ... @@ -11,6 +11,7 @@
11 11 imply HAVE_INTEL_ME if !EFI
12 12 imply ENABLE_MRC_CACHE
13 13 imply ENV_IS_IN_SPI_FLASH
  14 + imply AHCI_PCI
14 15 imply ICH_SPI
15 16 imply INTEL_ICH6_GPIO
16 17 imply MMC
arch/x86/cpu/broadwell/Kconfig
Diff comments   View file @ 24357df
... ... @@ -10,6 +10,7 @@
10 10 imply HAVE_INTEL_ME
11 11 imply ENABLE_MRC_CACHE
12 12 imply ENV_IS_IN_SPI_FLASH
  13 + imply AHCI_PCI
13 14 imply ICH_SPI
14 15 imply INTEL_BROADWELL_GPIO
15 16 imply SCSI
arch/x86/cpu/coreboot/Kconfig
Diff comments   View file @ 24357df
... ... @@ -4,6 +4,7 @@
4 4 bool
5 5 default y
6 6 imply ENV_IS_NOWHERE
  7 + imply AHCI_PCI
7 8 imply E1000
8 9 imply ICH_SPI
9 10 imply MMC
arch/x86/cpu/ivybridge/Kconfig
Diff comments   View file @ 24357df
... ... @@ -11,6 +11,7 @@
11 11 imply HAVE_INTEL_ME
12 12 imply ENABLE_MRC_CACHE
13 13 imply ENV_IS_IN_SPI_FLASH
  14 + imply AHCI_PCI
14 15 imply ICH_SPI
15 16 imply INTEL_ICH6_GPIO
16 17 imply SCSI
arch/x86/cpu/qemu/Kconfig
Diff comments   View file @ 24357df
... ... @@ -8,6 +8,7 @@
8 8 bool
9 9 select ARCH_EARLY_INIT_R
10 10 imply ENV_IS_NOWHERE
  11 + imply AHCI_PCI
11 12 imply E1000
12 13 imply SYS_NS16550
13 14 imply USB
arch/x86/cpu/queensbay/Kconfig
Diff comments   View file @ 24357df
... ... @@ -10,6 +10,7 @@
10 10 select HAVE_CMC
11 11 select ARCH_EARLY_INIT_R
12 12 imply ENV_IS_IN_SPI_FLASH
  13 + imply AHCI_PCI
13 14 imply ICH_SPI
14 15 imply INTEL_ICH6_GPIO
15 16 imply MMC
configs/chromebook_link64_defconfig
Diff comments   View file @ 24357df
... ... @@ -56,8 +56,6 @@
56 56 CONFIG_SPL_REGMAP=y
57 57 CONFIG_SYSCON=y
58 58 CONFIG_SPL_SYSCON=y
59   -CONFIG_DM_SCSI=y
60   -CONFIG_BLK=y
61 59 CONFIG_CPU=y
62 60 CONFIG_DM_I2C=y
63 61 CONFIG_SYS_I2C_INTEL=y
configs/chromebook_link_defconfig
Diff comments   View file @ 24357df
... ... @@ -38,8 +38,6 @@
38 38 CONFIG_EFI_PARTITION=y
39 39 CONFIG_REGMAP=y
40 40 CONFIG_SYSCON=y
41   -CONFIG_DM_SCSI=y
42   -CONFIG_BLK=y
43 41 CONFIG_CPU=y
44 42 CONFIG_DM_I2C=y
45 43 CONFIG_SYS_I2C_INTEL=y
configs/chromebox_panther_defconfig
Diff comments   View file @ 24357df
... ... @@ -34,8 +34,6 @@
34 34 CONFIG_EFI_PARTITION=y
35 35 CONFIG_REGMAP=y
36 36 CONFIG_SYSCON=y
37   -CONFIG_DM_SCSI=y
38   -CONFIG_BLK=y
39 37 CONFIG_CROS_EC=y
40 38 CONFIG_CROS_EC_LPC=y
41 39 CONFIG_RTL8169=y
include/configs/bayleybay.h
Diff comments   View file @ 24357df
... ... @@ -19,10 +19,6 @@
19 19 "stdout=serial,vidconsole\0" \
20 20 "stderr=serial,vidconsole\0"
21 21  
22   -#define CONFIG_SCSI_DEV_LIST \
23   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
24   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
25   -
26 22 /* Environment configuration */
27 23 #define CONFIG_ENV_SECT_SIZE 0x1000
28 24 #define CONFIG_ENV_OFFSET 0x006ff000
include/configs/conga-qeval20-qa3-e3845.h
Diff comments   View file @ 24357df
... ... @@ -19,10 +19,6 @@
19 19 "stdout=serial\0" \
20 20 "stderr=serial\0"
21 21  
22   -#define CONFIG_SCSI_DEV_LIST \
23   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
24   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
25   -
26 22 #define VIDEO_IO_OFFSET 0
27 23 #define CONFIG_X86EMU_RAW_IO
28 24  
include/configs/cougarcanyon2.h
Diff comments   View file @ 24357df
... ... @@ -17,9 +17,6 @@
17 17 "stdout=serial,vga\0" \
18 18 "stderr=serial,vga\0"
19 19  
20   -#define CONFIG_SCSI_DEV_LIST \
21   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE}
22   -
23 20 /* Environment configuration */
24 21 #define CONFIG_ENV_SECT_SIZE 0x1000
25 22 #define CONFIG_ENV_OFFSET 0x5ff000
include/configs/crownbay.h
Diff comments   View file @ 24357df
... ... @@ -21,9 +21,6 @@
21 21 "stdout=serial,vidconsole\0" \
22 22 "stderr=serial,vidconsole\0"
23 23  
24   -#define CONFIG_SCSI_DEV_LIST \
25   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA}
26   -
27 24 /* Environment configuration */
28 25 #define CONFIG_ENV_SECT_SIZE 0x1000
29 26 #define CONFIG_ENV_OFFSET 0
include/configs/dfi-bt700.h
Diff comments   View file @ 24357df
... ... @@ -24,10 +24,6 @@
24 24 "stdout=serial\0" \
25 25 "stderr=serial\0"
26 26  
27   -#define CONFIG_SCSI_DEV_LIST \
28   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
29   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
30   -
31 27 #define CONFIG_USB_HOST_ETHER
32 28 #define CONFIG_USB_ETHER_ASIX
33 29 #define CONFIG_USB_ETHER_SMSC95XX
include/configs/minnowmax.h
Diff comments   View file @ 24357df
... ... @@ -22,10 +22,6 @@
22 22 "stderr=vidconsole,serial\0" \
23 23 "usb_pgood_delay=40\0"
24 24  
25   -#define CONFIG_SCSI_DEV_LIST \
26   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
27   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
28   -
29 25 #define VIDEO_IO_OFFSET 0
30 26 #define CONFIG_X86EMU_RAW_IO
31 27  
include/configs/qemu-x86.h
Diff comments   View file @ 24357df
... ... @@ -23,11 +23,7 @@
23 23 * ATA/SATA support for QEMU x86 targets
24 24 * - Only legacy IDE controller is supported for QEMU '-M pc' target
25 25 * - AHCI controller is supported for QEMU '-M q35' target
26   - *
27   - * Default configuraion is to support the QEMU default x86 target
28   - * Undefine CONFIG_IDE to support q35 target
29 26 */
30   -#ifdef CONFIG_IDE
31 27 #define CONFIG_SYS_IDE_MAXBUS 2
32 28 #define CONFIG_SYS_IDE_MAXDEVICE 4
33 29 #define CONFIG_SYS_ATA_BASE_ADDR 0
... ... @@ -37,12 +33,6 @@
37 33 #define CONFIG_SYS_ATA_IDE0_OFFSET 0x1f0
38 34 #define CONFIG_SYS_ATA_IDE1_OFFSET 0x170
39 35 #define CONFIG_ATAPI
40   -
41   -#undef CONFIG_SCSI_AHCI
42   -#else
43   -#define CONFIG_SCSI_DEV_LIST \
44   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_AHCI}
45   -#endif
46 36  
47 37 /* SPI is not supported */
48 38  
include/configs/som-6896.h
Diff comments   View file @ 24357df
... ... @@ -16,9 +16,6 @@
16 16  
17 17 #define CONFIG_MISC_INIT_R
18 18  
19   -#define CONFIG_SCSI_DEV_LIST \
20   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_AHCI}
21   -
22 19 #define VIDEO_IO_OFFSET 0
23 20 #define CONFIG_X86EMU_RAW_IO
24 21  
include/configs/som-db5800-som-6867.h
Diff comments   View file @ 24357df
... ... @@ -19,10 +19,6 @@
19 19 "stdout=serial,vidconsole\0" \
20 20 "stderr=serial,vidconsole\0"
21 21  
22   -#define CONFIG_SCSI_DEV_LIST \
23   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
24   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
25   -
26 22 #define VIDEO_IO_OFFSET 0
27 23 #define CONFIG_X86EMU_RAW_IO
28 24  
include/configs/x86-chromebook.h
Diff comments   View file @ 24357df
... ... @@ -15,14 +15,6 @@
15 15 #define CONFIG_X86_REFCODE_ADDR 0xffea0000
16 16 #define CONFIG_X86_REFCODE_RUN_ADDR 0
17 17  
18   -#define CONFIG_SCSI_DEV_LIST \
19   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_NM10_AHCI}, \
20   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_AHCI_MOBILE}, \
21   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_AHCI_SERIES6}, \
22   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE}, \
23   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNXPOINT_AHCI}, \
24   - {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_AHCI}
25   -
26 18 #define CONFIG_PCI_MEM_BUS 0xe0000000
27 19 #define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
28 20 #define CONFIG_PCI_MEM_SIZE 0x10000000