diff options
| -rw-r--r-- | common/Kconfig | 10 | ||||
| -rw-r--r-- | common/Makefile | 4 | ||||
| -rw-r--r-- | common/efi/Kconfig | 16 | ||||
| -rw-r--r-- | common/efi/Makefile | 9 | ||||
| -rw-r--r-- | common/efi/devicepath.c (renamed from common/efi-devicepath.c) | 0 | ||||
| -rw-r--r-- | common/efi/guid.c (renamed from common/efi-guid.c) | 0 | ||||
| -rw-r--r-- | common/efi/payload/Makefile | 6 | ||||
| -rw-r--r-- | common/efi/payload/env-efi/network/eth0-discover (renamed from common/efi/env-efi/network/eth0-discover) | 0 | ||||
| -rw-r--r-- | common/efi/payload/image.c (renamed from common/efi/efi-image.c) | 2 | ||||
| -rw-r--r-- | common/efi/payload/init.c (renamed from common/efi/efi.c) | 2 | ||||
| -rw-r--r-- | common/efi/payload/iomem.c (renamed from common/efi/efi-iomem.c) | 0 | ||||
| -rw-r--r-- | drivers/efi/Kconfig | 1 |
12 files changed, 33 insertions, 17 deletions
diff --git a/common/Kconfig b/common/Kconfig index f4120b2083..42240ae841 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -78,14 +78,6 @@ config MENUTREE select GLOB select GLOB_SORT -config EFI_GUID - bool - help - With this option a table of EFI guids is compiled in. - -config EFI_DEVICEPATH - bool - config ARCH_DMA_ADDR_T_64BIT bool @@ -1538,6 +1530,8 @@ config COMPILE_TEST endmenu +source "common/efi/Kconfig" + config HAS_DEBUG_LL bool diff --git a/common/Makefile b/common/Makefile index 4b45f678c7..9ed279806a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -63,9 +63,7 @@ obj-$(CONFIG_BOOTCHOOSER) += bootchooser.o obj-$(CONFIG_UIMAGE) += image.o uimage.o obj-$(CONFIG_FITIMAGE) += image-fit.o obj-$(CONFIG_MENUTREE) += menutree.o -obj-$(CONFIG_EFI_BOOTUP) += efi/ -obj-$(CONFIG_EFI_GUID) += efi-guid.o -obj-$(CONFIG_EFI_DEVICEPATH) += efi-devicepath.o +obj-$(CONFIG_EFI) += efi/ lwl-$(CONFIG_IMD) += imd-barebox.o obj-$(CONFIG_IMD) += imd.o obj-y += file-list.o diff --git a/common/efi/Kconfig b/common/efi/Kconfig new file mode 100644 index 0000000000..a0565854c2 --- /dev/null +++ b/common/efi/Kconfig @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0 + +menu "EFI (Extensible Firmware Interface) Support" + +config EFI + bool + +config EFI_GUID + bool + help + With this option a table of EFI guids is compiled in. + +config EFI_DEVICEPATH + bool + +endmenu diff --git a/common/efi/Makefile b/common/efi/Makefile index d746fabe21..1ed5d45c1f 100644 --- a/common/efi/Makefile +++ b/common/efi/Makefile @@ -1,4 +1,5 @@ -obj-y += efi.o -obj-y += efi-image.o -bbenv-y += env-efi -obj-$(CONFIG_CMD_IOMEM) += efi-iomem.o +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_EFI_BOOTUP) += payload/ +obj-$(CONFIG_EFI_GUID) += guid.o +obj-$(CONFIG_EFI_DEVICEPATH) += devicepath.o diff --git a/common/efi-devicepath.c b/common/efi/devicepath.c index f17b9294cc..f17b9294cc 100644 --- a/common/efi-devicepath.c +++ b/common/efi/devicepath.c diff --git a/common/efi-guid.c b/common/efi/guid.c index fbe96ecd04..fbe96ecd04 100644 --- a/common/efi-guid.c +++ b/common/efi/guid.c diff --git a/common/efi/payload/Makefile b/common/efi/payload/Makefile new file mode 100644 index 0000000000..bcbdda335f --- /dev/null +++ b/common/efi/payload/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-y += init.o +obj-y += image.o +bbenv-y += env-efi +obj-$(CONFIG_CMD_IOMEM) += iomem.o diff --git a/common/efi/env-efi/network/eth0-discover b/common/efi/payload/env-efi/network/eth0-discover index 62c31a553c..62c31a553c 100644 --- a/common/efi/env-efi/network/eth0-discover +++ b/common/efi/payload/env-efi/network/eth0-discover diff --git a/common/efi/efi-image.c b/common/efi/payload/image.c index bd1c58438e..3c55a457ea 100644 --- a/common/efi/efi-image.c +++ b/common/efi/payload/image.c @@ -1,5 +1,5 @@ /* - * efi-image.c - barebox EFI payload support + * image.c - barebox EFI payload support * * Copyright (c) 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/common/efi/efi.c b/common/efi/payload/init.c index 7f12342cf9..88d0bfa939 100644 --- a/common/efi/efi.c +++ b/common/efi/payload/init.c @@ -1,5 +1,5 @@ /* - * efi.c - barebox EFI payload support + * init.c - barebox EFI payload support * * Copyright (c) 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/common/efi/efi-iomem.c b/common/efi/payload/iomem.c index 4d34328a58..4d34328a58 100644 --- a/common/efi/efi-iomem.c +++ b/common/efi/payload/iomem.c diff --git a/drivers/efi/Kconfig b/drivers/efi/Kconfig index dd3ac7525f..e8abc2709e 100644 --- a/drivers/efi/Kconfig +++ b/drivers/efi/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config EFI_BOOTUP bool + select EFI select BLOCK select PARTITION_DISK select HW_HAS_PCI |