Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 07:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

disk: Use Makefile to omit partition drivers

Browse source 
At present these files have an #ifdef covering the whole file. Move the
condition to the Makefile instead.

Add BLK to the condition since future patches will adjust things so that
HAVE_BLOCK_DEVICE is only for SPL, but the partition drivers are needed
in U-Boot proper too.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-08-11 19:34:44 -06:00 committed by Tom Rini
parent 1bbfdc575c
commit fc614d2044
7 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
disk/Makefile
View file

@ -9,8 +9,12 @@ obj-$(CONFIG_$(SPL_TPL_)PARTITIONS) += part.o
ifdef CONFIG_$(SPL_TPL_)BLK ifdef CONFIG_$(SPL_TPL_)BLK
obj-$(CONFIG_$(SPL_TPL_)PARTITIONS) += disk-uclass.o obj-$(CONFIG_$(SPL_TPL_)PARTITIONS) += disk-uclass.o
endif endif
# Must have BLK or HAVE_BLOCK_DEVICE to support partitions
ifneq ($(CONFIG_$(SPL_TPL_)BLK),$(CONFIG_HAVE_BLOCK_DEVICE),)
obj-$(CONFIG_$(SPL_TPL_)MAC_PARTITION) += part_mac.o obj-$(CONFIG_$(SPL_TPL_)MAC_PARTITION) += part_mac.o
obj-$(CONFIG_$(SPL_TPL_)DOS_PARTITION) += part_dos.o obj-$(CONFIG_$(SPL_TPL_)DOS_PARTITION) += part_dos.o
obj-$(CONFIG_$(SPL_TPL_)ISO_PARTITION) += part_iso.o obj-$(CONFIG_$(SPL_TPL_)ISO_PARTITION) += part_iso.o
obj-$(CONFIG_$(SPL_TPL_)AMIGA_PARTITION) += part_amiga.o obj-$(CONFIG_$(SPL_TPL_)AMIGA_PARTITION) += part_amiga.o
obj-$(CONFIG_$(SPL_TPL_)EFI_PARTITION) += part_efi.o obj-$(CONFIG_$(SPL_TPL_)EFI_PARTITION) += part_efi.o
endif

4
disk/part_amiga.c
View file

@ -11,8 +11,6 @@
#include "part_amiga.h" #include "part_amiga.h"
#include <part.h> #include <part.h>
#ifdef CONFIG_HAVE_BLOCK_DEVICE
#undef AMIGA_DEBUG #undef AMIGA_DEBUG
#ifdef AMIGA_DEBUG #ifdef AMIGA_DEBUG
@ -387,5 +385,3 @@ U_BOOT_PART_TYPE(amiga) = {
.print = part_print_amiga, .print = part_print_amiga,
.test = part_test_amiga, .test = part_test_amiga,
}; };
#endif

4
disk/part_dos.c
View file

@ -23,8 +23,6 @@
#include "part_dos.h" #include "part_dos.h"
#include <part.h> #include <part.h>
#ifdef CONFIG_HAVE_BLOCK_DEVICE
#define DOS_PART_DEFAULT_SECTOR 512 #define DOS_PART_DEFAULT_SECTOR 512
/* should this be configurable? It looks like it's not very common at all /* should this be configurable? It looks like it's not very common at all
@ -518,5 +516,3 @@ U_BOOT_PART_TYPE(dos) = {
.print = part_print_ptr(part_print_dos), .print = part_print_ptr(part_print_dos),
.test = part_test_dos, .test = part_test_dos,
}; };
#endif

3
disk/part_efi.c
View file

@ -28,8 +28,6 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <u-boot/crc.h> #include <u-boot/crc.h>
#ifdef CONFIG_HAVE_BLOCK_DEVICE
/* GUID for basic data partitons */ /* GUID for basic data partitons */
#if CONFIG_IS_ENABLED(EFI_PARTITION) #if CONFIG_IS_ENABLED(EFI_PARTITION)
static const efi_guid_t partition_basic_data_guid = PARTITION_BASIC_DATA_GUID; static const efi_guid_t partition_basic_data_guid = PARTITION_BASIC_DATA_GUID;
@ -1204,4 +1202,3 @@ U_BOOT_PART_TYPE(a_efi) = {
.print = part_print_ptr(part_print_efi), .print = part_print_ptr(part_print_efi),
.test = part_test_efi, .test = part_test_efi,
}; };
#endif /* CONFIG_HAVE_BLOCK_DEVICE */

3
disk/part_iso.c
View file

@ -12,8 +12,6 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include "part_iso.h" #include "part_iso.h"
#ifdef CONFIG_HAVE_BLOCK_DEVICE
/* #define ISO_PART_DEBUG */ /* #define ISO_PART_DEBUG */
#ifdef ISO_PART_DEBUG #ifdef ISO_PART_DEBUG
@ -241,4 +239,3 @@ U_BOOT_PART_TYPE(iso) = {
.print = part_print_iso, .print = part_print_iso,
.test = part_test_iso, .test = part_test_iso,
}; };
#endif

3
disk/part_mac.c
View file

@ -20,8 +20,6 @@
#include "part_mac.h" #include "part_mac.h"
#include <part.h> #include <part.h>
#ifdef CONFIG_HAVE_BLOCK_DEVICE
/* stdlib.h causes some compatibility problems; should fixe these! -- wd */ /* stdlib.h causes some compatibility problems; should fixe these! -- wd */
#ifndef __ldiv_t_defined #ifndef __ldiv_t_defined
typedef struct { typedef struct {
@ -247,4 +245,3 @@ U_BOOT_PART_TYPE(mac) = {
.print = part_print_mac, .print = part_print_mac,
.test = part_test_mac, .test = part_test_mac,
}; };
#endif

1
drivers/Makefile
View file

@ -60,6 +60,7 @@ 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) += ata/ scsi/ obj-$(CONFIG_SPL_SATA) += ata/ scsi/
obj-$(CONFIG_HAVE_BLOCK_DEVICE) += block/ obj-$(CONFIG_HAVE_BLOCK_DEVICE) += block/
obj-$(CONFIG_SPL_BLK) += block/
obj-$(CONFIG_SPL_THERMAL) += thermal/ obj-$(CONFIG_SPL_THERMAL) += thermal/
endif endif