| Message ID | 20230711223727.3738785-1-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | 4837a1dba6f17f21bbb5f32d6e41707ef76b65f8 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | disk: Use BOOT_DEFAULTS instead of DISTRO_DEFAULTS | expand |
On Tue, 11 Jul 2023 at 16:37, Jonas Karlman <jonas@kwiboo.se> wrote: > > Set default y based on common BOOT_DEFAULTS instead of DISTRO_DEFAULTS. > > No change is intended, affected options is already implied for DISTRO > and BOOTSTD due to BOOT_DEFAULTS imply DOS_PARTITION (USB_STORAGE), > EFI_PARTITION and ISO_PARTITION. > > Fixes: a0c739c184ca ("boot: Create a common BOOT_DEFAULTS for distro and bootstd") > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > --- > disk/Kconfig | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On Tue, Jul 11, 2023 at 10:37:30PM +0000, Jonas Karlman wrote: > Set default y based on common BOOT_DEFAULTS instead of DISTRO_DEFAULTS. > > No change is intended, affected options is already implied for DISTRO > and BOOTSTD due to BOOT_DEFAULTS imply DOS_PARTITION (USB_STORAGE), > EFI_PARTITION and ISO_PARTITION. > > Fixes: a0c739c184ca ("boot: Create a common BOOT_DEFAULTS for distro and bootstd") > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/disk/Kconfig b/disk/Kconfig index 817b7c8c76d5..854969580746 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -51,7 +51,7 @@ config SPL_MAC_PARTITION config DOS_PARTITION bool "Enable MS Dos partition table" - default y if DISTRO_DEFAULTS + default y if BOOT_DEFAULTS default y if x86 || CMD_FAT || USB_STORAGE select PARTITIONS help @@ -67,7 +67,7 @@ config SPL_DOS_PARTITION config ISO_PARTITION bool "Enable ISO partition table" - default y if DISTRO_DEFAULTS + default y if BOOT_DEFAULTS default y if MIPS || ARCH_TEGRA select PARTITIONS @@ -91,7 +91,7 @@ config SPL_AMIGA_PARTITION config EFI_PARTITION bool "Enable EFI GPT partition table" - default y if DISTRO_DEFAULTS + default y if BOOT_DEFAULTS default y if ARCH_TEGRA select PARTITIONS select LIB_UUID @@ -139,7 +139,7 @@ config SPL_EFI_PARTITION config PARTITION_UUIDS bool "Enable support of UUID for partition" depends on PARTITIONS - default y if DISTRO_DEFAULTS + default y if BOOT_DEFAULTS default y if EFI_PARTITION select LIB_UUID help
Set default y based on common BOOT_DEFAULTS instead of DISTRO_DEFAULTS. No change is intended, affected options is already implied for DISTRO and BOOTSTD due to BOOT_DEFAULTS imply DOS_PARTITION (USB_STORAGE), EFI_PARTITION and ISO_PARTITION. Fixes: a0c739c184ca ("boot: Create a common BOOT_DEFAULTS for distro and bootstd") Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- disk/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)