leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sata: Rename SATA_SUPPORT to SATA

Browse Source 
Rename this options so that CONFIG_IS_ENABLED can be used with it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-08-08 12:20:17 -06:00 committed by Tom Rini
parent 6f004adaf6
commit f7560376ae
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-mvebu/Kconfig
View File

@ -298,7 +298,7 @@ config MVEBU_SPL_BOOT_DEVICE_MMC
config MVEBU_SPL_BOOT_DEVICE_SATA config MVEBU_SPL_BOOT_DEVICE_SATA
bool "SATA" bool "SATA"
imply SPL_SATA_SUPPORT imply SPL_SATA
imply SPL_LIBDISK_SUPPORT imply SPL_LIBDISK_SUPPORT
select SPL_BOOTROM_SUPPORT select SPL_BOOTROM_SUPPORT

10
arch/arm/mach-mvebu/spl.c
View File

@ -18,7 +18,7 @@
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#if defined(CONFIG_SPL_SPI_FLASH_SUPPORT) || defined(CONFIG_SPL_MMC) || \ #if defined(CONFIG_SPL_SPI_FLASH_SUPPORT) || defined(CONFIG_SPL_MMC) || \
defined(CONFIG_SPL_SATA_SUPPORT) defined(CONFIG_SPL_SATA)
/* /*
* When loading U-Boot via SPL from SPI NOR, CONFIG_SYS_SPI_U_BOOT_OFFS must * When loading U-Boot via SPL from SPI NOR, CONFIG_SYS_SPI_U_BOOT_OFFS must
@ -57,7 +57,7 @@
* stored at sector 1. Therefore CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR must be * stored at sector 1. Therefore CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR must be
* set to 1. Otherwise U-Boot SPL would not be able to load U-Boot proper. * set to 1. Otherwise U-Boot SPL would not be able to load U-Boot proper.
*/ */
#ifdef CONFIG_SPL_SATA_SUPPORT #ifdef CONFIG_SPL_SATA
#if !defined(CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR) || !defined(CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR) || CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR != 1 #if !defined(CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR) || !defined(CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR) || CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR != 1
#error CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR must be set to 1 #error CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR must be set to 1
#endif #endif
@ -122,7 +122,7 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
#ifdef CONFIG_SPL_SPI_FLASH_SUPPORT #ifdef CONFIG_SPL_SPI_FLASH_SUPPORT
mhdr->blockid != IBR_HDR_SPI_ID && mhdr->blockid != IBR_HDR_SPI_ID &&
#endif #endif
#ifdef CONFIG_SPL_SATA_SUPPORT #ifdef CONFIG_SPL_SATA
mhdr->blockid != IBR_HDR_SATA_ID && mhdr->blockid != IBR_HDR_SATA_ID &&
#endif #endif
#ifdef CONFIG_SPL_MMC #ifdef CONFIG_SPL_MMC
@ -136,7 +136,7 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
spl_image->offset = mhdr->srcaddr; spl_image->offset = mhdr->srcaddr;
#ifdef CONFIG_SPL_SATA_SUPPORT #ifdef CONFIG_SPL_SATA
/* /*
* For SATA srcaddr is specified in number of sectors. * For SATA srcaddr is specified in number of sectors.
* The main header is must be stored at sector number 1. * The main header is must be stored at sector number 1.
@ -266,7 +266,7 @@ u32 spl_boot_device(void)
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:
return BOOT_DEVICE_MMC1; return BOOT_DEVICE_MMC1;
#endif #endif
#ifdef CONFIG_SPL_SATA_SUPPORT #ifdef CONFIG_SPL_SATA
case BOOT_FROM_SATA: case BOOT_FROM_SATA:
return BOOT_FROM_SATA; return BOOT_FROM_SATA;
#endif #endif

2
arch/arm/mach-zynqmp/spl.c
View File

@ -100,7 +100,7 @@ u32 spl_boot_device(void)
case USB_MODE: case USB_MODE:
return BOOT_DEVICE_DFU; return BOOT_DEVICE_DFU;
#endif #endif
#ifdef CONFIG_SPL_SATA_SUPPORT #ifdef CONFIG_SPL_SATA
case SW_SATA_MODE: case SW_SATA_MODE:
return BOOT_DEVICE_SATA; return BOOT_DEVICE_SATA;
#endif #endif

4
arch/powerpc/cpu/mpc83xx/Kconfig
View File

@ -119,7 +119,7 @@ config MPC83XX_PCIE2_SUPPORT
config MPC83XX_SDHC_SUPPORT config MPC83XX_SDHC_SUPPORT
bool bool
config MPC83XX_SATA_SUPPORT config MPC83XX_SATA
bool bool
config MPC83XX_SECOND_I2C config MPC83XX_SECOND_I2C
@ -198,7 +198,7 @@ config ARCH_MPC837X
select MPC83XX_PCIE1_SUPPORT select MPC83XX_PCIE1_SUPPORT
select MPC83XX_PCIE2_SUPPORT select MPC83XX_PCIE2_SUPPORT
select MPC83XX_SDHC_SUPPORT select MPC83XX_SDHC_SUPPORT
select MPC83XX_SATA_SUPPORT select MPC83XX_SATA
select MPC83XX_LDP_PIN select MPC83XX_LDP_PIN
select MPC83XX_SECOND_I2C select MPC83XX_SECOND_I2C
select SYS_CACHE_SHIFT_5 select SYS_CACHE_SHIFT_5

6
common/spl/Kconfig
View File

@ -196,7 +196,7 @@ config SPL_BOOTCOUNT_LIMIT
config SPL_RAW_IMAGE_SUPPORT config SPL_RAW_IMAGE_SUPPORT
bool "Support SPL loading and booting of RAW images" bool "Support SPL loading and booting of RAW images"
default n if (ARCH_MX6 && (SPL_MMC || SPL_SATA_SUPPORT)) default n if (ARCH_MX6 && (SPL_MMC || SPL_SATA))
default y if !TI_SECURE_DEVICE default y if !TI_SECURE_DEVICE
help help
SPL will support loading and booting a RAW image when this option SPL will support loading and booting a RAW image when this option
@ -1076,7 +1076,7 @@ config SPL_RTC
needed. This enables the drivers in drivers/rtc as part of an SPL needed. This enables the drivers in drivers/rtc as part of an SPL
build. build.
config SPL_SATA_SUPPORT config SPL_SATA
bool "Support loading from SATA" bool "Support loading from SATA"
help help
Enable support for SATA (Serial AT attachment) in SPL. This allows Enable support for SATA (Serial AT attachment) in SPL. This allows
@ -1088,7 +1088,7 @@ config SPL_SATA_SUPPORT
config SPL_SATA_RAW_U_BOOT_USE_SECTOR config SPL_SATA_RAW_U_BOOT_USE_SECTOR
bool "SATA raw mode: by sector" bool "SATA raw mode: by sector"
depends on SPL_SATA_SUPPORT depends on SPL_SATA
default y if ARCH_MVEBU default y if ARCH_MVEBU
help help
Use sector number for specifying U-Boot location on SATA disk in Use sector number for specifying U-Boot location on SATA disk in

2
common/spl/Makefile
View File

@ -27,7 +27,7 @@ obj-$(CONFIG_$(SPL_TPL_)OPENSBI) += spl_opensbi.o
obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o
obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o
obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o
obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o obj-$(CONFIG_$(SPL_TPL_)SATA) += spl_sata.o
obj-$(CONFIG_$(SPL_TPL_)DFU) += spl_dfu.o obj-$(CONFIG_$(SPL_TPL_)DFU) += spl_dfu.o
obj-$(CONFIG_$(SPL_TPL_)SPI_LOAD) += spl_spi.o obj-$(CONFIG_$(SPL_TPL_)SPI_LOAD) += spl_spi.o
obj-$(CONFIG_$(SPL_TPL_)RAM_SUPPORT) += spl_ram.o obj-$(CONFIG_$(SPL_TPL_)RAM_SUPPORT) += spl_ram.o

2
drivers/Makefile
View File

@ -60,7 +60,7 @@ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/
obj-$(CONFIG_SPL_WATCHDOG) += watchdog/ obj-$(CONFIG_SPL_WATCHDOG) += watchdog/
obj-$(CONFIG_SPL_USB_HOST) += usb/host/ obj-$(CONFIG_SPL_USB_HOST) += usb/host/
obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/ obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/
obj-$(CONFIG_SPL_SATA_SUPPORT) += ata/ scsi/ obj-$(CONFIG_SPL_SATA) += ata/ scsi/
obj-$(CONFIG_HAVE_BLOCK_DEVICE) += block/ obj-$(CONFIG_HAVE_BLOCK_DEVICE) += block/
obj-$(CONFIG_SPL_THERMAL) += thermal/ obj-$(CONFIG_SPL_THERMAL) += thermal/

2
drivers/scsi/Makefile
View File

@ -9,7 +9,7 @@ obj-$(CONFIG_SCSI) += scsi.o
endif endif
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
ifdef CONFIG_SPL_SATA_SUPPORT ifdef CONFIG_SPL_SATA
obj-$(CONFIG_DM_SCSI) += scsi-uclass.o obj-$(CONFIG_DM_SCSI) += scsi-uclass.o
obj-$(CONFIG_SCSI) += scsi.o obj-$(CONFIG_SCSI) += scsi.o
endif endif

2
include/configs/imx6_spl.h
View File

@ -59,7 +59,7 @@
#endif #endif
/* SATA support */ /* SATA support */
#if defined(CONFIG_SPL_SATA_SUPPORT) #if defined(CONFIG_SPL_SATA)
#define CONFIG_SPL_SATA_BOOT_DEVICE 0 #define CONFIG_SPL_SATA_BOOT_DEVICE 0
#define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1
#endif #endif