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

arm: mvebu: spl: Use IS_ENABLED() instead of #ifdef where possible

Browse Source 
Use the preferred
  if (IS_ENABLED(X))
instead of
  #ifdef X
where possible.

There are still places where this is not possible or is more complicated
to convert in this file. Leave those be for now.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Marek Behún 2022-01-14 14:31:44 +01:00 committed by Stefan Roese
parent c894566c5d
commit 37241ce1ba
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,26 +149,24 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
return -EINVAL;
}
#ifdef CONFIG_SPL_SPI_FLASH_SUPPORT
if (bootdev->boot_device == BOOT_DEVICE_SPI &&
if (IS_ENABLED(CONFIG_SPL_SPI_FLASH_SUPPORT) &&
bootdev->boot_device == BOOT_DEVICE_SPI &&
mhdr->blockid != IBR_HDR_SPI_ID) {
printf("ERROR: Wrong blockid (0x%x) in SPI kwbimage\n",
mhdr->blockid);
return -EINVAL;
}
#endif
#ifdef CONFIG_SPL_SATA
if (bootdev->boot_device == BOOT_DEVICE_SATA &&
if (IS_ENABLED(CONFIG_SPL_SATA) &&
bootdev->boot_device == BOOT_DEVICE_SATA &&
mhdr->blockid != IBR_HDR_SATA_ID) {
printf("ERROR: Wrong blockid (0x%x) in SATA kwbimage\n",
mhdr->blockid);
return -EINVAL;
}
#endif
#ifdef CONFIG_SPL_MMC
if ((bootdev->boot_device == BOOT_DEVICE_MMC1 ||
if (IS_ENABLED(CONFIG_SPL_MMC) &&
(bootdev->boot_device == BOOT_DEVICE_MMC1 ||
bootdev->boot_device == BOOT_DEVICE_MMC2 ||
bootdev->boot_device == BOOT_DEVICE_MMC2_2) &&
mhdr->blockid != IBR_HDR_SDIO_ID) {
@ -176,18 +174,16 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
mhdr->blockid);
return -EINVAL;
}
#endif
spl_image->offset = mhdr->srcaddr;
#ifdef CONFIG_SPL_SATA
/*
* For SATA srcaddr is specified in number of sectors.
* The main header is must be stored at sector number 1.
* This expects that sector size is 512 bytes and recalculates
* data offset to bytes relative to the main header.
*/
if (mhdr->blockid == IBR_HDR_SATA_ID) {
if (IS_ENABLED(CONFIG_SPL_SATA) && mhdr->blockid == IBR_HDR_SATA_ID) {
if (spl_image->offset < 1) {
printf("ERROR: Wrong srcaddr (0x%08x) in SATA kwbimage\n",
spl_image->offset);
@ -196,17 +192,14 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
spl_image->offset -= 1;
spl_image->offset *= 512;
}
#endif
#ifdef CONFIG_SPL_MMC
/*
* For SDIO (eMMC) srcaddr is specified in number of sectors.
* This expects that sector size is 512 bytes and recalculates
* data offset to bytes.
*/
if (mhdr->blockid == IBR_HDR_SDIO_ID)
if (IS_ENABLED(CONFIG_SPL_MMC) && mhdr->blockid == IBR_HDR_SDIO_ID)
spl_image->offset *= 512;
#endif
if (spl_image->offset % 4 != 0) {
printf("ERROR: Wrong srcaddr (0x%08x) in kwbimage\n",