config updates and fix typo in secureboot patch

This commit is contained in:
Justin M. Forbes 2018-06-11 08:50:40 -05:00
parent c67a8690e4
commit 15597c8e3d
13 changed files with 7 additions and 13 deletions

View File

@ -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
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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