From 15597c8e3d1bfb46f4730898ee81da3e2aa88a4c Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 11 Jun 2018 08:50:40 -0500 Subject: config updates and fix typo in secureboot patch --- efi-secureboot.patch | 2 +- kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-ppc64-debug.config | 2 +- kernel-ppc64.config | 2 +- kernel-ppc64le-debug.config | 2 +- kernel-ppc64le.config | 2 +- kernel-s390x-debug.config | 2 +- kernel-s390x.config | 2 +- 13 files changed, 7 insertions(+), 13 deletions(-) diff --git a/efi-secureboot.patch b/efi-secureboot.patch index 478938b41..c57037623 100644 --- a/efi-secureboot.patch +++ b/efi-secureboot.patch @@ -302,7 +302,7 @@ index 2c6b00f0c229..527f7e51dc8d 100644 #endif +#ifdef CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT + if (efi_enabled(EFI_SECURE_BOOT)) -+ ock_kernel_down("EFI secure boot"); ++ lock_kernel_down("EFI secure boot"); +#endif } diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 3fd70ca24..79872f45a 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -918,7 +918,6 @@ CONFIG_CLEANCACHE=y CONFIG_CLKDEV_LOOKUP=y # CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set -CONFIG_CLK_RASPBERRYPI_CPU=y CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y CONFIG_CLK_VEXPRESS_OSC=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index dd0ff6467..b635706df 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -918,7 +918,6 @@ CONFIG_CLEANCACHE=y CONFIG_CLKDEV_LOOKUP=y # CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set -CONFIG_CLK_RASPBERRYPI_CPU=y CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y CONFIG_CLK_VEXPRESS_OSC=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 61c6171b2..ab8a752bf 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -958,7 +958,6 @@ CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y # CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set -CONFIG_CLK_RASPBERRYPI_CPU=y CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y CONFIG_CLK_TWL6040=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 8cf12a5a6..171bce527 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -929,7 +929,6 @@ CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y # CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set -CONFIG_CLK_RASPBERRYPI_CPU=y CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y CONFIG_CLK_VEXPRESS_OSC=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 40507ccba..652cebfb8 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -928,7 +928,6 @@ CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y # CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set -CONFIG_CLK_RASPBERRYPI_CPU=y CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y CONFIG_CLK_VEXPRESS_OSC=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 5418f671f..5aa160c69 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -957,7 +957,6 @@ CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y # CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set -CONFIG_CLK_RASPBERRYPI_CPU=y CONFIG_CLK_SP810=y CONFIG_CLKSRC_VERSATILE=y CONFIG_CLK_TWL6040=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 578e5f307..5cd21e3f7 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2512,7 +2512,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_XZ is not set -# CONFIG_KEXEC_FILE is not set +CONFIG_KEXEC_FILE=y CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 166b1a8e0..f6a5b6534 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2489,7 +2489,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_XZ is not set -# CONFIG_KEXEC_FILE is not set +CONFIG_KEXEC_FILE=y CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index d42a27fb0..62704bae6 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2457,7 +2457,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_XZ is not set -# CONFIG_KEXEC_FILE is not set +CONFIG_KEXEC_FILE=y CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index ad292d36d..bd76e6841 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2434,7 +2434,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_XZ is not set -# CONFIG_KEXEC_FILE is not set +CONFIG_KEXEC_FILE=y CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index c64fd0b1b..d1a88d206 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2410,7 +2410,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZO is not set CONFIG_KERNEL_NOBP=y # CONFIG_KERNEL_XZ is not set -# CONFIG_KEXEC_FILE is not set +CONFIG_KEXEC_FILE=y CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 03ce5ef41..d0fd59a6d 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2387,7 +2387,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZO is not set CONFIG_KERNEL_NOBP=y # CONFIG_KERNEL_XZ is not set -# CONFIG_KEXEC_FILE is not set +CONFIG_KEXEC_FILE=y CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set -- cgit