* [PATCH] ACPI: Kconfig: Fix table override from built-in initrd
@ 2021-07-17 3:18 Rui Wang
2021-07-19 12:11 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Rui Wang @ 2021-07-17 3:18 UTC (permalink / raw)
To: linux-acpi
Cc: Rui Wang, Rafael J . Wysocki, Len Brown, Shunyong Yang, linux-kernel
The commit 65e00e04e5aea ("initramfs: refactor the initramfs build rules")
had dropped the CONFIG_INITRAMFS_COMPRESSION.
This patch updates INITRAMFS_COMPRESSION="" to INITRAMFS_COMPRESSION_NONE.
CC: Rafael J. Wysocki <rjw@rjwysocki.net>
CC: Len Brown <lenb@kernel.org>
CC: Shunyong Yang <shunyong.yang@hxt-semitech.com>
CC: linux-acpi@vger.kernel.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: Rui Wang <wangrui@loongson.cn>
---
drivers/acpi/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 9d872ea477a6..8f9940f40baa 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -370,7 +370,7 @@ config ACPI_TABLE_UPGRADE
config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
bool "Override ACPI tables from built-in initrd"
depends on ACPI_TABLE_UPGRADE
- depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION=""
+ depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION_NONE
help
This option provides functionality to override arbitrary ACPI tables
from built-in uncompressed initrd.
--
2.32.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ACPI: Kconfig: Fix table override from built-in initrd
2021-07-17 3:18 [PATCH] ACPI: Kconfig: Fix table override from built-in initrd Rui Wang
@ 2021-07-19 12:11 ` Rafael J. Wysocki
0 siblings, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2021-07-19 12:11 UTC (permalink / raw)
To: Rui Wang
Cc: ACPI Devel Maling List, Rafael J . Wysocki, Len Brown,
Shunyong Yang, Linux Kernel Mailing List
On Sat, Jul 17, 2021 at 5:18 AM Rui Wang <wangrui@loongson.cn> wrote:
>
> The commit 65e00e04e5aea ("initramfs: refactor the initramfs build rules")
> had dropped the CONFIG_INITRAMFS_COMPRESSION.
>
> This patch updates INITRAMFS_COMPRESSION="" to INITRAMFS_COMPRESSION_NONE.
>
> CC: Rafael J. Wysocki <rjw@rjwysocki.net>
> CC: Len Brown <lenb@kernel.org>
> CC: Shunyong Yang <shunyong.yang@hxt-semitech.com>
> CC: linux-acpi@vger.kernel.org
> CC: linux-kernel@vger.kernel.org
> Signed-off-by: Rui Wang <wangrui@loongson.cn>
I've already applied an alternative patch making the same change:
https://patchwork.kernel.org/project/linux-acpi/patch/ad9c50c54887bde41ae5de782248231c06a527c0.1626262835.git.rrichter@amd.com/
> ---
> drivers/acpi/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> index 9d872ea477a6..8f9940f40baa 100644
> --- a/drivers/acpi/Kconfig
> +++ b/drivers/acpi/Kconfig
> @@ -370,7 +370,7 @@ config ACPI_TABLE_UPGRADE
> config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
> bool "Override ACPI tables from built-in initrd"
> depends on ACPI_TABLE_UPGRADE
> - depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION=""
> + depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION_NONE
> help
> This option provides functionality to override arbitrary ACPI tables
> from built-in uncompressed initrd.
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ACPI: Kconfig: Fix table override from built-in initrd
2021-07-15 9:26 Robert Richter
@ 2021-07-16 17:29 ` Rafael J. Wysocki
0 siblings, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2021-07-16 17:29 UTC (permalink / raw)
To: Robert Richter
Cc: Rafael J. Wysocki, Len Brown, Masahiro Yamada,
ACPI Devel Maling List, Linux Kernel Mailing List
On Thu, Jul 15, 2021 at 11:26 AM Robert Richter <rrichter@amd.com> wrote:
>
> During a rework of initramfs code the INITRAMFS_COMPRESSION config
> option was removed in commit 65e00e04e5ae. A leftover as a dependency
> broke the config option ACPI_TABLE_OVERRIDE_VIA_ BUILTIN_INITRD that
> is used to enable the overriding of ACPI tables from built-in initrd.
> Fixing the dependency.
>
> Fixes: 65e00e04e5ae ("initramfs: refactor the initramfs build rules")
> Signed-off-by: Robert Richter <rrichter@amd.com>
> ---
> drivers/acpi/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> index 9d872ea477a6..8f9940f40baa 100644
> --- a/drivers/acpi/Kconfig
> +++ b/drivers/acpi/Kconfig
> @@ -370,7 +370,7 @@ config ACPI_TABLE_UPGRADE
> config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
> bool "Override ACPI tables from built-in initrd"
> depends on ACPI_TABLE_UPGRADE
> - depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION=""
> + depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION_NONE
> help
> This option provides functionality to override arbitrary ACPI tables
> from built-in uncompressed initrd.
> --
Applied as 5.14-rc material, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ACPI: Kconfig: Fix table override from built-in initrd
@ 2021-07-15 9:26 Robert Richter
2021-07-16 17:29 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Robert Richter @ 2021-07-15 9:26 UTC (permalink / raw)
To: Rafael J. Wysocki, Len Brown, Masahiro Yamada
Cc: Robert Richter, linux-acpi, linux-kernel
During a rework of initramfs code the INITRAMFS_COMPRESSION config
option was removed in commit 65e00e04e5ae. A leftover as a dependency
broke the config option ACPI_TABLE_OVERRIDE_VIA_ BUILTIN_INITRD that
is used to enable the overriding of ACPI tables from built-in initrd.
Fixing the dependency.
Fixes: 65e00e04e5ae ("initramfs: refactor the initramfs build rules")
Signed-off-by: Robert Richter <rrichter@amd.com>
---
drivers/acpi/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 9d872ea477a6..8f9940f40baa 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -370,7 +370,7 @@ config ACPI_TABLE_UPGRADE
config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
bool "Override ACPI tables from built-in initrd"
depends on ACPI_TABLE_UPGRADE
- depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION=""
+ depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION_NONE
help
This option provides functionality to override arbitrary ACPI tables
from built-in uncompressed initrd.
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-19 12:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-17 3:18 [PATCH] ACPI: Kconfig: Fix table override from built-in initrd Rui Wang
2021-07-19 12:11 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2021-07-15 9:26 Robert Richter
2021-07-16 17:29 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).