config updates and fix typo in secureboot patch
This commit is contained in:
parent
c67a8690e4
commit
15597c8e3d
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue