Hello,

I merged this, but I am not shipping a new kernel in the update for aarch64.

I suppose this is not necessary because people who need AHCI won’t be able to boot the previous kernel. They would have to use this image to start.

Best,
-Michael

> On 11 Nov 2020, at 08:11, Arne Fitzenreiter <arne_f(a)ipfire.org> wrote:
> 
> this is needed to boot on ESXi on arm.
> 
> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
> ---
> config/kernel/kernel.config.aarch64-ipfire | 2 +-
> config/rootfiles/common/aarch64/linux      | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
> index 2d4934a09..bc389470b 100644
> --- a/config/kernel/kernel.config.aarch64-ipfire
> +++ b/config/kernel/kernel.config.aarch64-ipfire
> @@ -1819,7 +1819,7 @@ CONFIG_SATA_PMP=y
> #
> # Controllers with non-SFF native interface
> #
> -# CONFIG_SATA_AHCI is not set
> +CONFIG_SATA_AHCI=y
> CONFIG_SATA_AHCI_PLATFORM=m
> CONFIG_AHCI_CEVA=m
> CONFIG_AHCI_MVEBU=m
> diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
> index 6f76519d0..0961daffe 100644
> --- a/config/rootfiles/common/aarch64/linux
> +++ b/config/rootfiles/common/aarch64/linux
> @@ -9617,6 +9617,7 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/include/config/s2io.h
> #lib/modules/KVER-ipfire/build/include/config/sata
> #lib/modules/KVER-ipfire/build/include/config/sata/ahci
> +#lib/modules/KVER-ipfire/build/include/config/sata/ahci.h
> #lib/modules/KVER-ipfire/build/include/config/sata/ahci/platform.h
> #lib/modules/KVER-ipfire/build/include/config/sata/dwc.h
> #lib/modules/KVER-ipfire/build/include/config/sata/mv.h
> @@ -17306,7 +17307,6 @@ lib/modules/KVER-ipfire/kernel
> #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_platform.ko.xz
> #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_qoriq.ko.xz
> #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_sunxi.ko.xz
> -#lib/modules/KVER-ipfire/kernel/drivers/ata/libahci.ko.xz
> #lib/modules/KVER-ipfire/kernel/drivers/ata/libahci_platform.ko.xz
> #lib/modules/KVER-ipfire/kernel/drivers/ata/sata_dwc_460ex.ko.xz
> #lib/modules/KVER-ipfire/kernel/drivers/ata/sata_mv.ko.xz
> -- 
> 2.17.1
>