diff options
author | Tony Lindgren <tony@atomide.com> | 2013-06-07 12:12:25 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-06-07 12:12:25 -0400 |
commit | bea6412a994a8f49d81bc103907563ab9f94c371 (patch) | |
tree | 93afcafccce0f149d4221ec4bb6156dcdafdb0e5 /arch | |
parent | 82c5cde1c4b01a62c9a19c9118b4b434c333ce86 (diff) | |
parent | 49006bfd31f728a0dfdef6ef41635f0e6c546155 (diff) |
Merge branch 'am33xx' into omap-for-v3.11/cleanup
Diffstat (limited to 'arch')
72 files changed, 2566 insertions, 1962 deletions
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 98dfc3ea5c0b..0673524238a6 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -497,6 +497,21 @@ | |||
497 | clock-names = "usbhost"; | 497 | clock-names = "usbhost"; |
498 | }; | 498 | }; |
499 | 499 | ||
500 | usbphy@12130000 { | ||
501 | compatible = "samsung,exynos5250-usb2phy"; | ||
502 | reg = <0x12130000 0x100>; | ||
503 | clocks = <&clock 1>, <&clock 285>; | ||
504 | clock-names = "ext_xtal", "usbhost"; | ||
505 | #address-cells = <1>; | ||
506 | #size-cells = <1>; | ||
507 | ranges; | ||
508 | |||
509 | usbphy-sys { | ||
510 | reg = <0x10040704 0x8>, | ||
511 | <0x10050230 0x4>; | ||
512 | }; | ||
513 | }; | ||
514 | |||
500 | amba { | 515 | amba { |
501 | #address-cells = <1>; | 516 | #address-cells = <1>; |
502 | #size-cells = <1>; | 517 | #size-cells = <1>; |
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index e40b435d204e..227abf9cc601 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig | |||
@@ -1,4 +1,4 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | 1 | CONFIG_SYSVIPC=y |
2 | CONFIG_NO_HZ=y | 2 | CONFIG_NO_HZ=y |
3 | CONFIG_HIGH_RES_TIMERS=y | 3 | CONFIG_HIGH_RES_TIMERS=y |
4 | CONFIG_BLK_DEV_INITRD=y | 4 | CONFIG_BLK_DEV_INITRD=y |
@@ -7,17 +7,18 @@ CONFIG_MODULES=y | |||
7 | CONFIG_MODULE_UNLOAD=y | 7 | CONFIG_MODULE_UNLOAD=y |
8 | # CONFIG_BLK_DEV_BSG is not set | 8 | # CONFIG_BLK_DEV_BSG is not set |
9 | CONFIG_PARTITION_ADVANCED=y | 9 | CONFIG_PARTITION_ADVANCED=y |
10 | CONFIG_EFI_PARTITION=y | ||
11 | CONFIG_ARCH_EXYNOS=y | 10 | CONFIG_ARCH_EXYNOS=y |
12 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 | 11 | CONFIG_S3C_LOWLEVEL_UART_PORT=3 |
13 | CONFIG_S3C24XX_PWM=y | 12 | CONFIG_S3C24XX_PWM=y |
14 | CONFIG_ARCH_EXYNOS5=y | 13 | CONFIG_ARCH_EXYNOS5=y |
15 | CONFIG_MACH_EXYNOS4_DT=y | 14 | CONFIG_MACH_EXYNOS4_DT=y |
16 | CONFIG_MACH_EXYNOS5_DT=y | ||
17 | CONFIG_SMP=y | 15 | CONFIG_SMP=y |
18 | CONFIG_NR_CPUS=2 | 16 | CONFIG_NR_CPUS=2 |
19 | CONFIG_PREEMPT=y | 17 | CONFIG_PREEMPT=y |
20 | CONFIG_AEABI=y | 18 | CONFIG_AEABI=y |
19 | CONFIG_HIGHMEM=y | ||
20 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
21 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
21 | CONFIG_ARM_APPENDED_DTB=y | 22 | CONFIG_ARM_APPENDED_DTB=y |
22 | CONFIG_ARM_ATAG_DTB_COMPAT=y | 23 | CONFIG_ARM_ATAG_DTB_COMPAT=y |
23 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" | 24 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" |
@@ -30,35 +31,58 @@ CONFIG_NET_KEY=y | |||
30 | CONFIG_INET=y | 31 | CONFIG_INET=y |
31 | CONFIG_RFKILL_REGULATOR=y | 32 | CONFIG_RFKILL_REGULATOR=y |
32 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 33 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
34 | CONFIG_DEVTMPFS=y | ||
35 | CONFIG_DEVTMPFS_MOUNT=y | ||
33 | CONFIG_PROC_DEVICETREE=y | 36 | CONFIG_PROC_DEVICETREE=y |
34 | CONFIG_BLK_DEV_LOOP=y | 37 | CONFIG_BLK_DEV_LOOP=y |
38 | CONFIG_BLK_DEV_CRYPTOLOOP=y | ||
35 | CONFIG_BLK_DEV_RAM=y | 39 | CONFIG_BLK_DEV_RAM=y |
36 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 40 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
37 | CONFIG_SCSI=y | 41 | CONFIG_SCSI=y |
38 | CONFIG_BLK_DEV_SD=y | 42 | CONFIG_BLK_DEV_SD=y |
39 | CONFIG_CHR_DEV_SG=y | 43 | CONFIG_CHR_DEV_SG=y |
44 | CONFIG_MD=y | ||
45 | CONFIG_BLK_DEV_DM=y | ||
46 | CONFIG_DM_CRYPT=m | ||
40 | CONFIG_NETDEVICES=y | 47 | CONFIG_NETDEVICES=y |
41 | CONFIG_SMSC911X=y | 48 | CONFIG_SMSC911X=y |
42 | CONFIG_USB_USBNET=y | 49 | CONFIG_USB_USBNET=y |
43 | CONFIG_USB_NET_SMSC75XX=y | 50 | CONFIG_USB_NET_SMSC75XX=y |
44 | CONFIG_USB_NET_SMSC95XX=y | 51 | CONFIG_USB_NET_SMSC95XX=y |
45 | CONFIG_INPUT_EVDEV=y | 52 | CONFIG_INPUT_EVDEV=y |
46 | # CONFIG_INPUT_KEYBOARD is not set | 53 | CONFIG_KEYBOARD_CROS_EC=y |
47 | # CONFIG_INPUT_MOUSE is not set | 54 | # CONFIG_MOUSE_PS2 is not set |
55 | CONFIG_MOUSE_CYAPA=y | ||
48 | CONFIG_INPUT_TOUCHSCREEN=y | 56 | CONFIG_INPUT_TOUCHSCREEN=y |
49 | CONFIG_SERIAL_8250=y | 57 | CONFIG_SERIAL_8250=y |
50 | CONFIG_SERIAL_SAMSUNG=y | 58 | CONFIG_SERIAL_SAMSUNG=y |
51 | CONFIG_SERIAL_SAMSUNG_CONSOLE=y | 59 | CONFIG_SERIAL_SAMSUNG_CONSOLE=y |
52 | CONFIG_SERIAL_OF_PLATFORM=y | 60 | CONFIG_SERIAL_OF_PLATFORM=y |
53 | CONFIG_HW_RANDOM=y | 61 | CONFIG_HW_RANDOM=y |
62 | CONFIG_TCG_TPM=y | ||
63 | CONFIG_TCG_TIS_I2C_INFINEON=y | ||
54 | CONFIG_I2C=y | 64 | CONFIG_I2C=y |
65 | CONFIG_I2C_MUX=y | ||
66 | CONFIG_I2C_ARB_GPIO_CHALLENGE=y | ||
67 | CONFIG_I2C_S3C2410=y | ||
68 | CONFIG_DEBUG_GPIO=y | ||
55 | # CONFIG_HWMON is not set | 69 | # CONFIG_HWMON is not set |
70 | CONFIG_MFD_CROS_EC=y | ||
71 | CONFIG_MFD_CROS_EC_I2C=y | ||
72 | CONFIG_MFD_MAX77686=y | ||
73 | CONFIG_MFD_MAX8997=y | ||
74 | CONFIG_MFD_SEC_CORE=y | ||
56 | CONFIG_MFD_TPS65090=y | 75 | CONFIG_MFD_TPS65090=y |
57 | CONFIG_REGULATOR=y | 76 | CONFIG_REGULATOR=y |
58 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 77 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
59 | CONFIG_REGULATOR_GPIO=y | 78 | CONFIG_REGULATOR_GPIO=y |
79 | CONFIG_REGULATOR_MAX8997=y | ||
80 | CONFIG_REGULATOR_MAX77686=y | ||
81 | CONFIG_REGULATOR_S5M8767=y | ||
60 | CONFIG_REGULATOR_TPS65090=y | 82 | CONFIG_REGULATOR_TPS65090=y |
61 | CONFIG_FB=y | 83 | CONFIG_FB=y |
84 | CONFIG_FB_MODE_HELPERS=y | ||
85 | CONFIG_FB_SIMPLE=y | ||
62 | CONFIG_EXYNOS_VIDEO=y | 86 | CONFIG_EXYNOS_VIDEO=y |
63 | CONFIG_EXYNOS_MIPI_DSI=y | 87 | CONFIG_EXYNOS_MIPI_DSI=y |
64 | CONFIG_EXYNOS_DP=y | 88 | CONFIG_EXYNOS_DP=y |
@@ -67,6 +91,20 @@ CONFIG_FONTS=y | |||
67 | CONFIG_FONT_7x14=y | 91 | CONFIG_FONT_7x14=y |
68 | CONFIG_LOGO=y | 92 | CONFIG_LOGO=y |
69 | CONFIG_USB=y | 93 | CONFIG_USB=y |
94 | CONFIG_USB_EHCI_HCD=y | ||
95 | CONFIG_USB_EHCI_S5P=y | ||
96 | CONFIG_USB_STORAGE=y | ||
97 | CONFIG_USB_DWC3=y | ||
98 | CONFIG_USB_PHY=y | ||
99 | CONFIG_SAMSUNG_USB2PHY=y | ||
100 | CONFIG_SAMSUNG_USB3PHY=y | ||
101 | CONFIG_MMC=y | ||
102 | CONFIG_MMC_SDHCI=y | ||
103 | CONFIG_MMC_SDHCI_S3C=y | ||
104 | CONFIG_MMC_DW=y | ||
105 | CONFIG_MMC_DW_IDMAC=y | ||
106 | CONFIG_MMC_DW_EXYNOS=y | ||
107 | CONFIG_COMMON_CLK_MAX77686=y | ||
70 | CONFIG_EXT2_FS=y | 108 | CONFIG_EXT2_FS=y |
71 | CONFIG_EXT3_FS=y | 109 | CONFIG_EXT3_FS=y |
72 | CONFIG_EXT4_FS=y | 110 | CONFIG_EXT4_FS=y |
@@ -79,6 +117,7 @@ CONFIG_ROMFS_FS=y | |||
79 | CONFIG_NLS_CODEPAGE_437=y | 117 | CONFIG_NLS_CODEPAGE_437=y |
80 | CONFIG_NLS_ASCII=y | 118 | CONFIG_NLS_ASCII=y |
81 | CONFIG_NLS_ISO8859_1=y | 119 | CONFIG_NLS_ISO8859_1=y |
120 | CONFIG_PRINTK_TIME=y | ||
82 | CONFIG_MAGIC_SYSRQ=y | 121 | CONFIG_MAGIC_SYSRQ=y |
83 | CONFIG_DEBUG_KERNEL=y | 122 | CONFIG_DEBUG_KERNEL=y |
84 | CONFIG_DETECT_HUNG_TASK=y | 123 | CONFIG_DETECT_HUNG_TASK=y |
@@ -87,6 +126,5 @@ CONFIG_DEBUG_SPINLOCK=y | |||
87 | CONFIG_DEBUG_MUTEXES=y | 126 | CONFIG_DEBUG_MUTEXES=y |
88 | CONFIG_DEBUG_INFO=y | 127 | CONFIG_DEBUG_INFO=y |
89 | CONFIG_DEBUG_USER=y | 128 | CONFIG_DEBUG_USER=y |
90 | CONFIG_DEBUG_LL=y | 129 | CONFIG_CRYPTO_SHA256=y |
91 | CONFIG_EARLY_PRINTK=y | ||
92 | CONFIG_CRC_CCITT=y | 130 | CONFIG_CRC_CCITT=y |
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index d19edff0ea6e..ff18fc2ea46f 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -250,6 +250,7 @@ config MACH_ARMLEX4210 | |||
250 | config MACH_UNIVERSAL_C210 | 250 | config MACH_UNIVERSAL_C210 |
251 | bool "Mobile UNIVERSAL_C210 Board" | 251 | bool "Mobile UNIVERSAL_C210 Board" |
252 | select CLKSRC_MMIO | 252 | select CLKSRC_MMIO |
253 | select CLKSRC_SAMSUNG_PWM | ||
253 | select CPU_EXYNOS4210 | 254 | select CPU_EXYNOS4210 |
254 | select EXYNOS4_SETUP_FIMC | 255 | select EXYNOS4_SETUP_FIMC |
255 | select EXYNOS4_SETUP_FIMD0 | 256 | select EXYNOS4_SETUP_FIMD0 |
@@ -281,7 +282,6 @@ config MACH_UNIVERSAL_C210 | |||
281 | select S5P_DEV_TV | 282 | select S5P_DEV_TV |
282 | select S5P_GPIO_INT | 283 | select S5P_GPIO_INT |
283 | select S5P_SETUP_MIPIPHY | 284 | select S5P_SETUP_MIPIPHY |
284 | select SAMSUNG_HRT | ||
285 | help | 285 | help |
286 | Machine support for Samsung Mobile Universal S5PC210 Reference | 286 | Machine support for Samsung Mobile Universal S5PC210 Reference |
287 | Board. | 287 | Board. |
@@ -410,6 +410,7 @@ config MACH_EXYNOS4_DT | |||
410 | depends on ARCH_EXYNOS4 | 410 | depends on ARCH_EXYNOS4 |
411 | select ARM_AMBA | 411 | select ARM_AMBA |
412 | select CLKSRC_OF | 412 | select CLKSRC_OF |
413 | select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 | ||
413 | select CPU_EXYNOS4210 | 414 | select CPU_EXYNOS4210 |
414 | select KEYBOARD_SAMSUNG if INPUT_KEYBOARD | 415 | select KEYBOARD_SAMSUNG if INPUT_KEYBOARD |
415 | select PINCTRL | 416 | select PINCTRL |
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 745e304ad0de..027c9e7f0d13 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
@@ -10,12 +10,14 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/bitops.h> | ||
13 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
14 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
15 | #include <linux/irqchip.h> | 16 | #include <linux/irqchip.h> |
16 | #include <linux/io.h> | 17 | #include <linux/io.h> |
17 | #include <linux/device.h> | 18 | #include <linux/device.h> |
18 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
20 | #include <clocksource/samsung_pwm.h> | ||
19 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
20 | #include <linux/serial_core.h> | 22 | #include <linux/serial_core.h> |
21 | #include <linux/of.h> | 23 | #include <linux/of.h> |
@@ -302,6 +304,13 @@ static struct map_desc exynos5440_iodesc0[] __initdata = { | |||
302 | }, | 304 | }, |
303 | }; | 305 | }; |
304 | 306 | ||
307 | static struct samsung_pwm_variant exynos4_pwm_variant = { | ||
308 | .bits = 32, | ||
309 | .div_base = 0, | ||
310 | .has_tint_cstat = true, | ||
311 | .tclk_mask = 0, | ||
312 | }; | ||
313 | |||
305 | void exynos4_restart(char mode, const char *cmd) | 314 | void exynos4_restart(char mode, const char *cmd) |
306 | { | 315 | { |
307 | __raw_writel(0x1, S5P_SWRESET); | 316 | __raw_writel(0x1, S5P_SWRESET); |
@@ -317,9 +326,16 @@ void exynos5_restart(char mode, const char *cmd) | |||
317 | val = 0x1; | 326 | val = 0x1; |
318 | addr = EXYNOS_SWRESET; | 327 | addr = EXYNOS_SWRESET; |
319 | } else if (of_machine_is_compatible("samsung,exynos5440")) { | 328 | } else if (of_machine_is_compatible("samsung,exynos5440")) { |
329 | u32 status; | ||
320 | np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock"); | 330 | np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock"); |
331 | |||
332 | addr = of_iomap(np, 0) + 0xbc; | ||
333 | status = __raw_readl(addr); | ||
334 | |||
321 | addr = of_iomap(np, 0) + 0xcc; | 335 | addr = of_iomap(np, 0) + 0xcc; |
322 | val = (0xfff << 20) | (0x1 << 16); | 336 | val = __raw_readl(addr); |
337 | |||
338 | val = (val & 0xffff0000) | (status & 0xffff); | ||
323 | } else { | 339 | } else { |
324 | pr_err("%s: cannot support non-DT\n", __func__); | 340 | pr_err("%s: cannot support non-DT\n", __func__); |
325 | return; | 341 | return; |
@@ -442,8 +458,20 @@ static void __init exynos5440_map_io(void) | |||
442 | iotable_init(exynos5440_iodesc0, ARRAY_SIZE(exynos5440_iodesc0)); | 458 | iotable_init(exynos5440_iodesc0, ARRAY_SIZE(exynos5440_iodesc0)); |
443 | } | 459 | } |
444 | 460 | ||
461 | void __init exynos_set_timer_source(u8 channels) | ||
462 | { | ||
463 | exynos4_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1; | ||
464 | exynos4_pwm_variant.output_mask &= ~channels; | ||
465 | } | ||
466 | |||
445 | void __init exynos_init_time(void) | 467 | void __init exynos_init_time(void) |
446 | { | 468 | { |
469 | unsigned int timer_irqs[SAMSUNG_PWM_NUM] = { | ||
470 | EXYNOS4_IRQ_TIMER0_VIC, EXYNOS4_IRQ_TIMER1_VIC, | ||
471 | EXYNOS4_IRQ_TIMER2_VIC, EXYNOS4_IRQ_TIMER3_VIC, | ||
472 | EXYNOS4_IRQ_TIMER4_VIC, | ||
473 | }; | ||
474 | |||
447 | if (of_have_populated_dt()) { | 475 | if (of_have_populated_dt()) { |
448 | #ifdef CONFIG_OF | 476 | #ifdef CONFIG_OF |
449 | of_clk_init(NULL); | 477 | of_clk_init(NULL); |
@@ -455,7 +483,14 @@ void __init exynos_init_time(void) | |||
455 | exynos4_clk_init(NULL, !soc_is_exynos4210(), S5P_VA_CMU, readl(S5P_VA_CHIPID + 8) & 1); | 483 | exynos4_clk_init(NULL, !soc_is_exynos4210(), S5P_VA_CMU, readl(S5P_VA_CHIPID + 8) & 1); |
456 | exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f); | 484 | exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f); |
457 | #endif | 485 | #endif |
458 | mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0, EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1); | 486 | #ifdef CONFIG_CLKSRC_SAMSUNG_PWM |
487 | if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_0) | ||
488 | samsung_pwm_clocksource_init(S3C_VA_TIMER, | ||
489 | timer_irqs, &exynos4_pwm_variant); | ||
490 | else | ||
491 | #endif | ||
492 | mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0, | ||
493 | EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1); | ||
459 | } | 494 | } |
460 | } | 495 | } |
461 | 496 | ||
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 60dd35cc01a6..11fc1e29819b 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h | |||
@@ -32,6 +32,8 @@ void exynos4_clk_register_fixed_ext(unsigned long, unsigned long); | |||
32 | 32 | ||
33 | void exynos_firmware_init(void); | 33 | void exynos_firmware_init(void); |
34 | 34 | ||
35 | void exynos_set_timer_source(u8 channels); | ||
36 | |||
35 | #ifdef CONFIG_PM_GENERIC_DOMAINS | 37 | #ifdef CONFIG_PM_GENERIC_DOMAINS |
36 | int exynos_pm_late_initcall(void); | 38 | int exynos_pm_late_initcall(void); |
37 | #else | 39 | #else |
diff --git a/arch/arm/mach-exynos/include/mach/pm-core.h b/arch/arm/mach-exynos/include/mach/pm-core.h index 7dbbfec13ea5..296090e7f423 100644 --- a/arch/arm/mach-exynos/include/mach/pm-core.h +++ b/arch/arm/mach-exynos/include/mach/pm-core.h | |||
@@ -18,8 +18,15 @@ | |||
18 | #ifndef __ASM_ARCH_PM_CORE_H | 18 | #ifndef __ASM_ARCH_PM_CORE_H |
19 | #define __ASM_ARCH_PM_CORE_H __FILE__ | 19 | #define __ASM_ARCH_PM_CORE_H __FILE__ |
20 | 20 | ||
21 | #include <linux/of.h> | ||
21 | #include <mach/regs-pmu.h> | 22 | #include <mach/regs-pmu.h> |
22 | 23 | ||
24 | #ifdef CONFIG_PINCTRL_EXYNOS | ||
25 | extern u32 exynos_get_eint_wake_mask(void); | ||
26 | #else | ||
27 | static inline u32 exynos_get_eint_wake_mask(void) { return 0xffffffff; } | ||
28 | #endif | ||
29 | |||
23 | static inline void s3c_pm_debug_init_uart(void) | 30 | static inline void s3c_pm_debug_init_uart(void) |
24 | { | 31 | { |
25 | /* nothing here yet */ | 32 | /* nothing here yet */ |
@@ -27,7 +34,12 @@ static inline void s3c_pm_debug_init_uart(void) | |||
27 | 34 | ||
28 | static inline void s3c_pm_arch_prepare_irqs(void) | 35 | static inline void s3c_pm_arch_prepare_irqs(void) |
29 | { | 36 | { |
30 | __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK); | 37 | u32 eintmask = s3c_irqwake_eintmask; |
38 | |||
39 | if (of_have_populated_dt()) | ||
40 | eintmask = exynos_get_eint_wake_mask(); | ||
41 | |||
42 | __raw_writel(eintmask, S5P_EINT_WAKEUP_MASK); | ||
31 | __raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); | 43 | __raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); |
32 | } | 44 | } |
33 | 45 | ||
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 327d50d4681d..74ddb2b55614 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <plat/mfc.h> | 41 | #include <plat/mfc.h> |
42 | #include <plat/sdhci.h> | 42 | #include <plat/sdhci.h> |
43 | #include <plat/fimc-core.h> | 43 | #include <plat/fimc-core.h> |
44 | #include <plat/samsung-time.h> | ||
45 | #include <plat/camport.h> | 44 | #include <plat/camport.h> |
46 | 45 | ||
47 | #include <mach/map.h> | 46 | #include <mach/map.h> |
@@ -1094,7 +1093,7 @@ static void __init universal_map_io(void) | |||
1094 | { | 1093 | { |
1095 | exynos_init_io(NULL, 0); | 1094 | exynos_init_io(NULL, 0); |
1096 | s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); | 1095 | s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); |
1097 | samsung_set_timer_source(SAMSUNG_PWM2, SAMSUNG_PWM4); | 1096 | exynos_set_timer_source(BIT(2) | BIT(4)); |
1098 | xxti_f = 0; | 1097 | xxti_f = 0; |
1099 | xusbxti_f = 24000000; | 1098 | xusbxti_f = 24000000; |
1100 | } | 1099 | } |
@@ -1154,7 +1153,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") | |||
1154 | .map_io = universal_map_io, | 1153 | .map_io = universal_map_io, |
1155 | .init_machine = universal_machine_init, | 1154 | .init_machine = universal_machine_init, |
1156 | .init_late = exynos_init_late, | 1155 | .init_late = exynos_init_late, |
1157 | .init_time = samsung_timer_init, | 1156 | .init_time = exynos_init_time, |
1158 | .reserve = &universal_reserve, | 1157 | .reserve = &universal_reserve, |
1159 | .restart = exynos4_restart, | 1158 | .restart = exynos4_restart, |
1160 | MACHINE_END | 1159 | MACHINE_END |
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c index 075f7cc51026..3c7675a6a8f4 100644 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c | |||
@@ -35,29 +35,6 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * 'emif_fw' class | ||
39 | * instance(s): emif_fw | ||
40 | */ | ||
41 | static struct omap_hwmod_class am33xx_emif_fw_hwmod_class = { | ||
42 | .name = "emif_fw", | ||
43 | }; | ||
44 | |||
45 | /* emif_fw */ | ||
46 | static struct omap_hwmod am33xx_emif_fw_hwmod = { | ||
47 | .name = "emif_fw", | ||
48 | .class = &am33xx_emif_fw_hwmod_class, | ||
49 | .clkdm_name = "l4fw_clkdm", | ||
50 | .main_clk = "l4fw_gclk", | ||
51 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), | ||
52 | .prcm = { | ||
53 | .omap4 = { | ||
54 | .clkctrl_offs = AM33XX_CM_PER_EMIF_FW_CLKCTRL_OFFSET, | ||
55 | .modulemode = MODULEMODE_SWCTRL, | ||
56 | }, | ||
57 | }, | ||
58 | }; | ||
59 | |||
60 | /* | ||
61 | * 'emif' class | 38 | * 'emif' class |
62 | * instance(s): emif | 39 | * instance(s): emif |
63 | */ | 40 | */ |
@@ -70,18 +47,12 @@ static struct omap_hwmod_class am33xx_emif_hwmod_class = { | |||
70 | .sysc = &am33xx_emif_sysc, | 47 | .sysc = &am33xx_emif_sysc, |
71 | }; | 48 | }; |
72 | 49 | ||
73 | static struct omap_hwmod_irq_info am33xx_emif_irqs[] = { | ||
74 | { .name = "ddrerr0", .irq = 101 + OMAP_INTC_START, }, | ||
75 | { .irq = -1 }, | ||
76 | }; | ||
77 | |||
78 | /* emif */ | 50 | /* emif */ |
79 | static struct omap_hwmod am33xx_emif_hwmod = { | 51 | static struct omap_hwmod am33xx_emif_hwmod = { |
80 | .name = "emif", | 52 | .name = "emif", |
81 | .class = &am33xx_emif_hwmod_class, | 53 | .class = &am33xx_emif_hwmod_class, |
82 | .clkdm_name = "l3_clkdm", | 54 | .clkdm_name = "l3_clkdm", |
83 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), | 55 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), |
84 | .mpu_irqs = am33xx_emif_irqs, | ||
85 | .main_clk = "dpll_ddr_m2_div2_ck", | 56 | .main_clk = "dpll_ddr_m2_div2_ck", |
86 | .prcm = { | 57 | .prcm = { |
87 | .omap4 = { | 58 | .omap4 = { |
@@ -99,19 +70,11 @@ static struct omap_hwmod_class am33xx_l3_hwmod_class = { | |||
99 | .name = "l3", | 70 | .name = "l3", |
100 | }; | 71 | }; |
101 | 72 | ||
102 | /* l3_main (l3_fast) */ | ||
103 | static struct omap_hwmod_irq_info am33xx_l3_main_irqs[] = { | ||
104 | { .name = "l3debug", .irq = 9 + OMAP_INTC_START, }, | ||
105 | { .name = "l3appint", .irq = 10 + OMAP_INTC_START, }, | ||
106 | { .irq = -1 }, | ||
107 | }; | ||
108 | |||
109 | static struct omap_hwmod am33xx_l3_main_hwmod = { | 73 | static struct omap_hwmod am33xx_l3_main_hwmod = { |
110 | .name = "l3_main", | 74 | .name = "l3_main", |
111 | .class = &am33xx_l3_hwmod_class, | 75 | .class = &am33xx_l3_hwmod_class, |
112 | .clkdm_name = "l3_clkdm", | 76 | .clkdm_name = "l3_clkdm", |
113 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), | 77 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), |
114 | .mpu_irqs = am33xx_l3_main_irqs, | ||
115 | .main_clk = "l3_gclk", | 78 | .main_clk = "l3_gclk", |
116 | .prcm = { | 79 | .prcm = { |
117 | .omap4 = { | 80 | .omap4 = { |
@@ -196,20 +159,6 @@ static struct omap_hwmod am33xx_l4_wkup_hwmod = { | |||
196 | }, | 159 | }, |
197 | }; | 160 | }; |
198 | 161 | ||
199 | /* l4_fw */ | ||
200 | static struct omap_hwmod am33xx_l4_fw_hwmod = { | ||
201 | .name = "l4_fw", | ||
202 | .class = &am33xx_l4_hwmod_class, | ||
203 | .clkdm_name = "l4fw_clkdm", | ||
204 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), | ||
205 | .prcm = { | ||
206 | .omap4 = { | ||
207 | .clkctrl_offs = AM33XX_CM_PER_L4FW_CLKCTRL_OFFSET, | ||
208 | .modulemode = MODULEMODE_SWCTRL, | ||
209 | }, | ||
210 | }, | ||
211 | }; | ||
212 | |||
213 | /* | 162 | /* |
214 | * 'mpu' class | 163 | * 'mpu' class |
215 | */ | 164 | */ |
@@ -217,21 +166,11 @@ static struct omap_hwmod_class am33xx_mpu_hwmod_class = { | |||
217 | .name = "mpu", | 166 | .name = "mpu", |
218 | }; | 167 | }; |
219 | 168 | ||
220 | /* mpu */ | ||
221 | static struct omap_hwmod_irq_info am33xx_mpu_irqs[] = { | ||
222 | { .name = "emuint", .irq = 0 + OMAP_INTC_START, }, | ||
223 | { .name = "commtx", .irq = 1 + OMAP_INTC_START, }, | ||
224 | { .name = "commrx", .irq = 2 + OMAP_INTC_START, }, | ||
225 | { .name = "bench", .irq = 3 + OMAP_INTC_START, }, | ||
226 | { .irq = -1 }, | ||
227 | }; | ||
228 | |||
229 | static struct omap_hwmod am33xx_mpu_hwmod = { | 169 | static struct omap_hwmod am33xx_mpu_hwmod = { |
230 | .name = "mpu", | 170 | .name = "mpu", |
231 | .class = &am33xx_mpu_hwmod_class, | 171 | .class = &am33xx_mpu_hwmod_class, |
232 | .clkdm_name = "mpu_clkdm", | 172 | .clkdm_name = "mpu_clkdm", |
233 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), | 173 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), |
234 | .mpu_irqs = am33xx_mpu_irqs, | ||
235 | .main_clk = "dpll_mpu_m2_ck", | 174 | .main_clk = "dpll_mpu_m2_ck", |
236 | .prcm = { | 175 | .prcm = { |
237 | .omap4 = { | 176 | .omap4 = { |
@@ -253,11 +192,6 @@ static struct omap_hwmod_rst_info am33xx_wkup_m3_resets[] = { | |||
253 | { .name = "wkup_m3", .rst_shift = 3, .st_shift = 5 }, | 192 | { .name = "wkup_m3", .rst_shift = 3, .st_shift = 5 }, |
254 | }; | 193 | }; |
255 | 194 | ||
256 | static struct omap_hwmod_irq_info am33xx_wkup_m3_irqs[] = { | ||
257 | { .name = "txev", .irq = 78 + OMAP_INTC_START, }, | ||
258 | { .irq = -1 }, | ||
259 | }; | ||
260 | |||
261 | /* wkup_m3 */ | 195 | /* wkup_m3 */ |
262 | static struct omap_hwmod am33xx_wkup_m3_hwmod = { | 196 | static struct omap_hwmod am33xx_wkup_m3_hwmod = { |
263 | .name = "wkup_m3", | 197 | .name = "wkup_m3", |
@@ -265,7 +199,6 @@ static struct omap_hwmod am33xx_wkup_m3_hwmod = { | |||
265 | .clkdm_name = "l4_wkup_aon_clkdm", | 199 | .clkdm_name = "l4_wkup_aon_clkdm", |
266 | /* Keep hardreset asserted */ | 200 | /* Keep hardreset asserted */ |
267 | .flags = HWMOD_INIT_NO_RESET | HWMOD_NO_IDLEST, | 201 | .flags = HWMOD_INIT_NO_RESET | HWMOD_NO_IDLEST, |
268 | .mpu_irqs = am33xx_wkup_m3_irqs, | ||
269 | .main_clk = "dpll_core_m4_div2_ck", | 202 | .main_clk = "dpll_core_m4_div2_ck", |
270 | .prcm = { | 203 | .prcm = { |
271 | .omap4 = { | 204 | .omap4 = { |
@@ -291,25 +224,12 @@ static struct omap_hwmod_rst_info am33xx_pruss_resets[] = { | |||
291 | { .name = "pruss", .rst_shift = 1 }, | 224 | { .name = "pruss", .rst_shift = 1 }, |
292 | }; | 225 | }; |
293 | 226 | ||
294 | static struct omap_hwmod_irq_info am33xx_pruss_irqs[] = { | ||
295 | { .name = "evtout0", .irq = 20 + OMAP_INTC_START, }, | ||
296 | { .name = "evtout1", .irq = 21 + OMAP_INTC_START, }, | ||
297 | { .name = "evtout2", .irq = 22 + OMAP_INTC_START, }, | ||
298 | { .name = "evtout3", .irq = 23 + OMAP_INTC_START, }, | ||
299 | { .name = "evtout4", .irq = 24 + OMAP_INTC_START, }, | ||
300 | { .name = "evtout5", .irq = 25 + OMAP_INTC_START, }, | ||
301 | { .name = "evtout6", .irq = 26 + OMAP_INTC_START, }, | ||
302 | { .name = "evtout7", .irq = 27 + OMAP_INTC_START, }, | ||
303 | { .irq = -1 }, | ||
304 | }; | ||
305 | |||
306 | /* pru-icss */ | 227 | /* pru-icss */ |
307 | /* Pseudo hwmod for reset control purpose only */ | 228 | /* Pseudo hwmod for reset control purpose only */ |
308 | static struct omap_hwmod am33xx_pruss_hwmod = { | 229 | static struct omap_hwmod am33xx_pruss_hwmod = { |
309 | .name = "pruss", | 230 | .name = "pruss", |
310 | .class = &am33xx_pruss_hwmod_class, | 231 | .class = &am33xx_pruss_hwmod_class, |
311 | .clkdm_name = "pruss_ocp_clkdm", | 232 | .clkdm_name = "pruss_ocp_clkdm", |
312 | .mpu_irqs = am33xx_pruss_irqs, | ||
313 | .main_clk = "pruss_ocp_gclk", | 233 | .main_clk = "pruss_ocp_gclk", |
314 | .prcm = { | 234 | .prcm = { |
315 | .omap4 = { | 235 | .omap4 = { |
@@ -332,16 +252,10 @@ static struct omap_hwmod_rst_info am33xx_gfx_resets[] = { | |||
332 | { .name = "gfx", .rst_shift = 0 }, | 252 | { .name = "gfx", .rst_shift = 0 }, |
333 | }; | 253 | }; |
334 | 254 | ||
335 | static struct omap_hwmod_irq_info am33xx_gfx_irqs[] = { | ||
336 | { .name = "gfxint", .irq = 37 + OMAP_INTC_START, }, | ||
337 | { .irq = -1 }, | ||
338 | }; | ||
339 | |||
340 | static struct omap_hwmod am33xx_gfx_hwmod = { | 255 | static struct omap_hwmod am33xx_gfx_hwmod = { |
341 | .name = "gfx", | 256 | .name = "gfx", |
342 | .class = &am33xx_gfx_hwmod_class, | 257 | .class = &am33xx_gfx_hwmod_class, |
343 | .clkdm_name = "gfx_l3_clkdm", | 258 | .clkdm_name = "gfx_l3_clkdm", |
344 | .mpu_irqs = am33xx_gfx_irqs, | ||
345 | .main_clk = "gfx_fck_div_ck", | 259 | .main_clk = "gfx_fck_div_ck", |
346 | .prcm = { | 260 | .prcm = { |
347 | .omap4 = { | 261 | .omap4 = { |
@@ -387,16 +301,10 @@ static struct omap_hwmod_class am33xx_adc_tsc_hwmod_class = { | |||
387 | .sysc = &am33xx_adc_tsc_sysc, | 301 | .sysc = &am33xx_adc_tsc_sysc, |
388 | }; | 302 | }; |
389 | 303 | ||
390 | static struct omap_hwmod_irq_info am33xx_adc_tsc_irqs[] = { | ||
391 | { .irq = 16 + OMAP_INTC_START, }, | ||
392 | { .irq = -1 }, | ||
393 | }; | ||
394 | |||
395 | static struct omap_hwmod am33xx_adc_tsc_hwmod = { | 304 | static struct omap_hwmod am33xx_adc_tsc_hwmod = { |
396 | .name = "adc_tsc", | 305 | .name = "adc_tsc", |
397 | .class = &am33xx_adc_tsc_hwmod_class, | 306 | .class = &am33xx_adc_tsc_hwmod_class, |
398 | .clkdm_name = "l4_wkup_clkdm", | 307 | .clkdm_name = "l4_wkup_clkdm", |
399 | .mpu_irqs = am33xx_adc_tsc_irqs, | ||
400 | .main_clk = "adc_tsc_fck", | 308 | .main_clk = "adc_tsc_fck", |
401 | .prcm = { | 309 | .prcm = { |
402 | .omap4 = { | 310 | .omap4 = { |
@@ -515,23 +423,10 @@ static struct omap_hwmod_class am33xx_aes0_hwmod_class = { | |||
515 | .sysc = &am33xx_aes0_sysc, | 423 | .sysc = &am33xx_aes0_sysc, |
516 | }; | 424 | }; |
517 | 425 | ||
518 | static struct omap_hwmod_irq_info am33xx_aes0_irqs[] = { | ||
519 | { .irq = 103 + OMAP_INTC_START, }, | ||
520 | { .irq = -1 }, | ||
521 | }; | ||
522 | |||
523 | static struct omap_hwmod_dma_info am33xx_aes0_edma_reqs[] = { | ||
524 | { .name = "tx", .dma_req = 6, }, | ||
525 | { .name = "rx", .dma_req = 5, }, | ||
526 | { .dma_req = -1 } | ||
527 | }; | ||
528 | |||
529 | static struct omap_hwmod am33xx_aes0_hwmod = { | 426 | static struct omap_hwmod am33xx_aes0_hwmod = { |
530 | .name = "aes", | 427 | .name = "aes", |
531 | .class = &am33xx_aes0_hwmod_class, | 428 | .class = &am33xx_aes0_hwmod_class, |
532 | .clkdm_name = "l3_clkdm", | 429 | .clkdm_name = "l3_clkdm", |
533 | .mpu_irqs = am33xx_aes0_irqs, | ||
534 | .sdma_reqs = am33xx_aes0_edma_reqs, | ||
535 | .main_clk = "aes0_fck", | 430 | .main_clk = "aes0_fck", |
536 | .prcm = { | 431 | .prcm = { |
537 | .omap4 = { | 432 | .omap4 = { |
@@ -554,22 +449,10 @@ static struct omap_hwmod_class am33xx_sha0_hwmod_class = { | |||
554 | .sysc = &am33xx_sha0_sysc, | 449 | .sysc = &am33xx_sha0_sysc, |
555 | }; | 450 | }; |
556 | 451 | ||
557 | static struct omap_hwmod_irq_info am33xx_sha0_irqs[] = { | ||
558 | { .irq = 109 + OMAP_INTC_START, }, | ||
559 | { .irq = -1 }, | ||
560 | }; | ||
561 | |||
562 | static struct omap_hwmod_dma_info am33xx_sha0_edma_reqs[] = { | ||
563 | { .name = "rx", .dma_req = 36, }, | ||
564 | { .dma_req = -1 } | ||
565 | }; | ||
566 | |||
567 | static struct omap_hwmod am33xx_sha0_hwmod = { | 452 | static struct omap_hwmod am33xx_sha0_hwmod = { |
568 | .name = "sham", | 453 | .name = "sham", |
569 | .class = &am33xx_sha0_hwmod_class, | 454 | .class = &am33xx_sha0_hwmod_class, |
570 | .clkdm_name = "l3_clkdm", | 455 | .clkdm_name = "l3_clkdm", |
571 | .mpu_irqs = am33xx_sha0_irqs, | ||
572 | .sdma_reqs = am33xx_sha0_edma_reqs, | ||
573 | .main_clk = "l3_gclk", | 456 | .main_clk = "l3_gclk", |
574 | .prcm = { | 457 | .prcm = { |
575 | .omap4 = { | 458 | .omap4 = { |
@@ -604,16 +487,10 @@ static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = { | |||
604 | }; | 487 | }; |
605 | 488 | ||
606 | /* smartreflex0 */ | 489 | /* smartreflex0 */ |
607 | static struct omap_hwmod_irq_info am33xx_smartreflex0_irqs[] = { | ||
608 | { .irq = 120 + OMAP_INTC_START, }, | ||
609 | { .irq = -1 }, | ||
610 | }; | ||
611 | |||
612 | static struct omap_hwmod am33xx_smartreflex0_hwmod = { | 490 | static struct omap_hwmod am33xx_smartreflex0_hwmod = { |
613 | .name = "smartreflex0", | 491 | .name = "smartreflex0", |
614 | .class = &am33xx_smartreflex_hwmod_class, | 492 | .class = &am33xx_smartreflex_hwmod_class, |
615 | .clkdm_name = "l4_wkup_clkdm", | 493 | .clkdm_name = "l4_wkup_clkdm", |
616 | .mpu_irqs = am33xx_smartreflex0_irqs, | ||
617 | .main_clk = "smartreflex0_fck", | 494 | .main_clk = "smartreflex0_fck", |
618 | .prcm = { | 495 | .prcm = { |
619 | .omap4 = { | 496 | .omap4 = { |
@@ -624,16 +501,10 @@ static struct omap_hwmod am33xx_smartreflex0_hwmod = { | |||
624 | }; | 501 | }; |
625 | 502 | ||
626 | /* smartreflex1 */ | 503 | /* smartreflex1 */ |
627 | static struct omap_hwmod_irq_info am33xx_smartreflex1_irqs[] = { | ||
628 | { .irq = 121 + OMAP_INTC_START, }, | ||
629 | { .irq = -1 }, | ||
630 | }; | ||
631 | |||
632 | static struct omap_hwmod am33xx_smartreflex1_hwmod = { | 504 | static struct omap_hwmod am33xx_smartreflex1_hwmod = { |
633 | .name = "smartreflex1", | 505 | .name = "smartreflex1", |
634 | .class = &am33xx_smartreflex_hwmod_class, | 506 | .class = &am33xx_smartreflex_hwmod_class, |
635 | .clkdm_name = "l4_wkup_clkdm", | 507 | .clkdm_name = "l4_wkup_clkdm", |
636 | .mpu_irqs = am33xx_smartreflex1_irqs, | ||
637 | .main_clk = "smartreflex1_fck", | 508 | .main_clk = "smartreflex1_fck", |
638 | .prcm = { | 509 | .prcm = { |
639 | .omap4 = { | 510 | .omap4 = { |
@@ -650,17 +521,11 @@ static struct omap_hwmod_class am33xx_control_hwmod_class = { | |||
650 | .name = "control", | 521 | .name = "control", |
651 | }; | 522 | }; |
652 | 523 | ||
653 | static struct omap_hwmod_irq_info am33xx_control_irqs[] = { | ||
654 | { .irq = 8 + OMAP_INTC_START, }, | ||
655 | { .irq = -1 }, | ||
656 | }; | ||
657 | |||
658 | static struct omap_hwmod am33xx_control_hwmod = { | 524 | static struct omap_hwmod am33xx_control_hwmod = { |
659 | .name = "control", | 525 | .name = "control", |
660 | .class = &am33xx_control_hwmod_class, | 526 | .class = &am33xx_control_hwmod_class, |
661 | .clkdm_name = "l4_wkup_clkdm", | 527 | .clkdm_name = "l4_wkup_clkdm", |
662 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), | 528 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), |
663 | .mpu_irqs = am33xx_control_irqs, | ||
664 | .main_clk = "dpll_core_m4_div2_ck", | 529 | .main_clk = "dpll_core_m4_div2_ck", |
665 | .prcm = { | 530 | .prcm = { |
666 | .omap4 = { | 531 | .omap4 = { |
@@ -690,20 +555,11 @@ static struct omap_hwmod_class am33xx_cpgmac0_hwmod_class = { | |||
690 | .sysc = &am33xx_cpgmac_sysc, | 555 | .sysc = &am33xx_cpgmac_sysc, |
691 | }; | 556 | }; |
692 | 557 | ||
693 | static struct omap_hwmod_irq_info am33xx_cpgmac0_irqs[] = { | ||
694 | { .name = "c0_rx_thresh_pend", .irq = 40 + OMAP_INTC_START, }, | ||
695 | { .name = "c0_rx_pend", .irq = 41 + OMAP_INTC_START, }, | ||
696 | { .name = "c0_tx_pend", .irq = 42 + OMAP_INTC_START, }, | ||
697 | { .name = "c0_misc_pend", .irq = 43 + OMAP_INTC_START, }, | ||
698 | { .irq = -1 }, | ||
699 | }; | ||
700 | |||
701 | static struct omap_hwmod am33xx_cpgmac0_hwmod = { | 558 | static struct omap_hwmod am33xx_cpgmac0_hwmod = { |
702 | .name = "cpgmac0", | 559 | .name = "cpgmac0", |
703 | .class = &am33xx_cpgmac0_hwmod_class, | 560 | .class = &am33xx_cpgmac0_hwmod_class, |
704 | .clkdm_name = "cpsw_125mhz_clkdm", | 561 | .clkdm_name = "cpsw_125mhz_clkdm", |
705 | .flags = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY), | 562 | .flags = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY), |
706 | .mpu_irqs = am33xx_cpgmac0_irqs, | ||
707 | .main_clk = "cpsw_125mhz_gclk", | 563 | .main_clk = "cpsw_125mhz_gclk", |
708 | .prcm = { | 564 | .prcm = { |
709 | .omap4 = { | 565 | .omap4 = { |
@@ -735,17 +591,10 @@ static struct omap_hwmod_class am33xx_dcan_hwmod_class = { | |||
735 | }; | 591 | }; |
736 | 592 | ||
737 | /* dcan0 */ | 593 | /* dcan0 */ |
738 | static struct omap_hwmod_irq_info am33xx_dcan0_irqs[] = { | ||
739 | { .name = "d_can_ms", .irq = 52 + OMAP_INTC_START, }, | ||
740 | { .name = "d_can_mo", .irq = 53 + OMAP_INTC_START, }, | ||
741 | { .irq = -1 }, | ||
742 | }; | ||
743 | |||
744 | static struct omap_hwmod am33xx_dcan0_hwmod = { | 594 | static struct omap_hwmod am33xx_dcan0_hwmod = { |
745 | .name = "d_can0", | 595 | .name = "d_can0", |
746 | .class = &am33xx_dcan_hwmod_class, | 596 | .class = &am33xx_dcan_hwmod_class, |
747 | .clkdm_name = "l4ls_clkdm", | 597 | .clkdm_name = "l4ls_clkdm", |
748 | .mpu_irqs = am33xx_dcan0_irqs, | ||
749 | .main_clk = "dcan0_fck", | 598 | .main_clk = "dcan0_fck", |
750 | .prcm = { | 599 | .prcm = { |
751 | .omap4 = { | 600 | .omap4 = { |
@@ -756,16 +605,10 @@ static struct omap_hwmod am33xx_dcan0_hwmod = { | |||
756 | }; | 605 | }; |
757 | 606 | ||
758 | /* dcan1 */ | 607 | /* dcan1 */ |
759 | static struct omap_hwmod_irq_info am33xx_dcan1_irqs[] = { | ||
760 | { .name = "d_can_ms", .irq = 55 + OMAP_INTC_START, }, | ||
761 | { .name = "d_can_mo", .irq = 56 + OMAP_INTC_START, }, | ||
762 | { .irq = -1 }, | ||
763 | }; | ||
764 | static struct omap_hwmod am33xx_dcan1_hwmod = { | 608 | static struct omap_hwmod am33xx_dcan1_hwmod = { |
765 | .name = "d_can1", | 609 | .name = "d_can1", |
766 | .class = &am33xx_dcan_hwmod_class, | 610 | .class = &am33xx_dcan_hwmod_class, |
767 | .clkdm_name = "l4ls_clkdm", | 611 | .clkdm_name = "l4ls_clkdm", |
768 | .mpu_irqs = am33xx_dcan1_irqs, | ||
769 | .main_clk = "dcan1_fck", | 612 | .main_clk = "dcan1_fck", |
770 | .prcm = { | 613 | .prcm = { |
771 | .omap4 = { | 614 | .omap4 = { |
@@ -792,16 +635,10 @@ static struct omap_hwmod_class am33xx_elm_hwmod_class = { | |||
792 | .sysc = &am33xx_elm_sysc, | 635 | .sysc = &am33xx_elm_sysc, |
793 | }; | 636 | }; |
794 | 637 | ||
795 | static struct omap_hwmod_irq_info am33xx_elm_irqs[] = { | ||
796 | { .irq = 4 + OMAP_INTC_START, }, | ||
797 | { .irq = -1 }, | ||
798 | }; | ||
799 | |||
800 | static struct omap_hwmod am33xx_elm_hwmod = { | 638 | static struct omap_hwmod am33xx_elm_hwmod = { |
801 | .name = "elm", | 639 | .name = "elm", |
802 | .class = &am33xx_elm_hwmod_class, | 640 | .class = &am33xx_elm_hwmod_class, |
803 | .clkdm_name = "l4ls_clkdm", | 641 | .clkdm_name = "l4ls_clkdm", |
804 | .mpu_irqs = am33xx_elm_irqs, | ||
805 | .main_clk = "l4ls_gclk", | 642 | .main_clk = "l4ls_gclk", |
806 | .prcm = { | 643 | .prcm = { |
807 | .omap4 = { | 644 | .omap4 = { |
@@ -854,45 +691,26 @@ static struct omap_hwmod am33xx_epwmss0_hwmod = { | |||
854 | }; | 691 | }; |
855 | 692 | ||
856 | /* ecap0 */ | 693 | /* ecap0 */ |
857 | static struct omap_hwmod_irq_info am33xx_ecap0_irqs[] = { | ||
858 | { .irq = 31 + OMAP_INTC_START, }, | ||
859 | { .irq = -1 }, | ||
860 | }; | ||
861 | |||
862 | static struct omap_hwmod am33xx_ecap0_hwmod = { | 694 | static struct omap_hwmod am33xx_ecap0_hwmod = { |
863 | .name = "ecap0", | 695 | .name = "ecap0", |
864 | .class = &am33xx_ecap_hwmod_class, | 696 | .class = &am33xx_ecap_hwmod_class, |
865 | .clkdm_name = "l4ls_clkdm", | 697 | .clkdm_name = "l4ls_clkdm", |
866 | .mpu_irqs = am33xx_ecap0_irqs, | ||
867 | .main_clk = "l4ls_gclk", | 698 | .main_clk = "l4ls_gclk", |
868 | }; | 699 | }; |
869 | 700 | ||
870 | /* eqep0 */ | 701 | /* eqep0 */ |
871 | static struct omap_hwmod_irq_info am33xx_eqep0_irqs[] = { | ||
872 | { .irq = 79 + OMAP_INTC_START, }, | ||
873 | { .irq = -1 }, | ||
874 | }; | ||
875 | |||
876 | static struct omap_hwmod am33xx_eqep0_hwmod = { | 702 | static struct omap_hwmod am33xx_eqep0_hwmod = { |
877 | .name = "eqep0", | 703 | .name = "eqep0", |
878 | .class = &am33xx_eqep_hwmod_class, | 704 | .class = &am33xx_eqep_hwmod_class, |
879 | .clkdm_name = "l4ls_clkdm", | 705 | .clkdm_name = "l4ls_clkdm", |
880 | .mpu_irqs = am33xx_eqep0_irqs, | ||
881 | .main_clk = "l4ls_gclk", | 706 | .main_clk = "l4ls_gclk", |
882 | }; | 707 | }; |
883 | 708 | ||
884 | /* ehrpwm0 */ | 709 | /* ehrpwm0 */ |
885 | static struct omap_hwmod_irq_info am33xx_ehrpwm0_irqs[] = { | ||
886 | { .name = "int", .irq = 86 + OMAP_INTC_START, }, | ||
887 | { .name = "tzint", .irq = 58 + OMAP_INTC_START, }, | ||
888 | { .irq = -1 }, | ||
889 | }; | ||
890 | |||
891 | static struct omap_hwmod am33xx_ehrpwm0_hwmod = { | 710 | static struct omap_hwmod am33xx_ehrpwm0_hwmod = { |
892 | .name = "ehrpwm0", | 711 | .name = "ehrpwm0", |
893 | .class = &am33xx_ehrpwm_hwmod_class, | 712 | .class = &am33xx_ehrpwm_hwmod_class, |
894 | .clkdm_name = "l4ls_clkdm", | 713 | .clkdm_name = "l4ls_clkdm", |
895 | .mpu_irqs = am33xx_ehrpwm0_irqs, | ||
896 | .main_clk = "l4ls_gclk", | 714 | .main_clk = "l4ls_gclk", |
897 | }; | 715 | }; |
898 | 716 | ||
@@ -911,45 +729,26 @@ static struct omap_hwmod am33xx_epwmss1_hwmod = { | |||
911 | }; | 729 | }; |
912 | 730 | ||
913 | /* ecap1 */ | 731 | /* ecap1 */ |
914 | static struct omap_hwmod_irq_info am33xx_ecap1_irqs[] = { | ||
915 | { .irq = 47 + OMAP_INTC_START, }, | ||
916 | { .irq = -1 }, | ||
917 | }; | ||
918 | |||
919 | static struct omap_hwmod am33xx_ecap1_hwmod = { | 732 | static struct omap_hwmod am33xx_ecap1_hwmod = { |
920 | .name = "ecap1", | 733 | .name = "ecap1", |
921 | .class = &am33xx_ecap_hwmod_class, | 734 | .class = &am33xx_ecap_hwmod_class, |
922 | .clkdm_name = "l4ls_clkdm", | 735 | .clkdm_name = "l4ls_clkdm", |
923 | .mpu_irqs = am33xx_ecap1_irqs, | ||
924 | .main_clk = "l4ls_gclk", | 736 | .main_clk = "l4ls_gclk", |
925 | }; | 737 | }; |
926 | 738 | ||
927 | /* eqep1 */ | 739 | /* eqep1 */ |
928 | static struct omap_hwmod_irq_info am33xx_eqep1_irqs[] = { | ||
929 | { .irq = 88 + OMAP_INTC_START, }, | ||
930 | { .irq = -1 }, | ||
931 | }; | ||
932 | |||
933 | static struct omap_hwmod am33xx_eqep1_hwmod = { | 740 | static struct omap_hwmod am33xx_eqep1_hwmod = { |
934 | .name = "eqep1", | 741 | .name = "eqep1", |
935 | .class = &am33xx_eqep_hwmod_class, | 742 | .class = &am33xx_eqep_hwmod_class, |
936 | .clkdm_name = "l4ls_clkdm", | 743 | .clkdm_name = "l4ls_clkdm", |
937 | .mpu_irqs = am33xx_eqep1_irqs, | ||
938 | .main_clk = "l4ls_gclk", | 744 | .main_clk = "l4ls_gclk", |
939 | }; | 745 | }; |
940 | 746 | ||
941 | /* ehrpwm1 */ | 747 | /* ehrpwm1 */ |
942 | static struct omap_hwmod_irq_info am33xx_ehrpwm1_irqs[] = { | ||
943 | { .name = "int", .irq = 87 + OMAP_INTC_START, }, | ||
944 | { .name = "tzint", .irq = 59 + OMAP_INTC_START, }, | ||
945 | { .irq = -1 }, | ||
946 | }; | ||
947 | |||
948 | static struct omap_hwmod am33xx_ehrpwm1_hwmod = { | 748 | static struct omap_hwmod am33xx_ehrpwm1_hwmod = { |
949 | .name = "ehrpwm1", | 749 | .name = "ehrpwm1", |
950 | .class = &am33xx_ehrpwm_hwmod_class, | 750 | .class = &am33xx_ehrpwm_hwmod_class, |
951 | .clkdm_name = "l4ls_clkdm", | 751 | .clkdm_name = "l4ls_clkdm", |
952 | .mpu_irqs = am33xx_ehrpwm1_irqs, | ||
953 | .main_clk = "l4ls_gclk", | 752 | .main_clk = "l4ls_gclk", |
954 | }; | 753 | }; |
955 | 754 | ||
@@ -968,45 +767,26 @@ static struct omap_hwmod am33xx_epwmss2_hwmod = { | |||
968 | }; | 767 | }; |
969 | 768 | ||
970 | /* ecap2 */ | 769 | /* ecap2 */ |
971 | static struct omap_hwmod_irq_info am33xx_ecap2_irqs[] = { | ||
972 | { .irq = 61 + OMAP_INTC_START, }, | ||
973 | { .irq = -1 }, | ||
974 | }; | ||
975 | |||
976 | static struct omap_hwmod am33xx_ecap2_hwmod = { | 770 | static struct omap_hwmod am33xx_ecap2_hwmod = { |
977 | .name = "ecap2", | 771 | .name = "ecap2", |
978 | .class = &am33xx_ecap_hwmod_class, | 772 | .class = &am33xx_ecap_hwmod_class, |
979 | .clkdm_name = "l4ls_clkdm", | 773 | .clkdm_name = "l4ls_clkdm", |
980 | .mpu_irqs = am33xx_ecap2_irqs, | ||
981 | .main_clk = "l4ls_gclk", | 774 | .main_clk = "l4ls_gclk", |
982 | }; | 775 | }; |
983 | 776 | ||
984 | /* eqep2 */ | 777 | /* eqep2 */ |
985 | static struct omap_hwmod_irq_info am33xx_eqep2_irqs[] = { | ||
986 | { .irq = 89 + OMAP_INTC_START, }, | ||
987 | { .irq = -1 }, | ||
988 | }; | ||
989 | |||
990 | static struct omap_hwmod am33xx_eqep2_hwmod = { | 778 | static struct omap_hwmod am33xx_eqep2_hwmod = { |
991 | .name = "eqep2", | 779 | .name = "eqep2", |
992 | .class = &am33xx_eqep_hwmod_class, | 780 | .class = &am33xx_eqep_hwmod_class, |
993 | .clkdm_name = "l4ls_clkdm", | 781 | .clkdm_name = "l4ls_clkdm", |
994 | .mpu_irqs = am33xx_eqep2_irqs, | ||
995 | .main_clk = "l4ls_gclk", | 782 | .main_clk = "l4ls_gclk", |
996 | }; | 783 | }; |
997 | 784 | ||
998 | /* ehrpwm2 */ | 785 | /* ehrpwm2 */ |
999 | static struct omap_hwmod_irq_info am33xx_ehrpwm2_irqs[] = { | ||
1000 | { .name = "int", .irq = 39 + OMAP_INTC_START, }, | ||
1001 | { .name = "tzint", .irq = 60 + OMAP_INTC_START, }, | ||
1002 | { .irq = -1 }, | ||
1003 | }; | ||
1004 | |||
1005 | static struct omap_hwmod am33xx_ehrpwm2_hwmod = { | 786 | static struct omap_hwmod am33xx_ehrpwm2_hwmod = { |
1006 | .name = "ehrpwm2", | 787 | .name = "ehrpwm2", |
1007 | .class = &am33xx_ehrpwm_hwmod_class, | 788 | .class = &am33xx_ehrpwm_hwmod_class, |
1008 | .clkdm_name = "l4ls_clkdm", | 789 | .clkdm_name = "l4ls_clkdm", |
1009 | .mpu_irqs = am33xx_ehrpwm2_irqs, | ||
1010 | .main_clk = "l4ls_gclk", | 790 | .main_clk = "l4ls_gclk", |
1011 | }; | 791 | }; |
1012 | 792 | ||
@@ -1041,17 +821,11 @@ static struct omap_hwmod_opt_clk gpio0_opt_clks[] = { | |||
1041 | { .role = "dbclk", .clk = "gpio0_dbclk" }, | 821 | { .role = "dbclk", .clk = "gpio0_dbclk" }, |
1042 | }; | 822 | }; |
1043 | 823 | ||
1044 | static struct omap_hwmod_irq_info am33xx_gpio0_irqs[] = { | ||
1045 | { .irq = 96 + OMAP_INTC_START, }, | ||
1046 | { .irq = -1 }, | ||
1047 | }; | ||
1048 | |||
1049 | static struct omap_hwmod am33xx_gpio0_hwmod = { | 824 | static struct omap_hwmod am33xx_gpio0_hwmod = { |
1050 | .name = "gpio1", | 825 | .name = "gpio1", |
1051 | .class = &am33xx_gpio_hwmod_class, | 826 | .class = &am33xx_gpio_hwmod_class, |
1052 | .clkdm_name = "l4_wkup_clkdm", | 827 | .clkdm_name = "l4_wkup_clkdm", |
1053 | .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, | 828 | .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, |
1054 | .mpu_irqs = am33xx_gpio0_irqs, | ||
1055 | .main_clk = "dpll_core_m4_div2_ck", | 829 | .main_clk = "dpll_core_m4_div2_ck", |
1056 | .prcm = { | 830 | .prcm = { |
1057 | .omap4 = { | 831 | .omap4 = { |
@@ -1065,11 +839,6 @@ static struct omap_hwmod am33xx_gpio0_hwmod = { | |||
1065 | }; | 839 | }; |
1066 | 840 | ||
1067 | /* gpio1 */ | 841 | /* gpio1 */ |
1068 | static struct omap_hwmod_irq_info am33xx_gpio1_irqs[] = { | ||
1069 | { .irq = 98 + OMAP_INTC_START, }, | ||
1070 | { .irq = -1 }, | ||
1071 | }; | ||
1072 | |||
1073 | static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { | 842 | static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { |
1074 | { .role = "dbclk", .clk = "gpio1_dbclk" }, | 843 | { .role = "dbclk", .clk = "gpio1_dbclk" }, |
1075 | }; | 844 | }; |
@@ -1079,7 +848,6 @@ static struct omap_hwmod am33xx_gpio1_hwmod = { | |||
1079 | .class = &am33xx_gpio_hwmod_class, | 848 | .class = &am33xx_gpio_hwmod_class, |
1080 | .clkdm_name = "l4ls_clkdm", | 849 | .clkdm_name = "l4ls_clkdm", |
1081 | .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, | 850 | .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, |
1082 | .mpu_irqs = am33xx_gpio1_irqs, | ||
1083 | .main_clk = "l4ls_gclk", | 851 | .main_clk = "l4ls_gclk", |
1084 | .prcm = { | 852 | .prcm = { |
1085 | .omap4 = { | 853 | .omap4 = { |
@@ -1093,11 +861,6 @@ static struct omap_hwmod am33xx_gpio1_hwmod = { | |||
1093 | }; | 861 | }; |
1094 | 862 | ||
1095 | /* gpio2 */ | 863 | /* gpio2 */ |
1096 | static struct omap_hwmod_irq_info am33xx_gpio2_irqs[] = { | ||
1097 | { .irq = 32 + OMAP_INTC_START, }, | ||
1098 | { .irq = -1 }, | ||
1099 | }; | ||
1100 | |||
1101 | static struct omap_hwmod_opt_clk gpio2_opt_clks[] = { | 864 | static struct omap_hwmod_opt_clk gpio2_opt_clks[] = { |
1102 | { .role = "dbclk", .clk = "gpio2_dbclk" }, | 865 | { .role = "dbclk", .clk = "gpio2_dbclk" }, |
1103 | }; | 866 | }; |
@@ -1107,7 +870,6 @@ static struct omap_hwmod am33xx_gpio2_hwmod = { | |||
1107 | .class = &am33xx_gpio_hwmod_class, | 870 | .class = &am33xx_gpio_hwmod_class, |
1108 | .clkdm_name = "l4ls_clkdm", | 871 | .clkdm_name = "l4ls_clkdm", |
1109 | .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, | 872 | .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, |
1110 | .mpu_irqs = am33xx_gpio2_irqs, | ||
1111 | .main_clk = "l4ls_gclk", | 873 | .main_clk = "l4ls_gclk", |
1112 | .prcm = { | 874 | .prcm = { |
1113 | .omap4 = { | 875 | .omap4 = { |
@@ -1121,11 +883,6 @@ static struct omap_hwmod am33xx_gpio2_hwmod = { | |||
1121 | }; | 883 | }; |
1122 | 884 | ||
1123 | /* gpio3 */ | 885 | /* gpio3 */ |
1124 | static struct omap_hwmod_irq_info am33xx_gpio3_irqs[] = { | ||
1125 | { .irq = 62 + OMAP_INTC_START, }, | ||
1126 | { .irq = -1 }, | ||
1127 | }; | ||
1128 | |||
1129 | static struct omap_hwmod_opt_clk gpio3_opt_clks[] = { | 886 | static struct omap_hwmod_opt_clk gpio3_opt_clks[] = { |
1130 | { .role = "dbclk", .clk = "gpio3_dbclk" }, | 887 | { .role = "dbclk", .clk = "gpio3_dbclk" }, |
1131 | }; | 888 | }; |
@@ -1135,7 +892,6 @@ static struct omap_hwmod am33xx_gpio3_hwmod = { | |||
1135 | .class = &am33xx_gpio_hwmod_class, | 892 | .class = &am33xx_gpio_hwmod_class, |
1136 | .clkdm_name = "l4ls_clkdm", | 893 | .clkdm_name = "l4ls_clkdm", |
1137 | .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, | 894 | .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, |
1138 | .mpu_irqs = am33xx_gpio3_irqs, | ||
1139 | .main_clk = "l4ls_gclk", | 895 | .main_clk = "l4ls_gclk", |
1140 | .prcm = { | 896 | .prcm = { |
1141 | .omap4 = { | 897 | .omap4 = { |
@@ -1164,17 +920,11 @@ static struct omap_hwmod_class am33xx_gpmc_hwmod_class = { | |||
1164 | .sysc = &gpmc_sysc, | 920 | .sysc = &gpmc_sysc, |
1165 | }; | 921 | }; |
1166 | 922 | ||
1167 | static struct omap_hwmod_irq_info am33xx_gpmc_irqs[] = { | ||
1168 | { .irq = 100 + OMAP_INTC_START, }, | ||
1169 | { .irq = -1 }, | ||
1170 | }; | ||
1171 | |||
1172 | static struct omap_hwmod am33xx_gpmc_hwmod = { | 923 | static struct omap_hwmod am33xx_gpmc_hwmod = { |
1173 | .name = "gpmc", | 924 | .name = "gpmc", |
1174 | .class = &am33xx_gpmc_hwmod_class, | 925 | .class = &am33xx_gpmc_hwmod_class, |
1175 | .clkdm_name = "l3s_clkdm", | 926 | .clkdm_name = "l3s_clkdm", |
1176 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), | 927 | .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET), |
1177 | .mpu_irqs = am33xx_gpmc_irqs, | ||
1178 | .main_clk = "l3s_gclk", | 928 | .main_clk = "l3s_gclk", |
1179 | .prcm = { | 929 | .prcm = { |
1180 | .omap4 = { | 930 | .omap4 = { |
@@ -1208,23 +958,10 @@ static struct omap_i2c_dev_attr i2c_dev_attr = { | |||
1208 | }; | 958 | }; |
1209 | 959 | ||
1210 | /* i2c1 */ | 960 | /* i2c1 */ |
1211 | static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = { | ||
1212 | { .irq = 70 + OMAP_INTC_START, }, | ||
1213 | { .irq = -1 }, | ||
1214 | }; | ||
1215 | |||
1216 | static struct omap_hwmod_dma_info i2c1_edma_reqs[] = { | ||
1217 | { .name = "tx", .dma_req = 0, }, | ||
1218 | { .name = "rx", .dma_req = 0, }, | ||
1219 | { .dma_req = -1 } | ||
1220 | }; | ||
1221 | |||
1222 | static struct omap_hwmod am33xx_i2c1_hwmod = { | 961 | static struct omap_hwmod am33xx_i2c1_hwmod = { |
1223 | .name = "i2c1", | 962 | .name = "i2c1", |
1224 | .class = &i2c_class, | 963 | .class = &i2c_class, |
1225 | .clkdm_name = "l4_wkup_clkdm", | 964 | .clkdm_name = "l4_wkup_clkdm", |
1226 | .mpu_irqs = i2c1_mpu_irqs, | ||
1227 | .sdma_reqs = i2c1_edma_reqs, | ||
1228 | .flags = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT, | 965 | .flags = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT, |
1229 | .main_clk = "dpll_per_m2_div4_wkupdm_ck", | 966 | .main_clk = "dpll_per_m2_div4_wkupdm_ck", |
1230 | .prcm = { | 967 | .prcm = { |
@@ -1237,23 +974,10 @@ static struct omap_hwmod am33xx_i2c1_hwmod = { | |||
1237 | }; | 974 | }; |
1238 | 975 | ||
1239 | /* i2c1 */ | 976 | /* i2c1 */ |
1240 | static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = { | ||
1241 | { .irq = 71 + OMAP_INTC_START, }, | ||
1242 | { .irq = -1 }, | ||
1243 | }; | ||
1244 | |||
1245 | static struct omap_hwmod_dma_info i2c2_edma_reqs[] = { | ||
1246 | { .name = "tx", .dma_req = 0, }, | ||
1247 | { .name = "rx", .dma_req = 0, }, | ||
1248 | { .dma_req = -1 } | ||
1249 | }; | ||
1250 | |||
1251 | static struct omap_hwmod am33xx_i2c2_hwmod = { | 977 | static struct omap_hwmod am33xx_i2c2_hwmod = { |
1252 | .name = "i2c2", | 978 | .name = "i2c2", |
1253 | .class = &i2c_class, | 979 | .class = &i2c_class, |
1254 | .clkdm_name = "l4ls_clkdm", | 980 | .clkdm_name = "l4ls_clkdm", |
1255 | .mpu_irqs = i2c2_mpu_irqs, | ||
1256 | .sdma_reqs = i2c2_edma_reqs, | ||
1257 | .flags = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT, | 981 | .flags = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT, |
1258 | .main_clk = "dpll_per_m2_div4_ck", | 982 | .main_clk = "dpll_per_m2_div4_ck", |
1259 | .prcm = { | 983 | .prcm = { |
@@ -1266,23 +990,10 @@ static struct omap_hwmod am33xx_i2c2_hwmod = { | |||
1266 | }; | 990 | }; |
1267 | 991 | ||
1268 | /* i2c3 */ | 992 | /* i2c3 */ |
1269 | static struct omap_hwmod_dma_info i2c3_edma_reqs[] = { | ||
1270 | { .name = "tx", .dma_req = 0, }, | ||
1271 | { .name = "rx", .dma_req = 0, }, | ||
1272 | { .dma_req = -1 } | ||
1273 | }; | ||
1274 | |||
1275 | static struct omap_hwmod_irq_info i2c3_mpu_irqs[] = { | ||
1276 | { .irq = 30 + OMAP_INTC_START, }, | ||
1277 | { .irq = -1 }, | ||
1278 | }; | ||
1279 | |||
1280 | static struct omap_hwmod am33xx_i2c3_hwmod = { | 993 | static struct omap_hwmod am33xx_i2c3_hwmod = { |
1281 | .name = "i2c3", | 994 | .name = "i2c3", |
1282 | .class = &i2c_class, | 995 | .class = &i2c_class, |
1283 | .clkdm_name = "l4ls_clkdm", | 996 | .clkdm_name = "l4ls_clkdm", |
1284 | .mpu_irqs = i2c3_mpu_irqs, | ||
1285 | .sdma_reqs = i2c3_edma_reqs, | ||
1286 | .flags = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT, | 997 | .flags = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT, |
1287 | .main_clk = "dpll_per_m2_div4_ck", | 998 | .main_clk = "dpll_per_m2_div4_ck", |
1288 | .prcm = { | 999 | .prcm = { |
@@ -1309,16 +1020,10 @@ static struct omap_hwmod_class am33xx_lcdc_hwmod_class = { | |||
1309 | .sysc = &lcdc_sysc, | 1020 | .sysc = &lcdc_sysc, |
1310 | }; | 1021 | }; |
1311 | 1022 | ||
1312 | static struct omap_hwmod_irq_info am33xx_lcdc_irqs[] = { | ||
1313 | { .irq = 36 + OMAP_INTC_START, }, | ||
1314 | { .irq = -1 }, | ||
1315 | }; | ||
1316 | |||
1317 | static struct omap_hwmod am33xx_lcdc_hwmod = { | 1023 | static struct omap_hwmod am33xx_lcdc_hwmod = { |
1318 | .name = "lcdc", | 1024 | .name = "lcdc", |
1319 | .class = &am33xx_lcdc_hwmod_class, | 1025 | .class = &am33xx_lcdc_hwmod_class, |
1320 | .clkdm_name = "lcdc_clkdm", | 1026 | .clkdm_name = "lcdc_clkdm", |
1321 | .mpu_irqs = am33xx_lcdc_irqs, | ||
1322 | .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, | 1027 | .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, |
1323 | .main_clk = "lcd_gclk", | 1028 | .main_clk = "lcd_gclk", |
1324 | .prcm = { | 1029 | .prcm = { |
@@ -1348,16 +1053,10 @@ static struct omap_hwmod_class am33xx_mailbox_hwmod_class = { | |||
1348 | .sysc = &am33xx_mailbox_sysc, | 1053 | .sysc = &am33xx_mailbox_sysc, |
1349 | }; | 1054 | }; |
1350 | 1055 | ||
1351 | static struct omap_hwmod_irq_info am33xx_mailbox_irqs[] = { | ||
1352 | { .irq = 77 + OMAP_INTC_START, }, | ||
1353 | { .irq = -1 }, | ||
1354 | }; | ||
1355 | |||
1356 | static struct omap_hwmod am33xx_mailbox_hwmod = { | 1056 | static struct omap_hwmod am33xx_mailbox_hwmod = { |
1357 | .name = "mailbox", | 1057 | .name = "mailbox", |
1358 | .class = &am33xx_mailbox_hwmod_class, | 1058 | .class = &am33xx_mailbox_hwmod_class, |
1359 | .clkdm_name = "l4ls_clkdm", | 1059 | .clkdm_name = "l4ls_clkdm", |
1360 | .mpu_irqs = am33xx_mailbox_irqs, | ||
1361 | .main_clk = "l4ls_gclk", | 1060 | .main_clk = "l4ls_gclk", |
1362 | .prcm = { | 1061 | .prcm = { |
1363 | .omap4 = { | 1062 | .omap4 = { |
@@ -1384,24 +1083,10 @@ static struct omap_hwmod_class am33xx_mcasp_hwmod_class = { | |||
1384 | }; | 1083 | }; |
1385 | 1084 | ||
1386 | /* mcasp0 */ | 1085 | /* mcasp0 */ |
1387 | static struct omap_hwmod_irq_info am33xx_mcasp0_irqs[] = { | ||
1388 | { .name = "ax", .irq = 80 + OMAP_INTC_START, }, | ||
1389 | { .name = "ar", .irq = 81 + OMAP_INTC_START, }, | ||
1390 | { .irq = -1 }, | ||
1391 | }; | ||
1392 | |||
1393 | static struct omap_hwmod_dma_info am33xx_mcasp0_edma_reqs[] = { | ||
1394 | { .name = "tx", .dma_req = 8, }, | ||
1395 | { .name = "rx", .dma_req = 9, }, | ||
1396 | { .dma_req = -1 } | ||
1397 | }; | ||
1398 | |||
1399 | static struct omap_hwmod am33xx_mcasp0_hwmod = { | 1086 | static struct omap_hwmod am33xx_mcasp0_hwmod = { |
1400 | .name = "mcasp0", | 1087 | .name = "mcasp0", |
1401 | .class = &am33xx_mcasp_hwmod_class, | 1088 | .class = &am33xx_mcasp_hwmod_class, |
1402 | .clkdm_name = "l3s_clkdm", | 1089 | .clkdm_name = "l3s_clkdm", |
1403 | .mpu_irqs = am33xx_mcasp0_irqs, | ||
1404 | .sdma_reqs = am33xx_mcasp0_edma_reqs, | ||
1405 | .main_clk = "mcasp0_fck", | 1090 | .main_clk = "mcasp0_fck", |
1406 | .prcm = { | 1091 | .prcm = { |
1407 | .omap4 = { | 1092 | .omap4 = { |
@@ -1412,24 +1097,10 @@ static struct omap_hwmod am33xx_mcasp0_hwmod = { | |||
1412 | }; | 1097 | }; |
1413 | 1098 | ||
1414 | /* mcasp1 */ | 1099 | /* mcasp1 */ |
1415 | static struct omap_hwmod_irq_info am33xx_mcasp1_irqs[] = { | ||
1416 | { .name = "ax", .irq = 82 + OMAP_INTC_START, }, | ||
1417 | { .name = "ar", .irq = 83 + OMAP_INTC_START, }, | ||
1418 | { .irq = -1 }, | ||
1419 | }; | ||
1420 | |||
1421 | static struct omap_hwmod_dma_info am33xx_mcasp1_edma_reqs[] = { | ||
1422 | { .name = "tx", .dma_req = 10, }, | ||
1423 | { .name = "rx", .dma_req = 11, }, | ||
1424 | { .dma_req = -1 } | ||
1425 | }; | ||
1426 | |||
1427 | static struct omap_hwmod am33xx_mcasp1_hwmod = { | 1100 | static struct omap_hwmod am33xx_mcasp1_hwmod = { |
1428 | .name = "mcasp1", | 1101 | .name = "mcasp1", |
1429 | .class = &am33xx_mcasp_hwmod_class, | 1102 | .class = &am33xx_mcasp_hwmod_class, |
1430 | .clkdm_name = "l3s_clkdm", | 1103 | .clkdm_name = "l3s_clkdm", |
1431 | .mpu_irqs = am33xx_mcasp1_irqs, | ||
1432 | .sdma_reqs = am33xx_mcasp1_edma_reqs, | ||
1433 | .main_clk = "mcasp1_fck", | 1104 | .main_clk = "mcasp1_fck", |
1434 | .prcm = { | 1105 | .prcm = { |
1435 | .omap4 = { | 1106 | .omap4 = { |
@@ -1457,17 +1128,6 @@ static struct omap_hwmod_class am33xx_mmc_hwmod_class = { | |||
1457 | }; | 1128 | }; |
1458 | 1129 | ||
1459 | /* mmc0 */ | 1130 | /* mmc0 */ |
1460 | static struct omap_hwmod_irq_info am33xx_mmc0_irqs[] = { | ||
1461 | { .irq = 64 + OMAP_INTC_START, }, | ||
1462 | { .irq = -1 }, | ||
1463 | }; | ||
1464 | |||
1465 | static struct omap_hwmod_dma_info am33xx_mmc0_edma_reqs[] = { | ||
1466 | { .name = "tx", .dma_req = 24, }, | ||
1467 | { .name = "rx", .dma_req = 25, }, | ||
1468 | { .dma_req = -1 } | ||
1469 | }; | ||
1470 | |||
1471 | static struct omap_mmc_dev_attr am33xx_mmc0_dev_attr = { | 1131 | static struct omap_mmc_dev_attr am33xx_mmc0_dev_attr = { |
1472 | .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, | 1132 | .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, |
1473 | }; | 1133 | }; |
@@ -1476,8 +1136,6 @@ static struct omap_hwmod am33xx_mmc0_hwmod = { | |||
1476 | .name = "mmc1", | 1136 | .name = "mmc1", |
1477 | .class = &am33xx_mmc_hwmod_class, | 1137 | .class = &am33xx_mmc_hwmod_class, |
1478 | .clkdm_name = "l4ls_clkdm", | 1138 | .clkdm_name = "l4ls_clkdm", |
1479 | .mpu_irqs = am33xx_mmc0_irqs, | ||
1480 | .sdma_reqs = am33xx_mmc0_edma_reqs, | ||
1481 | .main_clk = "mmc_clk", | 1139 | .main_clk = "mmc_clk", |
1482 | .prcm = { | 1140 | .prcm = { |
1483 | .omap4 = { | 1141 | .omap4 = { |
@@ -1489,17 +1147,6 @@ static struct omap_hwmod am33xx_mmc0_hwmod = { | |||
1489 | }; | 1147 | }; |
1490 | 1148 | ||
1491 | /* mmc1 */ | 1149 | /* mmc1 */ |
1492 | static struct omap_hwmod_irq_info am33xx_mmc1_irqs[] = { | ||
1493 | { .irq = 28 + OMAP_INTC_START, }, | ||
1494 | { .irq = -1 }, | ||
1495 | }; | ||
1496 | |||
1497 | static struct omap_hwmod_dma_info am33xx_mmc1_edma_reqs[] = { | ||
1498 | { .name = "tx", .dma_req = 2, }, | ||
1499 | { .name = "rx", .dma_req = 3, }, | ||
1500 | { .dma_req = -1 } | ||
1501 | }; | ||
1502 | |||
1503 | static struct omap_mmc_dev_attr am33xx_mmc1_dev_attr = { | 1150 | static struct omap_mmc_dev_attr am33xx_mmc1_dev_attr = { |
1504 | .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, | 1151 | .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, |
1505 | }; | 1152 | }; |
@@ -1508,8 +1155,6 @@ static struct omap_hwmod am33xx_mmc1_hwmod = { | |||
1508 | .name = "mmc2", | 1155 | .name = "mmc2", |
1509 | .class = &am33xx_mmc_hwmod_class, | 1156 | .class = &am33xx_mmc_hwmod_class, |
1510 | .clkdm_name = "l4ls_clkdm", | 1157 | .clkdm_name = "l4ls_clkdm", |
1511 | .mpu_irqs = am33xx_mmc1_irqs, | ||
1512 | .sdma_reqs = am33xx_mmc1_edma_reqs, | ||
1513 | .main_clk = "mmc_clk", | 1158 | .main_clk = "mmc_clk", |
1514 | .prcm = { | 1159 | .prcm = { |
1515 | .omap4 = { | 1160 | .omap4 = { |
@@ -1521,17 +1166,6 @@ static struct omap_hwmod am33xx_mmc1_hwmod = { | |||
1521 | }; | 1166 | }; |
1522 | 1167 | ||
1523 | /* mmc2 */ | 1168 | /* mmc2 */ |
1524 | static struct omap_hwmod_irq_info am33xx_mmc2_irqs[] = { | ||
1525 | { .irq = 29 + OMAP_INTC_START, }, | ||
1526 | { .irq = -1 }, | ||
1527 | }; | ||
1528 | |||
1529 | static struct omap_hwmod_dma_info am33xx_mmc2_edma_reqs[] = { | ||
1530 | { .name = "tx", .dma_req = 64, }, | ||
1531 | { .name = "rx", .dma_req = 65, }, | ||
1532 | { .dma_req = -1 } | ||
1533 | }; | ||
1534 | |||
1535 | static struct omap_mmc_dev_attr am33xx_mmc2_dev_attr = { | 1169 | static struct omap_mmc_dev_attr am33xx_mmc2_dev_attr = { |
1536 | .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, | 1170 | .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, |
1537 | }; | 1171 | }; |
@@ -1539,8 +1173,6 @@ static struct omap_hwmod am33xx_mmc2_hwmod = { | |||
1539 | .name = "mmc3", | 1173 | .name = "mmc3", |
1540 | .class = &am33xx_mmc_hwmod_class, | 1174 | .class = &am33xx_mmc_hwmod_class, |
1541 | .clkdm_name = "l3s_clkdm", | 1175 | .clkdm_name = "l3s_clkdm", |
1542 | .mpu_irqs = am33xx_mmc2_irqs, | ||
1543 | .sdma_reqs = am33xx_mmc2_edma_reqs, | ||
1544 | .main_clk = "mmc_clk", | 1176 | .main_clk = "mmc_clk", |
1545 | .prcm = { | 1177 | .prcm = { |
1546 | .omap4 = { | 1178 | .omap4 = { |
@@ -1569,17 +1201,10 @@ static struct omap_hwmod_class am33xx_rtc_hwmod_class = { | |||
1569 | .sysc = &am33xx_rtc_sysc, | 1201 | .sysc = &am33xx_rtc_sysc, |
1570 | }; | 1202 | }; |
1571 | 1203 | ||
1572 | static struct omap_hwmod_irq_info am33xx_rtc_irqs[] = { | ||
1573 | { .name = "rtcint", .irq = 75 + OMAP_INTC_START, }, | ||
1574 | { .name = "rtcalarmint", .irq = 76 + OMAP_INTC_START, }, | ||
1575 | { .irq = -1 }, | ||
1576 | }; | ||
1577 | |||
1578 | static struct omap_hwmod am33xx_rtc_hwmod = { | 1204 | static struct omap_hwmod am33xx_rtc_hwmod = { |
1579 | .name = "rtc", | 1205 | .name = "rtc", |
1580 | .class = &am33xx_rtc_hwmod_class, | 1206 | .class = &am33xx_rtc_hwmod_class, |
1581 | .clkdm_name = "l4_rtc_clkdm", | 1207 | .clkdm_name = "l4_rtc_clkdm", |
1582 | .mpu_irqs = am33xx_rtc_irqs, | ||
1583 | .main_clk = "clk_32768_ck", | 1208 | .main_clk = "clk_32768_ck", |
1584 | .prcm = { | 1209 | .prcm = { |
1585 | .omap4 = { | 1210 | .omap4 = { |
@@ -1608,19 +1233,6 @@ static struct omap_hwmod_class am33xx_spi_hwmod_class = { | |||
1608 | }; | 1233 | }; |
1609 | 1234 | ||
1610 | /* spi0 */ | 1235 | /* spi0 */ |
1611 | static struct omap_hwmod_irq_info am33xx_spi0_irqs[] = { | ||
1612 | { .irq = 65 + OMAP_INTC_START, }, | ||
1613 | { .irq = -1 }, | ||
1614 | }; | ||
1615 | |||
1616 | static struct omap_hwmod_dma_info am33xx_mcspi0_edma_reqs[] = { | ||
1617 | { .name = "rx0", .dma_req = 17 }, | ||
1618 | { .name = "tx0", .dma_req = 16 }, | ||
1619 | { .name = "rx1", .dma_req = 19 }, | ||
1620 | { .name = "tx1", .dma_req = 18 }, | ||
1621 | { .dma_req = -1 } | ||
1622 | }; | ||
1623 | |||
1624 | static struct omap2_mcspi_dev_attr mcspi_attrib = { | 1236 | static struct omap2_mcspi_dev_attr mcspi_attrib = { |
1625 | .num_chipselect = 2, | 1237 | .num_chipselect = 2, |
1626 | }; | 1238 | }; |
@@ -1628,8 +1240,6 @@ static struct omap_hwmod am33xx_spi0_hwmod = { | |||
1628 | .name = "spi0", | 1240 | .name = "spi0", |
1629 | .class = &am33xx_spi_hwmod_class, | 1241 | .class = &am33xx_spi_hwmod_class, |
1630 | .clkdm_name = "l4ls_clkdm", | 1242 | .clkdm_name = "l4ls_clkdm", |
1631 | .mpu_irqs = am33xx_spi0_irqs, | ||
1632 | .sdma_reqs = am33xx_mcspi0_edma_reqs, | ||
1633 | .main_clk = "dpll_per_m2_div4_ck", | 1243 | .main_clk = "dpll_per_m2_div4_ck", |
1634 | .prcm = { | 1244 | .prcm = { |
1635 | .omap4 = { | 1245 | .omap4 = { |
@@ -1641,25 +1251,10 @@ static struct omap_hwmod am33xx_spi0_hwmod = { | |||
1641 | }; | 1251 | }; |
1642 | 1252 | ||
1643 | /* spi1 */ | 1253 | /* spi1 */ |
1644 | static struct omap_hwmod_irq_info am33xx_spi1_irqs[] = { | ||
1645 | { .irq = 125 + OMAP_INTC_START, }, | ||
1646 | { .irq = -1 }, | ||
1647 | }; | ||
1648 | |||
1649 | static struct omap_hwmod_dma_info am33xx_mcspi1_edma_reqs[] = { | ||
1650 | { .name = "rx0", .dma_req = 43 }, | ||
1651 | { .name = "tx0", .dma_req = 42 }, | ||
1652 | { .name = "rx1", .dma_req = 45 }, | ||
1653 | { .name = "tx1", .dma_req = 44 }, | ||
1654 | { .dma_req = -1 } | ||
1655 | }; | ||
1656 | |||
1657 | static struct omap_hwmod am33xx_spi1_hwmod = { | 1254 | static struct omap_hwmod am33xx_spi1_hwmod = { |
1658 | .name = "spi1", | 1255 | .name = "spi1", |
1659 | .class = &am33xx_spi_hwmod_class, | 1256 | .class = &am33xx_spi_hwmod_class, |
1660 | .clkdm_name = "l4ls_clkdm", | 1257 | .clkdm_name = "l4ls_clkdm", |
1661 | .mpu_irqs = am33xx_spi1_irqs, | ||
1662 | .sdma_reqs = am33xx_mcspi1_edma_reqs, | ||
1663 | .main_clk = "dpll_per_m2_div4_ck", | 1258 | .main_clk = "dpll_per_m2_div4_ck", |
1664 | .prcm = { | 1259 | .prcm = { |
1665 | .omap4 = { | 1260 | .omap4 = { |
@@ -1725,16 +1320,10 @@ static struct omap_hwmod_class am33xx_timer1ms_hwmod_class = { | |||
1725 | .sysc = &am33xx_timer1ms_sysc, | 1320 | .sysc = &am33xx_timer1ms_sysc, |
1726 | }; | 1321 | }; |
1727 | 1322 | ||
1728 | static struct omap_hwmod_irq_info am33xx_timer1_irqs[] = { | ||
1729 | { .irq = 67 + OMAP_INTC_START, }, | ||
1730 | { .irq = -1 }, | ||
1731 | }; | ||
1732 | |||
1733 | static struct omap_hwmod am33xx_timer1_hwmod = { | 1323 | static struct omap_hwmod am33xx_timer1_hwmod = { |
1734 | .name = "timer1", | 1324 | .name = "timer1", |
1735 | .class = &am33xx_timer1ms_hwmod_class, | 1325 | .class = &am33xx_timer1ms_hwmod_class, |
1736 | .clkdm_name = "l4_wkup_clkdm", | 1326 | .clkdm_name = "l4_wkup_clkdm", |
1737 | .mpu_irqs = am33xx_timer1_irqs, | ||
1738 | .main_clk = "timer1_fck", | 1327 | .main_clk = "timer1_fck", |
1739 | .prcm = { | 1328 | .prcm = { |
1740 | .omap4 = { | 1329 | .omap4 = { |
@@ -1744,16 +1333,10 @@ static struct omap_hwmod am33xx_timer1_hwmod = { | |||
1744 | }, | 1333 | }, |
1745 | }; | 1334 | }; |
1746 | 1335 | ||
1747 | static struct omap_hwmod_irq_info am33xx_timer2_irqs[] = { | ||
1748 | { .irq = 68 + OMAP_INTC_START, }, | ||
1749 | { .irq = -1 }, | ||
1750 | }; | ||
1751 | |||
1752 | static struct omap_hwmod am33xx_timer2_hwmod = { | 1336 | static struct omap_hwmod am33xx_timer2_hwmod = { |
1753 | .name = "timer2", | 1337 | .name = "timer2", |
1754 | .class = &am33xx_timer_hwmod_class, | 1338 | .class = &am33xx_timer_hwmod_class, |
1755 | .clkdm_name = "l4ls_clkdm", | 1339 | .clkdm_name = "l4ls_clkdm", |
1756 | .mpu_irqs = am33xx_timer2_irqs, | ||
1757 | .main_clk = "timer2_fck", | 1340 | .main_clk = "timer2_fck", |
1758 | .prcm = { | 1341 | .prcm = { |
1759 | .omap4 = { | 1342 | .omap4 = { |
@@ -1763,16 +1346,10 @@ static struct omap_hwmod am33xx_timer2_hwmod = { | |||
1763 | }, | 1346 | }, |
1764 | }; | 1347 | }; |
1765 | 1348 | ||
1766 | static struct omap_hwmod_irq_info am33xx_timer3_irqs[] = { | ||
1767 | { .irq = 69 + OMAP_INTC_START, }, | ||
1768 | { .irq = -1 }, | ||
1769 | }; | ||
1770 | |||
1771 | static struct omap_hwmod am33xx_timer3_hwmod = { | 1349 | static struct omap_hwmod am33xx_timer3_hwmod = { |
1772 | .name = "timer3", | 1350 | .name = "timer3", |
1773 | .class = &am33xx_timer_hwmod_class, | 1351 | .class = &am33xx_timer_hwmod_class, |
1774 | .clkdm_name = "l4ls_clkdm", | 1352 | .clkdm_name = "l4ls_clkdm", |
1775 | .mpu_irqs = am33xx_timer3_irqs, | ||
1776 | .main_clk = "timer3_fck", | 1353 | .main_clk = "timer3_fck", |
1777 | .prcm = { | 1354 | .prcm = { |
1778 | .omap4 = { | 1355 | .omap4 = { |
@@ -1782,16 +1359,10 @@ static struct omap_hwmod am33xx_timer3_hwmod = { | |||
1782 | }, | 1359 | }, |
1783 | }; | 1360 | }; |
1784 | 1361 | ||
1785 | static struct omap_hwmod_irq_info am33xx_timer4_irqs[] = { | ||
1786 | { .irq = 92 + OMAP_INTC_START, }, | ||
1787 | { .irq = -1 }, | ||
1788 | }; | ||
1789 | |||
1790 | static struct omap_hwmod am33xx_timer4_hwmod = { | 1362 | static struct omap_hwmod am33xx_timer4_hwmod = { |
1791 | .name = "timer4", | 1363 | .name = "timer4", |
1792 | .class = &am33xx_timer_hwmod_class, | 1364 | .class = &am33xx_timer_hwmod_class, |
1793 | .clkdm_name = "l4ls_clkdm", | 1365 | .clkdm_name = "l4ls_clkdm", |
1794 | .mpu_irqs = am33xx_timer4_irqs, | ||
1795 | .main_clk = "timer4_fck", | 1366 | .main_clk = "timer4_fck", |
1796 | .prcm = { | 1367 | .prcm = { |
1797 | .omap4 = { | 1368 | .omap4 = { |
@@ -1801,16 +1372,10 @@ static struct omap_hwmod am33xx_timer4_hwmod = { | |||
1801 | }, | 1372 | }, |
1802 | }; | 1373 | }; |
1803 | 1374 | ||
1804 | static struct omap_hwmod_irq_info am33xx_timer5_irqs[] = { | ||
1805 | { .irq = 93 + OMAP_INTC_START, }, | ||
1806 | { .irq = -1 }, | ||
1807 | }; | ||
1808 | |||
1809 | static struct omap_hwmod am33xx_timer5_hwmod = { | 1375 | static struct omap_hwmod am33xx_timer5_hwmod = { |
1810 | .name = "timer5", | 1376 | .name = "timer5", |
1811 | .class = &am33xx_timer_hwmod_class, | 1377 | .class = &am33xx_timer_hwmod_class, |
1812 | .clkdm_name = "l4ls_clkdm", | 1378 | .clkdm_name = "l4ls_clkdm", |
1813 | .mpu_irqs = am33xx_timer5_irqs, | ||
1814 | .main_clk = "timer5_fck", | 1379 | .main_clk = "timer5_fck", |
1815 | .prcm = { | 1380 | .prcm = { |
1816 | .omap4 = { | 1381 | .omap4 = { |
@@ -1820,16 +1385,10 @@ static struct omap_hwmod am33xx_timer5_hwmod = { | |||
1820 | }, | 1385 | }, |
1821 | }; | 1386 | }; |
1822 | 1387 | ||
1823 | static struct omap_hwmod_irq_info am33xx_timer6_irqs[] = { | ||
1824 | { .irq = 94 + OMAP_INTC_START, }, | ||
1825 | { .irq = -1 }, | ||
1826 | }; | ||
1827 | |||
1828 | static struct omap_hwmod am33xx_timer6_hwmod = { | 1388 | static struct omap_hwmod am33xx_timer6_hwmod = { |
1829 | .name = "timer6", | 1389 | .name = "timer6", |
1830 | .class = &am33xx_timer_hwmod_class, | 1390 | .class = &am33xx_timer_hwmod_class, |
1831 | .clkdm_name = "l4ls_clkdm", | 1391 | .clkdm_name = "l4ls_clkdm", |
1832 | .mpu_irqs = am33xx_timer6_irqs, | ||
1833 | .main_clk = "timer6_fck", | 1392 | .main_clk = "timer6_fck", |
1834 | .prcm = { | 1393 | .prcm = { |
1835 | .omap4 = { | 1394 | .omap4 = { |
@@ -1839,16 +1398,10 @@ static struct omap_hwmod am33xx_timer6_hwmod = { | |||
1839 | }, | 1398 | }, |
1840 | }; | 1399 | }; |
1841 | 1400 | ||
1842 | static struct omap_hwmod_irq_info am33xx_timer7_irqs[] = { | ||
1843 | { .irq = 95 + OMAP_INTC_START, }, | ||
1844 | { .irq = -1 }, | ||
1845 | }; | ||
1846 | |||
1847 | static struct omap_hwmod am33xx_timer7_hwmod = { | 1401 | static struct omap_hwmod am33xx_timer7_hwmod = { |
1848 | .name = "timer7", | 1402 | .name = "timer7", |
1849 | .class = &am33xx_timer_hwmod_class, | 1403 | .class = &am33xx_timer_hwmod_class, |
1850 | .clkdm_name = "l4ls_clkdm", | 1404 | .clkdm_name = "l4ls_clkdm", |
1851 | .mpu_irqs = am33xx_timer7_irqs, | ||
1852 | .main_clk = "timer7_fck", | 1405 | .main_clk = "timer7_fck", |
1853 | .prcm = { | 1406 | .prcm = { |
1854 | .omap4 = { | 1407 | .omap4 = { |
@@ -1863,18 +1416,10 @@ static struct omap_hwmod_class am33xx_tpcc_hwmod_class = { | |||
1863 | .name = "tpcc", | 1416 | .name = "tpcc", |
1864 | }; | 1417 | }; |
1865 | 1418 | ||
1866 | static struct omap_hwmod_irq_info am33xx_tpcc_irqs[] = { | ||
1867 | { .name = "edma0", .irq = 12 + OMAP_INTC_START, }, | ||
1868 | { .name = "edma0_mperr", .irq = 13 + OMAP_INTC_START, }, | ||
1869 | { .name = "edma0_err", .irq = 14 + OMAP_INTC_START, }, | ||
1870 | { .irq = -1 }, | ||
1871 | }; | ||
1872 | |||
1873 | static struct omap_hwmod am33xx_tpcc_hwmod = { | 1419 | static struct omap_hwmod am33xx_tpcc_hwmod = { |
1874 | .name = "tpcc", | 1420 | .name = "tpcc", |
1875 | .class = &am33xx_tpcc_hwmod_class, | 1421 | .class = &am33xx_tpcc_hwmod_class, |
1876 | .clkdm_name = "l3_clkdm", | 1422 | .clkdm_name = "l3_clkdm", |
1877 | .mpu_irqs = am33xx_tpcc_irqs, | ||
1878 | .main_clk = "l3_gclk", | 1423 | .main_clk = "l3_gclk", |
1879 | .prcm = { | 1424 | .prcm = { |
1880 | .omap4 = { | 1425 | .omap4 = { |
@@ -1900,16 +1445,10 @@ static struct omap_hwmod_class am33xx_tptc_hwmod_class = { | |||
1900 | }; | 1445 | }; |
1901 | 1446 | ||
1902 | /* tptc0 */ | 1447 | /* tptc0 */ |
1903 | static struct omap_hwmod_irq_info am33xx_tptc0_irqs[] = { | ||
1904 | { .irq = 112 + OMAP_INTC_START, }, | ||
1905 | { .irq = -1 }, | ||
1906 | }; | ||
1907 | |||
1908 | static struct omap_hwmod am33xx_tptc0_hwmod = { | 1448 | static struct omap_hwmod am33xx_tptc0_hwmod = { |
1909 | .name = "tptc0", | 1449 | .name = "tptc0", |
1910 | .class = &am33xx_tptc_hwmod_class, | 1450 | .class = &am33xx_tptc_hwmod_class, |
1911 | .clkdm_name = "l3_clkdm", | 1451 | .clkdm_name = "l3_clkdm", |
1912 | .mpu_irqs = am33xx_tptc0_irqs, | ||
1913 | .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, | 1452 | .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, |
1914 | .main_clk = "l3_gclk", | 1453 | .main_clk = "l3_gclk", |
1915 | .prcm = { | 1454 | .prcm = { |
@@ -1921,16 +1460,10 @@ static struct omap_hwmod am33xx_tptc0_hwmod = { | |||
1921 | }; | 1460 | }; |
1922 | 1461 | ||
1923 | /* tptc1 */ | 1462 | /* tptc1 */ |
1924 | static struct omap_hwmod_irq_info am33xx_tptc1_irqs[] = { | ||
1925 | { .irq = 113 + OMAP_INTC_START, }, | ||
1926 | { .irq = -1 }, | ||
1927 | }; | ||
1928 | |||
1929 | static struct omap_hwmod am33xx_tptc1_hwmod = { | 1463 | static struct omap_hwmod am33xx_tptc1_hwmod = { |
1930 | .name = "tptc1", | 1464 | .name = "tptc1", |
1931 | .class = &am33xx_tptc_hwmod_class, | 1465 | .class = &am33xx_tptc_hwmod_class, |
1932 | .clkdm_name = "l3_clkdm", | 1466 | .clkdm_name = "l3_clkdm", |
1933 | .mpu_irqs = am33xx_tptc1_irqs, | ||
1934 | .flags = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY), | 1467 | .flags = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY), |
1935 | .main_clk = "l3_gclk", | 1468 | .main_clk = "l3_gclk", |
1936 | .prcm = { | 1469 | .prcm = { |
@@ -1942,16 +1475,10 @@ static struct omap_hwmod am33xx_tptc1_hwmod = { | |||
1942 | }; | 1475 | }; |
1943 | 1476 | ||
1944 | /* tptc2 */ | 1477 | /* tptc2 */ |
1945 | static struct omap_hwmod_irq_info am33xx_tptc2_irqs[] = { | ||
1946 | { .irq = 114 + OMAP_INTC_START, }, | ||
1947 | { .irq = -1 }, | ||
1948 | }; | ||
1949 | |||
1950 | static struct omap_hwmod am33xx_tptc2_hwmod = { | 1478 | static struct omap_hwmod am33xx_tptc2_hwmod = { |
1951 | .name = "tptc2", | 1479 | .name = "tptc2", |
1952 | .class = &am33xx_tptc_hwmod_class, | 1480 | .class = &am33xx_tptc_hwmod_class, |
1953 | .clkdm_name = "l3_clkdm", | 1481 | .clkdm_name = "l3_clkdm", |
1954 | .mpu_irqs = am33xx_tptc2_irqs, | ||
1955 | .flags = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY), | 1482 | .flags = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY), |
1956 | .main_clk = "l3_gclk", | 1483 | .main_clk = "l3_gclk", |
1957 | .prcm = { | 1484 | .prcm = { |
@@ -1980,24 +1507,11 @@ static struct omap_hwmod_class uart_class = { | |||
1980 | }; | 1507 | }; |
1981 | 1508 | ||
1982 | /* uart1 */ | 1509 | /* uart1 */ |
1983 | static struct omap_hwmod_dma_info uart1_edma_reqs[] = { | ||
1984 | { .name = "tx", .dma_req = 26, }, | ||
1985 | { .name = "rx", .dma_req = 27, }, | ||
1986 | { .dma_req = -1 } | ||
1987 | }; | ||
1988 | |||
1989 | static struct omap_hwmod_irq_info am33xx_uart1_irqs[] = { | ||
1990 | { .irq = 72 + OMAP_INTC_START, }, | ||
1991 | { .irq = -1 }, | ||
1992 | }; | ||
1993 | |||
1994 | static struct omap_hwmod am33xx_uart1_hwmod = { | 1510 | static struct omap_hwmod am33xx_uart1_hwmod = { |
1995 | .name = "uart1", | 1511 | .name = "uart1", |
1996 | .class = &uart_class, | 1512 | .class = &uart_class, |
1997 | .clkdm_name = "l4_wkup_clkdm", | 1513 | .clkdm_name = "l4_wkup_clkdm", |
1998 | .flags = HWMOD_SWSUP_SIDLE_ACT, | 1514 | .flags = HWMOD_SWSUP_SIDLE_ACT, |
1999 | .mpu_irqs = am33xx_uart1_irqs, | ||
2000 | .sdma_reqs = uart1_edma_reqs, | ||
2001 | .main_clk = "dpll_per_m2_div4_wkupdm_ck", | 1515 | .main_clk = "dpll_per_m2_div4_wkupdm_ck", |
2002 | .prcm = { | 1516 | .prcm = { |
2003 | .omap4 = { | 1517 | .omap4 = { |
@@ -2007,18 +1521,11 @@ static struct omap_hwmod am33xx_uart1_hwmod = { | |||
2007 | }, | 1521 | }, |
2008 | }; | 1522 | }; |
2009 | 1523 | ||
2010 | static struct omap_hwmod_irq_info am33xx_uart2_irqs[] = { | ||
2011 | { .irq = 73 + OMAP_INTC_START, }, | ||
2012 | { .irq = -1 }, | ||
2013 | }; | ||
2014 | |||
2015 | static struct omap_hwmod am33xx_uart2_hwmod = { | 1524 | static struct omap_hwmod am33xx_uart2_hwmod = { |
2016 | .name = "uart2", | 1525 | .name = "uart2", |
2017 | .class = &uart_class, | 1526 | .class = &uart_class, |
2018 | .clkdm_name = "l4ls_clkdm", | 1527 | .clkdm_name = "l4ls_clkdm", |
2019 | .flags = HWMOD_SWSUP_SIDLE_ACT, | 1528 | .flags = HWMOD_SWSUP_SIDLE_ACT, |
2020 | .mpu_irqs = am33xx_uart2_irqs, | ||
2021 | .sdma_reqs = uart1_edma_reqs, | ||
2022 | .main_clk = "dpll_per_m2_div4_ck", | 1529 | .main_clk = "dpll_per_m2_div4_ck", |
2023 | .prcm = { | 1530 | .prcm = { |
2024 | .omap4 = { | 1531 | .omap4 = { |
@@ -2029,24 +1536,11 @@ static struct omap_hwmod am33xx_uart2_hwmod = { | |||
2029 | }; | 1536 | }; |
2030 | 1537 | ||
2031 | /* uart3 */ | 1538 | /* uart3 */ |
2032 | static struct omap_hwmod_dma_info uart3_edma_reqs[] = { | ||
2033 | { .name = "tx", .dma_req = 30, }, | ||
2034 | { .name = "rx", .dma_req = 31, }, | ||
2035 | { .dma_req = -1 } | ||
2036 | }; | ||
2037 | |||
2038 | static struct omap_hwmod_irq_info am33xx_uart3_irqs[] = { | ||
2039 | { .irq = 74 + OMAP_INTC_START, }, | ||
2040 | { .irq = -1 }, | ||
2041 | }; | ||
2042 | |||
2043 | static struct omap_hwmod am33xx_uart3_hwmod = { | 1539 | static struct omap_hwmod am33xx_uart3_hwmod = { |
2044 | .name = "uart3", | 1540 | .name = "uart3", |
2045 | .class = &uart_class, | 1541 | .class = &uart_class, |
2046 | .clkdm_name = "l4ls_clkdm", | 1542 | .clkdm_name = "l4ls_clkdm", |
2047 | .flags = HWMOD_SWSUP_SIDLE_ACT, | 1543 | .flags = HWMOD_SWSUP_SIDLE_ACT, |
2048 | .mpu_irqs = am33xx_uart3_irqs, | ||
2049 | .sdma_reqs = uart3_edma_reqs, | ||
2050 | .main_clk = "dpll_per_m2_div4_ck", | 1544 | .main_clk = "dpll_per_m2_div4_ck", |
2051 | .prcm = { | 1545 | .prcm = { |
2052 | .omap4 = { | 1546 | .omap4 = { |
@@ -2056,18 +1550,11 @@ static struct omap_hwmod am33xx_uart3_hwmod = { | |||
2056 | }, | 1550 | }, |
2057 | }; | 1551 | }; |
2058 | 1552 | ||
2059 | static struct omap_hwmod_irq_info am33xx_uart4_irqs[] = { | ||
2060 | { .irq = 44 + OMAP_INTC_START, }, | ||
2061 | { .irq = -1 }, | ||
2062 | }; | ||
2063 | |||
2064 | static struct omap_hwmod am33xx_uart4_hwmod = { | 1553 | static struct omap_hwmod am33xx_uart4_hwmod = { |
2065 | .name = "uart4", | 1554 | .name = "uart4", |
2066 | .class = &uart_class, | 1555 | .class = &uart_class, |
2067 | .clkdm_name = "l4ls_clkdm", | 1556 | .clkdm_name = "l4ls_clkdm", |
2068 | .flags = HWMOD_SWSUP_SIDLE_ACT, | 1557 | .flags = HWMOD_SWSUP_SIDLE_ACT, |
2069 | .mpu_irqs = am33xx_uart4_irqs, | ||
2070 | .sdma_reqs = uart1_edma_reqs, | ||
2071 | .main_clk = "dpll_per_m2_div4_ck", | 1558 | .main_clk = "dpll_per_m2_div4_ck", |
2072 | .prcm = { | 1559 | .prcm = { |
2073 | .omap4 = { | 1560 | .omap4 = { |
@@ -2077,18 +1564,11 @@ static struct omap_hwmod am33xx_uart4_hwmod = { | |||
2077 | }, | 1564 | }, |
2078 | }; | 1565 | }; |
2079 | 1566 | ||
2080 | static struct omap_hwmod_irq_info am33xx_uart5_irqs[] = { | ||
2081 | { .irq = 45 + OMAP_INTC_START, }, | ||
2082 | { .irq = -1 }, | ||
2083 | }; | ||
2084 | |||
2085 | static struct omap_hwmod am33xx_uart5_hwmod = { | 1567 | static struct omap_hwmod am33xx_uart5_hwmod = { |
2086 | .name = "uart5", | 1568 | .name = "uart5", |
2087 | .class = &uart_class, | 1569 | .class = &uart_class, |
2088 | .clkdm_name = "l4ls_clkdm", | 1570 | .clkdm_name = "l4ls_clkdm", |
2089 | .flags = HWMOD_SWSUP_SIDLE_ACT, | 1571 | .flags = HWMOD_SWSUP_SIDLE_ACT, |
2090 | .mpu_irqs = am33xx_uart5_irqs, | ||
2091 | .sdma_reqs = uart1_edma_reqs, | ||
2092 | .main_clk = "dpll_per_m2_div4_ck", | 1572 | .main_clk = "dpll_per_m2_div4_ck", |
2093 | .prcm = { | 1573 | .prcm = { |
2094 | .omap4 = { | 1574 | .omap4 = { |
@@ -2098,18 +1578,11 @@ static struct omap_hwmod am33xx_uart5_hwmod = { | |||
2098 | }, | 1578 | }, |
2099 | }; | 1579 | }; |
2100 | 1580 | ||
2101 | static struct omap_hwmod_irq_info am33xx_uart6_irqs[] = { | ||
2102 | { .irq = 46 + OMAP_INTC_START, }, | ||
2103 | { .irq = -1 }, | ||
2104 | }; | ||
2105 | |||
2106 | static struct omap_hwmod am33xx_uart6_hwmod = { | 1581 | static struct omap_hwmod am33xx_uart6_hwmod = { |
2107 | .name = "uart6", | 1582 | .name = "uart6", |
2108 | .class = &uart_class, | 1583 | .class = &uart_class, |
2109 | .clkdm_name = "l4ls_clkdm", | 1584 | .clkdm_name = "l4ls_clkdm", |
2110 | .flags = HWMOD_SWSUP_SIDLE_ACT, | 1585 | .flags = HWMOD_SWSUP_SIDLE_ACT, |
2111 | .mpu_irqs = am33xx_uart6_irqs, | ||
2112 | .sdma_reqs = uart1_edma_reqs, | ||
2113 | .main_clk = "dpll_per_m2_div4_ck", | 1586 | .main_clk = "dpll_per_m2_div4_ck", |
2114 | .prcm = { | 1587 | .prcm = { |
2115 | .omap4 = { | 1588 | .omap4 = { |
@@ -2173,18 +1646,10 @@ static struct omap_hwmod_class am33xx_usbotg_class = { | |||
2173 | .sysc = &am33xx_usbhsotg_sysc, | 1646 | .sysc = &am33xx_usbhsotg_sysc, |
2174 | }; | 1647 | }; |
2175 | 1648 | ||
2176 | static struct omap_hwmod_irq_info am33xx_usbss_mpu_irqs[] = { | ||
2177 | { .name = "usbss-irq", .irq = 17 + OMAP_INTC_START, }, | ||
2178 | { .name = "musb0-irq", .irq = 18 + OMAP_INTC_START, }, | ||
2179 | { .name = "musb1-irq", .irq = 19 + OMAP_INTC_START, }, | ||
2180 | { .irq = -1, }, | ||
2181 | }; | ||
2182 | |||
2183 | static struct omap_hwmod am33xx_usbss_hwmod = { | 1649 | static struct omap_hwmod am33xx_usbss_hwmod = { |
2184 | .name = "usb_otg_hs", | 1650 | .name = "usb_otg_hs", |
2185 | .class = &am33xx_usbotg_class, | 1651 | .class = &am33xx_usbotg_class, |
2186 | .clkdm_name = "l3s_clkdm", | 1652 | .clkdm_name = "l3s_clkdm", |
2187 | .mpu_irqs = am33xx_usbss_mpu_irqs, | ||
2188 | .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, | 1653 | .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, |
2189 | .main_clk = "usbotg_fck", | 1654 | .main_clk = "usbotg_fck", |
2190 | .prcm = { | 1655 | .prcm = { |
@@ -2200,14 +1665,6 @@ static struct omap_hwmod am33xx_usbss_hwmod = { | |||
2200 | * Interfaces | 1665 | * Interfaces |
2201 | */ | 1666 | */ |
2202 | 1667 | ||
2203 | /* l4 fw -> emif fw */ | ||
2204 | static struct omap_hwmod_ocp_if am33xx_l4_fw__emif_fw = { | ||
2205 | .master = &am33xx_l4_fw_hwmod, | ||
2206 | .slave = &am33xx_emif_fw_hwmod, | ||
2207 | .clk = "l4fw_gclk", | ||
2208 | .user = OCP_USER_MPU, | ||
2209 | }; | ||
2210 | |||
2211 | static struct omap_hwmod_addr_space am33xx_emif_addrs[] = { | 1668 | static struct omap_hwmod_addr_space am33xx_emif_addrs[] = { |
2212 | { | 1669 | { |
2213 | .pa_start = 0x4c000000, | 1670 | .pa_start = 0x4c000000, |
@@ -2265,14 +1722,6 @@ static struct omap_hwmod_ocp_if am33xx_l3_s__l4_wkup = { | |||
2265 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1722 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2266 | }; | 1723 | }; |
2267 | 1724 | ||
2268 | /* l3 s -> l4 fw */ | ||
2269 | static struct omap_hwmod_ocp_if am33xx_l3_s__l4_fw = { | ||
2270 | .master = &am33xx_l3_s_hwmod, | ||
2271 | .slave = &am33xx_l4_fw_hwmod, | ||
2272 | .clk = "l3s_gclk", | ||
2273 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
2274 | }; | ||
2275 | |||
2276 | /* l3 main -> l3 instr */ | 1725 | /* l3 main -> l3 instr */ |
2277 | static struct omap_hwmod_ocp_if am33xx_l3_main__l3_instr = { | 1726 | static struct omap_hwmod_ocp_if am33xx_l3_main__l3_instr = { |
2278 | .master = &am33xx_l3_main_hwmod, | 1727 | .master = &am33xx_l3_main_hwmod, |
@@ -2322,261 +1771,114 @@ static struct omap_hwmod_ocp_if am33xx_gfx__l3_main = { | |||
2322 | }; | 1771 | }; |
2323 | 1772 | ||
2324 | /* l4 wkup -> wkup m3 */ | 1773 | /* l4 wkup -> wkup m3 */ |
2325 | static struct omap_hwmod_addr_space am33xx_wkup_m3_addrs[] = { | ||
2326 | { | ||
2327 | .name = "umem", | ||
2328 | .pa_start = 0x44d00000, | ||
2329 | .pa_end = 0x44d00000 + SZ_16K - 1, | ||
2330 | .flags = ADDR_TYPE_RT | ||
2331 | }, | ||
2332 | { | ||
2333 | .name = "dmem", | ||
2334 | .pa_start = 0x44d80000, | ||
2335 | .pa_end = 0x44d80000 + SZ_8K - 1, | ||
2336 | .flags = ADDR_TYPE_RT | ||
2337 | }, | ||
2338 | { } | ||
2339 | }; | ||
2340 | |||
2341 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__wkup_m3 = { | 1774 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__wkup_m3 = { |
2342 | .master = &am33xx_l4_wkup_hwmod, | 1775 | .master = &am33xx_l4_wkup_hwmod, |
2343 | .slave = &am33xx_wkup_m3_hwmod, | 1776 | .slave = &am33xx_wkup_m3_hwmod, |
2344 | .clk = "dpll_core_m4_div2_ck", | 1777 | .clk = "dpll_core_m4_div2_ck", |
2345 | .addr = am33xx_wkup_m3_addrs, | ||
2346 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1778 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2347 | }; | 1779 | }; |
2348 | 1780 | ||
2349 | /* l4 hs -> pru-icss */ | 1781 | /* l4 hs -> pru-icss */ |
2350 | static struct omap_hwmod_addr_space am33xx_pruss_addrs[] = { | ||
2351 | { | ||
2352 | .pa_start = 0x4a300000, | ||
2353 | .pa_end = 0x4a300000 + SZ_512K - 1, | ||
2354 | .flags = ADDR_TYPE_RT | ||
2355 | }, | ||
2356 | { } | ||
2357 | }; | ||
2358 | |||
2359 | static struct omap_hwmod_ocp_if am33xx_l4_hs__pruss = { | 1782 | static struct omap_hwmod_ocp_if am33xx_l4_hs__pruss = { |
2360 | .master = &am33xx_l4_hs_hwmod, | 1783 | .master = &am33xx_l4_hs_hwmod, |
2361 | .slave = &am33xx_pruss_hwmod, | 1784 | .slave = &am33xx_pruss_hwmod, |
2362 | .clk = "dpll_core_m4_ck", | 1785 | .clk = "dpll_core_m4_ck", |
2363 | .addr = am33xx_pruss_addrs, | ||
2364 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1786 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2365 | }; | 1787 | }; |
2366 | 1788 | ||
2367 | /* l3 main -> gfx */ | 1789 | /* l3 main -> gfx */ |
2368 | static struct omap_hwmod_addr_space am33xx_gfx_addrs[] = { | ||
2369 | { | ||
2370 | .pa_start = 0x56000000, | ||
2371 | .pa_end = 0x56000000 + SZ_16M - 1, | ||
2372 | .flags = ADDR_TYPE_RT | ||
2373 | }, | ||
2374 | { } | ||
2375 | }; | ||
2376 | |||
2377 | static struct omap_hwmod_ocp_if am33xx_l3_main__gfx = { | 1790 | static struct omap_hwmod_ocp_if am33xx_l3_main__gfx = { |
2378 | .master = &am33xx_l3_main_hwmod, | 1791 | .master = &am33xx_l3_main_hwmod, |
2379 | .slave = &am33xx_gfx_hwmod, | 1792 | .slave = &am33xx_gfx_hwmod, |
2380 | .clk = "dpll_core_m4_ck", | 1793 | .clk = "dpll_core_m4_ck", |
2381 | .addr = am33xx_gfx_addrs, | ||
2382 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1794 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2383 | }; | 1795 | }; |
2384 | 1796 | ||
2385 | /* l4 wkup -> smartreflex0 */ | 1797 | /* l4 wkup -> smartreflex0 */ |
2386 | static struct omap_hwmod_addr_space am33xx_smartreflex0_addrs[] = { | ||
2387 | { | ||
2388 | .pa_start = 0x44e37000, | ||
2389 | .pa_end = 0x44e37000 + SZ_4K - 1, | ||
2390 | .flags = ADDR_TYPE_RT | ||
2391 | }, | ||
2392 | { } | ||
2393 | }; | ||
2394 | |||
2395 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex0 = { | 1798 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex0 = { |
2396 | .master = &am33xx_l4_wkup_hwmod, | 1799 | .master = &am33xx_l4_wkup_hwmod, |
2397 | .slave = &am33xx_smartreflex0_hwmod, | 1800 | .slave = &am33xx_smartreflex0_hwmod, |
2398 | .clk = "dpll_core_m4_div2_ck", | 1801 | .clk = "dpll_core_m4_div2_ck", |
2399 | .addr = am33xx_smartreflex0_addrs, | ||
2400 | .user = OCP_USER_MPU, | 1802 | .user = OCP_USER_MPU, |
2401 | }; | 1803 | }; |
2402 | 1804 | ||
2403 | /* l4 wkup -> smartreflex1 */ | 1805 | /* l4 wkup -> smartreflex1 */ |
2404 | static struct omap_hwmod_addr_space am33xx_smartreflex1_addrs[] = { | ||
2405 | { | ||
2406 | .pa_start = 0x44e39000, | ||
2407 | .pa_end = 0x44e39000 + SZ_4K - 1, | ||
2408 | .flags = ADDR_TYPE_RT | ||
2409 | }, | ||
2410 | { } | ||
2411 | }; | ||
2412 | |||
2413 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex1 = { | 1806 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex1 = { |
2414 | .master = &am33xx_l4_wkup_hwmod, | 1807 | .master = &am33xx_l4_wkup_hwmod, |
2415 | .slave = &am33xx_smartreflex1_hwmod, | 1808 | .slave = &am33xx_smartreflex1_hwmod, |
2416 | .clk = "dpll_core_m4_div2_ck", | 1809 | .clk = "dpll_core_m4_div2_ck", |
2417 | .addr = am33xx_smartreflex1_addrs, | ||
2418 | .user = OCP_USER_MPU, | 1810 | .user = OCP_USER_MPU, |
2419 | }; | 1811 | }; |
2420 | 1812 | ||
2421 | /* l4 wkup -> control */ | 1813 | /* l4 wkup -> control */ |
2422 | static struct omap_hwmod_addr_space am33xx_control_addrs[] = { | ||
2423 | { | ||
2424 | .pa_start = 0x44e10000, | ||
2425 | .pa_end = 0x44e10000 + SZ_8K - 1, | ||
2426 | .flags = ADDR_TYPE_RT | ||
2427 | }, | ||
2428 | { } | ||
2429 | }; | ||
2430 | |||
2431 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__control = { | 1814 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__control = { |
2432 | .master = &am33xx_l4_wkup_hwmod, | 1815 | .master = &am33xx_l4_wkup_hwmod, |
2433 | .slave = &am33xx_control_hwmod, | 1816 | .slave = &am33xx_control_hwmod, |
2434 | .clk = "dpll_core_m4_div2_ck", | 1817 | .clk = "dpll_core_m4_div2_ck", |
2435 | .addr = am33xx_control_addrs, | ||
2436 | .user = OCP_USER_MPU, | 1818 | .user = OCP_USER_MPU, |
2437 | }; | 1819 | }; |
2438 | 1820 | ||
2439 | /* l4 wkup -> rtc */ | 1821 | /* l4 wkup -> rtc */ |
2440 | static struct omap_hwmod_addr_space am33xx_rtc_addrs[] = { | ||
2441 | { | ||
2442 | .pa_start = 0x44e3e000, | ||
2443 | .pa_end = 0x44e3e000 + SZ_4K - 1, | ||
2444 | .flags = ADDR_TYPE_RT | ||
2445 | }, | ||
2446 | { } | ||
2447 | }; | ||
2448 | |||
2449 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__rtc = { | 1822 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__rtc = { |
2450 | .master = &am33xx_l4_wkup_hwmod, | 1823 | .master = &am33xx_l4_wkup_hwmod, |
2451 | .slave = &am33xx_rtc_hwmod, | 1824 | .slave = &am33xx_rtc_hwmod, |
2452 | .clk = "clkdiv32k_ick", | 1825 | .clk = "clkdiv32k_ick", |
2453 | .addr = am33xx_rtc_addrs, | ||
2454 | .user = OCP_USER_MPU, | 1826 | .user = OCP_USER_MPU, |
2455 | }; | 1827 | }; |
2456 | 1828 | ||
2457 | /* l4 per/ls -> DCAN0 */ | 1829 | /* l4 per/ls -> DCAN0 */ |
2458 | static struct omap_hwmod_addr_space am33xx_dcan0_addrs[] = { | ||
2459 | { | ||
2460 | .pa_start = 0x481CC000, | ||
2461 | .pa_end = 0x481CC000 + SZ_4K - 1, | ||
2462 | .flags = ADDR_TYPE_RT | ||
2463 | }, | ||
2464 | { } | ||
2465 | }; | ||
2466 | |||
2467 | static struct omap_hwmod_ocp_if am33xx_l4_per__dcan0 = { | 1830 | static struct omap_hwmod_ocp_if am33xx_l4_per__dcan0 = { |
2468 | .master = &am33xx_l4_ls_hwmod, | 1831 | .master = &am33xx_l4_ls_hwmod, |
2469 | .slave = &am33xx_dcan0_hwmod, | 1832 | .slave = &am33xx_dcan0_hwmod, |
2470 | .clk = "l4ls_gclk", | 1833 | .clk = "l4ls_gclk", |
2471 | .addr = am33xx_dcan0_addrs, | ||
2472 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1834 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2473 | }; | 1835 | }; |
2474 | 1836 | ||
2475 | /* l4 per/ls -> DCAN1 */ | 1837 | /* l4 per/ls -> DCAN1 */ |
2476 | static struct omap_hwmod_addr_space am33xx_dcan1_addrs[] = { | ||
2477 | { | ||
2478 | .pa_start = 0x481D0000, | ||
2479 | .pa_end = 0x481D0000 + SZ_4K - 1, | ||
2480 | .flags = ADDR_TYPE_RT | ||
2481 | }, | ||
2482 | { } | ||
2483 | }; | ||
2484 | |||
2485 | static struct omap_hwmod_ocp_if am33xx_l4_per__dcan1 = { | 1838 | static struct omap_hwmod_ocp_if am33xx_l4_per__dcan1 = { |
2486 | .master = &am33xx_l4_ls_hwmod, | 1839 | .master = &am33xx_l4_ls_hwmod, |
2487 | .slave = &am33xx_dcan1_hwmod, | 1840 | .slave = &am33xx_dcan1_hwmod, |
2488 | .clk = "l4ls_gclk", | 1841 | .clk = "l4ls_gclk", |
2489 | .addr = am33xx_dcan1_addrs, | ||
2490 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1842 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2491 | }; | 1843 | }; |
2492 | 1844 | ||
2493 | /* l4 per/ls -> GPIO2 */ | 1845 | /* l4 per/ls -> GPIO2 */ |
2494 | static struct omap_hwmod_addr_space am33xx_gpio1_addrs[] = { | ||
2495 | { | ||
2496 | .pa_start = 0x4804C000, | ||
2497 | .pa_end = 0x4804C000 + SZ_4K - 1, | ||
2498 | .flags = ADDR_TYPE_RT, | ||
2499 | }, | ||
2500 | { } | ||
2501 | }; | ||
2502 | |||
2503 | static struct omap_hwmod_ocp_if am33xx_l4_per__gpio1 = { | 1846 | static struct omap_hwmod_ocp_if am33xx_l4_per__gpio1 = { |
2504 | .master = &am33xx_l4_ls_hwmod, | 1847 | .master = &am33xx_l4_ls_hwmod, |
2505 | .slave = &am33xx_gpio1_hwmod, | 1848 | .slave = &am33xx_gpio1_hwmod, |
2506 | .clk = "l4ls_gclk", | 1849 | .clk = "l4ls_gclk", |
2507 | .addr = am33xx_gpio1_addrs, | ||
2508 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1850 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2509 | }; | 1851 | }; |
2510 | 1852 | ||
2511 | /* l4 per/ls -> gpio3 */ | 1853 | /* l4 per/ls -> gpio3 */ |
2512 | static struct omap_hwmod_addr_space am33xx_gpio2_addrs[] = { | ||
2513 | { | ||
2514 | .pa_start = 0x481AC000, | ||
2515 | .pa_end = 0x481AC000 + SZ_4K - 1, | ||
2516 | .flags = ADDR_TYPE_RT, | ||
2517 | }, | ||
2518 | { } | ||
2519 | }; | ||
2520 | |||
2521 | static struct omap_hwmod_ocp_if am33xx_l4_per__gpio2 = { | 1854 | static struct omap_hwmod_ocp_if am33xx_l4_per__gpio2 = { |
2522 | .master = &am33xx_l4_ls_hwmod, | 1855 | .master = &am33xx_l4_ls_hwmod, |
2523 | .slave = &am33xx_gpio2_hwmod, | 1856 | .slave = &am33xx_gpio2_hwmod, |
2524 | .clk = "l4ls_gclk", | 1857 | .clk = "l4ls_gclk", |
2525 | .addr = am33xx_gpio2_addrs, | ||
2526 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1858 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2527 | }; | 1859 | }; |
2528 | 1860 | ||
2529 | /* l4 per/ls -> gpio4 */ | 1861 | /* l4 per/ls -> gpio4 */ |
2530 | static struct omap_hwmod_addr_space am33xx_gpio3_addrs[] = { | ||
2531 | { | ||
2532 | .pa_start = 0x481AE000, | ||
2533 | .pa_end = 0x481AE000 + SZ_4K - 1, | ||
2534 | .flags = ADDR_TYPE_RT, | ||
2535 | }, | ||
2536 | { } | ||
2537 | }; | ||
2538 | |||
2539 | static struct omap_hwmod_ocp_if am33xx_l4_per__gpio3 = { | 1862 | static struct omap_hwmod_ocp_if am33xx_l4_per__gpio3 = { |
2540 | .master = &am33xx_l4_ls_hwmod, | 1863 | .master = &am33xx_l4_ls_hwmod, |
2541 | .slave = &am33xx_gpio3_hwmod, | 1864 | .slave = &am33xx_gpio3_hwmod, |
2542 | .clk = "l4ls_gclk", | 1865 | .clk = "l4ls_gclk", |
2543 | .addr = am33xx_gpio3_addrs, | ||
2544 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1866 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2545 | }; | 1867 | }; |
2546 | 1868 | ||
2547 | /* L4 WKUP -> I2C1 */ | 1869 | /* L4 WKUP -> I2C1 */ |
2548 | static struct omap_hwmod_addr_space am33xx_i2c1_addr_space[] = { | ||
2549 | { | ||
2550 | .pa_start = 0x44E0B000, | ||
2551 | .pa_end = 0x44E0B000 + SZ_4K - 1, | ||
2552 | .flags = ADDR_TYPE_RT, | ||
2553 | }, | ||
2554 | { } | ||
2555 | }; | ||
2556 | |||
2557 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__i2c1 = { | 1870 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__i2c1 = { |
2558 | .master = &am33xx_l4_wkup_hwmod, | 1871 | .master = &am33xx_l4_wkup_hwmod, |
2559 | .slave = &am33xx_i2c1_hwmod, | 1872 | .slave = &am33xx_i2c1_hwmod, |
2560 | .clk = "dpll_core_m4_div2_ck", | 1873 | .clk = "dpll_core_m4_div2_ck", |
2561 | .addr = am33xx_i2c1_addr_space, | ||
2562 | .user = OCP_USER_MPU, | 1874 | .user = OCP_USER_MPU, |
2563 | }; | 1875 | }; |
2564 | 1876 | ||
2565 | /* L4 WKUP -> GPIO1 */ | 1877 | /* L4 WKUP -> GPIO1 */ |
2566 | static struct omap_hwmod_addr_space am33xx_gpio0_addrs[] = { | ||
2567 | { | ||
2568 | .pa_start = 0x44E07000, | ||
2569 | .pa_end = 0x44E07000 + SZ_4K - 1, | ||
2570 | .flags = ADDR_TYPE_RT, | ||
2571 | }, | ||
2572 | { } | ||
2573 | }; | ||
2574 | |||
2575 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__gpio0 = { | 1878 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__gpio0 = { |
2576 | .master = &am33xx_l4_wkup_hwmod, | 1879 | .master = &am33xx_l4_wkup_hwmod, |
2577 | .slave = &am33xx_gpio0_hwmod, | 1880 | .slave = &am33xx_gpio0_hwmod, |
2578 | .clk = "dpll_core_m4_div2_ck", | 1881 | .clk = "dpll_core_m4_div2_ck", |
2579 | .addr = am33xx_gpio0_addrs, | ||
2580 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 1882 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
2581 | }; | 1883 | }; |
2582 | 1884 | ||
@@ -2598,41 +1900,16 @@ static struct omap_hwmod_ocp_if am33xx_l4_wkup__adc_tsc = { | |||
2598 | .user = OCP_USER_MPU, | 1900 | .user = OCP_USER_MPU, |
2599 | }; | 1901 | }; |
2600 | 1902 | ||
2601 | static struct omap_hwmod_addr_space am33xx_cpgmac0_addr_space[] = { | ||
2602 | /* cpsw ss */ | ||
2603 | { | ||
2604 | .pa_start = 0x4a100000, | ||
2605 | .pa_end = 0x4a100000 + SZ_2K - 1, | ||
2606 | }, | ||
2607 | /* cpsw wr */ | ||
2608 | { | ||
2609 | .pa_start = 0x4a101200, | ||
2610 | .pa_end = 0x4a101200 + SZ_256 - 1, | ||
2611 | .flags = ADDR_TYPE_RT, | ||
2612 | }, | ||
2613 | { } | ||
2614 | }; | ||
2615 | |||
2616 | static struct omap_hwmod_ocp_if am33xx_l4_hs__cpgmac0 = { | 1903 | static struct omap_hwmod_ocp_if am33xx_l4_hs__cpgmac0 = { |
2617 | .master = &am33xx_l4_hs_hwmod, | 1904 | .master = &am33xx_l4_hs_hwmod, |
2618 | .slave = &am33xx_cpgmac0_hwmod, | 1905 | .slave = &am33xx_cpgmac0_hwmod, |
2619 | .clk = "cpsw_125mhz_gclk", | 1906 | .clk = "cpsw_125mhz_gclk", |
2620 | .addr = am33xx_cpgmac0_addr_space, | ||
2621 | .user = OCP_USER_MPU, | 1907 | .user = OCP_USER_MPU, |
2622 | }; | 1908 | }; |
2623 | 1909 | ||
2624 | static struct omap_hwmod_addr_space am33xx_mdio_addr_space[] = { | ||
2625 | { | ||
2626 | .pa_start = 0x4A101000, | ||
2627 | .pa_end = 0x4A101000 + SZ_256 - 1, | ||
2628 | }, | ||
2629 | { } | ||
2630 | }; | ||
2631 | |||
2632 | static struct omap_hwmod_ocp_if am33xx_cpgmac0__mdio = { | 1910 | static struct omap_hwmod_ocp_if am33xx_cpgmac0__mdio = { |
2633 | .master = &am33xx_cpgmac0_hwmod, | 1911 | .master = &am33xx_cpgmac0_hwmod, |
2634 | .slave = &am33xx_mdio_hwmod, | 1912 | .slave = &am33xx_mdio_hwmod, |
2635 | .addr = am33xx_mdio_addr_space, | ||
2636 | .user = OCP_USER_MPU, | 1913 | .user = OCP_USER_MPU, |
2637 | }; | 1914 | }; |
2638 | 1915 | ||
@@ -2670,51 +1947,24 @@ static struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss0 = { | |||
2670 | .user = OCP_USER_MPU, | 1947 | .user = OCP_USER_MPU, |
2671 | }; | 1948 | }; |
2672 | 1949 | ||
2673 | static struct omap_hwmod_addr_space am33xx_ecap0_addr_space[] = { | ||
2674 | { | ||
2675 | .pa_start = 0x48300100, | ||
2676 | .pa_end = 0x48300100 + SZ_128 - 1, | ||
2677 | }, | ||
2678 | { } | ||
2679 | }; | ||
2680 | |||
2681 | static struct omap_hwmod_ocp_if am33xx_epwmss0__ecap0 = { | 1950 | static struct omap_hwmod_ocp_if am33xx_epwmss0__ecap0 = { |
2682 | .master = &am33xx_epwmss0_hwmod, | 1951 | .master = &am33xx_epwmss0_hwmod, |
2683 | .slave = &am33xx_ecap0_hwmod, | 1952 | .slave = &am33xx_ecap0_hwmod, |
2684 | .clk = "l4ls_gclk", | 1953 | .clk = "l4ls_gclk", |
2685 | .addr = am33xx_ecap0_addr_space, | ||
2686 | .user = OCP_USER_MPU, | 1954 | .user = OCP_USER_MPU, |
2687 | }; | 1955 | }; |
2688 | 1956 | ||
2689 | static struct omap_hwmod_addr_space am33xx_eqep0_addr_space[] = { | ||
2690 | { | ||
2691 | .pa_start = 0x48300180, | ||
2692 | .pa_end = 0x48300180 + SZ_128 - 1, | ||
2693 | }, | ||
2694 | { } | ||
2695 | }; | ||
2696 | |||
2697 | static struct omap_hwmod_ocp_if am33xx_epwmss0__eqep0 = { | 1957 | static struct omap_hwmod_ocp_if am33xx_epwmss0__eqep0 = { |
2698 | .master = &am33xx_epwmss0_hwmod, | 1958 | .master = &am33xx_epwmss0_hwmod, |
2699 | .slave = &am33xx_eqep0_hwmod, | 1959 | .slave = &am33xx_eqep0_hwmod, |
2700 | .clk = "l4ls_gclk", | 1960 | .clk = "l4ls_gclk", |
2701 | .addr = am33xx_eqep0_addr_space, | ||
2702 | .user = OCP_USER_MPU, | 1961 | .user = OCP_USER_MPU, |
2703 | }; | 1962 | }; |
2704 | 1963 | ||
2705 | static struct omap_hwmod_addr_space am33xx_ehrpwm0_addr_space[] = { | ||
2706 | { | ||
2707 | .pa_start = 0x48300200, | ||
2708 | .pa_end = 0x48300200 + SZ_128 - 1, | ||
2709 | }, | ||
2710 | { } | ||
2711 | }; | ||
2712 | |||
2713 | static struct omap_hwmod_ocp_if am33xx_epwmss0__ehrpwm0 = { | 1964 | static struct omap_hwmod_ocp_if am33xx_epwmss0__ehrpwm0 = { |
2714 | .master = &am33xx_epwmss0_hwmod, | 1965 | .master = &am33xx_epwmss0_hwmod, |
2715 | .slave = &am33xx_ehrpwm0_hwmod, | 1966 | .slave = &am33xx_ehrpwm0_hwmod, |
2716 | .clk = "l4ls_gclk", | 1967 | .clk = "l4ls_gclk", |
2717 | .addr = am33xx_ehrpwm0_addr_space, | ||
2718 | .user = OCP_USER_MPU, | 1968 | .user = OCP_USER_MPU, |
2719 | }; | 1969 | }; |
2720 | 1970 | ||
@@ -2736,51 +1986,24 @@ static struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss1 = { | |||
2736 | .user = OCP_USER_MPU, | 1986 | .user = OCP_USER_MPU, |
2737 | }; | 1987 | }; |
2738 | 1988 | ||
2739 | static struct omap_hwmod_addr_space am33xx_ecap1_addr_space[] = { | ||
2740 | { | ||
2741 | .pa_start = 0x48302100, | ||
2742 | .pa_end = 0x48302100 + SZ_128 - 1, | ||
2743 | }, | ||
2744 | { } | ||
2745 | }; | ||
2746 | |||
2747 | static struct omap_hwmod_ocp_if am33xx_epwmss1__ecap1 = { | 1989 | static struct omap_hwmod_ocp_if am33xx_epwmss1__ecap1 = { |
2748 | .master = &am33xx_epwmss1_hwmod, | 1990 | .master = &am33xx_epwmss1_hwmod, |
2749 | .slave = &am33xx_ecap1_hwmod, | 1991 | .slave = &am33xx_ecap1_hwmod, |
2750 | .clk = "l4ls_gclk", | 1992 | .clk = "l4ls_gclk", |
2751 | .addr = am33xx_ecap1_addr_space, | ||
2752 | .user = OCP_USER_MPU, | 1993 | .user = OCP_USER_MPU, |
2753 | }; | 1994 | }; |
2754 | 1995 | ||
2755 | static struct omap_hwmod_addr_space am33xx_eqep1_addr_space[] = { | ||
2756 | { | ||
2757 | .pa_start = 0x48302180, | ||
2758 | .pa_end = 0x48302180 + SZ_128 - 1, | ||
2759 | }, | ||
2760 | { } | ||
2761 | }; | ||
2762 | |||
2763 | static struct omap_hwmod_ocp_if am33xx_epwmss1__eqep1 = { | 1996 | static struct omap_hwmod_ocp_if am33xx_epwmss1__eqep1 = { |
2764 | .master = &am33xx_epwmss1_hwmod, | 1997 | .master = &am33xx_epwmss1_hwmod, |
2765 | .slave = &am33xx_eqep1_hwmod, | 1998 | .slave = &am33xx_eqep1_hwmod, |
2766 | .clk = "l4ls_gclk", | 1999 | .clk = "l4ls_gclk", |
2767 | .addr = am33xx_eqep1_addr_space, | ||
2768 | .user = OCP_USER_MPU, | 2000 | .user = OCP_USER_MPU, |
2769 | }; | 2001 | }; |
2770 | 2002 | ||
2771 | static struct omap_hwmod_addr_space am33xx_ehrpwm1_addr_space[] = { | ||
2772 | { | ||
2773 | .pa_start = 0x48302200, | ||
2774 | .pa_end = 0x48302200 + SZ_128 - 1, | ||
2775 | }, | ||
2776 | { } | ||
2777 | }; | ||
2778 | |||
2779 | static struct omap_hwmod_ocp_if am33xx_epwmss1__ehrpwm1 = { | 2003 | static struct omap_hwmod_ocp_if am33xx_epwmss1__ehrpwm1 = { |
2780 | .master = &am33xx_epwmss1_hwmod, | 2004 | .master = &am33xx_epwmss1_hwmod, |
2781 | .slave = &am33xx_ehrpwm1_hwmod, | 2005 | .slave = &am33xx_ehrpwm1_hwmod, |
2782 | .clk = "l4ls_gclk", | 2006 | .clk = "l4ls_gclk", |
2783 | .addr = am33xx_ehrpwm1_addr_space, | ||
2784 | .user = OCP_USER_MPU, | 2007 | .user = OCP_USER_MPU, |
2785 | }; | 2008 | }; |
2786 | 2009 | ||
@@ -2801,51 +2024,24 @@ static struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss2 = { | |||
2801 | .user = OCP_USER_MPU, | 2024 | .user = OCP_USER_MPU, |
2802 | }; | 2025 | }; |
2803 | 2026 | ||
2804 | static struct omap_hwmod_addr_space am33xx_ecap2_addr_space[] = { | ||
2805 | { | ||
2806 | .pa_start = 0x48304100, | ||
2807 | .pa_end = 0x48304100 + SZ_128 - 1, | ||
2808 | }, | ||
2809 | { } | ||
2810 | }; | ||
2811 | |||
2812 | static struct omap_hwmod_ocp_if am33xx_epwmss2__ecap2 = { | 2027 | static struct omap_hwmod_ocp_if am33xx_epwmss2__ecap2 = { |
2813 | .master = &am33xx_epwmss2_hwmod, | 2028 | .master = &am33xx_epwmss2_hwmod, |
2814 | .slave = &am33xx_ecap2_hwmod, | 2029 | .slave = &am33xx_ecap2_hwmod, |
2815 | .clk = "l4ls_gclk", | 2030 | .clk = "l4ls_gclk", |
2816 | .addr = am33xx_ecap2_addr_space, | ||
2817 | .user = OCP_USER_MPU, | 2031 | .user = OCP_USER_MPU, |
2818 | }; | 2032 | }; |
2819 | 2033 | ||
2820 | static struct omap_hwmod_addr_space am33xx_eqep2_addr_space[] = { | ||
2821 | { | ||
2822 | .pa_start = 0x48304180, | ||
2823 | .pa_end = 0x48304180 + SZ_128 - 1, | ||
2824 | }, | ||
2825 | { } | ||
2826 | }; | ||
2827 | |||
2828 | static struct omap_hwmod_ocp_if am33xx_epwmss2__eqep2 = { | 2034 | static struct omap_hwmod_ocp_if am33xx_epwmss2__eqep2 = { |
2829 | .master = &am33xx_epwmss2_hwmod, | 2035 | .master = &am33xx_epwmss2_hwmod, |
2830 | .slave = &am33xx_eqep2_hwmod, | 2036 | .slave = &am33xx_eqep2_hwmod, |
2831 | .clk = "l4ls_gclk", | 2037 | .clk = "l4ls_gclk", |
2832 | .addr = am33xx_eqep2_addr_space, | ||
2833 | .user = OCP_USER_MPU, | 2038 | .user = OCP_USER_MPU, |
2834 | }; | 2039 | }; |
2835 | 2040 | ||
2836 | static struct omap_hwmod_addr_space am33xx_ehrpwm2_addr_space[] = { | ||
2837 | { | ||
2838 | .pa_start = 0x48304200, | ||
2839 | .pa_end = 0x48304200 + SZ_128 - 1, | ||
2840 | }, | ||
2841 | { } | ||
2842 | }; | ||
2843 | |||
2844 | static struct omap_hwmod_ocp_if am33xx_epwmss2__ehrpwm2 = { | 2041 | static struct omap_hwmod_ocp_if am33xx_epwmss2__ehrpwm2 = { |
2845 | .master = &am33xx_epwmss2_hwmod, | 2042 | .master = &am33xx_epwmss2_hwmod, |
2846 | .slave = &am33xx_ehrpwm2_hwmod, | 2043 | .slave = &am33xx_ehrpwm2_hwmod, |
2847 | .clk = "l4ls_gclk", | 2044 | .clk = "l4ls_gclk", |
2848 | .addr = am33xx_ehrpwm2_addr_space, | ||
2849 | .user = OCP_USER_MPU, | 2045 | .user = OCP_USER_MPU, |
2850 | }; | 2046 | }; |
2851 | 2047 | ||
@@ -2868,37 +2064,17 @@ static struct omap_hwmod_ocp_if am33xx_l3_s__gpmc = { | |||
2868 | }; | 2064 | }; |
2869 | 2065 | ||
2870 | /* i2c2 */ | 2066 | /* i2c2 */ |
2871 | static struct omap_hwmod_addr_space am33xx_i2c2_addr_space[] = { | ||
2872 | { | ||
2873 | .pa_start = 0x4802A000, | ||
2874 | .pa_end = 0x4802A000 + SZ_4K - 1, | ||
2875 | .flags = ADDR_TYPE_RT, | ||
2876 | }, | ||
2877 | { } | ||
2878 | }; | ||
2879 | |||
2880 | static struct omap_hwmod_ocp_if am33xx_l4_per__i2c2 = { | 2067 | static struct omap_hwmod_ocp_if am33xx_l4_per__i2c2 = { |
2881 | .master = &am33xx_l4_ls_hwmod, | 2068 | .master = &am33xx_l4_ls_hwmod, |
2882 | .slave = &am33xx_i2c2_hwmod, | 2069 | .slave = &am33xx_i2c2_hwmod, |
2883 | .clk = "l4ls_gclk", | 2070 | .clk = "l4ls_gclk", |
2884 | .addr = am33xx_i2c2_addr_space, | ||
2885 | .user = OCP_USER_MPU, | 2071 | .user = OCP_USER_MPU, |
2886 | }; | 2072 | }; |
2887 | 2073 | ||
2888 | static struct omap_hwmod_addr_space am33xx_i2c3_addr_space[] = { | ||
2889 | { | ||
2890 | .pa_start = 0x4819C000, | ||
2891 | .pa_end = 0x4819C000 + SZ_4K - 1, | ||
2892 | .flags = ADDR_TYPE_RT | ||
2893 | }, | ||
2894 | { } | ||
2895 | }; | ||
2896 | |||
2897 | static struct omap_hwmod_ocp_if am33xx_l4_per__i2c3 = { | 2074 | static struct omap_hwmod_ocp_if am33xx_l4_per__i2c3 = { |
2898 | .master = &am33xx_l4_ls_hwmod, | 2075 | .master = &am33xx_l4_ls_hwmod, |
2899 | .slave = &am33xx_i2c3_hwmod, | 2076 | .slave = &am33xx_i2c3_hwmod, |
2900 | .clk = "l4ls_gclk", | 2077 | .clk = "l4ls_gclk", |
2901 | .addr = am33xx_i2c3_addr_space, | ||
2902 | .user = OCP_USER_MPU, | 2078 | .user = OCP_USER_MPU, |
2903 | }; | 2079 | }; |
2904 | 2080 | ||
@@ -2938,20 +2114,10 @@ static struct omap_hwmod_ocp_if am33xx_l4_per__mailbox = { | |||
2938 | }; | 2114 | }; |
2939 | 2115 | ||
2940 | /* l4 ls -> spinlock */ | 2116 | /* l4 ls -> spinlock */ |
2941 | static struct omap_hwmod_addr_space am33xx_spinlock_addrs[] = { | ||
2942 | { | ||
2943 | .pa_start = 0x480Ca000, | ||
2944 | .pa_end = 0x480Ca000 + SZ_4K - 1, | ||
2945 | .flags = ADDR_TYPE_RT | ||
2946 | }, | ||
2947 | { } | ||
2948 | }; | ||
2949 | |||
2950 | static struct omap_hwmod_ocp_if am33xx_l4_ls__spinlock = { | 2117 | static struct omap_hwmod_ocp_if am33xx_l4_ls__spinlock = { |
2951 | .master = &am33xx_l4_ls_hwmod, | 2118 | .master = &am33xx_l4_ls_hwmod, |
2952 | .slave = &am33xx_spinlock_hwmod, | 2119 | .slave = &am33xx_spinlock_hwmod, |
2953 | .clk = "l4ls_gclk", | 2120 | .clk = "l4ls_gclk", |
2954 | .addr = am33xx_spinlock_addrs, | ||
2955 | .user = OCP_USER_MPU, | 2121 | .user = OCP_USER_MPU, |
2956 | }; | 2122 | }; |
2957 | 2123 | ||
@@ -2973,24 +2139,6 @@ static struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp0 = { | |||
2973 | .user = OCP_USER_MPU, | 2139 | .user = OCP_USER_MPU, |
2974 | }; | 2140 | }; |
2975 | 2141 | ||
2976 | /* l3 s -> mcasp0 data */ | ||
2977 | static struct omap_hwmod_addr_space am33xx_mcasp0_data_addr_space[] = { | ||
2978 | { | ||
2979 | .pa_start = 0x46000000, | ||
2980 | .pa_end = 0x46000000 + SZ_4M - 1, | ||
2981 | .flags = ADDR_TYPE_RT | ||
2982 | }, | ||
2983 | { } | ||
2984 | }; | ||
2985 | |||
2986 | static struct omap_hwmod_ocp_if am33xx_l3_s__mcasp0_data = { | ||
2987 | .master = &am33xx_l3_s_hwmod, | ||
2988 | .slave = &am33xx_mcasp0_hwmod, | ||
2989 | .clk = "l3s_gclk", | ||
2990 | .addr = am33xx_mcasp0_data_addr_space, | ||
2991 | .user = OCP_USER_SDMA, | ||
2992 | }; | ||
2993 | |||
2994 | /* l4 ls -> mcasp1 */ | 2142 | /* l4 ls -> mcasp1 */ |
2995 | static struct omap_hwmod_addr_space am33xx_mcasp1_addr_space[] = { | 2143 | static struct omap_hwmod_addr_space am33xx_mcasp1_addr_space[] = { |
2996 | { | 2144 | { |
@@ -3009,24 +2157,6 @@ static struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp1 = { | |||
3009 | .user = OCP_USER_MPU, | 2157 | .user = OCP_USER_MPU, |
3010 | }; | 2158 | }; |
3011 | 2159 | ||
3012 | /* l3 s -> mcasp1 data */ | ||
3013 | static struct omap_hwmod_addr_space am33xx_mcasp1_data_addr_space[] = { | ||
3014 | { | ||
3015 | .pa_start = 0x46400000, | ||
3016 | .pa_end = 0x46400000 + SZ_4M - 1, | ||
3017 | .flags = ADDR_TYPE_RT | ||
3018 | }, | ||
3019 | { } | ||
3020 | }; | ||
3021 | |||
3022 | static struct omap_hwmod_ocp_if am33xx_l3_s__mcasp1_data = { | ||
3023 | .master = &am33xx_l3_s_hwmod, | ||
3024 | .slave = &am33xx_mcasp1_hwmod, | ||
3025 | .clk = "l3s_gclk", | ||
3026 | .addr = am33xx_mcasp1_data_addr_space, | ||
3027 | .user = OCP_USER_SDMA, | ||
3028 | }; | ||
3029 | |||
3030 | /* l4 ls -> mmc0 */ | 2160 | /* l4 ls -> mmc0 */ |
3031 | static struct omap_hwmod_addr_space am33xx_mmc0_addr_space[] = { | 2161 | static struct omap_hwmod_addr_space am33xx_mmc0_addr_space[] = { |
3032 | { | 2162 | { |
@@ -3082,182 +2212,82 @@ static struct omap_hwmod_ocp_if am33xx_l3_s__mmc2 = { | |||
3082 | }; | 2212 | }; |
3083 | 2213 | ||
3084 | /* l4 ls -> mcspi0 */ | 2214 | /* l4 ls -> mcspi0 */ |
3085 | static struct omap_hwmod_addr_space am33xx_mcspi0_addr_space[] = { | ||
3086 | { | ||
3087 | .pa_start = 0x48030000, | ||
3088 | .pa_end = 0x48030000 + SZ_1K - 1, | ||
3089 | .flags = ADDR_TYPE_RT, | ||
3090 | }, | ||
3091 | { } | ||
3092 | }; | ||
3093 | |||
3094 | static struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi0 = { | 2215 | static struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi0 = { |
3095 | .master = &am33xx_l4_ls_hwmod, | 2216 | .master = &am33xx_l4_ls_hwmod, |
3096 | .slave = &am33xx_spi0_hwmod, | 2217 | .slave = &am33xx_spi0_hwmod, |
3097 | .clk = "l4ls_gclk", | 2218 | .clk = "l4ls_gclk", |
3098 | .addr = am33xx_mcspi0_addr_space, | ||
3099 | .user = OCP_USER_MPU, | 2219 | .user = OCP_USER_MPU, |
3100 | }; | 2220 | }; |
3101 | 2221 | ||
3102 | /* l4 ls -> mcspi1 */ | 2222 | /* l4 ls -> mcspi1 */ |
3103 | static struct omap_hwmod_addr_space am33xx_mcspi1_addr_space[] = { | ||
3104 | { | ||
3105 | .pa_start = 0x481A0000, | ||
3106 | .pa_end = 0x481A0000 + SZ_1K - 1, | ||
3107 | .flags = ADDR_TYPE_RT, | ||
3108 | }, | ||
3109 | { } | ||
3110 | }; | ||
3111 | |||
3112 | static struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi1 = { | 2223 | static struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi1 = { |
3113 | .master = &am33xx_l4_ls_hwmod, | 2224 | .master = &am33xx_l4_ls_hwmod, |
3114 | .slave = &am33xx_spi1_hwmod, | 2225 | .slave = &am33xx_spi1_hwmod, |
3115 | .clk = "l4ls_gclk", | 2226 | .clk = "l4ls_gclk", |
3116 | .addr = am33xx_mcspi1_addr_space, | ||
3117 | .user = OCP_USER_MPU, | 2227 | .user = OCP_USER_MPU, |
3118 | }; | 2228 | }; |
3119 | 2229 | ||
3120 | /* l4 wkup -> timer1 */ | 2230 | /* l4 wkup -> timer1 */ |
3121 | static struct omap_hwmod_addr_space am33xx_timer1_addr_space[] = { | ||
3122 | { | ||
3123 | .pa_start = 0x44E31000, | ||
3124 | .pa_end = 0x44E31000 + SZ_1K - 1, | ||
3125 | .flags = ADDR_TYPE_RT | ||
3126 | }, | ||
3127 | { } | ||
3128 | }; | ||
3129 | |||
3130 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__timer1 = { | 2231 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__timer1 = { |
3131 | .master = &am33xx_l4_wkup_hwmod, | 2232 | .master = &am33xx_l4_wkup_hwmod, |
3132 | .slave = &am33xx_timer1_hwmod, | 2233 | .slave = &am33xx_timer1_hwmod, |
3133 | .clk = "dpll_core_m4_div2_ck", | 2234 | .clk = "dpll_core_m4_div2_ck", |
3134 | .addr = am33xx_timer1_addr_space, | ||
3135 | .user = OCP_USER_MPU, | 2235 | .user = OCP_USER_MPU, |
3136 | }; | 2236 | }; |
3137 | 2237 | ||
3138 | /* l4 per -> timer2 */ | 2238 | /* l4 per -> timer2 */ |
3139 | static struct omap_hwmod_addr_space am33xx_timer2_addr_space[] = { | ||
3140 | { | ||
3141 | .pa_start = 0x48040000, | ||
3142 | .pa_end = 0x48040000 + SZ_1K - 1, | ||
3143 | .flags = ADDR_TYPE_RT | ||
3144 | }, | ||
3145 | { } | ||
3146 | }; | ||
3147 | |||
3148 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer2 = { | 2239 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer2 = { |
3149 | .master = &am33xx_l4_ls_hwmod, | 2240 | .master = &am33xx_l4_ls_hwmod, |
3150 | .slave = &am33xx_timer2_hwmod, | 2241 | .slave = &am33xx_timer2_hwmod, |
3151 | .clk = "l4ls_gclk", | 2242 | .clk = "l4ls_gclk", |
3152 | .addr = am33xx_timer2_addr_space, | ||
3153 | .user = OCP_USER_MPU, | 2243 | .user = OCP_USER_MPU, |
3154 | }; | 2244 | }; |
3155 | 2245 | ||
3156 | /* l4 per -> timer3 */ | 2246 | /* l4 per -> timer3 */ |
3157 | static struct omap_hwmod_addr_space am33xx_timer3_addr_space[] = { | ||
3158 | { | ||
3159 | .pa_start = 0x48042000, | ||
3160 | .pa_end = 0x48042000 + SZ_1K - 1, | ||
3161 | .flags = ADDR_TYPE_RT | ||
3162 | }, | ||
3163 | { } | ||
3164 | }; | ||
3165 | |||
3166 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer3 = { | 2247 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer3 = { |
3167 | .master = &am33xx_l4_ls_hwmod, | 2248 | .master = &am33xx_l4_ls_hwmod, |
3168 | .slave = &am33xx_timer3_hwmod, | 2249 | .slave = &am33xx_timer3_hwmod, |
3169 | .clk = "l4ls_gclk", | 2250 | .clk = "l4ls_gclk", |
3170 | .addr = am33xx_timer3_addr_space, | ||
3171 | .user = OCP_USER_MPU, | 2251 | .user = OCP_USER_MPU, |
3172 | }; | 2252 | }; |
3173 | 2253 | ||
3174 | /* l4 per -> timer4 */ | 2254 | /* l4 per -> timer4 */ |
3175 | static struct omap_hwmod_addr_space am33xx_timer4_addr_space[] = { | ||
3176 | { | ||
3177 | .pa_start = 0x48044000, | ||
3178 | .pa_end = 0x48044000 + SZ_1K - 1, | ||
3179 | .flags = ADDR_TYPE_RT | ||
3180 | }, | ||
3181 | { } | ||
3182 | }; | ||
3183 | |||
3184 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer4 = { | 2255 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer4 = { |
3185 | .master = &am33xx_l4_ls_hwmod, | 2256 | .master = &am33xx_l4_ls_hwmod, |
3186 | .slave = &am33xx_timer4_hwmod, | 2257 | .slave = &am33xx_timer4_hwmod, |
3187 | .clk = "l4ls_gclk", | 2258 | .clk = "l4ls_gclk", |
3188 | .addr = am33xx_timer4_addr_space, | ||
3189 | .user = OCP_USER_MPU, | 2259 | .user = OCP_USER_MPU, |
3190 | }; | 2260 | }; |
3191 | 2261 | ||
3192 | /* l4 per -> timer5 */ | 2262 | /* l4 per -> timer5 */ |
3193 | static struct omap_hwmod_addr_space am33xx_timer5_addr_space[] = { | ||
3194 | { | ||
3195 | .pa_start = 0x48046000, | ||
3196 | .pa_end = 0x48046000 + SZ_1K - 1, | ||
3197 | .flags = ADDR_TYPE_RT | ||
3198 | }, | ||
3199 | { } | ||
3200 | }; | ||
3201 | |||
3202 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer5 = { | 2263 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer5 = { |
3203 | .master = &am33xx_l4_ls_hwmod, | 2264 | .master = &am33xx_l4_ls_hwmod, |
3204 | .slave = &am33xx_timer5_hwmod, | 2265 | .slave = &am33xx_timer5_hwmod, |
3205 | .clk = "l4ls_gclk", | 2266 | .clk = "l4ls_gclk", |
3206 | .addr = am33xx_timer5_addr_space, | ||
3207 | .user = OCP_USER_MPU, | 2267 | .user = OCP_USER_MPU, |
3208 | }; | 2268 | }; |
3209 | 2269 | ||
3210 | /* l4 per -> timer6 */ | 2270 | /* l4 per -> timer6 */ |
3211 | static struct omap_hwmod_addr_space am33xx_timer6_addr_space[] = { | ||
3212 | { | ||
3213 | .pa_start = 0x48048000, | ||
3214 | .pa_end = 0x48048000 + SZ_1K - 1, | ||
3215 | .flags = ADDR_TYPE_RT | ||
3216 | }, | ||
3217 | { } | ||
3218 | }; | ||
3219 | |||
3220 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer6 = { | 2271 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer6 = { |
3221 | .master = &am33xx_l4_ls_hwmod, | 2272 | .master = &am33xx_l4_ls_hwmod, |
3222 | .slave = &am33xx_timer6_hwmod, | 2273 | .slave = &am33xx_timer6_hwmod, |
3223 | .clk = "l4ls_gclk", | 2274 | .clk = "l4ls_gclk", |
3224 | .addr = am33xx_timer6_addr_space, | ||
3225 | .user = OCP_USER_MPU, | 2275 | .user = OCP_USER_MPU, |
3226 | }; | 2276 | }; |
3227 | 2277 | ||
3228 | /* l4 per -> timer7 */ | 2278 | /* l4 per -> timer7 */ |
3229 | static struct omap_hwmod_addr_space am33xx_timer7_addr_space[] = { | ||
3230 | { | ||
3231 | .pa_start = 0x4804A000, | ||
3232 | .pa_end = 0x4804A000 + SZ_1K - 1, | ||
3233 | .flags = ADDR_TYPE_RT | ||
3234 | }, | ||
3235 | { } | ||
3236 | }; | ||
3237 | |||
3238 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer7 = { | 2279 | static struct omap_hwmod_ocp_if am33xx_l4_ls__timer7 = { |
3239 | .master = &am33xx_l4_ls_hwmod, | 2280 | .master = &am33xx_l4_ls_hwmod, |
3240 | .slave = &am33xx_timer7_hwmod, | 2281 | .slave = &am33xx_timer7_hwmod, |
3241 | .clk = "l4ls_gclk", | 2282 | .clk = "l4ls_gclk", |
3242 | .addr = am33xx_timer7_addr_space, | ||
3243 | .user = OCP_USER_MPU, | 2283 | .user = OCP_USER_MPU, |
3244 | }; | 2284 | }; |
3245 | 2285 | ||
3246 | /* l3 main -> tpcc */ | 2286 | /* l3 main -> tpcc */ |
3247 | static struct omap_hwmod_addr_space am33xx_tpcc_addr_space[] = { | ||
3248 | { | ||
3249 | .pa_start = 0x49000000, | ||
3250 | .pa_end = 0x49000000 + SZ_32K - 1, | ||
3251 | .flags = ADDR_TYPE_RT | ||
3252 | }, | ||
3253 | { } | ||
3254 | }; | ||
3255 | |||
3256 | static struct omap_hwmod_ocp_if am33xx_l3_main__tpcc = { | 2287 | static struct omap_hwmod_ocp_if am33xx_l3_main__tpcc = { |
3257 | .master = &am33xx_l3_main_hwmod, | 2288 | .master = &am33xx_l3_main_hwmod, |
3258 | .slave = &am33xx_tpcc_hwmod, | 2289 | .slave = &am33xx_tpcc_hwmod, |
3259 | .clk = "l3_gclk", | 2290 | .clk = "l3_gclk", |
3260 | .addr = am33xx_tpcc_addr_space, | ||
3261 | .user = OCP_USER_MPU, | 2291 | .user = OCP_USER_MPU, |
3262 | }; | 2292 | }; |
3263 | 2293 | ||
@@ -3316,160 +2346,67 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__tptc2 = { | |||
3316 | }; | 2346 | }; |
3317 | 2347 | ||
3318 | /* l4 wkup -> uart1 */ | 2348 | /* l4 wkup -> uart1 */ |
3319 | static struct omap_hwmod_addr_space am33xx_uart1_addr_space[] = { | ||
3320 | { | ||
3321 | .pa_start = 0x44E09000, | ||
3322 | .pa_end = 0x44E09000 + SZ_8K - 1, | ||
3323 | .flags = ADDR_TYPE_RT, | ||
3324 | }, | ||
3325 | { } | ||
3326 | }; | ||
3327 | |||
3328 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__uart1 = { | 2349 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__uart1 = { |
3329 | .master = &am33xx_l4_wkup_hwmod, | 2350 | .master = &am33xx_l4_wkup_hwmod, |
3330 | .slave = &am33xx_uart1_hwmod, | 2351 | .slave = &am33xx_uart1_hwmod, |
3331 | .clk = "dpll_core_m4_div2_ck", | 2352 | .clk = "dpll_core_m4_div2_ck", |
3332 | .addr = am33xx_uart1_addr_space, | ||
3333 | .user = OCP_USER_MPU, | 2353 | .user = OCP_USER_MPU, |
3334 | }; | 2354 | }; |
3335 | 2355 | ||
3336 | /* l4 ls -> uart2 */ | 2356 | /* l4 ls -> uart2 */ |
3337 | static struct omap_hwmod_addr_space am33xx_uart2_addr_space[] = { | ||
3338 | { | ||
3339 | .pa_start = 0x48022000, | ||
3340 | .pa_end = 0x48022000 + SZ_8K - 1, | ||
3341 | .flags = ADDR_TYPE_RT, | ||
3342 | }, | ||
3343 | { } | ||
3344 | }; | ||
3345 | |||
3346 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart2 = { | 2357 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart2 = { |
3347 | .master = &am33xx_l4_ls_hwmod, | 2358 | .master = &am33xx_l4_ls_hwmod, |
3348 | .slave = &am33xx_uart2_hwmod, | 2359 | .slave = &am33xx_uart2_hwmod, |
3349 | .clk = "l4ls_gclk", | 2360 | .clk = "l4ls_gclk", |
3350 | .addr = am33xx_uart2_addr_space, | ||
3351 | .user = OCP_USER_MPU, | 2361 | .user = OCP_USER_MPU, |
3352 | }; | 2362 | }; |
3353 | 2363 | ||
3354 | /* l4 ls -> uart3 */ | 2364 | /* l4 ls -> uart3 */ |
3355 | static struct omap_hwmod_addr_space am33xx_uart3_addr_space[] = { | ||
3356 | { | ||
3357 | .pa_start = 0x48024000, | ||
3358 | .pa_end = 0x48024000 + SZ_8K - 1, | ||
3359 | .flags = ADDR_TYPE_RT, | ||
3360 | }, | ||
3361 | { } | ||
3362 | }; | ||
3363 | |||
3364 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart3 = { | 2365 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart3 = { |
3365 | .master = &am33xx_l4_ls_hwmod, | 2366 | .master = &am33xx_l4_ls_hwmod, |
3366 | .slave = &am33xx_uart3_hwmod, | 2367 | .slave = &am33xx_uart3_hwmod, |
3367 | .clk = "l4ls_gclk", | 2368 | .clk = "l4ls_gclk", |
3368 | .addr = am33xx_uart3_addr_space, | ||
3369 | .user = OCP_USER_MPU, | 2369 | .user = OCP_USER_MPU, |
3370 | }; | 2370 | }; |
3371 | 2371 | ||
3372 | /* l4 ls -> uart4 */ | 2372 | /* l4 ls -> uart4 */ |
3373 | static struct omap_hwmod_addr_space am33xx_uart4_addr_space[] = { | ||
3374 | { | ||
3375 | .pa_start = 0x481A6000, | ||
3376 | .pa_end = 0x481A6000 + SZ_8K - 1, | ||
3377 | .flags = ADDR_TYPE_RT, | ||
3378 | }, | ||
3379 | { } | ||
3380 | }; | ||
3381 | |||
3382 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart4 = { | 2373 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart4 = { |
3383 | .master = &am33xx_l4_ls_hwmod, | 2374 | .master = &am33xx_l4_ls_hwmod, |
3384 | .slave = &am33xx_uart4_hwmod, | 2375 | .slave = &am33xx_uart4_hwmod, |
3385 | .clk = "l4ls_gclk", | 2376 | .clk = "l4ls_gclk", |
3386 | .addr = am33xx_uart4_addr_space, | ||
3387 | .user = OCP_USER_MPU, | 2377 | .user = OCP_USER_MPU, |
3388 | }; | 2378 | }; |
3389 | 2379 | ||
3390 | /* l4 ls -> uart5 */ | 2380 | /* l4 ls -> uart5 */ |
3391 | static struct omap_hwmod_addr_space am33xx_uart5_addr_space[] = { | ||
3392 | { | ||
3393 | .pa_start = 0x481A8000, | ||
3394 | .pa_end = 0x481A8000 + SZ_8K - 1, | ||
3395 | .flags = ADDR_TYPE_RT, | ||
3396 | }, | ||
3397 | { } | ||
3398 | }; | ||
3399 | |||
3400 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart5 = { | 2381 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart5 = { |
3401 | .master = &am33xx_l4_ls_hwmod, | 2382 | .master = &am33xx_l4_ls_hwmod, |
3402 | .slave = &am33xx_uart5_hwmod, | 2383 | .slave = &am33xx_uart5_hwmod, |
3403 | .clk = "l4ls_gclk", | 2384 | .clk = "l4ls_gclk", |
3404 | .addr = am33xx_uart5_addr_space, | ||
3405 | .user = OCP_USER_MPU, | 2385 | .user = OCP_USER_MPU, |
3406 | }; | 2386 | }; |
3407 | 2387 | ||
3408 | /* l4 ls -> uart6 */ | 2388 | /* l4 ls -> uart6 */ |
3409 | static struct omap_hwmod_addr_space am33xx_uart6_addr_space[] = { | ||
3410 | { | ||
3411 | .pa_start = 0x481aa000, | ||
3412 | .pa_end = 0x481aa000 + SZ_8K - 1, | ||
3413 | .flags = ADDR_TYPE_RT, | ||
3414 | }, | ||
3415 | { } | ||
3416 | }; | ||
3417 | |||
3418 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart6 = { | 2389 | static struct omap_hwmod_ocp_if am33xx_l4_ls__uart6 = { |
3419 | .master = &am33xx_l4_ls_hwmod, | 2390 | .master = &am33xx_l4_ls_hwmod, |
3420 | .slave = &am33xx_uart6_hwmod, | 2391 | .slave = &am33xx_uart6_hwmod, |
3421 | .clk = "l4ls_gclk", | 2392 | .clk = "l4ls_gclk", |
3422 | .addr = am33xx_uart6_addr_space, | ||
3423 | .user = OCP_USER_MPU, | 2393 | .user = OCP_USER_MPU, |
3424 | }; | 2394 | }; |
3425 | 2395 | ||
3426 | /* l4 wkup -> wd_timer1 */ | 2396 | /* l4 wkup -> wd_timer1 */ |
3427 | static struct omap_hwmod_addr_space am33xx_wd_timer1_addrs[] = { | ||
3428 | { | ||
3429 | .pa_start = 0x44e35000, | ||
3430 | .pa_end = 0x44e35000 + SZ_4K - 1, | ||
3431 | .flags = ADDR_TYPE_RT | ||
3432 | }, | ||
3433 | { } | ||
3434 | }; | ||
3435 | |||
3436 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__wd_timer1 = { | 2397 | static struct omap_hwmod_ocp_if am33xx_l4_wkup__wd_timer1 = { |
3437 | .master = &am33xx_l4_wkup_hwmod, | 2398 | .master = &am33xx_l4_wkup_hwmod, |
3438 | .slave = &am33xx_wd_timer1_hwmod, | 2399 | .slave = &am33xx_wd_timer1_hwmod, |
3439 | .clk = "dpll_core_m4_div2_ck", | 2400 | .clk = "dpll_core_m4_div2_ck", |
3440 | .addr = am33xx_wd_timer1_addrs, | ||
3441 | .user = OCP_USER_MPU, | 2401 | .user = OCP_USER_MPU, |
3442 | }; | 2402 | }; |
3443 | 2403 | ||
3444 | /* usbss */ | 2404 | /* usbss */ |
3445 | /* l3 s -> USBSS interface */ | 2405 | /* l3 s -> USBSS interface */ |
3446 | static struct omap_hwmod_addr_space am33xx_usbss_addr_space[] = { | ||
3447 | { | ||
3448 | .name = "usbss", | ||
3449 | .pa_start = 0x47400000, | ||
3450 | .pa_end = 0x47400000 + SZ_4K - 1, | ||
3451 | .flags = ADDR_TYPE_RT | ||
3452 | }, | ||
3453 | { | ||
3454 | .name = "musb0", | ||
3455 | .pa_start = 0x47401000, | ||
3456 | .pa_end = 0x47401000 + SZ_2K - 1, | ||
3457 | .flags = ADDR_TYPE_RT | ||
3458 | }, | ||
3459 | { | ||
3460 | .name = "musb1", | ||
3461 | .pa_start = 0x47401800, | ||
3462 | .pa_end = 0x47401800 + SZ_2K - 1, | ||
3463 | .flags = ADDR_TYPE_RT | ||
3464 | }, | ||
3465 | { } | ||
3466 | }; | ||
3467 | |||
3468 | static struct omap_hwmod_ocp_if am33xx_l3_s__usbss = { | 2406 | static struct omap_hwmod_ocp_if am33xx_l3_s__usbss = { |
3469 | .master = &am33xx_l3_s_hwmod, | 2407 | .master = &am33xx_l3_s_hwmod, |
3470 | .slave = &am33xx_usbss_hwmod, | 2408 | .slave = &am33xx_usbss_hwmod, |
3471 | .clk = "l3s_gclk", | 2409 | .clk = "l3s_gclk", |
3472 | .addr = am33xx_usbss_addr_space, | ||
3473 | .user = OCP_USER_MPU, | 2410 | .user = OCP_USER_MPU, |
3474 | .flags = OCPIF_SWSUP_IDLE, | 2411 | .flags = OCPIF_SWSUP_IDLE, |
3475 | }; | 2412 | }; |
@@ -3518,13 +2455,11 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__aes0 = { | |||
3518 | }; | 2455 | }; |
3519 | 2456 | ||
3520 | static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { | 2457 | static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { |
3521 | &am33xx_l4_fw__emif_fw, | ||
3522 | &am33xx_l3_main__emif, | 2458 | &am33xx_l3_main__emif, |
3523 | &am33xx_mpu__l3_main, | 2459 | &am33xx_mpu__l3_main, |
3524 | &am33xx_mpu__prcm, | 2460 | &am33xx_mpu__prcm, |
3525 | &am33xx_l3_s__l4_ls, | 2461 | &am33xx_l3_s__l4_ls, |
3526 | &am33xx_l3_s__l4_wkup, | 2462 | &am33xx_l3_s__l4_wkup, |
3527 | &am33xx_l3_s__l4_fw, | ||
3528 | &am33xx_l3_main__l4_hs, | 2463 | &am33xx_l3_main__l4_hs, |
3529 | &am33xx_l3_main__l3_s, | 2464 | &am33xx_l3_main__l3_s, |
3530 | &am33xx_l3_main__l3_instr, | 2465 | &am33xx_l3_main__l3_instr, |
@@ -3554,9 +2489,7 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = { | |||
3554 | &am33xx_l4_per__i2c3, | 2489 | &am33xx_l4_per__i2c3, |
3555 | &am33xx_l4_per__mailbox, | 2490 | &am33xx_l4_per__mailbox, |
3556 | &am33xx_l4_ls__mcasp0, | 2491 | &am33xx_l4_ls__mcasp0, |
3557 | &am33xx_l3_s__mcasp0_data, | ||
3558 | &am33xx_l4_ls__mcasp1, | 2492 | &am33xx_l4_ls__mcasp1, |
3559 | &am33xx_l3_s__mcasp1_data, | ||
3560 | &am33xx_l4_ls__mmc0, | 2493 | &am33xx_l4_ls__mmc0, |
3561 | &am33xx_l4_ls__mmc1, | 2494 | &am33xx_l4_ls__mmc1, |
3562 | &am33xx_l3_s__mmc2, | 2495 | &am33xx_l3_s__mmc2, |
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 30c2fe243f76..0f9c3f431a5f 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c | |||
@@ -311,9 +311,9 @@ struct platform_device s5p_device_jpeg = { | |||
311 | #ifdef CONFIG_S5P_DEV_FIMD0 | 311 | #ifdef CONFIG_S5P_DEV_FIMD0 |
312 | static struct resource s5p_fimd0_resource[] = { | 312 | static struct resource s5p_fimd0_resource[] = { |
313 | [0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K), | 313 | [0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K), |
314 | [1] = DEFINE_RES_IRQ(IRQ_FIMD0_VSYNC), | 314 | [1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"), |
315 | [2] = DEFINE_RES_IRQ(IRQ_FIMD0_FIFO), | 315 | [2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"), |
316 | [3] = DEFINE_RES_IRQ(IRQ_FIMD0_SYSTEM), | 316 | [3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"), |
317 | }; | 317 | }; |
318 | 318 | ||
319 | struct platform_device s5p_device_fimd0 = { | 319 | struct platform_device s5p_device_fimd0 = { |
diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c index 7df1aad29b67..41b4f626d554 100644 --- a/arch/arm64/kernel/arm64ksyms.c +++ b/arch/arm64/kernel/arm64ksyms.c | |||
@@ -34,6 +34,7 @@ EXPORT_SYMBOL(__strnlen_user); | |||
34 | EXPORT_SYMBOL(__strncpy_from_user); | 34 | EXPORT_SYMBOL(__strncpy_from_user); |
35 | 35 | ||
36 | EXPORT_SYMBOL(copy_page); | 36 | EXPORT_SYMBOL(copy_page); |
37 | EXPORT_SYMBOL(clear_page); | ||
37 | 38 | ||
38 | EXPORT_SYMBOL(__copy_from_user); | 39 | EXPORT_SYMBOL(__copy_from_user); |
39 | EXPORT_SYMBOL(__copy_to_user); | 40 | EXPORT_SYMBOL(__copy_to_user); |
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index c7e047049f2c..1d1314280a03 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S | |||
@@ -390,6 +390,16 @@ el0_sync_compat: | |||
390 | b.eq el0_fpsimd_exc | 390 | b.eq el0_fpsimd_exc |
391 | cmp x24, #ESR_EL1_EC_UNKNOWN // unknown exception in EL0 | 391 | cmp x24, #ESR_EL1_EC_UNKNOWN // unknown exception in EL0 |
392 | b.eq el0_undef | 392 | b.eq el0_undef |
393 | cmp x24, #ESR_EL1_EC_CP15_32 // CP15 MRC/MCR trap | ||
394 | b.eq el0_undef | ||
395 | cmp x24, #ESR_EL1_EC_CP15_64 // CP15 MRRC/MCRR trap | ||
396 | b.eq el0_undef | ||
397 | cmp x24, #ESR_EL1_EC_CP14_MR // CP14 MRC/MCR trap | ||
398 | b.eq el0_undef | ||
399 | cmp x24, #ESR_EL1_EC_CP14_LS // CP14 LDC/STC trap | ||
400 | b.eq el0_undef | ||
401 | cmp x24, #ESR_EL1_EC_CP14_64 // CP14 MRRC/MCRR trap | ||
402 | b.eq el0_undef | ||
393 | cmp x24, #ESR_EL1_EC_BREAKPT_EL0 // debug exception in EL0 | 403 | cmp x24, #ESR_EL1_EC_BREAKPT_EL0 // debug exception in EL0 |
394 | b.ge el0_dbg | 404 | b.ge el0_dbg |
395 | b el0_inv | 405 | b el0_inv |
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 61d7dd29f756..f30852d28590 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c | |||
@@ -267,7 +267,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) | |||
267 | return; | 267 | return; |
268 | #endif | 268 | #endif |
269 | 269 | ||
270 | if (show_unhandled_signals) { | 270 | if (show_unhandled_signals && unhandled_signal(current, SIGILL) && |
271 | printk_ratelimit()) { | ||
271 | pr_info("%s[%d]: undefined instruction: pc=%p\n", | 272 | pr_info("%s[%d]: undefined instruction: pc=%p\n", |
272 | current->comm, task_pid_nr(current), pc); | 273 | current->comm, task_pid_nr(current), pc); |
273 | dump_instr(KERN_INFO, regs); | 274 | dump_instr(KERN_INFO, regs); |
@@ -294,7 +295,7 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs) | |||
294 | } | 295 | } |
295 | #endif | 296 | #endif |
296 | 297 | ||
297 | if (show_unhandled_signals) { | 298 | if (show_unhandled_signals && printk_ratelimit()) { |
298 | pr_info("%s[%d]: syscall %d\n", current->comm, | 299 | pr_info("%s[%d]: syscall %d\n", current->comm, |
299 | task_pid_nr(current), (int)regs->syscallno); | 300 | task_pid_nr(current), (int)regs->syscallno); |
300 | dump_instr("", regs); | 301 | dump_instr("", regs); |
@@ -310,14 +311,20 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs) | |||
310 | */ | 311 | */ |
311 | asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) | 312 | asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) |
312 | { | 313 | { |
314 | siginfo_t info; | ||
315 | void __user *pc = (void __user *)instruction_pointer(regs); | ||
313 | console_verbose(); | 316 | console_verbose(); |
314 | 317 | ||
315 | pr_crit("Bad mode in %s handler detected, code 0x%08x\n", | 318 | pr_crit("Bad mode in %s handler detected, code 0x%08x\n", |
316 | handler[reason], esr); | 319 | handler[reason], esr); |
320 | __show_regs(regs); | ||
321 | |||
322 | info.si_signo = SIGILL; | ||
323 | info.si_errno = 0; | ||
324 | info.si_code = ILL_ILLOPC; | ||
325 | info.si_addr = pc; | ||
317 | 326 | ||
318 | die("Oops - bad mode", regs, 0); | 327 | arm64_notify_die("Oops - bad mode", regs, &info, 0); |
319 | local_irq_disable(); | ||
320 | panic("bad mode"); | ||
321 | } | 328 | } |
322 | 329 | ||
323 | void __pte_error(const char *file, int line, unsigned long val) | 330 | void __pte_error(const char *file, int line, unsigned long val) |
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 98af6e760cce..1426468b77f3 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c | |||
@@ -113,7 +113,8 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr, | |||
113 | { | 113 | { |
114 | struct siginfo si; | 114 | struct siginfo si; |
115 | 115 | ||
116 | if (show_unhandled_signals) { | 116 | if (show_unhandled_signals && unhandled_signal(tsk, sig) && |
117 | printk_ratelimit()) { | ||
117 | pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", | 118 | pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", |
118 | tsk->comm, task_pid_nr(tsk), fault_name(esr), sig, | 119 | tsk->comm, task_pid_nr(tsk), fault_name(esr), sig, |
119 | addr, esr); | 120 | addr, esr); |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 90d3109c82f4..19325e117eea 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
@@ -1,55 +1,78 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-amiga" | 1 | CONFIG_LOCALVERSION="-amiga" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_AMIGA=y | 16 | CONFIG_PARTITION_ADVANCED=y |
17 | CONFIG_ATARI_PARTITION=y | ||
18 | CONFIG_MAC_PARTITION=y | ||
19 | CONFIG_BSD_DISKLABEL=y | ||
20 | CONFIG_MINIX_SUBPARTITION=y | ||
21 | CONFIG_SOLARIS_X86_PARTITION=y | ||
22 | CONFIG_UNIXWARE_DISKLABEL=y | ||
23 | CONFIG_SUN_PARTITION=y | ||
24 | # CONFIG_EFI_PARTITION is not set | ||
25 | CONFIG_SYSV68_PARTITION=y | ||
26 | CONFIG_IOSCHED_DEADLINE=m | ||
14 | CONFIG_M68020=y | 27 | CONFIG_M68020=y |
15 | CONFIG_M68030=y | 28 | CONFIG_M68030=y |
16 | CONFIG_M68040=y | 29 | CONFIG_M68040=y |
17 | CONFIG_M68060=y | 30 | CONFIG_M68060=y |
18 | CONFIG_BINFMT_AOUT=m | 31 | CONFIG_AMIGA=y |
19 | CONFIG_BINFMT_MISC=m | ||
20 | CONFIG_ZORRO=y | 32 | CONFIG_ZORRO=y |
21 | CONFIG_AMIGA_PCMCIA=y | 33 | CONFIG_AMIGA_PCMCIA=y |
22 | CONFIG_HEARTBEAT=y | ||
23 | CONFIG_PROC_HARDWARE=y | ||
24 | CONFIG_ZORRO_NAMES=y | 34 | CONFIG_ZORRO_NAMES=y |
35 | # CONFIG_COMPACTION is not set | ||
36 | CONFIG_CLEANCACHE=y | ||
37 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
38 | CONFIG_BINFMT_AOUT=m | ||
39 | CONFIG_BINFMT_MISC=m | ||
25 | CONFIG_NET=y | 40 | CONFIG_NET=y |
26 | CONFIG_PACKET=y | 41 | CONFIG_PACKET=y |
42 | CONFIG_PACKET_DIAG=m | ||
27 | CONFIG_UNIX=y | 43 | CONFIG_UNIX=y |
44 | CONFIG_UNIX_DIAG=m | ||
45 | CONFIG_XFRM_MIGRATE=y | ||
28 | CONFIG_NET_KEY=y | 46 | CONFIG_NET_KEY=y |
29 | CONFIG_NET_KEY_MIGRATE=y | ||
30 | CONFIG_INET=y | 47 | CONFIG_INET=y |
31 | CONFIG_IP_PNP=y | 48 | CONFIG_IP_PNP=y |
49 | CONFIG_IP_PNP_DHCP=y | ||
50 | CONFIG_IP_PNP_BOOTP=y | ||
51 | CONFIG_IP_PNP_RARP=y | ||
32 | CONFIG_NET_IPIP=m | 52 | CONFIG_NET_IPIP=m |
53 | CONFIG_NET_IPGRE_DEMUX=m | ||
33 | CONFIG_NET_IPGRE=m | 54 | CONFIG_NET_IPGRE=m |
34 | CONFIG_SYN_COOKIES=y | 55 | CONFIG_SYN_COOKIES=y |
56 | CONFIG_NET_IPVTI=m | ||
35 | CONFIG_INET_AH=m | 57 | CONFIG_INET_AH=m |
36 | CONFIG_INET_ESP=m | 58 | CONFIG_INET_ESP=m |
37 | CONFIG_INET_IPCOMP=m | 59 | CONFIG_INET_IPCOMP=m |
38 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 60 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
39 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 61 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
40 | CONFIG_INET_XFRM_MODE_BEET=m | 62 | CONFIG_INET_XFRM_MODE_BEET=m |
63 | # CONFIG_INET_LRO is not set | ||
41 | CONFIG_INET_DIAG=m | 64 | CONFIG_INET_DIAG=m |
65 | CONFIG_INET_UDP_DIAG=m | ||
42 | CONFIG_IPV6_PRIVACY=y | 66 | CONFIG_IPV6_PRIVACY=y |
43 | CONFIG_IPV6_ROUTER_PREF=y | 67 | CONFIG_IPV6_ROUTER_PREF=y |
44 | CONFIG_IPV6_ROUTE_INFO=y | ||
45 | CONFIG_INET6_AH=m | 68 | CONFIG_INET6_AH=m |
46 | CONFIG_INET6_ESP=m | 69 | CONFIG_INET6_ESP=m |
47 | CONFIG_INET6_IPCOMP=m | 70 | CONFIG_INET6_IPCOMP=m |
48 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 71 | CONFIG_IPV6_GRE=m |
49 | CONFIG_IPV6_TUNNEL=m | ||
50 | CONFIG_NETFILTER=y | 72 | CONFIG_NETFILTER=y |
51 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
52 | CONFIG_NF_CONNTRACK=m | 73 | CONFIG_NF_CONNTRACK=m |
74 | CONFIG_NF_CONNTRACK_ZONES=y | ||
75 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
53 | # CONFIG_NF_CT_PROTO_DCCP is not set | 76 | # CONFIG_NF_CT_PROTO_DCCP is not set |
54 | CONFIG_NF_CT_PROTO_UDPLITE=m | 77 | CONFIG_NF_CT_PROTO_UDPLITE=m |
55 | CONFIG_NF_CONNTRACK_AMANDA=m | 78 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -57,25 +80,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
57 | CONFIG_NF_CONNTRACK_H323=m | 80 | CONFIG_NF_CONNTRACK_H323=m |
58 | CONFIG_NF_CONNTRACK_IRC=m | 81 | CONFIG_NF_CONNTRACK_IRC=m |
59 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 82 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
83 | CONFIG_NF_CONNTRACK_SNMP=m | ||
60 | CONFIG_NF_CONNTRACK_PPTP=m | 84 | CONFIG_NF_CONNTRACK_PPTP=m |
61 | CONFIG_NF_CONNTRACK_SANE=m | 85 | CONFIG_NF_CONNTRACK_SANE=m |
62 | CONFIG_NF_CONNTRACK_SIP=m | 86 | CONFIG_NF_CONNTRACK_SIP=m |
63 | CONFIG_NF_CONNTRACK_TFTP=m | 87 | CONFIG_NF_CONNTRACK_TFTP=m |
88 | CONFIG_NETFILTER_XT_SET=m | ||
89 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
64 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 90 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
65 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 91 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
66 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 92 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
93 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
94 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
95 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
67 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 96 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
68 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 97 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
69 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 98 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
99 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
100 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
70 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 101 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
71 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 102 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
72 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 103 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
104 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
105 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
73 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 106 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
74 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 107 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
75 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
109 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
76 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 110 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
77 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 111 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
78 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 112 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
113 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
79 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 114 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
80 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 115 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
81 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 116 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -86,6 +121,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
86 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 121 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
87 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 122 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
88 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 123 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
124 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
125 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
89 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 126 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
90 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 127 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
91 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 128 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -99,22 +136,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
99 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 136 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
100 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 137 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
101 | CONFIG_NETFILTER_XT_MATCH_U32=m | 138 | CONFIG_NETFILTER_XT_MATCH_U32=m |
139 | CONFIG_IP_SET=m | ||
140 | CONFIG_IP_SET_BITMAP_IP=m | ||
141 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
142 | CONFIG_IP_SET_BITMAP_PORT=m | ||
143 | CONFIG_IP_SET_HASH_IP=m | ||
144 | CONFIG_IP_SET_HASH_IPPORT=m | ||
145 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
146 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
147 | CONFIG_IP_SET_HASH_NET=m | ||
148 | CONFIG_IP_SET_HASH_NETPORT=m | ||
149 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
150 | CONFIG_IP_SET_LIST_SET=m | ||
102 | CONFIG_NF_CONNTRACK_IPV4=m | 151 | CONFIG_NF_CONNTRACK_IPV4=m |
103 | CONFIG_IP_NF_QUEUE=m | ||
104 | CONFIG_IP_NF_IPTABLES=m | 152 | CONFIG_IP_NF_IPTABLES=m |
105 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
106 | CONFIG_IP_NF_MATCH_AH=m | 153 | CONFIG_IP_NF_MATCH_AH=m |
107 | CONFIG_IP_NF_MATCH_ECN=m | 154 | CONFIG_IP_NF_MATCH_ECN=m |
155 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
108 | CONFIG_IP_NF_MATCH_TTL=m | 156 | CONFIG_IP_NF_MATCH_TTL=m |
109 | CONFIG_IP_NF_FILTER=m | 157 | CONFIG_IP_NF_FILTER=m |
110 | CONFIG_IP_NF_TARGET_REJECT=m | 158 | CONFIG_IP_NF_TARGET_REJECT=m |
111 | CONFIG_IP_NF_TARGET_LOG=m | ||
112 | CONFIG_IP_NF_TARGET_ULOG=m | 159 | CONFIG_IP_NF_TARGET_ULOG=m |
113 | CONFIG_NF_NAT=m | 160 | CONFIG_NF_NAT_IPV4=m |
114 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 161 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
115 | CONFIG_IP_NF_TARGET_NETMAP=m | 162 | CONFIG_IP_NF_TARGET_NETMAP=m |
116 | CONFIG_IP_NF_TARGET_REDIRECT=m | 163 | CONFIG_IP_NF_TARGET_REDIRECT=m |
117 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
118 | CONFIG_IP_NF_MANGLE=m | 164 | CONFIG_IP_NF_MANGLE=m |
119 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 165 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
120 | CONFIG_IP_NF_TARGET_ECN=m | 166 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -124,7 +170,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
124 | CONFIG_IP_NF_ARPFILTER=m | 170 | CONFIG_IP_NF_ARPFILTER=m |
125 | CONFIG_IP_NF_ARP_MANGLE=m | 171 | CONFIG_IP_NF_ARP_MANGLE=m |
126 | CONFIG_NF_CONNTRACK_IPV6=m | 172 | CONFIG_NF_CONNTRACK_IPV6=m |
127 | CONFIG_IP6_NF_QUEUE=m | ||
128 | CONFIG_IP6_NF_IPTABLES=m | 173 | CONFIG_IP6_NF_IPTABLES=m |
129 | CONFIG_IP6_NF_MATCH_AH=m | 174 | CONFIG_IP6_NF_MATCH_AH=m |
130 | CONFIG_IP6_NF_MATCH_EUI64=m | 175 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -133,18 +178,30 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
133 | CONFIG_IP6_NF_MATCH_HL=m | 178 | CONFIG_IP6_NF_MATCH_HL=m |
134 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 179 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
135 | CONFIG_IP6_NF_MATCH_MH=m | 180 | CONFIG_IP6_NF_MATCH_MH=m |
181 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
136 | CONFIG_IP6_NF_MATCH_RT=m | 182 | CONFIG_IP6_NF_MATCH_RT=m |
137 | CONFIG_IP6_NF_TARGET_HL=m | 183 | CONFIG_IP6_NF_TARGET_HL=m |
138 | CONFIG_IP6_NF_TARGET_LOG=m | ||
139 | CONFIG_IP6_NF_FILTER=m | 184 | CONFIG_IP6_NF_FILTER=m |
140 | CONFIG_IP6_NF_TARGET_REJECT=m | 185 | CONFIG_IP6_NF_TARGET_REJECT=m |
141 | CONFIG_IP6_NF_MANGLE=m | 186 | CONFIG_IP6_NF_MANGLE=m |
142 | CONFIG_IP6_NF_RAW=m | 187 | CONFIG_IP6_NF_RAW=m |
188 | CONFIG_NF_NAT_IPV6=m | ||
189 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
190 | CONFIG_IP6_NF_TARGET_NPT=m | ||
143 | CONFIG_IP_DCCP=m | 191 | CONFIG_IP_DCCP=m |
144 | # CONFIG_IP_DCCP_CCID3 is not set | 192 | # CONFIG_IP_DCCP_CCID3 is not set |
193 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
194 | CONFIG_RDS=m | ||
195 | CONFIG_RDS_TCP=m | ||
196 | CONFIG_L2TP=m | ||
145 | CONFIG_ATALK=m | 197 | CONFIG_ATALK=m |
198 | CONFIG_BATMAN_ADV=m | ||
199 | CONFIG_BATMAN_ADV_DAT=y | ||
200 | # CONFIG_WIRELESS is not set | ||
146 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 201 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
202 | CONFIG_DEVTMPFS=y | ||
147 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 203 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
204 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
148 | CONFIG_CONNECTOR=m | 205 | CONFIG_CONNECTOR=m |
149 | CONFIG_PARPORT=m | 206 | CONFIG_PARPORT=m |
150 | CONFIG_PARPORT_AMIGA=m | 207 | CONFIG_PARPORT_AMIGA=m |
@@ -154,11 +211,13 @@ CONFIG_AMIGA_FLOPPY=y | |||
154 | CONFIG_AMIGA_Z2RAM=y | 211 | CONFIG_AMIGA_Z2RAM=y |
155 | CONFIG_BLK_DEV_LOOP=y | 212 | CONFIG_BLK_DEV_LOOP=y |
156 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 213 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
214 | CONFIG_BLK_DEV_DRBD=m | ||
157 | CONFIG_BLK_DEV_NBD=m | 215 | CONFIG_BLK_DEV_NBD=m |
158 | CONFIG_BLK_DEV_RAM=y | 216 | CONFIG_BLK_DEV_RAM=y |
159 | CONFIG_CDROM_PKTCDVD=m | 217 | CONFIG_CDROM_PKTCDVD=m |
160 | CONFIG_ATA_OVER_ETH=m | 218 | CONFIG_ATA_OVER_ETH=m |
161 | CONFIG_IDE=y | 219 | CONFIG_IDE=y |
220 | CONFIG_IDE_GD_ATAPI=y | ||
162 | CONFIG_BLK_DEV_IDECD=y | 221 | CONFIG_BLK_DEV_IDECD=y |
163 | CONFIG_BLK_DEV_GAYLE=y | 222 | CONFIG_BLK_DEV_GAYLE=y |
164 | CONFIG_BLK_DEV_BUDDHA=y | 223 | CONFIG_BLK_DEV_BUDDHA=y |
@@ -172,57 +231,77 @@ CONFIG_BLK_DEV_SR=y | |||
172 | CONFIG_BLK_DEV_SR_VENDOR=y | 231 | CONFIG_BLK_DEV_SR_VENDOR=y |
173 | CONFIG_CHR_DEV_SG=m | 232 | CONFIG_CHR_DEV_SG=m |
174 | CONFIG_SCSI_CONSTANTS=y | 233 | CONFIG_SCSI_CONSTANTS=y |
175 | CONFIG_SCSI_SAS_LIBSAS=m | 234 | CONFIG_SCSI_SAS_ATTRS=m |
176 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
177 | CONFIG_SCSI_SRP_ATTRS=m | ||
178 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
179 | CONFIG_ISCSI_TCP=m | 235 | CONFIG_ISCSI_TCP=m |
236 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
180 | CONFIG_A3000_SCSI=y | 237 | CONFIG_A3000_SCSI=y |
181 | CONFIG_A2091_SCSI=y | 238 | CONFIG_A2091_SCSI=y |
182 | CONFIG_GVP11_SCSI=y | 239 | CONFIG_GVP11_SCSI=y |
183 | CONFIG_SCSI_A4000T=y | 240 | CONFIG_SCSI_A4000T=y |
184 | CONFIG_SCSI_ZORRO7XX=y | 241 | CONFIG_SCSI_ZORRO7XX=y |
185 | CONFIG_MD=y | 242 | CONFIG_MD=y |
186 | CONFIG_BLK_DEV_MD=m | ||
187 | CONFIG_MD_LINEAR=m | 243 | CONFIG_MD_LINEAR=m |
188 | CONFIG_MD_RAID0=m | 244 | CONFIG_MD_RAID0=m |
189 | CONFIG_MD_RAID1=m | ||
190 | CONFIG_MD_RAID456=m | ||
191 | CONFIG_BLK_DEV_DM=m | 245 | CONFIG_BLK_DEV_DM=m |
192 | CONFIG_DM_CRYPT=m | 246 | CONFIG_DM_CRYPT=m |
193 | CONFIG_DM_SNAPSHOT=m | 247 | CONFIG_DM_SNAPSHOT=m |
248 | CONFIG_DM_THIN_PROVISIONING=m | ||
249 | CONFIG_DM_CACHE=m | ||
194 | CONFIG_DM_MIRROR=m | 250 | CONFIG_DM_MIRROR=m |
251 | CONFIG_DM_RAID=m | ||
195 | CONFIG_DM_ZERO=m | 252 | CONFIG_DM_ZERO=m |
196 | CONFIG_DM_MULTIPATH=m | 253 | CONFIG_DM_MULTIPATH=m |
197 | CONFIG_DM_UEVENT=y | 254 | CONFIG_DM_UEVENT=y |
255 | CONFIG_TARGET_CORE=m | ||
256 | CONFIG_TCM_IBLOCK=m | ||
257 | CONFIG_TCM_FILEIO=m | ||
258 | CONFIG_TCM_PSCSI=m | ||
198 | CONFIG_NETDEVICES=y | 259 | CONFIG_NETDEVICES=y |
199 | CONFIG_DUMMY=m | 260 | CONFIG_DUMMY=m |
200 | CONFIG_MACVLAN=m | ||
201 | CONFIG_EQUALIZER=m | 261 | CONFIG_EQUALIZER=m |
262 | CONFIG_NET_TEAM=m | ||
263 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
264 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
265 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
266 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
267 | CONFIG_VXLAN=m | ||
268 | CONFIG_NETCONSOLE=m | ||
269 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
202 | CONFIG_VETH=m | 270 | CONFIG_VETH=m |
203 | CONFIG_NET_ETHERNET=y | 271 | # CONFIG_NET_VENDOR_3COM is not set |
204 | CONFIG_ARIADNE=y | ||
205 | CONFIG_A2065=y | 272 | CONFIG_A2065=y |
273 | CONFIG_ARIADNE=y | ||
274 | # CONFIG_NET_CADENCE is not set | ||
275 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
276 | # CONFIG_NET_VENDOR_CIRRUS is not set | ||
277 | # CONFIG_NET_VENDOR_FUJITSU is not set | ||
278 | # CONFIG_NET_VENDOR_HP is not set | ||
279 | # CONFIG_NET_VENDOR_INTEL is not set | ||
280 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
281 | # CONFIG_NET_VENDOR_MICREL is not set | ||
206 | CONFIG_HYDRA=y | 282 | CONFIG_HYDRA=y |
207 | CONFIG_ZORRO8390=y | ||
208 | CONFIG_APNE=y | 283 | CONFIG_APNE=y |
209 | # CONFIG_NETDEV_1000 is not set | 284 | CONFIG_ZORRO8390=y |
210 | # CONFIG_NETDEV_10000 is not set | 285 | # CONFIG_NET_VENDOR_SEEQ is not set |
286 | # CONFIG_NET_VENDOR_SMSC is not set | ||
287 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
288 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
211 | CONFIG_PPP=m | 289 | CONFIG_PPP=m |
212 | CONFIG_PPP_FILTER=y | ||
213 | CONFIG_PPP_ASYNC=m | ||
214 | CONFIG_PPP_SYNC_TTY=m | ||
215 | CONFIG_PPP_DEFLATE=m | ||
216 | CONFIG_PPP_BSDCOMP=m | 290 | CONFIG_PPP_BSDCOMP=m |
291 | CONFIG_PPP_DEFLATE=m | ||
292 | CONFIG_PPP_FILTER=y | ||
217 | CONFIG_PPP_MPPE=m | 293 | CONFIG_PPP_MPPE=m |
218 | CONFIG_PPPOE=m | 294 | CONFIG_PPPOE=m |
295 | CONFIG_PPTP=m | ||
296 | CONFIG_PPPOL2TP=m | ||
297 | CONFIG_PPP_ASYNC=m | ||
298 | CONFIG_PPP_SYNC_TTY=m | ||
219 | CONFIG_SLIP=m | 299 | CONFIG_SLIP=m |
220 | CONFIG_SLIP_COMPRESSED=y | 300 | CONFIG_SLIP_COMPRESSED=y |
221 | CONFIG_SLIP_SMART=y | 301 | CONFIG_SLIP_SMART=y |
222 | CONFIG_SLIP_MODE_SLIP6=y | 302 | CONFIG_SLIP_MODE_SLIP6=y |
223 | CONFIG_NETCONSOLE=m | 303 | # CONFIG_WLAN is not set |
224 | CONFIG_NETCONSOLE_DYNAMIC=y | 304 | CONFIG_INPUT_EVDEV=m |
225 | CONFIG_INPUT_FF_MEMLESS=m | ||
226 | CONFIG_KEYBOARD_AMIGA=y | 305 | CONFIG_KEYBOARD_AMIGA=y |
227 | # CONFIG_KEYBOARD_ATKBD is not set | 306 | # CONFIG_KEYBOARD_ATKBD is not set |
228 | # CONFIG_MOUSE_PS2 is not set | 307 | # CONFIG_MOUSE_PS2 is not set |
@@ -233,11 +312,14 @@ CONFIG_INPUT_MISC=y | |||
233 | CONFIG_INPUT_M68K_BEEP=m | 312 | CONFIG_INPUT_M68K_BEEP=m |
234 | # CONFIG_SERIO is not set | 313 | # CONFIG_SERIO is not set |
235 | CONFIG_VT_HW_CONSOLE_BINDING=y | 314 | CONFIG_VT_HW_CONSOLE_BINDING=y |
315 | # CONFIG_LEGACY_PTYS is not set | ||
236 | # CONFIG_DEVKMEM is not set | 316 | # CONFIG_DEVKMEM is not set |
237 | CONFIG_PRINTER=m | 317 | CONFIG_PRINTER=m |
238 | # CONFIG_HW_RANDOM is not set | 318 | # CONFIG_HW_RANDOM is not set |
239 | CONFIG_GEN_RTC=m | 319 | CONFIG_NTP_PPS=y |
240 | CONFIG_GEN_RTC_X=y | 320 | CONFIG_PPS_CLIENT_LDISC=m |
321 | CONFIG_PPS_CLIENT_PARPORT=m | ||
322 | CONFIG_PTP_1588_CLOCK=m | ||
241 | # CONFIG_HWMON is not set | 323 | # CONFIG_HWMON is not set |
242 | CONFIG_FB=y | 324 | CONFIG_FB=y |
243 | CONFIG_FB_CIRRUS=y | 325 | CONFIG_FB_CIRRUS=y |
@@ -252,48 +334,64 @@ CONFIG_SOUND=m | |||
252 | CONFIG_DMASOUND_PAULA=m | 334 | CONFIG_DMASOUND_PAULA=m |
253 | CONFIG_HID=m | 335 | CONFIG_HID=m |
254 | CONFIG_HIDRAW=y | 336 | CONFIG_HIDRAW=y |
337 | CONFIG_UHID=m | ||
338 | # CONFIG_HID_GENERIC is not set | ||
255 | # CONFIG_USB_SUPPORT is not set | 339 | # CONFIG_USB_SUPPORT is not set |
340 | CONFIG_RTC_CLASS=y | ||
341 | CONFIG_RTC_DRV_MSM6242=m | ||
342 | CONFIG_RTC_DRV_RP5C01=m | ||
343 | # CONFIG_IOMMU_SUPPORT is not set | ||
344 | CONFIG_HEARTBEAT=y | ||
345 | CONFIG_PROC_HARDWARE=y | ||
256 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 346 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
257 | CONFIG_SERIAL_CONSOLE=y | 347 | CONFIG_SERIAL_CONSOLE=y |
258 | CONFIG_EXT2_FS=y | 348 | CONFIG_EXT2_FS=y |
259 | CONFIG_EXT3_FS=y | 349 | CONFIG_EXT3_FS=y |
260 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 350 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
261 | # CONFIG_EXT3_FS_XATTR is not set | 351 | # CONFIG_EXT3_FS_XATTR is not set |
352 | CONFIG_EXT4_FS=y | ||
262 | CONFIG_REISERFS_FS=m | 353 | CONFIG_REISERFS_FS=m |
263 | CONFIG_JFS_FS=m | 354 | CONFIG_JFS_FS=m |
264 | CONFIG_XFS_FS=m | 355 | CONFIG_XFS_FS=m |
265 | CONFIG_OCFS2_FS=m | 356 | CONFIG_OCFS2_FS=m |
266 | # CONFIG_OCFS2_FS_STATS is not set | ||
267 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 357 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
358 | CONFIG_FANOTIFY=y | ||
268 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 359 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
269 | # CONFIG_PRINT_QUOTA_WARNING is not set | 360 | # CONFIG_PRINT_QUOTA_WARNING is not set |
270 | CONFIG_AUTOFS_FS=m | ||
271 | CONFIG_AUTOFS4_FS=m | 361 | CONFIG_AUTOFS4_FS=m |
272 | CONFIG_FUSE_FS=m | 362 | CONFIG_FUSE_FS=m |
363 | CONFIG_CUSE=m | ||
273 | CONFIG_ISO9660_FS=y | 364 | CONFIG_ISO9660_FS=y |
274 | CONFIG_JOLIET=y | 365 | CONFIG_JOLIET=y |
275 | CONFIG_ZISOFS=y | 366 | CONFIG_ZISOFS=y |
276 | CONFIG_UDF_FS=m | 367 | CONFIG_UDF_FS=m |
277 | CONFIG_MSDOS_FS=y | 368 | CONFIG_MSDOS_FS=m |
278 | CONFIG_VFAT_FS=m | 369 | CONFIG_VFAT_FS=m |
279 | CONFIG_PROC_KCORE=y | 370 | CONFIG_PROC_KCORE=y |
280 | CONFIG_TMPFS=y | 371 | CONFIG_TMPFS=y |
281 | CONFIG_AFFS_FS=m | 372 | CONFIG_AFFS_FS=m |
373 | CONFIG_ECRYPT_FS=m | ||
374 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
282 | CONFIG_HFS_FS=m | 375 | CONFIG_HFS_FS=m |
283 | CONFIG_HFSPLUS_FS=m | 376 | CONFIG_HFSPLUS_FS=m |
284 | CONFIG_CRAMFS=m | 377 | CONFIG_CRAMFS=m |
285 | CONFIG_SQUASHFS=m | 378 | CONFIG_SQUASHFS=m |
286 | CONFIG_MINIX_FS=y | 379 | CONFIG_SQUASHFS_LZO=y |
380 | CONFIG_MINIX_FS=m | ||
381 | CONFIG_OMFS_FS=m | ||
287 | CONFIG_HPFS_FS=m | 382 | CONFIG_HPFS_FS=m |
383 | CONFIG_QNX4FS_FS=m | ||
384 | CONFIG_QNX6FS_FS=m | ||
288 | CONFIG_SYSV_FS=m | 385 | CONFIG_SYSV_FS=m |
289 | CONFIG_UFS_FS=m | 386 | CONFIG_UFS_FS=m |
290 | CONFIG_NFS_FS=y | 387 | CONFIG_NFS_FS=y |
291 | CONFIG_NFS_V3=y | ||
292 | CONFIG_NFS_V4=y | 388 | CONFIG_NFS_V4=y |
389 | CONFIG_NFS_SWAP=y | ||
390 | CONFIG_ROOT_NFS=y | ||
293 | CONFIG_NFSD=m | 391 | CONFIG_NFSD=m |
294 | CONFIG_NFSD_V3=y | 392 | CONFIG_NFSD_V3=y |
295 | CONFIG_SMB_FS=m | 393 | CONFIG_CIFS=m |
296 | CONFIG_SMB_NLS_DEFAULT=y | 394 | # CONFIG_CIFS_DEBUG is not set |
297 | CONFIG_CODA_FS=m | 395 | CONFIG_CODA_FS=m |
298 | CONFIG_NLS_CODEPAGE_437=y | 396 | CONFIG_NLS_CODEPAGE_437=y |
299 | CONFIG_NLS_CODEPAGE_737=m | 397 | CONFIG_NLS_CODEPAGE_737=m |
@@ -332,10 +430,23 @@ CONFIG_NLS_ISO8859_14=m | |||
332 | CONFIG_NLS_ISO8859_15=m | 430 | CONFIG_NLS_ISO8859_15=m |
333 | CONFIG_NLS_KOI8_R=m | 431 | CONFIG_NLS_KOI8_R=m |
334 | CONFIG_NLS_KOI8_U=m | 432 | CONFIG_NLS_KOI8_U=m |
433 | CONFIG_NLS_MAC_ROMAN=m | ||
434 | CONFIG_NLS_MAC_CELTIC=m | ||
435 | CONFIG_NLS_MAC_CENTEURO=m | ||
436 | CONFIG_NLS_MAC_CROATIAN=m | ||
437 | CONFIG_NLS_MAC_CYRILLIC=m | ||
438 | CONFIG_NLS_MAC_GAELIC=m | ||
439 | CONFIG_NLS_MAC_GREEK=m | ||
440 | CONFIG_NLS_MAC_ICELAND=m | ||
441 | CONFIG_NLS_MAC_INUIT=m | ||
442 | CONFIG_NLS_MAC_ROMANIAN=m | ||
443 | CONFIG_NLS_MAC_TURKISH=m | ||
335 | CONFIG_DLM=m | 444 | CONFIG_DLM=m |
336 | CONFIG_MAGIC_SYSRQ=y | 445 | CONFIG_MAGIC_SYSRQ=y |
337 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 446 | CONFIG_ASYNC_RAID6_TEST=m |
338 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 447 | CONFIG_ENCRYPTED_KEYS=m |
448 | CONFIG_CRYPTO_MANAGER=y | ||
449 | CONFIG_CRYPTO_USER=m | ||
339 | CONFIG_CRYPTO_NULL=m | 450 | CONFIG_CRYPTO_NULL=m |
340 | CONFIG_CRYPTO_CRYPTD=m | 451 | CONFIG_CRYPTO_CRYPTD=m |
341 | CONFIG_CRYPTO_TEST=m | 452 | CONFIG_CRYPTO_TEST=m |
@@ -345,19 +456,16 @@ CONFIG_CRYPTO_CTS=m | |||
345 | CONFIG_CRYPTO_LRW=m | 456 | CONFIG_CRYPTO_LRW=m |
346 | CONFIG_CRYPTO_PCBC=m | 457 | CONFIG_CRYPTO_PCBC=m |
347 | CONFIG_CRYPTO_XTS=m | 458 | CONFIG_CRYPTO_XTS=m |
348 | CONFIG_CRYPTO_HMAC=y | ||
349 | CONFIG_CRYPTO_XCBC=m | 459 | CONFIG_CRYPTO_XCBC=m |
350 | CONFIG_CRYPTO_MD4=m | 460 | CONFIG_CRYPTO_VMAC=m |
351 | CONFIG_CRYPTO_MICHAEL_MIC=m | 461 | CONFIG_CRYPTO_MICHAEL_MIC=m |
352 | CONFIG_CRYPTO_RMD128=m | 462 | CONFIG_CRYPTO_RMD128=m |
353 | CONFIG_CRYPTO_RMD160=m | 463 | CONFIG_CRYPTO_RMD160=m |
354 | CONFIG_CRYPTO_RMD256=m | 464 | CONFIG_CRYPTO_RMD256=m |
355 | CONFIG_CRYPTO_RMD320=m | 465 | CONFIG_CRYPTO_RMD320=m |
356 | CONFIG_CRYPTO_SHA256=m | ||
357 | CONFIG_CRYPTO_SHA512=m | 466 | CONFIG_CRYPTO_SHA512=m |
358 | CONFIG_CRYPTO_TGR192=m | 467 | CONFIG_CRYPTO_TGR192=m |
359 | CONFIG_CRYPTO_WP512=m | 468 | CONFIG_CRYPTO_WP512=m |
360 | CONFIG_CRYPTO_AES=m | ||
361 | CONFIG_CRYPTO_ANUBIS=m | 469 | CONFIG_CRYPTO_ANUBIS=m |
362 | CONFIG_CRYPTO_BLOWFISH=m | 470 | CONFIG_CRYPTO_BLOWFISH=m |
363 | CONFIG_CRYPTO_CAMELLIA=m | 471 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -373,6 +481,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
373 | CONFIG_CRYPTO_ZLIB=m | 481 | CONFIG_CRYPTO_ZLIB=m |
374 | CONFIG_CRYPTO_LZO=m | 482 | CONFIG_CRYPTO_LZO=m |
375 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 483 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
484 | CONFIG_CRYPTO_USER_API_HASH=m | ||
485 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
376 | # CONFIG_CRYPTO_HW is not set | 486 | # CONFIG_CRYPTO_HW is not set |
377 | CONFIG_CRC16=m | ||
378 | CONFIG_CRC_T10DIF=y | 487 | CONFIG_CRC_T10DIF=y |
488 | CONFIG_XZ_DEC_X86=y | ||
489 | CONFIG_XZ_DEC_POWERPC=y | ||
490 | CONFIG_XZ_DEC_IA64=y | ||
491 | CONFIG_XZ_DEC_ARM=y | ||
492 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
493 | CONFIG_XZ_DEC_SPARC=y | ||
494 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 8f4f657fdbc6..14dc6ccda7f4 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -1,55 +1,76 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-apollo" | 1 | CONFIG_LOCALVERSION="-apollo" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_APOLLO=y | 16 | CONFIG_PARTITION_ADVANCED=y |
17 | CONFIG_AMIGA_PARTITION=y | ||
18 | CONFIG_ATARI_PARTITION=y | ||
19 | CONFIG_MAC_PARTITION=y | ||
20 | CONFIG_BSD_DISKLABEL=y | ||
21 | CONFIG_MINIX_SUBPARTITION=y | ||
22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
24 | CONFIG_SUN_PARTITION=y | ||
25 | # CONFIG_EFI_PARTITION is not set | ||
26 | CONFIG_SYSV68_PARTITION=y | ||
27 | CONFIG_IOSCHED_DEADLINE=m | ||
14 | CONFIG_M68020=y | 28 | CONFIG_M68020=y |
15 | CONFIG_M68030=y | 29 | CONFIG_M68030=y |
16 | CONFIG_M68040=y | 30 | CONFIG_M68040=y |
17 | CONFIG_M68060=y | 31 | CONFIG_M68060=y |
32 | CONFIG_APOLLO=y | ||
33 | # CONFIG_COMPACTION is not set | ||
34 | CONFIG_CLEANCACHE=y | ||
35 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
18 | CONFIG_BINFMT_AOUT=m | 36 | CONFIG_BINFMT_AOUT=m |
19 | CONFIG_BINFMT_MISC=m | 37 | CONFIG_BINFMT_MISC=m |
20 | CONFIG_HEARTBEAT=y | ||
21 | CONFIG_PROC_HARDWARE=y | ||
22 | CONFIG_NET=y | 38 | CONFIG_NET=y |
23 | CONFIG_PACKET=y | 39 | CONFIG_PACKET=y |
40 | CONFIG_PACKET_DIAG=m | ||
24 | CONFIG_UNIX=y | 41 | CONFIG_UNIX=y |
42 | CONFIG_UNIX_DIAG=m | ||
43 | CONFIG_XFRM_MIGRATE=y | ||
25 | CONFIG_NET_KEY=y | 44 | CONFIG_NET_KEY=y |
26 | CONFIG_NET_KEY_MIGRATE=y | ||
27 | CONFIG_INET=y | 45 | CONFIG_INET=y |
28 | CONFIG_IP_PNP=y | 46 | CONFIG_IP_PNP=y |
29 | CONFIG_IP_PNP_DHCP=y | 47 | CONFIG_IP_PNP_DHCP=y |
30 | CONFIG_IP_PNP_BOOTP=y | 48 | CONFIG_IP_PNP_BOOTP=y |
31 | CONFIG_IP_PNP_RARP=y | 49 | CONFIG_IP_PNP_RARP=y |
32 | CONFIG_NET_IPIP=m | 50 | CONFIG_NET_IPIP=m |
51 | CONFIG_NET_IPGRE_DEMUX=m | ||
33 | CONFIG_NET_IPGRE=m | 52 | CONFIG_NET_IPGRE=m |
34 | CONFIG_SYN_COOKIES=y | 53 | CONFIG_SYN_COOKIES=y |
54 | CONFIG_NET_IPVTI=m | ||
35 | CONFIG_INET_AH=m | 55 | CONFIG_INET_AH=m |
36 | CONFIG_INET_ESP=m | 56 | CONFIG_INET_ESP=m |
37 | CONFIG_INET_IPCOMP=m | 57 | CONFIG_INET_IPCOMP=m |
38 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 58 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
39 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 59 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
40 | CONFIG_INET_XFRM_MODE_BEET=m | 60 | CONFIG_INET_XFRM_MODE_BEET=m |
61 | # CONFIG_INET_LRO is not set | ||
41 | CONFIG_INET_DIAG=m | 62 | CONFIG_INET_DIAG=m |
63 | CONFIG_INET_UDP_DIAG=m | ||
42 | CONFIG_IPV6_PRIVACY=y | 64 | CONFIG_IPV6_PRIVACY=y |
43 | CONFIG_IPV6_ROUTER_PREF=y | 65 | CONFIG_IPV6_ROUTER_PREF=y |
44 | CONFIG_IPV6_ROUTE_INFO=y | ||
45 | CONFIG_INET6_AH=m | 66 | CONFIG_INET6_AH=m |
46 | CONFIG_INET6_ESP=m | 67 | CONFIG_INET6_ESP=m |
47 | CONFIG_INET6_IPCOMP=m | 68 | CONFIG_INET6_IPCOMP=m |
48 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 69 | CONFIG_IPV6_GRE=m |
49 | CONFIG_IPV6_TUNNEL=m | ||
50 | CONFIG_NETFILTER=y | 70 | CONFIG_NETFILTER=y |
51 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
52 | CONFIG_NF_CONNTRACK=m | 71 | CONFIG_NF_CONNTRACK=m |
72 | CONFIG_NF_CONNTRACK_ZONES=y | ||
73 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
53 | # CONFIG_NF_CT_PROTO_DCCP is not set | 74 | # CONFIG_NF_CT_PROTO_DCCP is not set |
54 | CONFIG_NF_CT_PROTO_UDPLITE=m | 75 | CONFIG_NF_CT_PROTO_UDPLITE=m |
55 | CONFIG_NF_CONNTRACK_AMANDA=m | 76 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -57,25 +78,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
57 | CONFIG_NF_CONNTRACK_H323=m | 78 | CONFIG_NF_CONNTRACK_H323=m |
58 | CONFIG_NF_CONNTRACK_IRC=m | 79 | CONFIG_NF_CONNTRACK_IRC=m |
59 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 80 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
81 | CONFIG_NF_CONNTRACK_SNMP=m | ||
60 | CONFIG_NF_CONNTRACK_PPTP=m | 82 | CONFIG_NF_CONNTRACK_PPTP=m |
61 | CONFIG_NF_CONNTRACK_SANE=m | 83 | CONFIG_NF_CONNTRACK_SANE=m |
62 | CONFIG_NF_CONNTRACK_SIP=m | 84 | CONFIG_NF_CONNTRACK_SIP=m |
63 | CONFIG_NF_CONNTRACK_TFTP=m | 85 | CONFIG_NF_CONNTRACK_TFTP=m |
86 | CONFIG_NETFILTER_XT_SET=m | ||
87 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
64 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 88 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
65 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 89 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
66 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 90 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
91 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
92 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
93 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
67 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 94 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
68 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 95 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
69 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 96 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
97 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
98 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
70 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 99 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
71 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 100 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
72 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 101 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
102 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
103 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
73 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 104 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
74 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 105 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
75 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
107 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
76 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
77 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 109 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
78 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 110 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
111 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
79 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 112 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
80 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 113 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
81 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 114 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -86,6 +119,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
86 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 119 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
87 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 120 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
88 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 121 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
122 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
123 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
89 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 124 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
90 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 125 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
91 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 126 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -99,22 +134,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
99 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 134 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
100 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 135 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
101 | CONFIG_NETFILTER_XT_MATCH_U32=m | 136 | CONFIG_NETFILTER_XT_MATCH_U32=m |
137 | CONFIG_IP_SET=m | ||
138 | CONFIG_IP_SET_BITMAP_IP=m | ||
139 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
140 | CONFIG_IP_SET_BITMAP_PORT=m | ||
141 | CONFIG_IP_SET_HASH_IP=m | ||
142 | CONFIG_IP_SET_HASH_IPPORT=m | ||
143 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
144 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
145 | CONFIG_IP_SET_HASH_NET=m | ||
146 | CONFIG_IP_SET_HASH_NETPORT=m | ||
147 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
148 | CONFIG_IP_SET_LIST_SET=m | ||
102 | CONFIG_NF_CONNTRACK_IPV4=m | 149 | CONFIG_NF_CONNTRACK_IPV4=m |
103 | CONFIG_IP_NF_QUEUE=m | ||
104 | CONFIG_IP_NF_IPTABLES=m | 150 | CONFIG_IP_NF_IPTABLES=m |
105 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
106 | CONFIG_IP_NF_MATCH_AH=m | 151 | CONFIG_IP_NF_MATCH_AH=m |
107 | CONFIG_IP_NF_MATCH_ECN=m | 152 | CONFIG_IP_NF_MATCH_ECN=m |
153 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
108 | CONFIG_IP_NF_MATCH_TTL=m | 154 | CONFIG_IP_NF_MATCH_TTL=m |
109 | CONFIG_IP_NF_FILTER=m | 155 | CONFIG_IP_NF_FILTER=m |
110 | CONFIG_IP_NF_TARGET_REJECT=m | 156 | CONFIG_IP_NF_TARGET_REJECT=m |
111 | CONFIG_IP_NF_TARGET_LOG=m | ||
112 | CONFIG_IP_NF_TARGET_ULOG=m | 157 | CONFIG_IP_NF_TARGET_ULOG=m |
113 | CONFIG_NF_NAT=m | 158 | CONFIG_NF_NAT_IPV4=m |
114 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 159 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
115 | CONFIG_IP_NF_TARGET_NETMAP=m | 160 | CONFIG_IP_NF_TARGET_NETMAP=m |
116 | CONFIG_IP_NF_TARGET_REDIRECT=m | 161 | CONFIG_IP_NF_TARGET_REDIRECT=m |
117 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
118 | CONFIG_IP_NF_MANGLE=m | 162 | CONFIG_IP_NF_MANGLE=m |
119 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 163 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
120 | CONFIG_IP_NF_TARGET_ECN=m | 164 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -124,7 +168,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
124 | CONFIG_IP_NF_ARPFILTER=m | 168 | CONFIG_IP_NF_ARPFILTER=m |
125 | CONFIG_IP_NF_ARP_MANGLE=m | 169 | CONFIG_IP_NF_ARP_MANGLE=m |
126 | CONFIG_NF_CONNTRACK_IPV6=m | 170 | CONFIG_NF_CONNTRACK_IPV6=m |
127 | CONFIG_IP6_NF_QUEUE=m | ||
128 | CONFIG_IP6_NF_IPTABLES=m | 171 | CONFIG_IP6_NF_IPTABLES=m |
129 | CONFIG_IP6_NF_MATCH_AH=m | 172 | CONFIG_IP6_NF_MATCH_AH=m |
130 | CONFIG_IP6_NF_MATCH_EUI64=m | 173 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -133,21 +176,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
133 | CONFIG_IP6_NF_MATCH_HL=m | 176 | CONFIG_IP6_NF_MATCH_HL=m |
134 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 177 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
135 | CONFIG_IP6_NF_MATCH_MH=m | 178 | CONFIG_IP6_NF_MATCH_MH=m |
179 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
136 | CONFIG_IP6_NF_MATCH_RT=m | 180 | CONFIG_IP6_NF_MATCH_RT=m |
137 | CONFIG_IP6_NF_TARGET_HL=m | 181 | CONFIG_IP6_NF_TARGET_HL=m |
138 | CONFIG_IP6_NF_TARGET_LOG=m | ||
139 | CONFIG_IP6_NF_FILTER=m | 182 | CONFIG_IP6_NF_FILTER=m |
140 | CONFIG_IP6_NF_TARGET_REJECT=m | 183 | CONFIG_IP6_NF_TARGET_REJECT=m |
141 | CONFIG_IP6_NF_MANGLE=m | 184 | CONFIG_IP6_NF_MANGLE=m |
142 | CONFIG_IP6_NF_RAW=m | 185 | CONFIG_IP6_NF_RAW=m |
186 | CONFIG_NF_NAT_IPV6=m | ||
187 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
188 | CONFIG_IP6_NF_TARGET_NPT=m | ||
143 | CONFIG_IP_DCCP=m | 189 | CONFIG_IP_DCCP=m |
144 | # CONFIG_IP_DCCP_CCID3 is not set | 190 | # CONFIG_IP_DCCP_CCID3 is not set |
191 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
192 | CONFIG_RDS=m | ||
193 | CONFIG_RDS_TCP=m | ||
194 | CONFIG_L2TP=m | ||
145 | CONFIG_ATALK=m | 195 | CONFIG_ATALK=m |
196 | CONFIG_BATMAN_ADV=m | ||
197 | CONFIG_BATMAN_ADV_DAT=y | ||
198 | # CONFIG_WIRELESS is not set | ||
146 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 199 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
200 | CONFIG_DEVTMPFS=y | ||
147 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 201 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
202 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
148 | CONFIG_CONNECTOR=m | 203 | CONFIG_CONNECTOR=m |
149 | CONFIG_BLK_DEV_LOOP=y | 204 | CONFIG_BLK_DEV_LOOP=y |
150 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 205 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
206 | CONFIG_BLK_DEV_DRBD=m | ||
151 | CONFIG_BLK_DEV_NBD=m | 207 | CONFIG_BLK_DEV_NBD=m |
152 | CONFIG_BLK_DEV_RAM=y | 208 | CONFIG_BLK_DEV_RAM=y |
153 | CONFIG_CDROM_PKTCDVD=m | 209 | CONFIG_CDROM_PKTCDVD=m |
@@ -162,57 +218,74 @@ CONFIG_BLK_DEV_SR=y | |||
162 | CONFIG_BLK_DEV_SR_VENDOR=y | 218 | CONFIG_BLK_DEV_SR_VENDOR=y |
163 | CONFIG_CHR_DEV_SG=m | 219 | CONFIG_CHR_DEV_SG=m |
164 | CONFIG_SCSI_CONSTANTS=y | 220 | CONFIG_SCSI_CONSTANTS=y |
165 | CONFIG_SCSI_SAS_LIBSAS=m | 221 | CONFIG_SCSI_SAS_ATTRS=m |
166 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
167 | CONFIG_SCSI_SRP_ATTRS=m | ||
168 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
169 | CONFIG_ISCSI_TCP=m | 222 | CONFIG_ISCSI_TCP=m |
223 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
170 | CONFIG_MD=y | 224 | CONFIG_MD=y |
171 | CONFIG_BLK_DEV_MD=m | ||
172 | CONFIG_MD_LINEAR=m | 225 | CONFIG_MD_LINEAR=m |
173 | CONFIG_MD_RAID0=m | 226 | CONFIG_MD_RAID0=m |
174 | CONFIG_MD_RAID1=m | ||
175 | CONFIG_MD_RAID456=m | ||
176 | CONFIG_BLK_DEV_DM=m | 227 | CONFIG_BLK_DEV_DM=m |
177 | CONFIG_DM_CRYPT=m | 228 | CONFIG_DM_CRYPT=m |
178 | CONFIG_DM_SNAPSHOT=m | 229 | CONFIG_DM_SNAPSHOT=m |
230 | CONFIG_DM_THIN_PROVISIONING=m | ||
231 | CONFIG_DM_CACHE=m | ||
179 | CONFIG_DM_MIRROR=m | 232 | CONFIG_DM_MIRROR=m |
233 | CONFIG_DM_RAID=m | ||
180 | CONFIG_DM_ZERO=m | 234 | CONFIG_DM_ZERO=m |
181 | CONFIG_DM_MULTIPATH=m | 235 | CONFIG_DM_MULTIPATH=m |
182 | CONFIG_DM_UEVENT=y | 236 | CONFIG_DM_UEVENT=y |
237 | CONFIG_TARGET_CORE=m | ||
238 | CONFIG_TCM_IBLOCK=m | ||
239 | CONFIG_TCM_FILEIO=m | ||
240 | CONFIG_TCM_PSCSI=m | ||
183 | CONFIG_NETDEVICES=y | 241 | CONFIG_NETDEVICES=y |
184 | CONFIG_DUMMY=m | 242 | CONFIG_DUMMY=m |
185 | CONFIG_MACVLAN=m | ||
186 | CONFIG_EQUALIZER=m | 243 | CONFIG_EQUALIZER=m |
244 | CONFIG_NET_TEAM=m | ||
245 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
246 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
247 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
248 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
249 | CONFIG_VXLAN=m | ||
250 | CONFIG_NETCONSOLE=m | ||
251 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
187 | CONFIG_VETH=m | 252 | CONFIG_VETH=m |
188 | CONFIG_NET_ETHERNET=y | 253 | # CONFIG_NET_CADENCE is not set |
189 | # CONFIG_NETDEV_1000 is not set | 254 | # CONFIG_NET_VENDOR_BROADCOM is not set |
190 | # CONFIG_NETDEV_10000 is not set | 255 | # CONFIG_NET_VENDOR_INTEL is not set |
256 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
257 | # CONFIG_NET_VENDOR_MICREL is not set | ||
258 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
259 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
260 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
261 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
191 | CONFIG_PPP=m | 262 | CONFIG_PPP=m |
192 | CONFIG_PPP_FILTER=y | ||
193 | CONFIG_PPP_ASYNC=m | ||
194 | CONFIG_PPP_SYNC_TTY=m | ||
195 | CONFIG_PPP_DEFLATE=m | ||
196 | CONFIG_PPP_BSDCOMP=m | 263 | CONFIG_PPP_BSDCOMP=m |
264 | CONFIG_PPP_DEFLATE=m | ||
265 | CONFIG_PPP_FILTER=y | ||
197 | CONFIG_PPP_MPPE=m | 266 | CONFIG_PPP_MPPE=m |
198 | CONFIG_PPPOE=m | 267 | CONFIG_PPPOE=m |
268 | CONFIG_PPTP=m | ||
269 | CONFIG_PPPOL2TP=m | ||
270 | CONFIG_PPP_ASYNC=m | ||
271 | CONFIG_PPP_SYNC_TTY=m | ||
199 | CONFIG_SLIP=m | 272 | CONFIG_SLIP=m |
200 | CONFIG_SLIP_COMPRESSED=y | 273 | CONFIG_SLIP_COMPRESSED=y |
201 | CONFIG_SLIP_SMART=y | 274 | CONFIG_SLIP_SMART=y |
202 | CONFIG_SLIP_MODE_SLIP6=y | 275 | CONFIG_SLIP_MODE_SLIP6=y |
203 | CONFIG_NETCONSOLE=m | 276 | # CONFIG_WLAN is not set |
204 | CONFIG_NETCONSOLE_DYNAMIC=y | 277 | CONFIG_INPUT_EVDEV=m |
205 | CONFIG_INPUT_FF_MEMLESS=m | ||
206 | # CONFIG_KEYBOARD_ATKBD is not set | 278 | # CONFIG_KEYBOARD_ATKBD is not set |
207 | CONFIG_MOUSE_PS2=m | 279 | # CONFIG_MOUSE_PS2 is not set |
208 | CONFIG_MOUSE_SERIAL=m | 280 | CONFIG_MOUSE_SERIAL=m |
209 | CONFIG_SERIO=m | 281 | CONFIG_SERIO=m |
210 | # CONFIG_SERIO_SERPORT is not set | ||
211 | CONFIG_VT_HW_CONSOLE_BINDING=y | 282 | CONFIG_VT_HW_CONSOLE_BINDING=y |
283 | # CONFIG_LEGACY_PTYS is not set | ||
212 | # CONFIG_DEVKMEM is not set | 284 | # CONFIG_DEVKMEM is not set |
213 | # CONFIG_HW_RANDOM is not set | 285 | # CONFIG_HW_RANDOM is not set |
214 | CONFIG_GEN_RTC=m | 286 | CONFIG_NTP_PPS=y |
215 | CONFIG_GEN_RTC_X=y | 287 | CONFIG_PPS_CLIENT_LDISC=m |
288 | CONFIG_PTP_1588_CLOCK=m | ||
216 | # CONFIG_HWMON is not set | 289 | # CONFIG_HWMON is not set |
217 | CONFIG_FB=y | 290 | CONFIG_FB=y |
218 | CONFIG_FRAMEBUFFER_CONSOLE=y | 291 | CONFIG_FRAMEBUFFER_CONSOLE=y |
@@ -221,47 +294,61 @@ CONFIG_LOGO=y | |||
221 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 294 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
222 | CONFIG_HID=m | 295 | CONFIG_HID=m |
223 | CONFIG_HIDRAW=y | 296 | CONFIG_HIDRAW=y |
297 | CONFIG_UHID=m | ||
298 | # CONFIG_HID_GENERIC is not set | ||
224 | # CONFIG_USB_SUPPORT is not set | 299 | # CONFIG_USB_SUPPORT is not set |
300 | CONFIG_RTC_CLASS=y | ||
301 | CONFIG_RTC_DRV_GENERIC=m | ||
302 | # CONFIG_IOMMU_SUPPORT is not set | ||
303 | CONFIG_HEARTBEAT=y | ||
304 | CONFIG_PROC_HARDWARE=y | ||
225 | CONFIG_EXT2_FS=y | 305 | CONFIG_EXT2_FS=y |
226 | CONFIG_EXT3_FS=y | 306 | CONFIG_EXT3_FS=y |
227 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 307 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
228 | # CONFIG_EXT3_FS_XATTR is not set | 308 | # CONFIG_EXT3_FS_XATTR is not set |
309 | CONFIG_EXT4_FS=y | ||
229 | CONFIG_REISERFS_FS=m | 310 | CONFIG_REISERFS_FS=m |
230 | CONFIG_JFS_FS=m | 311 | CONFIG_JFS_FS=m |
231 | CONFIG_XFS_FS=m | 312 | CONFIG_XFS_FS=m |
232 | CONFIG_OCFS2_FS=m | 313 | CONFIG_OCFS2_FS=m |
233 | # CONFIG_OCFS2_FS_STATS is not set | ||
234 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 314 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
315 | CONFIG_FANOTIFY=y | ||
235 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 316 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
236 | # CONFIG_PRINT_QUOTA_WARNING is not set | 317 | # CONFIG_PRINT_QUOTA_WARNING is not set |
237 | CONFIG_AUTOFS_FS=m | ||
238 | CONFIG_AUTOFS4_FS=m | 318 | CONFIG_AUTOFS4_FS=m |
239 | CONFIG_FUSE_FS=m | 319 | CONFIG_FUSE_FS=m |
320 | CONFIG_CUSE=m | ||
240 | CONFIG_ISO9660_FS=y | 321 | CONFIG_ISO9660_FS=y |
241 | CONFIG_JOLIET=y | 322 | CONFIG_JOLIET=y |
242 | CONFIG_ZISOFS=y | 323 | CONFIG_ZISOFS=y |
243 | CONFIG_UDF_FS=m | 324 | CONFIG_UDF_FS=m |
244 | CONFIG_MSDOS_FS=y | 325 | CONFIG_MSDOS_FS=m |
245 | CONFIG_VFAT_FS=m | 326 | CONFIG_VFAT_FS=m |
246 | CONFIG_PROC_KCORE=y | 327 | CONFIG_PROC_KCORE=y |
247 | CONFIG_TMPFS=y | 328 | CONFIG_TMPFS=y |
248 | CONFIG_AFFS_FS=m | 329 | CONFIG_AFFS_FS=m |
330 | CONFIG_ECRYPT_FS=m | ||
331 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
249 | CONFIG_HFS_FS=m | 332 | CONFIG_HFS_FS=m |
250 | CONFIG_HFSPLUS_FS=m | 333 | CONFIG_HFSPLUS_FS=m |
251 | CONFIG_CRAMFS=m | 334 | CONFIG_CRAMFS=m |
252 | CONFIG_SQUASHFS=m | 335 | CONFIG_SQUASHFS=m |
253 | CONFIG_MINIX_FS=y | 336 | CONFIG_SQUASHFS_LZO=y |
337 | CONFIG_MINIX_FS=m | ||
338 | CONFIG_OMFS_FS=m | ||
254 | CONFIG_HPFS_FS=m | 339 | CONFIG_HPFS_FS=m |
340 | CONFIG_QNX4FS_FS=m | ||
341 | CONFIG_QNX6FS_FS=m | ||
255 | CONFIG_SYSV_FS=m | 342 | CONFIG_SYSV_FS=m |
256 | CONFIG_UFS_FS=m | 343 | CONFIG_UFS_FS=m |
257 | CONFIG_NFS_FS=y | 344 | CONFIG_NFS_FS=y |
258 | CONFIG_NFS_V3=y | ||
259 | CONFIG_NFS_V4=y | 345 | CONFIG_NFS_V4=y |
346 | CONFIG_NFS_SWAP=y | ||
260 | CONFIG_ROOT_NFS=y | 347 | CONFIG_ROOT_NFS=y |
261 | CONFIG_NFSD=m | 348 | CONFIG_NFSD=m |
262 | CONFIG_NFSD_V3=y | 349 | CONFIG_NFSD_V3=y |
263 | CONFIG_SMB_FS=m | 350 | CONFIG_CIFS=m |
264 | CONFIG_SMB_NLS_DEFAULT=y | 351 | # CONFIG_CIFS_DEBUG is not set |
265 | CONFIG_CODA_FS=m | 352 | CONFIG_CODA_FS=m |
266 | CONFIG_NLS_CODEPAGE_437=y | 353 | CONFIG_NLS_CODEPAGE_437=y |
267 | CONFIG_NLS_CODEPAGE_737=m | 354 | CONFIG_NLS_CODEPAGE_737=m |
@@ -300,10 +387,23 @@ CONFIG_NLS_ISO8859_14=m | |||
300 | CONFIG_NLS_ISO8859_15=m | 387 | CONFIG_NLS_ISO8859_15=m |
301 | CONFIG_NLS_KOI8_R=m | 388 | CONFIG_NLS_KOI8_R=m |
302 | CONFIG_NLS_KOI8_U=m | 389 | CONFIG_NLS_KOI8_U=m |
390 | CONFIG_NLS_MAC_ROMAN=m | ||
391 | CONFIG_NLS_MAC_CELTIC=m | ||
392 | CONFIG_NLS_MAC_CENTEURO=m | ||
393 | CONFIG_NLS_MAC_CROATIAN=m | ||
394 | CONFIG_NLS_MAC_CYRILLIC=m | ||
395 | CONFIG_NLS_MAC_GAELIC=m | ||
396 | CONFIG_NLS_MAC_GREEK=m | ||
397 | CONFIG_NLS_MAC_ICELAND=m | ||
398 | CONFIG_NLS_MAC_INUIT=m | ||
399 | CONFIG_NLS_MAC_ROMANIAN=m | ||
400 | CONFIG_NLS_MAC_TURKISH=m | ||
303 | CONFIG_DLM=m | 401 | CONFIG_DLM=m |
304 | CONFIG_MAGIC_SYSRQ=y | 402 | CONFIG_MAGIC_SYSRQ=y |
305 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 403 | CONFIG_ASYNC_RAID6_TEST=m |
306 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 404 | CONFIG_ENCRYPTED_KEYS=m |
405 | CONFIG_CRYPTO_MANAGER=y | ||
406 | CONFIG_CRYPTO_USER=m | ||
307 | CONFIG_CRYPTO_NULL=m | 407 | CONFIG_CRYPTO_NULL=m |
308 | CONFIG_CRYPTO_CRYPTD=m | 408 | CONFIG_CRYPTO_CRYPTD=m |
309 | CONFIG_CRYPTO_TEST=m | 409 | CONFIG_CRYPTO_TEST=m |
@@ -313,19 +413,16 @@ CONFIG_CRYPTO_CTS=m | |||
313 | CONFIG_CRYPTO_LRW=m | 413 | CONFIG_CRYPTO_LRW=m |
314 | CONFIG_CRYPTO_PCBC=m | 414 | CONFIG_CRYPTO_PCBC=m |
315 | CONFIG_CRYPTO_XTS=m | 415 | CONFIG_CRYPTO_XTS=m |
316 | CONFIG_CRYPTO_HMAC=y | ||
317 | CONFIG_CRYPTO_XCBC=m | 416 | CONFIG_CRYPTO_XCBC=m |
318 | CONFIG_CRYPTO_MD4=m | 417 | CONFIG_CRYPTO_VMAC=m |
319 | CONFIG_CRYPTO_MICHAEL_MIC=m | 418 | CONFIG_CRYPTO_MICHAEL_MIC=m |
320 | CONFIG_CRYPTO_RMD128=m | 419 | CONFIG_CRYPTO_RMD128=m |
321 | CONFIG_CRYPTO_RMD160=m | 420 | CONFIG_CRYPTO_RMD160=m |
322 | CONFIG_CRYPTO_RMD256=m | 421 | CONFIG_CRYPTO_RMD256=m |
323 | CONFIG_CRYPTO_RMD320=m | 422 | CONFIG_CRYPTO_RMD320=m |
324 | CONFIG_CRYPTO_SHA256=m | ||
325 | CONFIG_CRYPTO_SHA512=m | 423 | CONFIG_CRYPTO_SHA512=m |
326 | CONFIG_CRYPTO_TGR192=m | 424 | CONFIG_CRYPTO_TGR192=m |
327 | CONFIG_CRYPTO_WP512=m | 425 | CONFIG_CRYPTO_WP512=m |
328 | CONFIG_CRYPTO_AES=m | ||
329 | CONFIG_CRYPTO_ANUBIS=m | 426 | CONFIG_CRYPTO_ANUBIS=m |
330 | CONFIG_CRYPTO_BLOWFISH=m | 427 | CONFIG_CRYPTO_BLOWFISH=m |
331 | CONFIG_CRYPTO_CAMELLIA=m | 428 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -341,6 +438,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
341 | CONFIG_CRYPTO_ZLIB=m | 438 | CONFIG_CRYPTO_ZLIB=m |
342 | CONFIG_CRYPTO_LZO=m | 439 | CONFIG_CRYPTO_LZO=m |
343 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 440 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
441 | CONFIG_CRYPTO_USER_API_HASH=m | ||
442 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
344 | # CONFIG_CRYPTO_HW is not set | 443 | # CONFIG_CRYPTO_HW is not set |
345 | CONFIG_CRC16=m | ||
346 | CONFIG_CRC_T10DIF=y | 444 | CONFIG_CRC_T10DIF=y |
445 | CONFIG_XZ_DEC_X86=y | ||
446 | CONFIG_XZ_DEC_POWERPC=y | ||
447 | CONFIG_XZ_DEC_IA64=y | ||
448 | CONFIG_XZ_DEC_ARM=y | ||
449 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
450 | CONFIG_XZ_DEC_SPARC=y | ||
451 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 4571d33903fe..6d5370c914b2 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -1,53 +1,75 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-atari" | 1 | CONFIG_LOCALVERSION="-atari" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_ATARI=y | 16 | CONFIG_PARTITION_ADVANCED=y |
17 | CONFIG_AMIGA_PARTITION=y | ||
18 | CONFIG_MAC_PARTITION=y | ||
19 | CONFIG_BSD_DISKLABEL=y | ||
20 | CONFIG_MINIX_SUBPARTITION=y | ||
21 | CONFIG_SOLARIS_X86_PARTITION=y | ||
22 | CONFIG_UNIXWARE_DISKLABEL=y | ||
23 | CONFIG_SUN_PARTITION=y | ||
24 | # CONFIG_EFI_PARTITION is not set | ||
25 | CONFIG_SYSV68_PARTITION=y | ||
26 | CONFIG_IOSCHED_DEADLINE=m | ||
14 | CONFIG_M68020=y | 27 | CONFIG_M68020=y |
15 | CONFIG_M68030=y | 28 | CONFIG_M68030=y |
16 | CONFIG_M68040=y | 29 | CONFIG_M68040=y |
17 | CONFIG_M68060=y | 30 | CONFIG_M68060=y |
31 | CONFIG_ATARI=y | ||
32 | # CONFIG_COMPACTION is not set | ||
33 | CONFIG_CLEANCACHE=y | ||
34 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
18 | CONFIG_BINFMT_AOUT=m | 35 | CONFIG_BINFMT_AOUT=m |
19 | CONFIG_BINFMT_MISC=m | 36 | CONFIG_BINFMT_MISC=m |
20 | CONFIG_STRAM_PROC=y | ||
21 | CONFIG_HEARTBEAT=y | ||
22 | CONFIG_PROC_HARDWARE=y | ||
23 | CONFIG_NET=y | 37 | CONFIG_NET=y |
24 | CONFIG_PACKET=y | 38 | CONFIG_PACKET=y |
39 | CONFIG_PACKET_DIAG=m | ||
25 | CONFIG_UNIX=y | 40 | CONFIG_UNIX=y |
41 | CONFIG_UNIX_DIAG=m | ||
42 | CONFIG_XFRM_MIGRATE=y | ||
26 | CONFIG_NET_KEY=y | 43 | CONFIG_NET_KEY=y |
27 | CONFIG_NET_KEY_MIGRATE=y | ||
28 | CONFIG_INET=y | 44 | CONFIG_INET=y |
29 | CONFIG_IP_PNP=y | 45 | CONFIG_IP_PNP=y |
46 | CONFIG_IP_PNP_DHCP=y | ||
47 | CONFIG_IP_PNP_BOOTP=y | ||
48 | CONFIG_IP_PNP_RARP=y | ||
30 | CONFIG_NET_IPIP=m | 49 | CONFIG_NET_IPIP=m |
50 | CONFIG_NET_IPGRE_DEMUX=m | ||
31 | CONFIG_NET_IPGRE=m | 51 | CONFIG_NET_IPGRE=m |
32 | CONFIG_SYN_COOKIES=y | 52 | CONFIG_SYN_COOKIES=y |
53 | CONFIG_NET_IPVTI=m | ||
33 | CONFIG_INET_AH=m | 54 | CONFIG_INET_AH=m |
34 | CONFIG_INET_ESP=m | 55 | CONFIG_INET_ESP=m |
35 | CONFIG_INET_IPCOMP=m | 56 | CONFIG_INET_IPCOMP=m |
36 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 57 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
37 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 58 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
38 | CONFIG_INET_XFRM_MODE_BEET=m | 59 | CONFIG_INET_XFRM_MODE_BEET=m |
60 | # CONFIG_INET_LRO is not set | ||
39 | CONFIG_INET_DIAG=m | 61 | CONFIG_INET_DIAG=m |
62 | CONFIG_INET_UDP_DIAG=m | ||
40 | CONFIG_IPV6_PRIVACY=y | 63 | CONFIG_IPV6_PRIVACY=y |
41 | CONFIG_IPV6_ROUTER_PREF=y | 64 | CONFIG_IPV6_ROUTER_PREF=y |
42 | CONFIG_IPV6_ROUTE_INFO=y | ||
43 | CONFIG_INET6_AH=m | 65 | CONFIG_INET6_AH=m |
44 | CONFIG_INET6_ESP=m | 66 | CONFIG_INET6_ESP=m |
45 | CONFIG_INET6_IPCOMP=m | 67 | CONFIG_INET6_IPCOMP=m |
46 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 68 | CONFIG_IPV6_GRE=m |
47 | CONFIG_IPV6_TUNNEL=m | ||
48 | CONFIG_NETFILTER=y | 69 | CONFIG_NETFILTER=y |
49 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
50 | CONFIG_NF_CONNTRACK=m | 70 | CONFIG_NF_CONNTRACK=m |
71 | CONFIG_NF_CONNTRACK_ZONES=y | ||
72 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
51 | # CONFIG_NF_CT_PROTO_DCCP is not set | 73 | # CONFIG_NF_CT_PROTO_DCCP is not set |
52 | CONFIG_NF_CT_PROTO_UDPLITE=m | 74 | CONFIG_NF_CT_PROTO_UDPLITE=m |
53 | CONFIG_NF_CONNTRACK_AMANDA=m | 75 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -55,25 +77,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
55 | CONFIG_NF_CONNTRACK_H323=m | 77 | CONFIG_NF_CONNTRACK_H323=m |
56 | CONFIG_NF_CONNTRACK_IRC=m | 78 | CONFIG_NF_CONNTRACK_IRC=m |
57 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 79 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
80 | CONFIG_NF_CONNTRACK_SNMP=m | ||
58 | CONFIG_NF_CONNTRACK_PPTP=m | 81 | CONFIG_NF_CONNTRACK_PPTP=m |
59 | CONFIG_NF_CONNTRACK_SANE=m | 82 | CONFIG_NF_CONNTRACK_SANE=m |
60 | CONFIG_NF_CONNTRACK_SIP=m | 83 | CONFIG_NF_CONNTRACK_SIP=m |
61 | CONFIG_NF_CONNTRACK_TFTP=m | 84 | CONFIG_NF_CONNTRACK_TFTP=m |
85 | CONFIG_NETFILTER_XT_SET=m | ||
86 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
62 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 87 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
63 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 88 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
64 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 89 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
90 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
91 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
92 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
65 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 93 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
66 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
67 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 95 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
96 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
97 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
68 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 98 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
69 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
70 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 100 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
101 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
102 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
71 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 103 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
72 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 104 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
73 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
106 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
74 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
75 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
76 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 109 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
110 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
77 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 111 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
78 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 112 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
79 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 113 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -84,6 +118,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
84 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 118 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
85 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 119 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
86 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 120 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
121 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
122 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
87 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 123 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
88 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 124 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
89 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 125 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -97,22 +133,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
97 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 133 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
98 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 134 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
99 | CONFIG_NETFILTER_XT_MATCH_U32=m | 135 | CONFIG_NETFILTER_XT_MATCH_U32=m |
136 | CONFIG_IP_SET=m | ||
137 | CONFIG_IP_SET_BITMAP_IP=m | ||
138 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
139 | CONFIG_IP_SET_BITMAP_PORT=m | ||
140 | CONFIG_IP_SET_HASH_IP=m | ||
141 | CONFIG_IP_SET_HASH_IPPORT=m | ||
142 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
143 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
144 | CONFIG_IP_SET_HASH_NET=m | ||
145 | CONFIG_IP_SET_HASH_NETPORT=m | ||
146 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
147 | CONFIG_IP_SET_LIST_SET=m | ||
100 | CONFIG_NF_CONNTRACK_IPV4=m | 148 | CONFIG_NF_CONNTRACK_IPV4=m |
101 | CONFIG_IP_NF_QUEUE=m | ||
102 | CONFIG_IP_NF_IPTABLES=m | 149 | CONFIG_IP_NF_IPTABLES=m |
103 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
104 | CONFIG_IP_NF_MATCH_AH=m | 150 | CONFIG_IP_NF_MATCH_AH=m |
105 | CONFIG_IP_NF_MATCH_ECN=m | 151 | CONFIG_IP_NF_MATCH_ECN=m |
152 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
106 | CONFIG_IP_NF_MATCH_TTL=m | 153 | CONFIG_IP_NF_MATCH_TTL=m |
107 | CONFIG_IP_NF_FILTER=m | 154 | CONFIG_IP_NF_FILTER=m |
108 | CONFIG_IP_NF_TARGET_REJECT=m | 155 | CONFIG_IP_NF_TARGET_REJECT=m |
109 | CONFIG_IP_NF_TARGET_LOG=m | ||
110 | CONFIG_IP_NF_TARGET_ULOG=m | 156 | CONFIG_IP_NF_TARGET_ULOG=m |
111 | CONFIG_NF_NAT=m | 157 | CONFIG_NF_NAT_IPV4=m |
112 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 158 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
113 | CONFIG_IP_NF_TARGET_NETMAP=m | 159 | CONFIG_IP_NF_TARGET_NETMAP=m |
114 | CONFIG_IP_NF_TARGET_REDIRECT=m | 160 | CONFIG_IP_NF_TARGET_REDIRECT=m |
115 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
116 | CONFIG_IP_NF_MANGLE=m | 161 | CONFIG_IP_NF_MANGLE=m |
117 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 162 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
118 | CONFIG_IP_NF_TARGET_ECN=m | 163 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -122,7 +167,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
122 | CONFIG_IP_NF_ARPFILTER=m | 167 | CONFIG_IP_NF_ARPFILTER=m |
123 | CONFIG_IP_NF_ARP_MANGLE=m | 168 | CONFIG_IP_NF_ARP_MANGLE=m |
124 | CONFIG_NF_CONNTRACK_IPV6=m | 169 | CONFIG_NF_CONNTRACK_IPV6=m |
125 | CONFIG_IP6_NF_QUEUE=m | ||
126 | CONFIG_IP6_NF_IPTABLES=m | 170 | CONFIG_IP6_NF_IPTABLES=m |
127 | CONFIG_IP6_NF_MATCH_AH=m | 171 | CONFIG_IP6_NF_MATCH_AH=m |
128 | CONFIG_IP6_NF_MATCH_EUI64=m | 172 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -131,18 +175,30 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
131 | CONFIG_IP6_NF_MATCH_HL=m | 175 | CONFIG_IP6_NF_MATCH_HL=m |
132 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 176 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
133 | CONFIG_IP6_NF_MATCH_MH=m | 177 | CONFIG_IP6_NF_MATCH_MH=m |
178 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
134 | CONFIG_IP6_NF_MATCH_RT=m | 179 | CONFIG_IP6_NF_MATCH_RT=m |
135 | CONFIG_IP6_NF_TARGET_HL=m | 180 | CONFIG_IP6_NF_TARGET_HL=m |
136 | CONFIG_IP6_NF_TARGET_LOG=m | ||
137 | CONFIG_IP6_NF_FILTER=m | 181 | CONFIG_IP6_NF_FILTER=m |
138 | CONFIG_IP6_NF_TARGET_REJECT=m | 182 | CONFIG_IP6_NF_TARGET_REJECT=m |
139 | CONFIG_IP6_NF_MANGLE=m | 183 | CONFIG_IP6_NF_MANGLE=m |
140 | CONFIG_IP6_NF_RAW=m | 184 | CONFIG_IP6_NF_RAW=m |
185 | CONFIG_NF_NAT_IPV6=m | ||
186 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
187 | CONFIG_IP6_NF_TARGET_NPT=m | ||
141 | CONFIG_IP_DCCP=m | 188 | CONFIG_IP_DCCP=m |
142 | # CONFIG_IP_DCCP_CCID3 is not set | 189 | # CONFIG_IP_DCCP_CCID3 is not set |
190 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
191 | CONFIG_RDS=m | ||
192 | CONFIG_RDS_TCP=m | ||
193 | CONFIG_L2TP=m | ||
143 | CONFIG_ATALK=m | 194 | CONFIG_ATALK=m |
195 | CONFIG_BATMAN_ADV=m | ||
196 | CONFIG_BATMAN_ADV_DAT=y | ||
197 | # CONFIG_WIRELESS is not set | ||
144 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 198 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
199 | CONFIG_DEVTMPFS=y | ||
145 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 200 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
201 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
146 | CONFIG_CONNECTOR=m | 202 | CONFIG_CONNECTOR=m |
147 | CONFIG_PARPORT=m | 203 | CONFIG_PARPORT=m |
148 | CONFIG_PARPORT_ATARI=m | 204 | CONFIG_PARPORT_ATARI=m |
@@ -150,11 +206,13 @@ CONFIG_PARPORT_1284=y | |||
150 | CONFIG_ATARI_FLOPPY=y | 206 | CONFIG_ATARI_FLOPPY=y |
151 | CONFIG_BLK_DEV_LOOP=y | 207 | CONFIG_BLK_DEV_LOOP=y |
152 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 208 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
209 | CONFIG_BLK_DEV_DRBD=m | ||
153 | CONFIG_BLK_DEV_NBD=m | 210 | CONFIG_BLK_DEV_NBD=m |
154 | CONFIG_BLK_DEV_RAM=y | 211 | CONFIG_BLK_DEV_RAM=y |
155 | CONFIG_CDROM_PKTCDVD=m | 212 | CONFIG_CDROM_PKTCDVD=m |
156 | CONFIG_ATA_OVER_ETH=m | 213 | CONFIG_ATA_OVER_ETH=m |
157 | CONFIG_IDE=y | 214 | CONFIG_IDE=y |
215 | CONFIG_IDE_GD_ATAPI=y | ||
158 | CONFIG_BLK_DEV_IDECD=y | 216 | CONFIG_BLK_DEV_IDECD=y |
159 | CONFIG_BLK_DEV_FALCON_IDE=y | 217 | CONFIG_BLK_DEV_FALCON_IDE=y |
160 | CONFIG_RAID_ATTRS=m | 218 | CONFIG_RAID_ATTRS=m |
@@ -167,63 +225,81 @@ CONFIG_BLK_DEV_SR=y | |||
167 | CONFIG_BLK_DEV_SR_VENDOR=y | 225 | CONFIG_BLK_DEV_SR_VENDOR=y |
168 | CONFIG_CHR_DEV_SG=m | 226 | CONFIG_CHR_DEV_SG=m |
169 | CONFIG_SCSI_CONSTANTS=y | 227 | CONFIG_SCSI_CONSTANTS=y |
170 | CONFIG_SCSI_SAS_LIBSAS=m | 228 | CONFIG_SCSI_SAS_ATTRS=m |
171 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
172 | CONFIG_SCSI_SRP_ATTRS=m | ||
173 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
174 | CONFIG_ISCSI_TCP=m | 229 | CONFIG_ISCSI_TCP=m |
230 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
175 | CONFIG_ATARI_SCSI=y | 231 | CONFIG_ATARI_SCSI=y |
176 | CONFIG_MD=y | 232 | CONFIG_MD=y |
177 | CONFIG_BLK_DEV_MD=m | ||
178 | CONFIG_MD_LINEAR=m | 233 | CONFIG_MD_LINEAR=m |
179 | CONFIG_MD_RAID0=m | 234 | CONFIG_MD_RAID0=m |
180 | CONFIG_MD_RAID1=m | ||
181 | CONFIG_MD_RAID456=m | ||
182 | CONFIG_BLK_DEV_DM=m | 235 | CONFIG_BLK_DEV_DM=m |
183 | CONFIG_DM_CRYPT=m | 236 | CONFIG_DM_CRYPT=m |
184 | CONFIG_DM_SNAPSHOT=m | 237 | CONFIG_DM_SNAPSHOT=m |
238 | CONFIG_DM_THIN_PROVISIONING=m | ||
239 | CONFIG_DM_CACHE=m | ||
185 | CONFIG_DM_MIRROR=m | 240 | CONFIG_DM_MIRROR=m |
241 | CONFIG_DM_RAID=m | ||
186 | CONFIG_DM_ZERO=m | 242 | CONFIG_DM_ZERO=m |
187 | CONFIG_DM_MULTIPATH=m | 243 | CONFIG_DM_MULTIPATH=m |
188 | CONFIG_DM_UEVENT=y | 244 | CONFIG_DM_UEVENT=y |
245 | CONFIG_TARGET_CORE=m | ||
246 | CONFIG_TCM_IBLOCK=m | ||
247 | CONFIG_TCM_FILEIO=m | ||
248 | CONFIG_TCM_PSCSI=m | ||
189 | CONFIG_NETDEVICES=y | 249 | CONFIG_NETDEVICES=y |
190 | CONFIG_DUMMY=m | 250 | CONFIG_DUMMY=m |
191 | CONFIG_MACVLAN=m | ||
192 | CONFIG_EQUALIZER=m | 251 | CONFIG_EQUALIZER=m |
193 | CONFIG_VETH=m | ||
194 | CONFIG_NET_ETHERNET=y | ||
195 | CONFIG_MII=y | 252 | CONFIG_MII=y |
253 | CONFIG_NET_TEAM=m | ||
254 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
255 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
256 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
257 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
258 | CONFIG_VXLAN=m | ||
259 | CONFIG_NETCONSOLE=m | ||
260 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
261 | CONFIG_VETH=m | ||
196 | CONFIG_ATARILANCE=y | 262 | CONFIG_ATARILANCE=y |
197 | # CONFIG_NETDEV_1000 is not set | 263 | # CONFIG_NET_CADENCE is not set |
198 | # CONFIG_NETDEV_10000 is not set | 264 | # CONFIG_NET_VENDOR_BROADCOM is not set |
265 | # CONFIG_NET_VENDOR_INTEL is not set | ||
266 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
267 | # CONFIG_NET_VENDOR_MICREL is not set | ||
268 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
269 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
270 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
199 | CONFIG_PPP=m | 271 | CONFIG_PPP=m |
200 | CONFIG_PPP_FILTER=y | ||
201 | CONFIG_PPP_ASYNC=m | ||
202 | CONFIG_PPP_SYNC_TTY=m | ||
203 | CONFIG_PPP_DEFLATE=m | ||
204 | CONFIG_PPP_BSDCOMP=m | 272 | CONFIG_PPP_BSDCOMP=m |
273 | CONFIG_PPP_DEFLATE=m | ||
274 | CONFIG_PPP_FILTER=y | ||
205 | CONFIG_PPP_MPPE=m | 275 | CONFIG_PPP_MPPE=m |
206 | CONFIG_PPPOE=m | 276 | CONFIG_PPPOE=m |
277 | CONFIG_PPTP=m | ||
278 | CONFIG_PPPOL2TP=m | ||
279 | CONFIG_PPP_ASYNC=m | ||
280 | CONFIG_PPP_SYNC_TTY=m | ||
207 | CONFIG_SLIP=m | 281 | CONFIG_SLIP=m |
208 | CONFIG_SLIP_COMPRESSED=y | 282 | CONFIG_SLIP_COMPRESSED=y |
209 | CONFIG_SLIP_SMART=y | 283 | CONFIG_SLIP_SMART=y |
210 | CONFIG_SLIP_MODE_SLIP6=y | 284 | CONFIG_SLIP_MODE_SLIP6=y |
211 | CONFIG_NETCONSOLE=m | 285 | # CONFIG_WLAN is not set |
212 | CONFIG_NETCONSOLE_DYNAMIC=y | 286 | CONFIG_INPUT_EVDEV=m |
213 | CONFIG_INPUT_FF_MEMLESS=m | ||
214 | CONFIG_KEYBOARD_ATARI=y | 287 | CONFIG_KEYBOARD_ATARI=y |
215 | # CONFIG_KEYBOARD_ATKBD is not set | 288 | # CONFIG_KEYBOARD_ATKBD is not set |
216 | CONFIG_MOUSE_PS2=m | 289 | # CONFIG_MOUSE_PS2 is not set |
217 | CONFIG_MOUSE_ATARI=m | 290 | CONFIG_MOUSE_ATARI=m |
218 | CONFIG_INPUT_MISC=y | 291 | CONFIG_INPUT_MISC=y |
219 | CONFIG_INPUT_M68K_BEEP=m | 292 | CONFIG_INPUT_M68K_BEEP=m |
220 | # CONFIG_SERIO_SERPORT is not set | 293 | # CONFIG_SERIO is not set |
221 | CONFIG_VT_HW_CONSOLE_BINDING=y | 294 | CONFIG_VT_HW_CONSOLE_BINDING=y |
295 | # CONFIG_LEGACY_PTYS is not set | ||
222 | # CONFIG_DEVKMEM is not set | 296 | # CONFIG_DEVKMEM is not set |
223 | CONFIG_PRINTER=m | 297 | CONFIG_PRINTER=m |
224 | # CONFIG_HW_RANDOM is not set | 298 | # CONFIG_HW_RANDOM is not set |
225 | CONFIG_GEN_RTC=m | 299 | CONFIG_NTP_PPS=y |
226 | CONFIG_GEN_RTC_X=y | 300 | CONFIG_PPS_CLIENT_LDISC=m |
301 | CONFIG_PPS_CLIENT_PARPORT=m | ||
302 | CONFIG_PTP_1588_CLOCK=m | ||
227 | # CONFIG_HWMON is not set | 303 | # CONFIG_HWMON is not set |
228 | CONFIG_FB=y | 304 | CONFIG_FB=y |
229 | CONFIG_FB_ATARI=y | 305 | CONFIG_FB_ATARI=y |
@@ -233,47 +309,64 @@ CONFIG_SOUND=m | |||
233 | CONFIG_DMASOUND_ATARI=m | 309 | CONFIG_DMASOUND_ATARI=m |
234 | CONFIG_HID=m | 310 | CONFIG_HID=m |
235 | CONFIG_HIDRAW=y | 311 | CONFIG_HIDRAW=y |
236 | # CONFIG_USB_SUPPORT is not set | 312 | CONFIG_UHID=m |
313 | CONFIG_RTC_CLASS=y | ||
314 | CONFIG_RTC_DRV_GENERIC=m | ||
315 | # CONFIG_IOMMU_SUPPORT is not set | ||
316 | CONFIG_HEARTBEAT=y | ||
317 | CONFIG_PROC_HARDWARE=y | ||
318 | CONFIG_NATFEAT=y | ||
319 | CONFIG_NFBLOCK=y | ||
320 | CONFIG_NFCON=y | ||
321 | CONFIG_NFETH=y | ||
237 | CONFIG_ATARI_DSP56K=m | 322 | CONFIG_ATARI_DSP56K=m |
238 | CONFIG_EXT2_FS=y | 323 | CONFIG_EXT2_FS=y |
239 | CONFIG_EXT3_FS=y | 324 | CONFIG_EXT3_FS=y |
240 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 325 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
241 | # CONFIG_EXT3_FS_XATTR is not set | 326 | # CONFIG_EXT3_FS_XATTR is not set |
327 | CONFIG_EXT4_FS=y | ||
242 | CONFIG_REISERFS_FS=m | 328 | CONFIG_REISERFS_FS=m |
243 | CONFIG_JFS_FS=m | 329 | CONFIG_JFS_FS=m |
244 | CONFIG_XFS_FS=m | 330 | CONFIG_XFS_FS=m |
245 | CONFIG_OCFS2_FS=m | 331 | CONFIG_OCFS2_FS=m |
246 | # CONFIG_OCFS2_FS_STATS is not set | ||
247 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 332 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
333 | CONFIG_FANOTIFY=y | ||
248 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 334 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
249 | # CONFIG_PRINT_QUOTA_WARNING is not set | 335 | # CONFIG_PRINT_QUOTA_WARNING is not set |
250 | CONFIG_AUTOFS_FS=m | ||
251 | CONFIG_AUTOFS4_FS=m | 336 | CONFIG_AUTOFS4_FS=m |
252 | CONFIG_FUSE_FS=m | 337 | CONFIG_FUSE_FS=m |
338 | CONFIG_CUSE=m | ||
253 | CONFIG_ISO9660_FS=y | 339 | CONFIG_ISO9660_FS=y |
254 | CONFIG_JOLIET=y | 340 | CONFIG_JOLIET=y |
255 | CONFIG_ZISOFS=y | 341 | CONFIG_ZISOFS=y |
256 | CONFIG_UDF_FS=m | 342 | CONFIG_UDF_FS=m |
257 | CONFIG_MSDOS_FS=y | 343 | CONFIG_MSDOS_FS=m |
258 | CONFIG_VFAT_FS=m | 344 | CONFIG_VFAT_FS=m |
259 | CONFIG_PROC_KCORE=y | 345 | CONFIG_PROC_KCORE=y |
260 | CONFIG_TMPFS=y | 346 | CONFIG_TMPFS=y |
261 | CONFIG_AFFS_FS=m | 347 | CONFIG_AFFS_FS=m |
348 | CONFIG_ECRYPT_FS=m | ||
349 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
262 | CONFIG_HFS_FS=m | 350 | CONFIG_HFS_FS=m |
263 | CONFIG_HFSPLUS_FS=m | 351 | CONFIG_HFSPLUS_FS=m |
264 | CONFIG_CRAMFS=m | 352 | CONFIG_CRAMFS=m |
265 | CONFIG_SQUASHFS=m | 353 | CONFIG_SQUASHFS=m |
266 | CONFIG_MINIX_FS=y | 354 | CONFIG_SQUASHFS_LZO=y |
355 | CONFIG_MINIX_FS=m | ||
356 | CONFIG_OMFS_FS=m | ||
267 | CONFIG_HPFS_FS=m | 357 | CONFIG_HPFS_FS=m |
358 | CONFIG_QNX4FS_FS=m | ||
359 | CONFIG_QNX6FS_FS=m | ||
268 | CONFIG_SYSV_FS=m | 360 | CONFIG_SYSV_FS=m |
269 | CONFIG_UFS_FS=m | 361 | CONFIG_UFS_FS=m |
270 | CONFIG_NFS_FS=y | 362 | CONFIG_NFS_FS=y |
271 | CONFIG_NFS_V3=y | ||
272 | CONFIG_NFS_V4=y | 363 | CONFIG_NFS_V4=y |
364 | CONFIG_NFS_SWAP=y | ||
365 | CONFIG_ROOT_NFS=y | ||
273 | CONFIG_NFSD=m | 366 | CONFIG_NFSD=m |
274 | CONFIG_NFSD_V3=y | 367 | CONFIG_NFSD_V3=y |
275 | CONFIG_SMB_FS=m | 368 | CONFIG_CIFS=m |
276 | CONFIG_SMB_NLS_DEFAULT=y | 369 | # CONFIG_CIFS_DEBUG is not set |
277 | CONFIG_CODA_FS=m | 370 | CONFIG_CODA_FS=m |
278 | CONFIG_NLS_CODEPAGE_437=y | 371 | CONFIG_NLS_CODEPAGE_437=y |
279 | CONFIG_NLS_CODEPAGE_737=m | 372 | CONFIG_NLS_CODEPAGE_737=m |
@@ -312,10 +405,23 @@ CONFIG_NLS_ISO8859_14=m | |||
312 | CONFIG_NLS_ISO8859_15=m | 405 | CONFIG_NLS_ISO8859_15=m |
313 | CONFIG_NLS_KOI8_R=m | 406 | CONFIG_NLS_KOI8_R=m |
314 | CONFIG_NLS_KOI8_U=m | 407 | CONFIG_NLS_KOI8_U=m |
408 | CONFIG_NLS_MAC_ROMAN=m | ||
409 | CONFIG_NLS_MAC_CELTIC=m | ||
410 | CONFIG_NLS_MAC_CENTEURO=m | ||
411 | CONFIG_NLS_MAC_CROATIAN=m | ||
412 | CONFIG_NLS_MAC_CYRILLIC=m | ||
413 | CONFIG_NLS_MAC_GAELIC=m | ||
414 | CONFIG_NLS_MAC_GREEK=m | ||
415 | CONFIG_NLS_MAC_ICELAND=m | ||
416 | CONFIG_NLS_MAC_INUIT=m | ||
417 | CONFIG_NLS_MAC_ROMANIAN=m | ||
418 | CONFIG_NLS_MAC_TURKISH=m | ||
315 | CONFIG_DLM=m | 419 | CONFIG_DLM=m |
316 | CONFIG_MAGIC_SYSRQ=y | 420 | CONFIG_MAGIC_SYSRQ=y |
317 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 421 | CONFIG_ASYNC_RAID6_TEST=m |
318 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 422 | CONFIG_ENCRYPTED_KEYS=m |
423 | CONFIG_CRYPTO_MANAGER=y | ||
424 | CONFIG_CRYPTO_USER=m | ||
319 | CONFIG_CRYPTO_NULL=m | 425 | CONFIG_CRYPTO_NULL=m |
320 | CONFIG_CRYPTO_CRYPTD=m | 426 | CONFIG_CRYPTO_CRYPTD=m |
321 | CONFIG_CRYPTO_TEST=m | 427 | CONFIG_CRYPTO_TEST=m |
@@ -325,19 +431,16 @@ CONFIG_CRYPTO_CTS=m | |||
325 | CONFIG_CRYPTO_LRW=m | 431 | CONFIG_CRYPTO_LRW=m |
326 | CONFIG_CRYPTO_PCBC=m | 432 | CONFIG_CRYPTO_PCBC=m |
327 | CONFIG_CRYPTO_XTS=m | 433 | CONFIG_CRYPTO_XTS=m |
328 | CONFIG_CRYPTO_HMAC=y | ||
329 | CONFIG_CRYPTO_XCBC=m | 434 | CONFIG_CRYPTO_XCBC=m |
330 | CONFIG_CRYPTO_MD4=m | 435 | CONFIG_CRYPTO_VMAC=m |
331 | CONFIG_CRYPTO_MICHAEL_MIC=m | 436 | CONFIG_CRYPTO_MICHAEL_MIC=m |
332 | CONFIG_CRYPTO_RMD128=m | 437 | CONFIG_CRYPTO_RMD128=m |
333 | CONFIG_CRYPTO_RMD160=m | 438 | CONFIG_CRYPTO_RMD160=m |
334 | CONFIG_CRYPTO_RMD256=m | 439 | CONFIG_CRYPTO_RMD256=m |
335 | CONFIG_CRYPTO_RMD320=m | 440 | CONFIG_CRYPTO_RMD320=m |
336 | CONFIG_CRYPTO_SHA256=m | ||
337 | CONFIG_CRYPTO_SHA512=m | 441 | CONFIG_CRYPTO_SHA512=m |
338 | CONFIG_CRYPTO_TGR192=m | 442 | CONFIG_CRYPTO_TGR192=m |
339 | CONFIG_CRYPTO_WP512=m | 443 | CONFIG_CRYPTO_WP512=m |
340 | CONFIG_CRYPTO_AES=m | ||
341 | CONFIG_CRYPTO_ANUBIS=m | 444 | CONFIG_CRYPTO_ANUBIS=m |
342 | CONFIG_CRYPTO_BLOWFISH=m | 445 | CONFIG_CRYPTO_BLOWFISH=m |
343 | CONFIG_CRYPTO_CAMELLIA=m | 446 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -353,6 +456,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
353 | CONFIG_CRYPTO_ZLIB=m | 456 | CONFIG_CRYPTO_ZLIB=m |
354 | CONFIG_CRYPTO_LZO=m | 457 | CONFIG_CRYPTO_LZO=m |
355 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 458 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
459 | CONFIG_CRYPTO_USER_API_HASH=m | ||
460 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
356 | # CONFIG_CRYPTO_HW is not set | 461 | # CONFIG_CRYPTO_HW is not set |
357 | CONFIG_CRC16=y | ||
358 | CONFIG_CRC_T10DIF=y | 462 | CONFIG_CRC_T10DIF=y |
463 | CONFIG_XZ_DEC_X86=y | ||
464 | CONFIG_XZ_DEC_POWERPC=y | ||
465 | CONFIG_XZ_DEC_IA64=y | ||
466 | CONFIG_XZ_DEC_ARM=y | ||
467 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
468 | CONFIG_XZ_DEC_SPARC=y | ||
469 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 12f211733ba0..c015ddb6fd80 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
@@ -1,53 +1,74 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-bvme6000" | 1 | CONFIG_LOCALVERSION="-bvme6000" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_VME=y | 16 | CONFIG_PARTITION_ADVANCED=y |
14 | CONFIG_BVME6000=y | 17 | CONFIG_AMIGA_PARTITION=y |
18 | CONFIG_ATARI_PARTITION=y | ||
19 | CONFIG_MAC_PARTITION=y | ||
20 | CONFIG_BSD_DISKLABEL=y | ||
21 | CONFIG_MINIX_SUBPARTITION=y | ||
22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
24 | CONFIG_SUN_PARTITION=y | ||
25 | # CONFIG_EFI_PARTITION is not set | ||
26 | CONFIG_IOSCHED_DEADLINE=m | ||
15 | CONFIG_M68040=y | 27 | CONFIG_M68040=y |
16 | CONFIG_M68060=y | 28 | CONFIG_M68060=y |
29 | CONFIG_VME=y | ||
30 | CONFIG_BVME6000=y | ||
31 | # CONFIG_COMPACTION is not set | ||
32 | CONFIG_CLEANCACHE=y | ||
33 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
17 | CONFIG_BINFMT_AOUT=m | 34 | CONFIG_BINFMT_AOUT=m |
18 | CONFIG_BINFMT_MISC=m | 35 | CONFIG_BINFMT_MISC=m |
19 | CONFIG_PROC_HARDWARE=y | ||
20 | CONFIG_NET=y | 36 | CONFIG_NET=y |
21 | CONFIG_PACKET=y | 37 | CONFIG_PACKET=y |
38 | CONFIG_PACKET_DIAG=m | ||
22 | CONFIG_UNIX=y | 39 | CONFIG_UNIX=y |
40 | CONFIG_UNIX_DIAG=m | ||
41 | CONFIG_XFRM_MIGRATE=y | ||
23 | CONFIG_NET_KEY=y | 42 | CONFIG_NET_KEY=y |
24 | CONFIG_NET_KEY_MIGRATE=y | ||
25 | CONFIG_INET=y | 43 | CONFIG_INET=y |
26 | CONFIG_IP_PNP=y | 44 | CONFIG_IP_PNP=y |
27 | CONFIG_IP_PNP_DHCP=y | 45 | CONFIG_IP_PNP_DHCP=y |
28 | CONFIG_IP_PNP_BOOTP=y | 46 | CONFIG_IP_PNP_BOOTP=y |
29 | CONFIG_IP_PNP_RARP=y | 47 | CONFIG_IP_PNP_RARP=y |
30 | CONFIG_NET_IPIP=m | 48 | CONFIG_NET_IPIP=m |
49 | CONFIG_NET_IPGRE_DEMUX=m | ||
31 | CONFIG_NET_IPGRE=m | 50 | CONFIG_NET_IPGRE=m |
32 | CONFIG_SYN_COOKIES=y | 51 | CONFIG_SYN_COOKIES=y |
52 | CONFIG_NET_IPVTI=m | ||
33 | CONFIG_INET_AH=m | 53 | CONFIG_INET_AH=m |
34 | CONFIG_INET_ESP=m | 54 | CONFIG_INET_ESP=m |
35 | CONFIG_INET_IPCOMP=m | 55 | CONFIG_INET_IPCOMP=m |
36 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 56 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
37 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 57 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
38 | CONFIG_INET_XFRM_MODE_BEET=m | 58 | CONFIG_INET_XFRM_MODE_BEET=m |
59 | # CONFIG_INET_LRO is not set | ||
39 | CONFIG_INET_DIAG=m | 60 | CONFIG_INET_DIAG=m |
61 | CONFIG_INET_UDP_DIAG=m | ||
40 | CONFIG_IPV6_PRIVACY=y | 62 | CONFIG_IPV6_PRIVACY=y |
41 | CONFIG_IPV6_ROUTER_PREF=y | 63 | CONFIG_IPV6_ROUTER_PREF=y |
42 | CONFIG_IPV6_ROUTE_INFO=y | ||
43 | CONFIG_INET6_AH=m | 64 | CONFIG_INET6_AH=m |
44 | CONFIG_INET6_ESP=m | 65 | CONFIG_INET6_ESP=m |
45 | CONFIG_INET6_IPCOMP=m | 66 | CONFIG_INET6_IPCOMP=m |
46 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 67 | CONFIG_IPV6_GRE=m |
47 | CONFIG_IPV6_TUNNEL=m | ||
48 | CONFIG_NETFILTER=y | 68 | CONFIG_NETFILTER=y |
49 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
50 | CONFIG_NF_CONNTRACK=m | 69 | CONFIG_NF_CONNTRACK=m |
70 | CONFIG_NF_CONNTRACK_ZONES=y | ||
71 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
51 | # CONFIG_NF_CT_PROTO_DCCP is not set | 72 | # CONFIG_NF_CT_PROTO_DCCP is not set |
52 | CONFIG_NF_CT_PROTO_UDPLITE=m | 73 | CONFIG_NF_CT_PROTO_UDPLITE=m |
53 | CONFIG_NF_CONNTRACK_AMANDA=m | 74 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -55,25 +76,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
55 | CONFIG_NF_CONNTRACK_H323=m | 76 | CONFIG_NF_CONNTRACK_H323=m |
56 | CONFIG_NF_CONNTRACK_IRC=m | 77 | CONFIG_NF_CONNTRACK_IRC=m |
57 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 78 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
79 | CONFIG_NF_CONNTRACK_SNMP=m | ||
58 | CONFIG_NF_CONNTRACK_PPTP=m | 80 | CONFIG_NF_CONNTRACK_PPTP=m |
59 | CONFIG_NF_CONNTRACK_SANE=m | 81 | CONFIG_NF_CONNTRACK_SANE=m |
60 | CONFIG_NF_CONNTRACK_SIP=m | 82 | CONFIG_NF_CONNTRACK_SIP=m |
61 | CONFIG_NF_CONNTRACK_TFTP=m | 83 | CONFIG_NF_CONNTRACK_TFTP=m |
84 | CONFIG_NETFILTER_XT_SET=m | ||
85 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
62 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 86 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
63 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 87 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
64 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 88 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
89 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
90 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
91 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
65 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 92 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
66 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 93 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
67 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
95 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
96 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
68 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 97 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
69 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 98 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
70 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
100 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
101 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
71 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 102 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
72 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 103 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
73 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
105 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
74 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
75 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
76 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
109 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
77 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 110 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
78 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 111 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
79 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 112 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -84,6 +117,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
84 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 117 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
85 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 118 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
86 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 119 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
120 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
121 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
87 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 122 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
88 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 123 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
89 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 124 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -97,22 +132,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
97 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 132 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
98 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 133 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
99 | CONFIG_NETFILTER_XT_MATCH_U32=m | 134 | CONFIG_NETFILTER_XT_MATCH_U32=m |
135 | CONFIG_IP_SET=m | ||
136 | CONFIG_IP_SET_BITMAP_IP=m | ||
137 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
138 | CONFIG_IP_SET_BITMAP_PORT=m | ||
139 | CONFIG_IP_SET_HASH_IP=m | ||
140 | CONFIG_IP_SET_HASH_IPPORT=m | ||
141 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
142 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
143 | CONFIG_IP_SET_HASH_NET=m | ||
144 | CONFIG_IP_SET_HASH_NETPORT=m | ||
145 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
146 | CONFIG_IP_SET_LIST_SET=m | ||
100 | CONFIG_NF_CONNTRACK_IPV4=m | 147 | CONFIG_NF_CONNTRACK_IPV4=m |
101 | CONFIG_IP_NF_QUEUE=m | ||
102 | CONFIG_IP_NF_IPTABLES=m | 148 | CONFIG_IP_NF_IPTABLES=m |
103 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
104 | CONFIG_IP_NF_MATCH_AH=m | 149 | CONFIG_IP_NF_MATCH_AH=m |
105 | CONFIG_IP_NF_MATCH_ECN=m | 150 | CONFIG_IP_NF_MATCH_ECN=m |
151 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
106 | CONFIG_IP_NF_MATCH_TTL=m | 152 | CONFIG_IP_NF_MATCH_TTL=m |
107 | CONFIG_IP_NF_FILTER=m | 153 | CONFIG_IP_NF_FILTER=m |
108 | CONFIG_IP_NF_TARGET_REJECT=m | 154 | CONFIG_IP_NF_TARGET_REJECT=m |
109 | CONFIG_IP_NF_TARGET_LOG=m | ||
110 | CONFIG_IP_NF_TARGET_ULOG=m | 155 | CONFIG_IP_NF_TARGET_ULOG=m |
111 | CONFIG_NF_NAT=m | 156 | CONFIG_NF_NAT_IPV4=m |
112 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 157 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
113 | CONFIG_IP_NF_TARGET_NETMAP=m | 158 | CONFIG_IP_NF_TARGET_NETMAP=m |
114 | CONFIG_IP_NF_TARGET_REDIRECT=m | 159 | CONFIG_IP_NF_TARGET_REDIRECT=m |
115 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
116 | CONFIG_IP_NF_MANGLE=m | 160 | CONFIG_IP_NF_MANGLE=m |
117 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 161 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
118 | CONFIG_IP_NF_TARGET_ECN=m | 162 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -122,7 +166,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
122 | CONFIG_IP_NF_ARPFILTER=m | 166 | CONFIG_IP_NF_ARPFILTER=m |
123 | CONFIG_IP_NF_ARP_MANGLE=m | 167 | CONFIG_IP_NF_ARP_MANGLE=m |
124 | CONFIG_NF_CONNTRACK_IPV6=m | 168 | CONFIG_NF_CONNTRACK_IPV6=m |
125 | CONFIG_IP6_NF_QUEUE=m | ||
126 | CONFIG_IP6_NF_IPTABLES=m | 169 | CONFIG_IP6_NF_IPTABLES=m |
127 | CONFIG_IP6_NF_MATCH_AH=m | 170 | CONFIG_IP6_NF_MATCH_AH=m |
128 | CONFIG_IP6_NF_MATCH_EUI64=m | 171 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -131,21 +174,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
131 | CONFIG_IP6_NF_MATCH_HL=m | 174 | CONFIG_IP6_NF_MATCH_HL=m |
132 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 175 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
133 | CONFIG_IP6_NF_MATCH_MH=m | 176 | CONFIG_IP6_NF_MATCH_MH=m |
177 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
134 | CONFIG_IP6_NF_MATCH_RT=m | 178 | CONFIG_IP6_NF_MATCH_RT=m |
135 | CONFIG_IP6_NF_TARGET_HL=m | 179 | CONFIG_IP6_NF_TARGET_HL=m |
136 | CONFIG_IP6_NF_TARGET_LOG=m | ||
137 | CONFIG_IP6_NF_FILTER=m | 180 | CONFIG_IP6_NF_FILTER=m |
138 | CONFIG_IP6_NF_TARGET_REJECT=m | 181 | CONFIG_IP6_NF_TARGET_REJECT=m |
139 | CONFIG_IP6_NF_MANGLE=m | 182 | CONFIG_IP6_NF_MANGLE=m |
140 | CONFIG_IP6_NF_RAW=m | 183 | CONFIG_IP6_NF_RAW=m |
184 | CONFIG_NF_NAT_IPV6=m | ||
185 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
186 | CONFIG_IP6_NF_TARGET_NPT=m | ||
141 | CONFIG_IP_DCCP=m | 187 | CONFIG_IP_DCCP=m |
142 | # CONFIG_IP_DCCP_CCID3 is not set | 188 | # CONFIG_IP_DCCP_CCID3 is not set |
189 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
190 | CONFIG_RDS=m | ||
191 | CONFIG_RDS_TCP=m | ||
192 | CONFIG_L2TP=m | ||
143 | CONFIG_ATALK=m | 193 | CONFIG_ATALK=m |
194 | CONFIG_BATMAN_ADV=m | ||
195 | CONFIG_BATMAN_ADV_DAT=y | ||
196 | # CONFIG_WIRELESS is not set | ||
144 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 197 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
198 | CONFIG_DEVTMPFS=y | ||
145 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 199 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
200 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
146 | CONFIG_CONNECTOR=m | 201 | CONFIG_CONNECTOR=m |
147 | CONFIG_BLK_DEV_LOOP=y | 202 | CONFIG_BLK_DEV_LOOP=y |
148 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 203 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
204 | CONFIG_BLK_DEV_DRBD=m | ||
149 | CONFIG_BLK_DEV_NBD=m | 205 | CONFIG_BLK_DEV_NBD=m |
150 | CONFIG_BLK_DEV_RAM=y | 206 | CONFIG_BLK_DEV_RAM=y |
151 | CONFIG_CDROM_PKTCDVD=m | 207 | CONFIG_CDROM_PKTCDVD=m |
@@ -160,103 +216,131 @@ CONFIG_BLK_DEV_SR=y | |||
160 | CONFIG_BLK_DEV_SR_VENDOR=y | 216 | CONFIG_BLK_DEV_SR_VENDOR=y |
161 | CONFIG_CHR_DEV_SG=m | 217 | CONFIG_CHR_DEV_SG=m |
162 | CONFIG_SCSI_CONSTANTS=y | 218 | CONFIG_SCSI_CONSTANTS=y |
163 | CONFIG_SCSI_SAS_LIBSAS=m | 219 | CONFIG_SCSI_SAS_ATTRS=m |
164 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
165 | CONFIG_SCSI_SRP_ATTRS=m | ||
166 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
167 | CONFIG_ISCSI_TCP=m | 220 | CONFIG_ISCSI_TCP=m |
221 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
168 | CONFIG_BVME6000_SCSI=y | 222 | CONFIG_BVME6000_SCSI=y |
169 | CONFIG_MD=y | 223 | CONFIG_MD=y |
170 | CONFIG_BLK_DEV_MD=m | ||
171 | CONFIG_MD_LINEAR=m | 224 | CONFIG_MD_LINEAR=m |
172 | CONFIG_MD_RAID0=m | 225 | CONFIG_MD_RAID0=m |
173 | CONFIG_MD_RAID1=m | ||
174 | CONFIG_MD_RAID456=m | ||
175 | CONFIG_BLK_DEV_DM=m | 226 | CONFIG_BLK_DEV_DM=m |
176 | CONFIG_DM_CRYPT=m | 227 | CONFIG_DM_CRYPT=m |
177 | CONFIG_DM_SNAPSHOT=m | 228 | CONFIG_DM_SNAPSHOT=m |
229 | CONFIG_DM_THIN_PROVISIONING=m | ||
230 | CONFIG_DM_CACHE=m | ||
178 | CONFIG_DM_MIRROR=m | 231 | CONFIG_DM_MIRROR=m |
232 | CONFIG_DM_RAID=m | ||
179 | CONFIG_DM_ZERO=m | 233 | CONFIG_DM_ZERO=m |
180 | CONFIG_DM_MULTIPATH=m | 234 | CONFIG_DM_MULTIPATH=m |
181 | CONFIG_DM_UEVENT=y | 235 | CONFIG_DM_UEVENT=y |
236 | CONFIG_TARGET_CORE=m | ||
237 | CONFIG_TCM_IBLOCK=m | ||
238 | CONFIG_TCM_FILEIO=m | ||
239 | CONFIG_TCM_PSCSI=m | ||
182 | CONFIG_NETDEVICES=y | 240 | CONFIG_NETDEVICES=y |
183 | CONFIG_DUMMY=m | 241 | CONFIG_DUMMY=m |
184 | CONFIG_MACVLAN=m | ||
185 | CONFIG_EQUALIZER=m | 242 | CONFIG_EQUALIZER=m |
243 | CONFIG_NET_TEAM=m | ||
244 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
245 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
246 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
247 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
248 | CONFIG_VXLAN=m | ||
249 | CONFIG_NETCONSOLE=m | ||
250 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
186 | CONFIG_VETH=m | 251 | CONFIG_VETH=m |
187 | CONFIG_NET_ETHERNET=y | 252 | # CONFIG_NET_CADENCE is not set |
253 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
188 | CONFIG_BVME6000_NET=y | 254 | CONFIG_BVME6000_NET=y |
189 | # CONFIG_NETDEV_1000 is not set | 255 | # CONFIG_NET_VENDOR_MARVELL is not set |
190 | # CONFIG_NETDEV_10000 is not set | 256 | # CONFIG_NET_VENDOR_MICREL is not set |
257 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
258 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
259 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
260 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
191 | CONFIG_PPP=m | 261 | CONFIG_PPP=m |
192 | CONFIG_PPP_FILTER=y | ||
193 | CONFIG_PPP_ASYNC=m | ||
194 | CONFIG_PPP_SYNC_TTY=m | ||
195 | CONFIG_PPP_DEFLATE=m | ||
196 | CONFIG_PPP_BSDCOMP=m | 262 | CONFIG_PPP_BSDCOMP=m |
263 | CONFIG_PPP_DEFLATE=m | ||
264 | CONFIG_PPP_FILTER=y | ||
197 | CONFIG_PPP_MPPE=m | 265 | CONFIG_PPP_MPPE=m |
198 | CONFIG_PPPOE=m | 266 | CONFIG_PPPOE=m |
267 | CONFIG_PPTP=m | ||
268 | CONFIG_PPPOL2TP=m | ||
269 | CONFIG_PPP_ASYNC=m | ||
270 | CONFIG_PPP_SYNC_TTY=m | ||
199 | CONFIG_SLIP=m | 271 | CONFIG_SLIP=m |
200 | CONFIG_SLIP_COMPRESSED=y | 272 | CONFIG_SLIP_COMPRESSED=y |
201 | CONFIG_SLIP_SMART=y | 273 | CONFIG_SLIP_SMART=y |
202 | CONFIG_SLIP_MODE_SLIP6=y | 274 | CONFIG_SLIP_MODE_SLIP6=y |
203 | CONFIG_NETCONSOLE=m | 275 | # CONFIG_WLAN is not set |
204 | CONFIG_NETCONSOLE_DYNAMIC=y | 276 | CONFIG_INPUT_EVDEV=m |
205 | CONFIG_INPUT_FF_MEMLESS=m | ||
206 | # CONFIG_KEYBOARD_ATKBD is not set | 277 | # CONFIG_KEYBOARD_ATKBD is not set |
207 | CONFIG_MOUSE_PS2=m | 278 | # CONFIG_MOUSE_PS2 is not set |
208 | CONFIG_MOUSE_SERIAL=m | 279 | # CONFIG_SERIO is not set |
209 | CONFIG_SERIO=m | ||
210 | # CONFIG_SERIO_SERPORT is not set | ||
211 | CONFIG_VT_HW_CONSOLE_BINDING=y | 280 | CONFIG_VT_HW_CONSOLE_BINDING=y |
281 | # CONFIG_LEGACY_PTYS is not set | ||
212 | # CONFIG_DEVKMEM is not set | 282 | # CONFIG_DEVKMEM is not set |
213 | # CONFIG_HW_RANDOM is not set | 283 | # CONFIG_HW_RANDOM is not set |
214 | CONFIG_GEN_RTC=m | 284 | CONFIG_NTP_PPS=y |
215 | CONFIG_GEN_RTC_X=y | 285 | CONFIG_PPS_CLIENT_LDISC=m |
286 | CONFIG_PTP_1588_CLOCK=m | ||
216 | # CONFIG_HWMON is not set | 287 | # CONFIG_HWMON is not set |
217 | CONFIG_HID=m | 288 | CONFIG_HID=m |
218 | CONFIG_HIDRAW=y | 289 | CONFIG_HIDRAW=y |
290 | CONFIG_UHID=m | ||
291 | # CONFIG_HID_GENERIC is not set | ||
219 | # CONFIG_USB_SUPPORT is not set | 292 | # CONFIG_USB_SUPPORT is not set |
293 | CONFIG_RTC_CLASS=y | ||
294 | CONFIG_RTC_DRV_GENERIC=m | ||
295 | # CONFIG_IOMMU_SUPPORT is not set | ||
296 | CONFIG_PROC_HARDWARE=y | ||
220 | CONFIG_EXT2_FS=y | 297 | CONFIG_EXT2_FS=y |
221 | CONFIG_EXT3_FS=y | 298 | CONFIG_EXT3_FS=y |
222 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 299 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
223 | # CONFIG_EXT3_FS_XATTR is not set | 300 | # CONFIG_EXT3_FS_XATTR is not set |
301 | CONFIG_EXT4_FS=y | ||
224 | CONFIG_REISERFS_FS=m | 302 | CONFIG_REISERFS_FS=m |
225 | CONFIG_JFS_FS=m | 303 | CONFIG_JFS_FS=m |
226 | CONFIG_XFS_FS=m | 304 | CONFIG_XFS_FS=m |
227 | CONFIG_OCFS2_FS=m | 305 | CONFIG_OCFS2_FS=m |
228 | # CONFIG_OCFS2_FS_STATS is not set | ||
229 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 306 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
307 | CONFIG_FANOTIFY=y | ||
230 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 308 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
231 | # CONFIG_PRINT_QUOTA_WARNING is not set | 309 | # CONFIG_PRINT_QUOTA_WARNING is not set |
232 | CONFIG_AUTOFS_FS=m | ||
233 | CONFIG_AUTOFS4_FS=m | 310 | CONFIG_AUTOFS4_FS=m |
234 | CONFIG_FUSE_FS=m | 311 | CONFIG_FUSE_FS=m |
312 | CONFIG_CUSE=m | ||
235 | CONFIG_ISO9660_FS=y | 313 | CONFIG_ISO9660_FS=y |
236 | CONFIG_JOLIET=y | 314 | CONFIG_JOLIET=y |
237 | CONFIG_ZISOFS=y | 315 | CONFIG_ZISOFS=y |
238 | CONFIG_UDF_FS=m | 316 | CONFIG_UDF_FS=m |
239 | CONFIG_MSDOS_FS=y | 317 | CONFIG_MSDOS_FS=m |
240 | CONFIG_VFAT_FS=m | 318 | CONFIG_VFAT_FS=m |
241 | CONFIG_PROC_KCORE=y | 319 | CONFIG_PROC_KCORE=y |
242 | CONFIG_TMPFS=y | 320 | CONFIG_TMPFS=y |
243 | CONFIG_AFFS_FS=m | 321 | CONFIG_AFFS_FS=m |
322 | CONFIG_ECRYPT_FS=m | ||
323 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
244 | CONFIG_HFS_FS=m | 324 | CONFIG_HFS_FS=m |
245 | CONFIG_HFSPLUS_FS=m | 325 | CONFIG_HFSPLUS_FS=m |
246 | CONFIG_CRAMFS=m | 326 | CONFIG_CRAMFS=m |
247 | CONFIG_SQUASHFS=m | 327 | CONFIG_SQUASHFS=m |
248 | CONFIG_MINIX_FS=y | 328 | CONFIG_SQUASHFS_LZO=y |
329 | CONFIG_MINIX_FS=m | ||
330 | CONFIG_OMFS_FS=m | ||
249 | CONFIG_HPFS_FS=m | 331 | CONFIG_HPFS_FS=m |
332 | CONFIG_QNX4FS_FS=m | ||
333 | CONFIG_QNX6FS_FS=m | ||
250 | CONFIG_SYSV_FS=m | 334 | CONFIG_SYSV_FS=m |
251 | CONFIG_UFS_FS=m | 335 | CONFIG_UFS_FS=m |
252 | CONFIG_NFS_FS=y | 336 | CONFIG_NFS_FS=y |
253 | CONFIG_NFS_V3=y | ||
254 | CONFIG_NFS_V4=y | 337 | CONFIG_NFS_V4=y |
338 | CONFIG_NFS_SWAP=y | ||
255 | CONFIG_ROOT_NFS=y | 339 | CONFIG_ROOT_NFS=y |
256 | CONFIG_NFSD=m | 340 | CONFIG_NFSD=m |
257 | CONFIG_NFSD_V3=y | 341 | CONFIG_NFSD_V3=y |
258 | CONFIG_SMB_FS=m | 342 | CONFIG_CIFS=m |
259 | CONFIG_SMB_NLS_DEFAULT=y | 343 | # CONFIG_CIFS_DEBUG is not set |
260 | CONFIG_CODA_FS=m | 344 | CONFIG_CODA_FS=m |
261 | CONFIG_NLS_CODEPAGE_437=y | 345 | CONFIG_NLS_CODEPAGE_437=y |
262 | CONFIG_NLS_CODEPAGE_737=m | 346 | CONFIG_NLS_CODEPAGE_737=m |
@@ -295,10 +379,23 @@ CONFIG_NLS_ISO8859_14=m | |||
295 | CONFIG_NLS_ISO8859_15=m | 379 | CONFIG_NLS_ISO8859_15=m |
296 | CONFIG_NLS_KOI8_R=m | 380 | CONFIG_NLS_KOI8_R=m |
297 | CONFIG_NLS_KOI8_U=m | 381 | CONFIG_NLS_KOI8_U=m |
382 | CONFIG_NLS_MAC_ROMAN=m | ||
383 | CONFIG_NLS_MAC_CELTIC=m | ||
384 | CONFIG_NLS_MAC_CENTEURO=m | ||
385 | CONFIG_NLS_MAC_CROATIAN=m | ||
386 | CONFIG_NLS_MAC_CYRILLIC=m | ||
387 | CONFIG_NLS_MAC_GAELIC=m | ||
388 | CONFIG_NLS_MAC_GREEK=m | ||
389 | CONFIG_NLS_MAC_ICELAND=m | ||
390 | CONFIG_NLS_MAC_INUIT=m | ||
391 | CONFIG_NLS_MAC_ROMANIAN=m | ||
392 | CONFIG_NLS_MAC_TURKISH=m | ||
298 | CONFIG_DLM=m | 393 | CONFIG_DLM=m |
299 | CONFIG_MAGIC_SYSRQ=y | 394 | CONFIG_MAGIC_SYSRQ=y |
300 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 395 | CONFIG_ASYNC_RAID6_TEST=m |
301 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 396 | CONFIG_ENCRYPTED_KEYS=m |
397 | CONFIG_CRYPTO_MANAGER=y | ||
398 | CONFIG_CRYPTO_USER=m | ||
302 | CONFIG_CRYPTO_NULL=m | 399 | CONFIG_CRYPTO_NULL=m |
303 | CONFIG_CRYPTO_CRYPTD=m | 400 | CONFIG_CRYPTO_CRYPTD=m |
304 | CONFIG_CRYPTO_TEST=m | 401 | CONFIG_CRYPTO_TEST=m |
@@ -308,19 +405,16 @@ CONFIG_CRYPTO_CTS=m | |||
308 | CONFIG_CRYPTO_LRW=m | 405 | CONFIG_CRYPTO_LRW=m |
309 | CONFIG_CRYPTO_PCBC=m | 406 | CONFIG_CRYPTO_PCBC=m |
310 | CONFIG_CRYPTO_XTS=m | 407 | CONFIG_CRYPTO_XTS=m |
311 | CONFIG_CRYPTO_HMAC=y | ||
312 | CONFIG_CRYPTO_XCBC=m | 408 | CONFIG_CRYPTO_XCBC=m |
313 | CONFIG_CRYPTO_MD4=m | 409 | CONFIG_CRYPTO_VMAC=m |
314 | CONFIG_CRYPTO_MICHAEL_MIC=m | 410 | CONFIG_CRYPTO_MICHAEL_MIC=m |
315 | CONFIG_CRYPTO_RMD128=m | 411 | CONFIG_CRYPTO_RMD128=m |
316 | CONFIG_CRYPTO_RMD160=m | 412 | CONFIG_CRYPTO_RMD160=m |
317 | CONFIG_CRYPTO_RMD256=m | 413 | CONFIG_CRYPTO_RMD256=m |
318 | CONFIG_CRYPTO_RMD320=m | 414 | CONFIG_CRYPTO_RMD320=m |
319 | CONFIG_CRYPTO_SHA256=m | ||
320 | CONFIG_CRYPTO_SHA512=m | 415 | CONFIG_CRYPTO_SHA512=m |
321 | CONFIG_CRYPTO_TGR192=m | 416 | CONFIG_CRYPTO_TGR192=m |
322 | CONFIG_CRYPTO_WP512=m | 417 | CONFIG_CRYPTO_WP512=m |
323 | CONFIG_CRYPTO_AES=m | ||
324 | CONFIG_CRYPTO_ANUBIS=m | 418 | CONFIG_CRYPTO_ANUBIS=m |
325 | CONFIG_CRYPTO_BLOWFISH=m | 419 | CONFIG_CRYPTO_BLOWFISH=m |
326 | CONFIG_CRYPTO_CAMELLIA=m | 420 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -336,7 +430,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
336 | CONFIG_CRYPTO_ZLIB=m | 430 | CONFIG_CRYPTO_ZLIB=m |
337 | CONFIG_CRYPTO_LZO=m | 431 | CONFIG_CRYPTO_LZO=m |
338 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 432 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
433 | CONFIG_CRYPTO_USER_API_HASH=m | ||
434 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
339 | # CONFIG_CRYPTO_HW is not set | 435 | # CONFIG_CRYPTO_HW is not set |
340 | CONFIG_CRC16=m | ||
341 | CONFIG_CRC_T10DIF=y | 436 | CONFIG_CRC_T10DIF=y |
342 | CONFIG_CRC32=m | 437 | CONFIG_XZ_DEC_X86=y |
438 | CONFIG_XZ_DEC_POWERPC=y | ||
439 | CONFIG_XZ_DEC_IA64=y | ||
440 | CONFIG_XZ_DEC_ARM=y | ||
441 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
442 | CONFIG_XZ_DEC_SPARC=y | ||
443 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 215389a5407f..ec7382d8afff 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
@@ -1,54 +1,76 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-hp300" | 1 | CONFIG_LOCALVERSION="-hp300" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_HP300=y | 16 | CONFIG_PARTITION_ADVANCED=y |
17 | CONFIG_AMIGA_PARTITION=y | ||
18 | CONFIG_ATARI_PARTITION=y | ||
19 | CONFIG_MAC_PARTITION=y | ||
20 | CONFIG_BSD_DISKLABEL=y | ||
21 | CONFIG_MINIX_SUBPARTITION=y | ||
22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
24 | CONFIG_SUN_PARTITION=y | ||
25 | # CONFIG_EFI_PARTITION is not set | ||
26 | CONFIG_SYSV68_PARTITION=y | ||
27 | CONFIG_IOSCHED_DEADLINE=m | ||
14 | CONFIG_M68020=y | 28 | CONFIG_M68020=y |
15 | CONFIG_M68030=y | 29 | CONFIG_M68030=y |
16 | CONFIG_M68040=y | 30 | CONFIG_M68040=y |
17 | CONFIG_M68060=y | 31 | CONFIG_M68060=y |
32 | CONFIG_HP300=y | ||
33 | # CONFIG_COMPACTION is not set | ||
34 | CONFIG_CLEANCACHE=y | ||
35 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
18 | CONFIG_BINFMT_AOUT=m | 36 | CONFIG_BINFMT_AOUT=m |
19 | CONFIG_BINFMT_MISC=m | 37 | CONFIG_BINFMT_MISC=m |
20 | CONFIG_PROC_HARDWARE=y | ||
21 | CONFIG_NET=y | 38 | CONFIG_NET=y |
22 | CONFIG_PACKET=y | 39 | CONFIG_PACKET=y |
40 | CONFIG_PACKET_DIAG=m | ||
23 | CONFIG_UNIX=y | 41 | CONFIG_UNIX=y |
42 | CONFIG_UNIX_DIAG=m | ||
43 | CONFIG_XFRM_MIGRATE=y | ||
24 | CONFIG_NET_KEY=y | 44 | CONFIG_NET_KEY=y |
25 | CONFIG_NET_KEY_MIGRATE=y | ||
26 | CONFIG_INET=y | 45 | CONFIG_INET=y |
27 | CONFIG_IP_PNP=y | 46 | CONFIG_IP_PNP=y |
28 | CONFIG_IP_PNP_DHCP=y | 47 | CONFIG_IP_PNP_DHCP=y |
29 | CONFIG_IP_PNP_BOOTP=y | 48 | CONFIG_IP_PNP_BOOTP=y |
30 | CONFIG_IP_PNP_RARP=y | 49 | CONFIG_IP_PNP_RARP=y |
31 | CONFIG_NET_IPIP=m | 50 | CONFIG_NET_IPIP=m |
51 | CONFIG_NET_IPGRE_DEMUX=m | ||
32 | CONFIG_NET_IPGRE=m | 52 | CONFIG_NET_IPGRE=m |
33 | CONFIG_SYN_COOKIES=y | 53 | CONFIG_SYN_COOKIES=y |
54 | CONFIG_NET_IPVTI=m | ||
34 | CONFIG_INET_AH=m | 55 | CONFIG_INET_AH=m |
35 | CONFIG_INET_ESP=m | 56 | CONFIG_INET_ESP=m |
36 | CONFIG_INET_IPCOMP=m | 57 | CONFIG_INET_IPCOMP=m |
37 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 58 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
38 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 59 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
39 | CONFIG_INET_XFRM_MODE_BEET=m | 60 | CONFIG_INET_XFRM_MODE_BEET=m |
61 | # CONFIG_INET_LRO is not set | ||
40 | CONFIG_INET_DIAG=m | 62 | CONFIG_INET_DIAG=m |
63 | CONFIG_INET_UDP_DIAG=m | ||
41 | CONFIG_IPV6_PRIVACY=y | 64 | CONFIG_IPV6_PRIVACY=y |
42 | CONFIG_IPV6_ROUTER_PREF=y | 65 | CONFIG_IPV6_ROUTER_PREF=y |
43 | CONFIG_IPV6_ROUTE_INFO=y | ||
44 | CONFIG_INET6_AH=m | 66 | CONFIG_INET6_AH=m |
45 | CONFIG_INET6_ESP=m | 67 | CONFIG_INET6_ESP=m |
46 | CONFIG_INET6_IPCOMP=m | 68 | CONFIG_INET6_IPCOMP=m |
47 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 69 | CONFIG_IPV6_GRE=m |
48 | CONFIG_IPV6_TUNNEL=m | ||
49 | CONFIG_NETFILTER=y | 70 | CONFIG_NETFILTER=y |
50 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
51 | CONFIG_NF_CONNTRACK=m | 71 | CONFIG_NF_CONNTRACK=m |
72 | CONFIG_NF_CONNTRACK_ZONES=y | ||
73 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
52 | # CONFIG_NF_CT_PROTO_DCCP is not set | 74 | # CONFIG_NF_CT_PROTO_DCCP is not set |
53 | CONFIG_NF_CT_PROTO_UDPLITE=m | 75 | CONFIG_NF_CT_PROTO_UDPLITE=m |
54 | CONFIG_NF_CONNTRACK_AMANDA=m | 76 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -56,25 +78,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
56 | CONFIG_NF_CONNTRACK_H323=m | 78 | CONFIG_NF_CONNTRACK_H323=m |
57 | CONFIG_NF_CONNTRACK_IRC=m | 79 | CONFIG_NF_CONNTRACK_IRC=m |
58 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 80 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
81 | CONFIG_NF_CONNTRACK_SNMP=m | ||
59 | CONFIG_NF_CONNTRACK_PPTP=m | 82 | CONFIG_NF_CONNTRACK_PPTP=m |
60 | CONFIG_NF_CONNTRACK_SANE=m | 83 | CONFIG_NF_CONNTRACK_SANE=m |
61 | CONFIG_NF_CONNTRACK_SIP=m | 84 | CONFIG_NF_CONNTRACK_SIP=m |
62 | CONFIG_NF_CONNTRACK_TFTP=m | 85 | CONFIG_NF_CONNTRACK_TFTP=m |
86 | CONFIG_NETFILTER_XT_SET=m | ||
87 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
63 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 88 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
64 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 89 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
65 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 90 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
91 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
92 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
93 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
66 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 94 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
67 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 95 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
68 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 96 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
97 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
98 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
69 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 99 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
70 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 100 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
71 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 101 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
102 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
103 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
72 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 104 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
73 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 105 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
74 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
107 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
75 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
76 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 109 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
77 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 110 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
111 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
78 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 112 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
79 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 113 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
80 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 114 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -85,6 +119,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
85 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 119 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
86 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 120 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
87 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 121 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
122 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
123 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
88 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 124 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
89 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 125 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
90 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 126 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -98,22 +134,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
98 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 134 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
99 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 135 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
100 | CONFIG_NETFILTER_XT_MATCH_U32=m | 136 | CONFIG_NETFILTER_XT_MATCH_U32=m |
137 | CONFIG_IP_SET=m | ||
138 | CONFIG_IP_SET_BITMAP_IP=m | ||
139 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
140 | CONFIG_IP_SET_BITMAP_PORT=m | ||
141 | CONFIG_IP_SET_HASH_IP=m | ||
142 | CONFIG_IP_SET_HASH_IPPORT=m | ||
143 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
144 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
145 | CONFIG_IP_SET_HASH_NET=m | ||
146 | CONFIG_IP_SET_HASH_NETPORT=m | ||
147 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
148 | CONFIG_IP_SET_LIST_SET=m | ||
101 | CONFIG_NF_CONNTRACK_IPV4=m | 149 | CONFIG_NF_CONNTRACK_IPV4=m |
102 | CONFIG_IP_NF_QUEUE=m | ||
103 | CONFIG_IP_NF_IPTABLES=m | 150 | CONFIG_IP_NF_IPTABLES=m |
104 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
105 | CONFIG_IP_NF_MATCH_AH=m | 151 | CONFIG_IP_NF_MATCH_AH=m |
106 | CONFIG_IP_NF_MATCH_ECN=m | 152 | CONFIG_IP_NF_MATCH_ECN=m |
153 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
107 | CONFIG_IP_NF_MATCH_TTL=m | 154 | CONFIG_IP_NF_MATCH_TTL=m |
108 | CONFIG_IP_NF_FILTER=m | 155 | CONFIG_IP_NF_FILTER=m |
109 | CONFIG_IP_NF_TARGET_REJECT=m | 156 | CONFIG_IP_NF_TARGET_REJECT=m |
110 | CONFIG_IP_NF_TARGET_LOG=m | ||
111 | CONFIG_IP_NF_TARGET_ULOG=m | 157 | CONFIG_IP_NF_TARGET_ULOG=m |
112 | CONFIG_NF_NAT=m | 158 | CONFIG_NF_NAT_IPV4=m |
113 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 159 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
114 | CONFIG_IP_NF_TARGET_NETMAP=m | 160 | CONFIG_IP_NF_TARGET_NETMAP=m |
115 | CONFIG_IP_NF_TARGET_REDIRECT=m | 161 | CONFIG_IP_NF_TARGET_REDIRECT=m |
116 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
117 | CONFIG_IP_NF_MANGLE=m | 162 | CONFIG_IP_NF_MANGLE=m |
118 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 163 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
119 | CONFIG_IP_NF_TARGET_ECN=m | 164 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -123,7 +168,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
123 | CONFIG_IP_NF_ARPFILTER=m | 168 | CONFIG_IP_NF_ARPFILTER=m |
124 | CONFIG_IP_NF_ARP_MANGLE=m | 169 | CONFIG_IP_NF_ARP_MANGLE=m |
125 | CONFIG_NF_CONNTRACK_IPV6=m | 170 | CONFIG_NF_CONNTRACK_IPV6=m |
126 | CONFIG_IP6_NF_QUEUE=m | ||
127 | CONFIG_IP6_NF_IPTABLES=m | 171 | CONFIG_IP6_NF_IPTABLES=m |
128 | CONFIG_IP6_NF_MATCH_AH=m | 172 | CONFIG_IP6_NF_MATCH_AH=m |
129 | CONFIG_IP6_NF_MATCH_EUI64=m | 173 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -132,21 +176,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
132 | CONFIG_IP6_NF_MATCH_HL=m | 176 | CONFIG_IP6_NF_MATCH_HL=m |
133 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 177 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
134 | CONFIG_IP6_NF_MATCH_MH=m | 178 | CONFIG_IP6_NF_MATCH_MH=m |
179 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
135 | CONFIG_IP6_NF_MATCH_RT=m | 180 | CONFIG_IP6_NF_MATCH_RT=m |
136 | CONFIG_IP6_NF_TARGET_HL=m | 181 | CONFIG_IP6_NF_TARGET_HL=m |
137 | CONFIG_IP6_NF_TARGET_LOG=m | ||
138 | CONFIG_IP6_NF_FILTER=m | 182 | CONFIG_IP6_NF_FILTER=m |
139 | CONFIG_IP6_NF_TARGET_REJECT=m | 183 | CONFIG_IP6_NF_TARGET_REJECT=m |
140 | CONFIG_IP6_NF_MANGLE=m | 184 | CONFIG_IP6_NF_MANGLE=m |
141 | CONFIG_IP6_NF_RAW=m | 185 | CONFIG_IP6_NF_RAW=m |
186 | CONFIG_NF_NAT_IPV6=m | ||
187 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
188 | CONFIG_IP6_NF_TARGET_NPT=m | ||
142 | CONFIG_IP_DCCP=m | 189 | CONFIG_IP_DCCP=m |
143 | # CONFIG_IP_DCCP_CCID3 is not set | 190 | # CONFIG_IP_DCCP_CCID3 is not set |
191 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
192 | CONFIG_RDS=m | ||
193 | CONFIG_RDS_TCP=m | ||
194 | CONFIG_L2TP=m | ||
144 | CONFIG_ATALK=m | 195 | CONFIG_ATALK=m |
196 | CONFIG_BATMAN_ADV=m | ||
197 | CONFIG_BATMAN_ADV_DAT=y | ||
198 | # CONFIG_WIRELESS is not set | ||
145 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 199 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
200 | CONFIG_DEVTMPFS=y | ||
146 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 201 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
202 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
147 | CONFIG_CONNECTOR=m | 203 | CONFIG_CONNECTOR=m |
148 | CONFIG_BLK_DEV_LOOP=y | 204 | CONFIG_BLK_DEV_LOOP=y |
149 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 205 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
206 | CONFIG_BLK_DEV_DRBD=m | ||
150 | CONFIG_BLK_DEV_NBD=m | 207 | CONFIG_BLK_DEV_NBD=m |
151 | CONFIG_BLK_DEV_RAM=y | 208 | CONFIG_BLK_DEV_RAM=y |
152 | CONFIG_CDROM_PKTCDVD=m | 209 | CONFIG_CDROM_PKTCDVD=m |
@@ -161,59 +218,77 @@ CONFIG_BLK_DEV_SR=y | |||
161 | CONFIG_BLK_DEV_SR_VENDOR=y | 218 | CONFIG_BLK_DEV_SR_VENDOR=y |
162 | CONFIG_CHR_DEV_SG=m | 219 | CONFIG_CHR_DEV_SG=m |
163 | CONFIG_SCSI_CONSTANTS=y | 220 | CONFIG_SCSI_CONSTANTS=y |
164 | CONFIG_SCSI_SAS_LIBSAS=m | 221 | CONFIG_SCSI_SAS_ATTRS=m |
165 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
166 | CONFIG_SCSI_SRP_ATTRS=m | ||
167 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
168 | CONFIG_ISCSI_TCP=m | 222 | CONFIG_ISCSI_TCP=m |
223 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
169 | CONFIG_MD=y | 224 | CONFIG_MD=y |
170 | CONFIG_BLK_DEV_MD=m | ||
171 | CONFIG_MD_LINEAR=m | 225 | CONFIG_MD_LINEAR=m |
172 | CONFIG_MD_RAID0=m | 226 | CONFIG_MD_RAID0=m |
173 | CONFIG_MD_RAID1=m | ||
174 | CONFIG_MD_RAID456=m | ||
175 | CONFIG_BLK_DEV_DM=m | 227 | CONFIG_BLK_DEV_DM=m |
176 | CONFIG_DM_CRYPT=m | 228 | CONFIG_DM_CRYPT=m |
177 | CONFIG_DM_SNAPSHOT=m | 229 | CONFIG_DM_SNAPSHOT=m |
230 | CONFIG_DM_THIN_PROVISIONING=m | ||
231 | CONFIG_DM_CACHE=m | ||
178 | CONFIG_DM_MIRROR=m | 232 | CONFIG_DM_MIRROR=m |
233 | CONFIG_DM_RAID=m | ||
179 | CONFIG_DM_ZERO=m | 234 | CONFIG_DM_ZERO=m |
180 | CONFIG_DM_MULTIPATH=m | 235 | CONFIG_DM_MULTIPATH=m |
181 | CONFIG_DM_UEVENT=y | 236 | CONFIG_DM_UEVENT=y |
237 | CONFIG_TARGET_CORE=m | ||
238 | CONFIG_TCM_IBLOCK=m | ||
239 | CONFIG_TCM_FILEIO=m | ||
240 | CONFIG_TCM_PSCSI=m | ||
182 | CONFIG_NETDEVICES=y | 241 | CONFIG_NETDEVICES=y |
183 | CONFIG_DUMMY=m | 242 | CONFIG_DUMMY=m |
184 | CONFIG_MACVLAN=m | ||
185 | CONFIG_EQUALIZER=m | 243 | CONFIG_EQUALIZER=m |
244 | CONFIG_NET_TEAM=m | ||
245 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
246 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
247 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
248 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
249 | CONFIG_VXLAN=m | ||
250 | CONFIG_NETCONSOLE=m | ||
251 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
186 | CONFIG_VETH=m | 252 | CONFIG_VETH=m |
187 | CONFIG_NET_ETHERNET=y | ||
188 | CONFIG_HPLANCE=y | 253 | CONFIG_HPLANCE=y |
189 | # CONFIG_NETDEV_1000 is not set | 254 | # CONFIG_NET_CADENCE is not set |
190 | # CONFIG_NETDEV_10000 is not set | 255 | # CONFIG_NET_VENDOR_BROADCOM is not set |
256 | # CONFIG_NET_VENDOR_INTEL is not set | ||
257 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
258 | # CONFIG_NET_VENDOR_MICREL is not set | ||
259 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
260 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
261 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
262 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
191 | CONFIG_PPP=m | 263 | CONFIG_PPP=m |
192 | CONFIG_PPP_FILTER=y | ||
193 | CONFIG_PPP_ASYNC=m | ||
194 | CONFIG_PPP_SYNC_TTY=m | ||
195 | CONFIG_PPP_DEFLATE=m | ||
196 | CONFIG_PPP_BSDCOMP=m | 264 | CONFIG_PPP_BSDCOMP=m |
265 | CONFIG_PPP_DEFLATE=m | ||
266 | CONFIG_PPP_FILTER=y | ||
197 | CONFIG_PPP_MPPE=m | 267 | CONFIG_PPP_MPPE=m |
198 | CONFIG_PPPOE=m | 268 | CONFIG_PPPOE=m |
269 | CONFIG_PPTP=m | ||
270 | CONFIG_PPPOL2TP=m | ||
271 | CONFIG_PPP_ASYNC=m | ||
272 | CONFIG_PPP_SYNC_TTY=m | ||
199 | CONFIG_SLIP=m | 273 | CONFIG_SLIP=m |
200 | CONFIG_SLIP_COMPRESSED=y | 274 | CONFIG_SLIP_COMPRESSED=y |
201 | CONFIG_SLIP_SMART=y | 275 | CONFIG_SLIP_SMART=y |
202 | CONFIG_SLIP_MODE_SLIP6=y | 276 | CONFIG_SLIP_MODE_SLIP6=y |
203 | CONFIG_NETCONSOLE=m | 277 | # CONFIG_WLAN is not set |
204 | CONFIG_NETCONSOLE_DYNAMIC=y | 278 | CONFIG_INPUT_EVDEV=m |
205 | CONFIG_INPUT_FF_MEMLESS=m | ||
206 | # CONFIG_KEYBOARD_ATKBD is not set | 279 | # CONFIG_KEYBOARD_ATKBD is not set |
207 | CONFIG_MOUSE_PS2=m | 280 | # CONFIG_MOUSE_PS2 is not set |
208 | CONFIG_MOUSE_SERIAL=m | 281 | CONFIG_MOUSE_SERIAL=m |
209 | CONFIG_INPUT_MISC=y | 282 | CONFIG_INPUT_MISC=y |
210 | CONFIG_HP_SDC_RTC=m | 283 | CONFIG_HP_SDC_RTC=m |
211 | # CONFIG_SERIO_SERPORT is not set | 284 | CONFIG_SERIO_SERPORT=m |
212 | CONFIG_VT_HW_CONSOLE_BINDING=y | 285 | CONFIG_VT_HW_CONSOLE_BINDING=y |
286 | # CONFIG_LEGACY_PTYS is not set | ||
213 | # CONFIG_DEVKMEM is not set | 287 | # CONFIG_DEVKMEM is not set |
214 | # CONFIG_HW_RANDOM is not set | 288 | # CONFIG_HW_RANDOM is not set |
215 | CONFIG_GEN_RTC=m | 289 | CONFIG_NTP_PPS=y |
216 | CONFIG_GEN_RTC_X=y | 290 | CONFIG_PPS_CLIENT_LDISC=m |
291 | CONFIG_PTP_1588_CLOCK=m | ||
217 | # CONFIG_HWMON is not set | 292 | # CONFIG_HWMON is not set |
218 | CONFIG_FB=y | 293 | CONFIG_FB=y |
219 | CONFIG_FRAMEBUFFER_CONSOLE=y | 294 | CONFIG_FRAMEBUFFER_CONSOLE=y |
@@ -222,47 +297,60 @@ CONFIG_LOGO=y | |||
222 | # CONFIG_LOGO_LINUX_VGA16 is not set | 297 | # CONFIG_LOGO_LINUX_VGA16 is not set |
223 | CONFIG_HID=m | 298 | CONFIG_HID=m |
224 | CONFIG_HIDRAW=y | 299 | CONFIG_HIDRAW=y |
300 | CONFIG_UHID=m | ||
301 | # CONFIG_HID_GENERIC is not set | ||
225 | # CONFIG_USB_SUPPORT is not set | 302 | # CONFIG_USB_SUPPORT is not set |
303 | CONFIG_RTC_CLASS=y | ||
304 | CONFIG_RTC_DRV_GENERIC=m | ||
305 | # CONFIG_IOMMU_SUPPORT is not set | ||
306 | CONFIG_PROC_HARDWARE=y | ||
226 | CONFIG_EXT2_FS=y | 307 | CONFIG_EXT2_FS=y |
227 | CONFIG_EXT3_FS=y | 308 | CONFIG_EXT3_FS=y |
228 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 309 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
229 | # CONFIG_EXT3_FS_XATTR is not set | 310 | # CONFIG_EXT3_FS_XATTR is not set |
311 | CONFIG_EXT4_FS=y | ||
230 | CONFIG_REISERFS_FS=m | 312 | CONFIG_REISERFS_FS=m |
231 | CONFIG_JFS_FS=m | 313 | CONFIG_JFS_FS=m |
232 | CONFIG_XFS_FS=m | 314 | CONFIG_XFS_FS=m |
233 | CONFIG_OCFS2_FS=m | 315 | CONFIG_OCFS2_FS=m |
234 | # CONFIG_OCFS2_FS_STATS is not set | ||
235 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 316 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
317 | CONFIG_FANOTIFY=y | ||
236 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 318 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
237 | # CONFIG_PRINT_QUOTA_WARNING is not set | 319 | # CONFIG_PRINT_QUOTA_WARNING is not set |
238 | CONFIG_AUTOFS_FS=m | ||
239 | CONFIG_AUTOFS4_FS=m | 320 | CONFIG_AUTOFS4_FS=m |
240 | CONFIG_FUSE_FS=m | 321 | CONFIG_FUSE_FS=m |
322 | CONFIG_CUSE=m | ||
241 | CONFIG_ISO9660_FS=y | 323 | CONFIG_ISO9660_FS=y |
242 | CONFIG_JOLIET=y | 324 | CONFIG_JOLIET=y |
243 | CONFIG_ZISOFS=y | 325 | CONFIG_ZISOFS=y |
244 | CONFIG_UDF_FS=m | 326 | CONFIG_UDF_FS=m |
245 | CONFIG_MSDOS_FS=y | 327 | CONFIG_MSDOS_FS=m |
246 | CONFIG_VFAT_FS=m | 328 | CONFIG_VFAT_FS=m |
247 | CONFIG_PROC_KCORE=y | 329 | CONFIG_PROC_KCORE=y |
248 | CONFIG_TMPFS=y | 330 | CONFIG_TMPFS=y |
249 | CONFIG_AFFS_FS=m | 331 | CONFIG_AFFS_FS=m |
332 | CONFIG_ECRYPT_FS=m | ||
333 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
250 | CONFIG_HFS_FS=m | 334 | CONFIG_HFS_FS=m |
251 | CONFIG_HFSPLUS_FS=m | 335 | CONFIG_HFSPLUS_FS=m |
252 | CONFIG_CRAMFS=m | 336 | CONFIG_CRAMFS=m |
253 | CONFIG_SQUASHFS=m | 337 | CONFIG_SQUASHFS=m |
254 | CONFIG_MINIX_FS=y | 338 | CONFIG_SQUASHFS_LZO=y |
339 | CONFIG_MINIX_FS=m | ||
340 | CONFIG_OMFS_FS=m | ||
255 | CONFIG_HPFS_FS=m | 341 | CONFIG_HPFS_FS=m |
342 | CONFIG_QNX4FS_FS=m | ||
343 | CONFIG_QNX6FS_FS=m | ||
256 | CONFIG_SYSV_FS=m | 344 | CONFIG_SYSV_FS=m |
257 | CONFIG_UFS_FS=m | 345 | CONFIG_UFS_FS=m |
258 | CONFIG_NFS_FS=y | 346 | CONFIG_NFS_FS=y |
259 | CONFIG_NFS_V3=y | ||
260 | CONFIG_NFS_V4=y | 347 | CONFIG_NFS_V4=y |
348 | CONFIG_NFS_SWAP=y | ||
261 | CONFIG_ROOT_NFS=y | 349 | CONFIG_ROOT_NFS=y |
262 | CONFIG_NFSD=m | 350 | CONFIG_NFSD=m |
263 | CONFIG_NFSD_V3=y | 351 | CONFIG_NFSD_V3=y |
264 | CONFIG_SMB_FS=m | 352 | CONFIG_CIFS=m |
265 | CONFIG_SMB_NLS_DEFAULT=y | 353 | # CONFIG_CIFS_DEBUG is not set |
266 | CONFIG_CODA_FS=m | 354 | CONFIG_CODA_FS=m |
267 | CONFIG_NLS_CODEPAGE_437=y | 355 | CONFIG_NLS_CODEPAGE_437=y |
268 | CONFIG_NLS_CODEPAGE_737=m | 356 | CONFIG_NLS_CODEPAGE_737=m |
@@ -301,10 +389,23 @@ CONFIG_NLS_ISO8859_14=m | |||
301 | CONFIG_NLS_ISO8859_15=m | 389 | CONFIG_NLS_ISO8859_15=m |
302 | CONFIG_NLS_KOI8_R=m | 390 | CONFIG_NLS_KOI8_R=m |
303 | CONFIG_NLS_KOI8_U=m | 391 | CONFIG_NLS_KOI8_U=m |
392 | CONFIG_NLS_MAC_ROMAN=m | ||
393 | CONFIG_NLS_MAC_CELTIC=m | ||
394 | CONFIG_NLS_MAC_CENTEURO=m | ||
395 | CONFIG_NLS_MAC_CROATIAN=m | ||
396 | CONFIG_NLS_MAC_CYRILLIC=m | ||
397 | CONFIG_NLS_MAC_GAELIC=m | ||
398 | CONFIG_NLS_MAC_GREEK=m | ||
399 | CONFIG_NLS_MAC_ICELAND=m | ||
400 | CONFIG_NLS_MAC_INUIT=m | ||
401 | CONFIG_NLS_MAC_ROMANIAN=m | ||
402 | CONFIG_NLS_MAC_TURKISH=m | ||
304 | CONFIG_DLM=m | 403 | CONFIG_DLM=m |
305 | CONFIG_MAGIC_SYSRQ=y | 404 | CONFIG_MAGIC_SYSRQ=y |
306 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 405 | CONFIG_ASYNC_RAID6_TEST=m |
307 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 406 | CONFIG_ENCRYPTED_KEYS=m |
407 | CONFIG_CRYPTO_MANAGER=y | ||
408 | CONFIG_CRYPTO_USER=m | ||
308 | CONFIG_CRYPTO_NULL=m | 409 | CONFIG_CRYPTO_NULL=m |
309 | CONFIG_CRYPTO_CRYPTD=m | 410 | CONFIG_CRYPTO_CRYPTD=m |
310 | CONFIG_CRYPTO_TEST=m | 411 | CONFIG_CRYPTO_TEST=m |
@@ -314,19 +415,16 @@ CONFIG_CRYPTO_CTS=m | |||
314 | CONFIG_CRYPTO_LRW=m | 415 | CONFIG_CRYPTO_LRW=m |
315 | CONFIG_CRYPTO_PCBC=m | 416 | CONFIG_CRYPTO_PCBC=m |
316 | CONFIG_CRYPTO_XTS=m | 417 | CONFIG_CRYPTO_XTS=m |
317 | CONFIG_CRYPTO_HMAC=y | ||
318 | CONFIG_CRYPTO_XCBC=m | 418 | CONFIG_CRYPTO_XCBC=m |
319 | CONFIG_CRYPTO_MD4=m | 419 | CONFIG_CRYPTO_VMAC=m |
320 | CONFIG_CRYPTO_MICHAEL_MIC=m | 420 | CONFIG_CRYPTO_MICHAEL_MIC=m |
321 | CONFIG_CRYPTO_RMD128=m | 421 | CONFIG_CRYPTO_RMD128=m |
322 | CONFIG_CRYPTO_RMD160=m | 422 | CONFIG_CRYPTO_RMD160=m |
323 | CONFIG_CRYPTO_RMD256=m | 423 | CONFIG_CRYPTO_RMD256=m |
324 | CONFIG_CRYPTO_RMD320=m | 424 | CONFIG_CRYPTO_RMD320=m |
325 | CONFIG_CRYPTO_SHA256=m | ||
326 | CONFIG_CRYPTO_SHA512=m | 425 | CONFIG_CRYPTO_SHA512=m |
327 | CONFIG_CRYPTO_TGR192=m | 426 | CONFIG_CRYPTO_TGR192=m |
328 | CONFIG_CRYPTO_WP512=m | 427 | CONFIG_CRYPTO_WP512=m |
329 | CONFIG_CRYPTO_AES=m | ||
330 | CONFIG_CRYPTO_ANUBIS=m | 428 | CONFIG_CRYPTO_ANUBIS=m |
331 | CONFIG_CRYPTO_BLOWFISH=m | 429 | CONFIG_CRYPTO_BLOWFISH=m |
332 | CONFIG_CRYPTO_CAMELLIA=m | 430 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -342,6 +440,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
342 | CONFIG_CRYPTO_ZLIB=m | 440 | CONFIG_CRYPTO_ZLIB=m |
343 | CONFIG_CRYPTO_LZO=m | 441 | CONFIG_CRYPTO_LZO=m |
344 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 442 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
443 | CONFIG_CRYPTO_USER_API_HASH=m | ||
444 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
345 | # CONFIG_CRYPTO_HW is not set | 445 | # CONFIG_CRYPTO_HW is not set |
346 | CONFIG_CRC16=m | ||
347 | CONFIG_CRC_T10DIF=y | 446 | CONFIG_CRC_T10DIF=y |
447 | CONFIG_XZ_DEC_X86=y | ||
448 | CONFIG_XZ_DEC_POWERPC=y | ||
449 | CONFIG_XZ_DEC_IA64=y | ||
450 | CONFIG_XZ_DEC_ARM=y | ||
451 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
452 | CONFIG_XZ_DEC_SPARC=y | ||
453 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index cb9dfb30b674..7d46fbec7042 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -1,49 +1,75 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-mac" | 1 | CONFIG_LOCALVERSION="-mac" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_MAC=y | 16 | CONFIG_PARTITION_ADVANCED=y |
17 | CONFIG_AMIGA_PARTITION=y | ||
18 | CONFIG_ATARI_PARTITION=y | ||
19 | CONFIG_BSD_DISKLABEL=y | ||
20 | CONFIG_MINIX_SUBPARTITION=y | ||
21 | CONFIG_SOLARIS_X86_PARTITION=y | ||
22 | CONFIG_UNIXWARE_DISKLABEL=y | ||
23 | CONFIG_SUN_PARTITION=y | ||
24 | # CONFIG_EFI_PARTITION is not set | ||
25 | CONFIG_SYSV68_PARTITION=y | ||
26 | CONFIG_IOSCHED_DEADLINE=m | ||
14 | CONFIG_M68020=y | 27 | CONFIG_M68020=y |
15 | CONFIG_M68030=y | 28 | CONFIG_M68030=y |
16 | CONFIG_M68040=y | 29 | CONFIG_M68040=y |
30 | CONFIG_M68KFPU_EMU=y | ||
31 | CONFIG_MAC=y | ||
32 | # CONFIG_COMPACTION is not set | ||
33 | CONFIG_CLEANCACHE=y | ||
34 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
17 | CONFIG_BINFMT_AOUT=m | 35 | CONFIG_BINFMT_AOUT=m |
18 | CONFIG_BINFMT_MISC=m | 36 | CONFIG_BINFMT_MISC=m |
19 | CONFIG_PROC_HARDWARE=y | ||
20 | CONFIG_NET=y | 37 | CONFIG_NET=y |
21 | CONFIG_PACKET=y | 38 | CONFIG_PACKET=y |
39 | CONFIG_PACKET_DIAG=m | ||
22 | CONFIG_UNIX=y | 40 | CONFIG_UNIX=y |
41 | CONFIG_UNIX_DIAG=m | ||
42 | CONFIG_XFRM_MIGRATE=y | ||
23 | CONFIG_NET_KEY=y | 43 | CONFIG_NET_KEY=y |
24 | CONFIG_NET_KEY_MIGRATE=y | ||
25 | CONFIG_INET=y | 44 | CONFIG_INET=y |
45 | CONFIG_IP_PNP=y | ||
46 | CONFIG_IP_PNP_DHCP=y | ||
47 | CONFIG_IP_PNP_BOOTP=y | ||
48 | CONFIG_IP_PNP_RARP=y | ||
26 | CONFIG_NET_IPIP=m | 49 | CONFIG_NET_IPIP=m |
50 | CONFIG_NET_IPGRE_DEMUX=m | ||
27 | CONFIG_NET_IPGRE=m | 51 | CONFIG_NET_IPGRE=m |
28 | CONFIG_SYN_COOKIES=y | 52 | CONFIG_SYN_COOKIES=y |
53 | CONFIG_NET_IPVTI=m | ||
29 | CONFIG_INET_AH=m | 54 | CONFIG_INET_AH=m |
30 | CONFIG_INET_ESP=m | 55 | CONFIG_INET_ESP=m |
31 | CONFIG_INET_IPCOMP=m | 56 | CONFIG_INET_IPCOMP=m |
32 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 57 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
33 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 58 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
34 | CONFIG_INET_XFRM_MODE_BEET=m | 59 | CONFIG_INET_XFRM_MODE_BEET=m |
60 | # CONFIG_INET_LRO is not set | ||
35 | CONFIG_INET_DIAG=m | 61 | CONFIG_INET_DIAG=m |
62 | CONFIG_INET_UDP_DIAG=m | ||
36 | CONFIG_IPV6_PRIVACY=y | 63 | CONFIG_IPV6_PRIVACY=y |
37 | CONFIG_IPV6_ROUTER_PREF=y | 64 | CONFIG_IPV6_ROUTER_PREF=y |
38 | CONFIG_IPV6_ROUTE_INFO=y | ||
39 | CONFIG_INET6_AH=m | 65 | CONFIG_INET6_AH=m |
40 | CONFIG_INET6_ESP=m | 66 | CONFIG_INET6_ESP=m |
41 | CONFIG_INET6_IPCOMP=m | 67 | CONFIG_INET6_IPCOMP=m |
42 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 68 | CONFIG_IPV6_GRE=m |
43 | CONFIG_IPV6_TUNNEL=m | ||
44 | CONFIG_NETFILTER=y | 69 | CONFIG_NETFILTER=y |
45 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
46 | CONFIG_NF_CONNTRACK=m | 70 | CONFIG_NF_CONNTRACK=m |
71 | CONFIG_NF_CONNTRACK_ZONES=y | ||
72 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
47 | # CONFIG_NF_CT_PROTO_DCCP is not set | 73 | # CONFIG_NF_CT_PROTO_DCCP is not set |
48 | CONFIG_NF_CT_PROTO_UDPLITE=m | 74 | CONFIG_NF_CT_PROTO_UDPLITE=m |
49 | CONFIG_NF_CONNTRACK_AMANDA=m | 75 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -51,25 +77,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
51 | CONFIG_NF_CONNTRACK_H323=m | 77 | CONFIG_NF_CONNTRACK_H323=m |
52 | CONFIG_NF_CONNTRACK_IRC=m | 78 | CONFIG_NF_CONNTRACK_IRC=m |
53 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 79 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
80 | CONFIG_NF_CONNTRACK_SNMP=m | ||
54 | CONFIG_NF_CONNTRACK_PPTP=m | 81 | CONFIG_NF_CONNTRACK_PPTP=m |
55 | CONFIG_NF_CONNTRACK_SANE=m | 82 | CONFIG_NF_CONNTRACK_SANE=m |
56 | CONFIG_NF_CONNTRACK_SIP=m | 83 | CONFIG_NF_CONNTRACK_SIP=m |
57 | CONFIG_NF_CONNTRACK_TFTP=m | 84 | CONFIG_NF_CONNTRACK_TFTP=m |
85 | CONFIG_NETFILTER_XT_SET=m | ||
86 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
58 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 87 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
59 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 88 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
60 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 89 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
90 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
91 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
92 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
61 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 93 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
62 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
63 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 95 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
96 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
97 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
64 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 98 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
65 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
66 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 100 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
101 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
102 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
67 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 103 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
68 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 104 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
69 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
106 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
70 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
71 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
72 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 109 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
110 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
73 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 111 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
74 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 112 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
75 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 113 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -80,6 +118,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
80 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 118 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
81 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 119 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
82 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 120 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
121 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
122 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
83 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 123 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
84 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 124 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
85 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 125 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -93,22 +133,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
93 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 133 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
94 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 134 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
95 | CONFIG_NETFILTER_XT_MATCH_U32=m | 135 | CONFIG_NETFILTER_XT_MATCH_U32=m |
136 | CONFIG_IP_SET=m | ||
137 | CONFIG_IP_SET_BITMAP_IP=m | ||
138 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
139 | CONFIG_IP_SET_BITMAP_PORT=m | ||
140 | CONFIG_IP_SET_HASH_IP=m | ||
141 | CONFIG_IP_SET_HASH_IPPORT=m | ||
142 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
143 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
144 | CONFIG_IP_SET_HASH_NET=m | ||
145 | CONFIG_IP_SET_HASH_NETPORT=m | ||
146 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
147 | CONFIG_IP_SET_LIST_SET=m | ||
96 | CONFIG_NF_CONNTRACK_IPV4=m | 148 | CONFIG_NF_CONNTRACK_IPV4=m |
97 | CONFIG_IP_NF_QUEUE=m | ||
98 | CONFIG_IP_NF_IPTABLES=m | 149 | CONFIG_IP_NF_IPTABLES=m |
99 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
100 | CONFIG_IP_NF_MATCH_AH=m | 150 | CONFIG_IP_NF_MATCH_AH=m |
101 | CONFIG_IP_NF_MATCH_ECN=m | 151 | CONFIG_IP_NF_MATCH_ECN=m |
152 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
102 | CONFIG_IP_NF_MATCH_TTL=m | 153 | CONFIG_IP_NF_MATCH_TTL=m |
103 | CONFIG_IP_NF_FILTER=m | 154 | CONFIG_IP_NF_FILTER=m |
104 | CONFIG_IP_NF_TARGET_REJECT=m | 155 | CONFIG_IP_NF_TARGET_REJECT=m |
105 | CONFIG_IP_NF_TARGET_LOG=m | ||
106 | CONFIG_IP_NF_TARGET_ULOG=m | 156 | CONFIG_IP_NF_TARGET_ULOG=m |
107 | CONFIG_NF_NAT=m | 157 | CONFIG_NF_NAT_IPV4=m |
108 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 158 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
109 | CONFIG_IP_NF_TARGET_NETMAP=m | 159 | CONFIG_IP_NF_TARGET_NETMAP=m |
110 | CONFIG_IP_NF_TARGET_REDIRECT=m | 160 | CONFIG_IP_NF_TARGET_REDIRECT=m |
111 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
112 | CONFIG_IP_NF_MANGLE=m | 161 | CONFIG_IP_NF_MANGLE=m |
113 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 162 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
114 | CONFIG_IP_NF_TARGET_ECN=m | 163 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -118,7 +167,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
118 | CONFIG_IP_NF_ARPFILTER=m | 167 | CONFIG_IP_NF_ARPFILTER=m |
119 | CONFIG_IP_NF_ARP_MANGLE=m | 168 | CONFIG_IP_NF_ARP_MANGLE=m |
120 | CONFIG_NF_CONNTRACK_IPV6=m | 169 | CONFIG_NF_CONNTRACK_IPV6=m |
121 | CONFIG_IP6_NF_QUEUE=m | ||
122 | CONFIG_IP6_NF_IPTABLES=m | 170 | CONFIG_IP6_NF_IPTABLES=m |
123 | CONFIG_IP6_NF_MATCH_AH=m | 171 | CONFIG_IP6_NF_MATCH_AH=m |
124 | CONFIG_IP6_NF_MATCH_EUI64=m | 172 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -127,31 +175,45 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
127 | CONFIG_IP6_NF_MATCH_HL=m | 175 | CONFIG_IP6_NF_MATCH_HL=m |
128 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 176 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
129 | CONFIG_IP6_NF_MATCH_MH=m | 177 | CONFIG_IP6_NF_MATCH_MH=m |
178 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
130 | CONFIG_IP6_NF_MATCH_RT=m | 179 | CONFIG_IP6_NF_MATCH_RT=m |
131 | CONFIG_IP6_NF_TARGET_HL=m | 180 | CONFIG_IP6_NF_TARGET_HL=m |
132 | CONFIG_IP6_NF_TARGET_LOG=m | ||
133 | CONFIG_IP6_NF_FILTER=m | 181 | CONFIG_IP6_NF_FILTER=m |
134 | CONFIG_IP6_NF_TARGET_REJECT=m | 182 | CONFIG_IP6_NF_TARGET_REJECT=m |
135 | CONFIG_IP6_NF_MANGLE=m | 183 | CONFIG_IP6_NF_MANGLE=m |
136 | CONFIG_IP6_NF_RAW=m | 184 | CONFIG_IP6_NF_RAW=m |
185 | CONFIG_NF_NAT_IPV6=m | ||
186 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
187 | CONFIG_IP6_NF_TARGET_NPT=m | ||
137 | CONFIG_IP_DCCP=m | 188 | CONFIG_IP_DCCP=m |
138 | # CONFIG_IP_DCCP_CCID3 is not set | 189 | # CONFIG_IP_DCCP_CCID3 is not set |
190 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
191 | CONFIG_RDS=m | ||
192 | CONFIG_RDS_TCP=m | ||
193 | CONFIG_L2TP=m | ||
139 | CONFIG_ATALK=m | 194 | CONFIG_ATALK=m |
140 | CONFIG_DEV_APPLETALK=m | 195 | CONFIG_DEV_APPLETALK=m |
141 | CONFIG_IPDDP=m | 196 | CONFIG_IPDDP=m |
142 | CONFIG_IPDDP_ENCAP=y | 197 | CONFIG_IPDDP_ENCAP=y |
143 | CONFIG_IPDDP_DECAP=y | 198 | CONFIG_IPDDP_DECAP=y |
199 | CONFIG_BATMAN_ADV=m | ||
200 | CONFIG_BATMAN_ADV_DAT=y | ||
201 | # CONFIG_WIRELESS is not set | ||
144 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 202 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
203 | CONFIG_DEVTMPFS=y | ||
145 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 204 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
205 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
146 | CONFIG_CONNECTOR=m | 206 | CONFIG_CONNECTOR=m |
147 | CONFIG_BLK_DEV_SWIM=y | 207 | CONFIG_BLK_DEV_SWIM=m |
148 | CONFIG_BLK_DEV_LOOP=y | 208 | CONFIG_BLK_DEV_LOOP=y |
149 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 209 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
210 | CONFIG_BLK_DEV_DRBD=m | ||
150 | CONFIG_BLK_DEV_NBD=m | 211 | CONFIG_BLK_DEV_NBD=m |
151 | CONFIG_BLK_DEV_RAM=y | 212 | CONFIG_BLK_DEV_RAM=y |
152 | CONFIG_CDROM_PKTCDVD=m | 213 | CONFIG_CDROM_PKTCDVD=m |
153 | CONFIG_ATA_OVER_ETH=m | 214 | CONFIG_ATA_OVER_ETH=m |
154 | CONFIG_IDE=y | 215 | CONFIG_IDE=y |
216 | CONFIG_IDE_GD_ATAPI=y | ||
155 | CONFIG_BLK_DEV_IDECD=y | 217 | CONFIG_BLK_DEV_IDECD=y |
156 | CONFIG_BLK_DEV_MAC_IDE=y | 218 | CONFIG_BLK_DEV_MAC_IDE=y |
157 | CONFIG_RAID_ATTRS=m | 219 | CONFIG_RAID_ATTRS=m |
@@ -164,29 +226,30 @@ CONFIG_BLK_DEV_SR=y | |||
164 | CONFIG_BLK_DEV_SR_VENDOR=y | 226 | CONFIG_BLK_DEV_SR_VENDOR=y |
165 | CONFIG_CHR_DEV_SG=m | 227 | CONFIG_CHR_DEV_SG=m |
166 | CONFIG_SCSI_CONSTANTS=y | 228 | CONFIG_SCSI_CONSTANTS=y |
167 | CONFIG_SCSI_SAS_LIBSAS=m | 229 | CONFIG_SCSI_SAS_ATTRS=m |
168 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
169 | CONFIG_SCSI_SRP_ATTRS=m | ||
170 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
171 | CONFIG_ISCSI_TCP=m | 230 | CONFIG_ISCSI_TCP=m |
231 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
172 | CONFIG_MAC_SCSI=y | 232 | CONFIG_MAC_SCSI=y |
173 | CONFIG_SCSI_MAC_ESP=y | 233 | CONFIG_SCSI_MAC_ESP=y |
174 | CONFIG_MD=y | 234 | CONFIG_MD=y |
175 | CONFIG_BLK_DEV_MD=m | ||
176 | CONFIG_MD_LINEAR=m | 235 | CONFIG_MD_LINEAR=m |
177 | CONFIG_MD_RAID0=m | 236 | CONFIG_MD_RAID0=m |
178 | CONFIG_MD_RAID1=m | ||
179 | CONFIG_MD_RAID456=m | ||
180 | CONFIG_BLK_DEV_DM=m | 237 | CONFIG_BLK_DEV_DM=m |
181 | CONFIG_DM_CRYPT=m | 238 | CONFIG_DM_CRYPT=m |
182 | CONFIG_DM_SNAPSHOT=m | 239 | CONFIG_DM_SNAPSHOT=m |
240 | CONFIG_DM_THIN_PROVISIONING=m | ||
241 | CONFIG_DM_CACHE=m | ||
183 | CONFIG_DM_MIRROR=m | 242 | CONFIG_DM_MIRROR=m |
243 | CONFIG_DM_RAID=m | ||
184 | CONFIG_DM_ZERO=m | 244 | CONFIG_DM_ZERO=m |
185 | CONFIG_DM_MULTIPATH=m | 245 | CONFIG_DM_MULTIPATH=m |
186 | CONFIG_DM_UEVENT=y | 246 | CONFIG_DM_UEVENT=y |
247 | CONFIG_TARGET_CORE=m | ||
248 | CONFIG_TCM_IBLOCK=m | ||
249 | CONFIG_TCM_FILEIO=m | ||
250 | CONFIG_TCM_PSCSI=m | ||
187 | CONFIG_ADB=y | 251 | CONFIG_ADB=y |
188 | CONFIG_ADB_MACII=y | 252 | CONFIG_ADB_MACII=y |
189 | CONFIG_ADB_MACIISI=y | ||
190 | CONFIG_ADB_IOP=y | 253 | CONFIG_ADB_IOP=y |
191 | CONFIG_ADB_PMU68K=y | 254 | CONFIG_ADB_PMU68K=y |
192 | CONFIG_ADB_CUDA=y | 255 | CONFIG_ADB_CUDA=y |
@@ -194,46 +257,61 @@ CONFIG_INPUT_ADBHID=y | |||
194 | CONFIG_MAC_EMUMOUSEBTN=y | 257 | CONFIG_MAC_EMUMOUSEBTN=y |
195 | CONFIG_NETDEVICES=y | 258 | CONFIG_NETDEVICES=y |
196 | CONFIG_DUMMY=m | 259 | CONFIG_DUMMY=m |
197 | CONFIG_MACVLAN=m | ||
198 | CONFIG_EQUALIZER=m | 260 | CONFIG_EQUALIZER=m |
261 | CONFIG_NET_TEAM=m | ||
262 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
263 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
264 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
265 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
266 | CONFIG_VXLAN=m | ||
267 | CONFIG_NETCONSOLE=m | ||
268 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
199 | CONFIG_VETH=m | 269 | CONFIG_VETH=m |
200 | CONFIG_NET_ETHERNET=y | ||
201 | CONFIG_MAC8390=y | ||
202 | CONFIG_MAC89x0=m | ||
203 | CONFIG_MACSONIC=m | ||
204 | CONFIG_MACMACE=y | 270 | CONFIG_MACMACE=y |
205 | # CONFIG_NETDEV_1000 is not set | 271 | # CONFIG_NET_CADENCE is not set |
206 | # CONFIG_NETDEV_10000 is not set | 272 | # CONFIG_NET_VENDOR_BROADCOM is not set |
273 | CONFIG_MAC89x0=y | ||
274 | # CONFIG_NET_VENDOR_INTEL is not set | ||
275 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
276 | # CONFIG_NET_VENDOR_MICREL is not set | ||
277 | CONFIG_MACSONIC=y | ||
278 | CONFIG_MAC8390=y | ||
279 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
280 | # CONFIG_NET_VENDOR_SMSC is not set | ||
281 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
282 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
207 | CONFIG_PPP=m | 283 | CONFIG_PPP=m |
208 | CONFIG_PPP_FILTER=y | ||
209 | CONFIG_PPP_ASYNC=m | ||
210 | CONFIG_PPP_SYNC_TTY=m | ||
211 | CONFIG_PPP_DEFLATE=m | ||
212 | CONFIG_PPP_BSDCOMP=m | 284 | CONFIG_PPP_BSDCOMP=m |
285 | CONFIG_PPP_DEFLATE=m | ||
286 | CONFIG_PPP_FILTER=y | ||
213 | CONFIG_PPP_MPPE=m | 287 | CONFIG_PPP_MPPE=m |
214 | CONFIG_PPPOE=m | 288 | CONFIG_PPPOE=m |
289 | CONFIG_PPTP=m | ||
290 | CONFIG_PPPOL2TP=m | ||
291 | CONFIG_PPP_ASYNC=m | ||
292 | CONFIG_PPP_SYNC_TTY=m | ||
215 | CONFIG_SLIP=m | 293 | CONFIG_SLIP=m |
216 | CONFIG_SLIP_COMPRESSED=y | 294 | CONFIG_SLIP_COMPRESSED=y |
217 | CONFIG_SLIP_SMART=y | 295 | CONFIG_SLIP_SMART=y |
218 | CONFIG_SLIP_MODE_SLIP6=y | 296 | CONFIG_SLIP_MODE_SLIP6=y |
219 | CONFIG_NETCONSOLE=m | 297 | # CONFIG_WLAN is not set |
220 | CONFIG_NETCONSOLE_DYNAMIC=y | 298 | CONFIG_INPUT_EVDEV=m |
221 | CONFIG_INPUT_FF_MEMLESS=m | ||
222 | # CONFIG_KEYBOARD_ATKBD is not set | 299 | # CONFIG_KEYBOARD_ATKBD is not set |
223 | CONFIG_MOUSE_PS2=m | 300 | # CONFIG_MOUSE_PS2 is not set |
224 | CONFIG_MOUSE_SERIAL=m | 301 | CONFIG_MOUSE_SERIAL=m |
225 | CONFIG_INPUT_MISC=y | 302 | CONFIG_INPUT_MISC=y |
226 | CONFIG_INPUT_M68K_BEEP=m | 303 | CONFIG_INPUT_M68K_BEEP=m |
227 | CONFIG_SERIO=m | 304 | CONFIG_SERIO=m |
228 | # CONFIG_SERIO_SERPORT is not set | ||
229 | CONFIG_VT_HW_CONSOLE_BINDING=y | 305 | CONFIG_VT_HW_CONSOLE_BINDING=y |
306 | # CONFIG_LEGACY_PTYS is not set | ||
230 | # CONFIG_DEVKMEM is not set | 307 | # CONFIG_DEVKMEM is not set |
231 | CONFIG_SERIAL_PMACZILOG=y | 308 | CONFIG_SERIAL_PMACZILOG=y |
232 | CONFIG_SERIAL_PMACZILOG_TTYS=y | 309 | CONFIG_SERIAL_PMACZILOG_TTYS=y |
233 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y | 310 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y |
234 | # CONFIG_HW_RANDOM is not set | 311 | # CONFIG_HW_RANDOM is not set |
235 | CONFIG_GEN_RTC=m | 312 | CONFIG_NTP_PPS=y |
236 | CONFIG_GEN_RTC_X=y | 313 | CONFIG_PPS_CLIENT_LDISC=m |
314 | CONFIG_PTP_1588_CLOCK=m | ||
237 | # CONFIG_HWMON is not set | 315 | # CONFIG_HWMON is not set |
238 | CONFIG_FB=y | 316 | CONFIG_FB=y |
239 | CONFIG_FB_VALKYRIE=y | 317 | CONFIG_FB_VALKYRIE=y |
@@ -242,46 +320,60 @@ CONFIG_FRAMEBUFFER_CONSOLE=y | |||
242 | CONFIG_LOGO=y | 320 | CONFIG_LOGO=y |
243 | CONFIG_HID=m | 321 | CONFIG_HID=m |
244 | CONFIG_HIDRAW=y | 322 | CONFIG_HIDRAW=y |
323 | CONFIG_UHID=m | ||
324 | # CONFIG_HID_GENERIC is not set | ||
245 | # CONFIG_USB_SUPPORT is not set | 325 | # CONFIG_USB_SUPPORT is not set |
326 | CONFIG_RTC_CLASS=y | ||
327 | CONFIG_RTC_DRV_GENERIC=m | ||
328 | # CONFIG_IOMMU_SUPPORT is not set | ||
329 | CONFIG_PROC_HARDWARE=y | ||
246 | CONFIG_EXT2_FS=y | 330 | CONFIG_EXT2_FS=y |
247 | CONFIG_EXT3_FS=y | 331 | CONFIG_EXT3_FS=y |
248 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 332 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
249 | # CONFIG_EXT3_FS_XATTR is not set | 333 | # CONFIG_EXT3_FS_XATTR is not set |
334 | CONFIG_EXT4_FS=y | ||
250 | CONFIG_REISERFS_FS=m | 335 | CONFIG_REISERFS_FS=m |
251 | CONFIG_JFS_FS=m | 336 | CONFIG_JFS_FS=m |
252 | CONFIG_XFS_FS=m | 337 | CONFIG_XFS_FS=m |
253 | CONFIG_OCFS2_FS=m | 338 | CONFIG_OCFS2_FS=m |
254 | # CONFIG_OCFS2_FS_STATS is not set | ||
255 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 339 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
340 | CONFIG_FANOTIFY=y | ||
256 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 341 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
257 | # CONFIG_PRINT_QUOTA_WARNING is not set | 342 | # CONFIG_PRINT_QUOTA_WARNING is not set |
258 | CONFIG_AUTOFS_FS=m | ||
259 | CONFIG_AUTOFS4_FS=m | 343 | CONFIG_AUTOFS4_FS=m |
260 | CONFIG_FUSE_FS=m | 344 | CONFIG_FUSE_FS=m |
345 | CONFIG_CUSE=m | ||
261 | CONFIG_ISO9660_FS=y | 346 | CONFIG_ISO9660_FS=y |
262 | CONFIG_JOLIET=y | 347 | CONFIG_JOLIET=y |
263 | CONFIG_ZISOFS=y | 348 | CONFIG_ZISOFS=y |
264 | CONFIG_UDF_FS=m | 349 | CONFIG_UDF_FS=m |
265 | CONFIG_MSDOS_FS=y | 350 | CONFIG_MSDOS_FS=m |
266 | CONFIG_VFAT_FS=m | 351 | CONFIG_VFAT_FS=m |
267 | CONFIG_PROC_KCORE=y | 352 | CONFIG_PROC_KCORE=y |
268 | CONFIG_TMPFS=y | 353 | CONFIG_TMPFS=y |
269 | CONFIG_AFFS_FS=m | 354 | CONFIG_AFFS_FS=m |
270 | CONFIG_HFS_FS=y | 355 | CONFIG_ECRYPT_FS=m |
271 | CONFIG_HFSPLUS_FS=y | 356 | CONFIG_ECRYPT_FS_MESSAGING=y |
357 | CONFIG_HFS_FS=m | ||
358 | CONFIG_HFSPLUS_FS=m | ||
272 | CONFIG_CRAMFS=m | 359 | CONFIG_CRAMFS=m |
273 | CONFIG_SQUASHFS=m | 360 | CONFIG_SQUASHFS=m |
274 | CONFIG_MINIX_FS=y | 361 | CONFIG_SQUASHFS_LZO=y |
362 | CONFIG_MINIX_FS=m | ||
363 | CONFIG_OMFS_FS=m | ||
275 | CONFIG_HPFS_FS=m | 364 | CONFIG_HPFS_FS=m |
365 | CONFIG_QNX4FS_FS=m | ||
366 | CONFIG_QNX6FS_FS=m | ||
276 | CONFIG_SYSV_FS=m | 367 | CONFIG_SYSV_FS=m |
277 | CONFIG_UFS_FS=m | 368 | CONFIG_UFS_FS=m |
278 | CONFIG_NFS_FS=m | 369 | CONFIG_NFS_FS=y |
279 | CONFIG_NFS_V3=y | ||
280 | CONFIG_NFS_V4=y | 370 | CONFIG_NFS_V4=y |
371 | CONFIG_NFS_SWAP=y | ||
372 | CONFIG_ROOT_NFS=y | ||
281 | CONFIG_NFSD=m | 373 | CONFIG_NFSD=m |
282 | CONFIG_NFSD_V3=y | 374 | CONFIG_NFSD_V3=y |
283 | CONFIG_SMB_FS=m | 375 | CONFIG_CIFS=m |
284 | CONFIG_SMB_NLS_DEFAULT=y | 376 | # CONFIG_CIFS_DEBUG is not set |
285 | CONFIG_CODA_FS=m | 377 | CONFIG_CODA_FS=m |
286 | CONFIG_NLS_CODEPAGE_437=y | 378 | CONFIG_NLS_CODEPAGE_437=y |
287 | CONFIG_NLS_CODEPAGE_737=m | 379 | CONFIG_NLS_CODEPAGE_737=m |
@@ -320,10 +412,23 @@ CONFIG_NLS_ISO8859_14=m | |||
320 | CONFIG_NLS_ISO8859_15=m | 412 | CONFIG_NLS_ISO8859_15=m |
321 | CONFIG_NLS_KOI8_R=m | 413 | CONFIG_NLS_KOI8_R=m |
322 | CONFIG_NLS_KOI8_U=m | 414 | CONFIG_NLS_KOI8_U=m |
415 | CONFIG_NLS_MAC_ROMAN=m | ||
416 | CONFIG_NLS_MAC_CELTIC=m | ||
417 | CONFIG_NLS_MAC_CENTEURO=m | ||
418 | CONFIG_NLS_MAC_CROATIAN=m | ||
419 | CONFIG_NLS_MAC_CYRILLIC=m | ||
420 | CONFIG_NLS_MAC_GAELIC=m | ||
421 | CONFIG_NLS_MAC_GREEK=m | ||
422 | CONFIG_NLS_MAC_ICELAND=m | ||
423 | CONFIG_NLS_MAC_INUIT=m | ||
424 | CONFIG_NLS_MAC_ROMANIAN=m | ||
425 | CONFIG_NLS_MAC_TURKISH=m | ||
323 | CONFIG_DLM=m | 426 | CONFIG_DLM=m |
324 | CONFIG_MAGIC_SYSRQ=y | 427 | CONFIG_MAGIC_SYSRQ=y |
325 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 428 | CONFIG_ASYNC_RAID6_TEST=m |
326 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 429 | CONFIG_ENCRYPTED_KEYS=m |
430 | CONFIG_CRYPTO_MANAGER=y | ||
431 | CONFIG_CRYPTO_USER=m | ||
327 | CONFIG_CRYPTO_NULL=m | 432 | CONFIG_CRYPTO_NULL=m |
328 | CONFIG_CRYPTO_CRYPTD=m | 433 | CONFIG_CRYPTO_CRYPTD=m |
329 | CONFIG_CRYPTO_TEST=m | 434 | CONFIG_CRYPTO_TEST=m |
@@ -333,19 +438,16 @@ CONFIG_CRYPTO_CTS=m | |||
333 | CONFIG_CRYPTO_LRW=m | 438 | CONFIG_CRYPTO_LRW=m |
334 | CONFIG_CRYPTO_PCBC=m | 439 | CONFIG_CRYPTO_PCBC=m |
335 | CONFIG_CRYPTO_XTS=m | 440 | CONFIG_CRYPTO_XTS=m |
336 | CONFIG_CRYPTO_HMAC=y | ||
337 | CONFIG_CRYPTO_XCBC=m | 441 | CONFIG_CRYPTO_XCBC=m |
338 | CONFIG_CRYPTO_MD4=m | 442 | CONFIG_CRYPTO_VMAC=m |
339 | CONFIG_CRYPTO_MICHAEL_MIC=m | 443 | CONFIG_CRYPTO_MICHAEL_MIC=m |
340 | CONFIG_CRYPTO_RMD128=m | 444 | CONFIG_CRYPTO_RMD128=m |
341 | CONFIG_CRYPTO_RMD160=m | 445 | CONFIG_CRYPTO_RMD160=m |
342 | CONFIG_CRYPTO_RMD256=m | 446 | CONFIG_CRYPTO_RMD256=m |
343 | CONFIG_CRYPTO_RMD320=m | 447 | CONFIG_CRYPTO_RMD320=m |
344 | CONFIG_CRYPTO_SHA256=m | ||
345 | CONFIG_CRYPTO_SHA512=m | 448 | CONFIG_CRYPTO_SHA512=m |
346 | CONFIG_CRYPTO_TGR192=m | 449 | CONFIG_CRYPTO_TGR192=m |
347 | CONFIG_CRYPTO_WP512=m | 450 | CONFIG_CRYPTO_WP512=m |
348 | CONFIG_CRYPTO_AES=m | ||
349 | CONFIG_CRYPTO_ANUBIS=m | 451 | CONFIG_CRYPTO_ANUBIS=m |
350 | CONFIG_CRYPTO_BLOWFISH=m | 452 | CONFIG_CRYPTO_BLOWFISH=m |
351 | CONFIG_CRYPTO_CAMELLIA=m | 453 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -361,6 +463,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
361 | CONFIG_CRYPTO_ZLIB=m | 463 | CONFIG_CRYPTO_ZLIB=m |
362 | CONFIG_CRYPTO_LZO=m | 464 | CONFIG_CRYPTO_LZO=m |
363 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 465 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
466 | CONFIG_CRYPTO_USER_API_HASH=m | ||
467 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
364 | # CONFIG_CRYPTO_HW is not set | 468 | # CONFIG_CRYPTO_HW is not set |
365 | CONFIG_CRC16=m | ||
366 | CONFIG_CRC_T10DIF=y | 469 | CONFIG_CRC_T10DIF=y |
470 | CONFIG_XZ_DEC_X86=y | ||
471 | CONFIG_XZ_DEC_POWERPC=y | ||
472 | CONFIG_XZ_DEC_IA64=y | ||
473 | CONFIG_XZ_DEC_ARM=y | ||
474 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
475 | CONFIG_XZ_DEC_SPARC=y | ||
476 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 8d5def4a31e0..0f795d8e65fa 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -1,15 +1,29 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-multi" | 1 | CONFIG_LOCALVERSION="-multi" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
16 | CONFIG_PARTITION_ADVANCED=y | ||
17 | CONFIG_BSD_DISKLABEL=y | ||
18 | CONFIG_MINIX_SUBPARTITION=y | ||
19 | CONFIG_SOLARIS_X86_PARTITION=y | ||
20 | CONFIG_UNIXWARE_DISKLABEL=y | ||
21 | # CONFIG_EFI_PARTITION is not set | ||
22 | CONFIG_IOSCHED_DEADLINE=m | ||
23 | CONFIG_M68020=y | ||
24 | CONFIG_M68040=y | ||
25 | CONFIG_M68060=y | ||
26 | CONFIG_M68KFPU_EMU=y | ||
13 | CONFIG_AMIGA=y | 27 | CONFIG_AMIGA=y |
14 | CONFIG_ATARI=y | 28 | CONFIG_ATARI=y |
15 | CONFIG_MAC=y | 29 | CONFIG_MAC=y |
@@ -21,48 +35,50 @@ CONFIG_BVME6000=y | |||
21 | CONFIG_HP300=y | 35 | CONFIG_HP300=y |
22 | CONFIG_SUN3X=y | 36 | CONFIG_SUN3X=y |
23 | CONFIG_Q40=y | 37 | CONFIG_Q40=y |
24 | CONFIG_M68020=y | ||
25 | CONFIG_M68040=y | ||
26 | CONFIG_M68060=y | ||
27 | CONFIG_BINFMT_AOUT=m | ||
28 | CONFIG_BINFMT_MISC=m | ||
29 | CONFIG_ZORRO=y | 38 | CONFIG_ZORRO=y |
30 | CONFIG_AMIGA_PCMCIA=y | 39 | CONFIG_AMIGA_PCMCIA=y |
31 | CONFIG_STRAM_PROC=y | ||
32 | CONFIG_HEARTBEAT=y | ||
33 | CONFIG_PROC_HARDWARE=y | ||
34 | CONFIG_ZORRO_NAMES=y | 40 | CONFIG_ZORRO_NAMES=y |
41 | # CONFIG_COMPACTION is not set | ||
42 | CONFIG_CLEANCACHE=y | ||
43 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
44 | CONFIG_BINFMT_AOUT=m | ||
45 | CONFIG_BINFMT_MISC=m | ||
35 | CONFIG_NET=y | 46 | CONFIG_NET=y |
36 | CONFIG_PACKET=y | 47 | CONFIG_PACKET=y |
48 | CONFIG_PACKET_DIAG=m | ||
37 | CONFIG_UNIX=y | 49 | CONFIG_UNIX=y |
50 | CONFIG_UNIX_DIAG=m | ||
51 | CONFIG_XFRM_MIGRATE=y | ||
38 | CONFIG_NET_KEY=y | 52 | CONFIG_NET_KEY=y |
39 | CONFIG_NET_KEY_MIGRATE=y | ||
40 | CONFIG_INET=y | 53 | CONFIG_INET=y |
41 | CONFIG_IP_PNP=y | 54 | CONFIG_IP_PNP=y |
42 | CONFIG_IP_PNP_DHCP=y | 55 | CONFIG_IP_PNP_DHCP=y |
43 | CONFIG_IP_PNP_BOOTP=y | 56 | CONFIG_IP_PNP_BOOTP=y |
44 | CONFIG_IP_PNP_RARP=y | 57 | CONFIG_IP_PNP_RARP=y |
45 | CONFIG_NET_IPIP=m | 58 | CONFIG_NET_IPIP=m |
59 | CONFIG_NET_IPGRE_DEMUX=m | ||
46 | CONFIG_NET_IPGRE=m | 60 | CONFIG_NET_IPGRE=m |
47 | CONFIG_SYN_COOKIES=y | 61 | CONFIG_SYN_COOKIES=y |
62 | CONFIG_NET_IPVTI=m | ||
48 | CONFIG_INET_AH=m | 63 | CONFIG_INET_AH=m |
49 | CONFIG_INET_ESP=m | 64 | CONFIG_INET_ESP=m |
50 | CONFIG_INET_IPCOMP=m | 65 | CONFIG_INET_IPCOMP=m |
51 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 66 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
52 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 67 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
53 | CONFIG_INET_XFRM_MODE_BEET=m | 68 | CONFIG_INET_XFRM_MODE_BEET=m |
69 | # CONFIG_INET_LRO is not set | ||
54 | CONFIG_INET_DIAG=m | 70 | CONFIG_INET_DIAG=m |
71 | CONFIG_INET_UDP_DIAG=m | ||
55 | CONFIG_IPV6_PRIVACY=y | 72 | CONFIG_IPV6_PRIVACY=y |
56 | CONFIG_IPV6_ROUTER_PREF=y | 73 | CONFIG_IPV6_ROUTER_PREF=y |
57 | CONFIG_IPV6_ROUTE_INFO=y | ||
58 | CONFIG_INET6_AH=m | 74 | CONFIG_INET6_AH=m |
59 | CONFIG_INET6_ESP=m | 75 | CONFIG_INET6_ESP=m |
60 | CONFIG_INET6_IPCOMP=m | 76 | CONFIG_INET6_IPCOMP=m |
61 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 77 | CONFIG_IPV6_GRE=m |
62 | CONFIG_IPV6_TUNNEL=m | ||
63 | CONFIG_NETFILTER=y | 78 | CONFIG_NETFILTER=y |
64 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
65 | CONFIG_NF_CONNTRACK=m | 79 | CONFIG_NF_CONNTRACK=m |
80 | CONFIG_NF_CONNTRACK_ZONES=y | ||
81 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
66 | # CONFIG_NF_CT_PROTO_DCCP is not set | 82 | # CONFIG_NF_CT_PROTO_DCCP is not set |
67 | CONFIG_NF_CT_PROTO_UDPLITE=m | 83 | CONFIG_NF_CT_PROTO_UDPLITE=m |
68 | CONFIG_NF_CONNTRACK_AMANDA=m | 84 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -70,25 +86,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
70 | CONFIG_NF_CONNTRACK_H323=m | 86 | CONFIG_NF_CONNTRACK_H323=m |
71 | CONFIG_NF_CONNTRACK_IRC=m | 87 | CONFIG_NF_CONNTRACK_IRC=m |
72 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 88 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
89 | CONFIG_NF_CONNTRACK_SNMP=m | ||
73 | CONFIG_NF_CONNTRACK_PPTP=m | 90 | CONFIG_NF_CONNTRACK_PPTP=m |
74 | CONFIG_NF_CONNTRACK_SANE=m | 91 | CONFIG_NF_CONNTRACK_SANE=m |
75 | CONFIG_NF_CONNTRACK_SIP=m | 92 | CONFIG_NF_CONNTRACK_SIP=m |
76 | CONFIG_NF_CONNTRACK_TFTP=m | 93 | CONFIG_NF_CONNTRACK_TFTP=m |
94 | CONFIG_NETFILTER_XT_SET=m | ||
95 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
77 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 96 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
78 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 97 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
79 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 98 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
99 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
100 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
101 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
80 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 102 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
81 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 103 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
82 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 104 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
105 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
106 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
83 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 107 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
84 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 108 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
85 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 109 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
110 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
111 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
86 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 112 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
87 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 113 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
88 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 114 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
115 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
89 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 116 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
90 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 117 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
91 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 118 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
119 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
92 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 120 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
93 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 121 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
94 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 122 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -99,6 +127,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
99 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 127 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
100 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 128 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
101 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 129 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
130 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
131 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
102 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 132 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
103 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 133 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
104 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 134 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -112,22 +142,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
112 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 142 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
113 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 143 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
114 | CONFIG_NETFILTER_XT_MATCH_U32=m | 144 | CONFIG_NETFILTER_XT_MATCH_U32=m |
145 | CONFIG_IP_SET=m | ||
146 | CONFIG_IP_SET_BITMAP_IP=m | ||
147 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
148 | CONFIG_IP_SET_BITMAP_PORT=m | ||
149 | CONFIG_IP_SET_HASH_IP=m | ||
150 | CONFIG_IP_SET_HASH_IPPORT=m | ||
151 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
152 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
153 | CONFIG_IP_SET_HASH_NET=m | ||
154 | CONFIG_IP_SET_HASH_NETPORT=m | ||
155 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
156 | CONFIG_IP_SET_LIST_SET=m | ||
115 | CONFIG_NF_CONNTRACK_IPV4=m | 157 | CONFIG_NF_CONNTRACK_IPV4=m |
116 | CONFIG_IP_NF_QUEUE=m | ||
117 | CONFIG_IP_NF_IPTABLES=m | 158 | CONFIG_IP_NF_IPTABLES=m |
118 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
119 | CONFIG_IP_NF_MATCH_AH=m | 159 | CONFIG_IP_NF_MATCH_AH=m |
120 | CONFIG_IP_NF_MATCH_ECN=m | 160 | CONFIG_IP_NF_MATCH_ECN=m |
161 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
121 | CONFIG_IP_NF_MATCH_TTL=m | 162 | CONFIG_IP_NF_MATCH_TTL=m |
122 | CONFIG_IP_NF_FILTER=m | 163 | CONFIG_IP_NF_FILTER=m |
123 | CONFIG_IP_NF_TARGET_REJECT=m | 164 | CONFIG_IP_NF_TARGET_REJECT=m |
124 | CONFIG_IP_NF_TARGET_LOG=m | ||
125 | CONFIG_IP_NF_TARGET_ULOG=m | 165 | CONFIG_IP_NF_TARGET_ULOG=m |
126 | CONFIG_NF_NAT=m | 166 | CONFIG_NF_NAT_IPV4=m |
127 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 167 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
128 | CONFIG_IP_NF_TARGET_NETMAP=m | 168 | CONFIG_IP_NF_TARGET_NETMAP=m |
129 | CONFIG_IP_NF_TARGET_REDIRECT=m | 169 | CONFIG_IP_NF_TARGET_REDIRECT=m |
130 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
131 | CONFIG_IP_NF_MANGLE=m | 170 | CONFIG_IP_NF_MANGLE=m |
132 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 171 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
133 | CONFIG_IP_NF_TARGET_ECN=m | 172 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -137,7 +176,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
137 | CONFIG_IP_NF_ARPFILTER=m | 176 | CONFIG_IP_NF_ARPFILTER=m |
138 | CONFIG_IP_NF_ARP_MANGLE=m | 177 | CONFIG_IP_NF_ARP_MANGLE=m |
139 | CONFIG_NF_CONNTRACK_IPV6=m | 178 | CONFIG_NF_CONNTRACK_IPV6=m |
140 | CONFIG_IP6_NF_QUEUE=m | ||
141 | CONFIG_IP6_NF_IPTABLES=m | 179 | CONFIG_IP6_NF_IPTABLES=m |
142 | CONFIG_IP6_NF_MATCH_AH=m | 180 | CONFIG_IP6_NF_MATCH_AH=m |
143 | CONFIG_IP6_NF_MATCH_EUI64=m | 181 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -146,22 +184,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
146 | CONFIG_IP6_NF_MATCH_HL=m | 184 | CONFIG_IP6_NF_MATCH_HL=m |
147 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 185 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
148 | CONFIG_IP6_NF_MATCH_MH=m | 186 | CONFIG_IP6_NF_MATCH_MH=m |
187 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
149 | CONFIG_IP6_NF_MATCH_RT=m | 188 | CONFIG_IP6_NF_MATCH_RT=m |
150 | CONFIG_IP6_NF_TARGET_HL=m | 189 | CONFIG_IP6_NF_TARGET_HL=m |
151 | CONFIG_IP6_NF_TARGET_LOG=m | ||
152 | CONFIG_IP6_NF_FILTER=m | 190 | CONFIG_IP6_NF_FILTER=m |
153 | CONFIG_IP6_NF_TARGET_REJECT=m | 191 | CONFIG_IP6_NF_TARGET_REJECT=m |
154 | CONFIG_IP6_NF_MANGLE=m | 192 | CONFIG_IP6_NF_MANGLE=m |
155 | CONFIG_IP6_NF_RAW=m | 193 | CONFIG_IP6_NF_RAW=m |
194 | CONFIG_NF_NAT_IPV6=m | ||
195 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
196 | CONFIG_IP6_NF_TARGET_NPT=m | ||
156 | CONFIG_IP_DCCP=m | 197 | CONFIG_IP_DCCP=m |
157 | # CONFIG_IP_DCCP_CCID3 is not set | 198 | # CONFIG_IP_DCCP_CCID3 is not set |
199 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
200 | CONFIG_RDS=m | ||
201 | CONFIG_RDS_TCP=m | ||
202 | CONFIG_L2TP=m | ||
158 | CONFIG_ATALK=m | 203 | CONFIG_ATALK=m |
159 | CONFIG_DEV_APPLETALK=m | 204 | CONFIG_DEV_APPLETALK=m |
160 | CONFIG_IPDDP=m | 205 | CONFIG_IPDDP=m |
161 | CONFIG_IPDDP_ENCAP=y | 206 | CONFIG_IPDDP_ENCAP=y |
162 | CONFIG_IPDDP_DECAP=y | 207 | CONFIG_IPDDP_DECAP=y |
208 | CONFIG_BATMAN_ADV=m | ||
209 | CONFIG_BATMAN_ADV_DAT=y | ||
210 | # CONFIG_WIRELESS is not set | ||
163 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 211 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
212 | CONFIG_DEVTMPFS=y | ||
164 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 213 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
214 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
165 | CONFIG_CONNECTOR=m | 215 | CONFIG_CONNECTOR=m |
166 | CONFIG_PARPORT=m | 216 | CONFIG_PARPORT=m |
167 | CONFIG_PARPORT_AMIGA=m | 217 | CONFIG_PARPORT_AMIGA=m |
@@ -170,15 +220,17 @@ CONFIG_PARPORT_ATARI=m | |||
170 | CONFIG_PARPORT_1284=y | 220 | CONFIG_PARPORT_1284=y |
171 | CONFIG_AMIGA_FLOPPY=y | 221 | CONFIG_AMIGA_FLOPPY=y |
172 | CONFIG_ATARI_FLOPPY=y | 222 | CONFIG_ATARI_FLOPPY=y |
173 | CONFIG_BLK_DEV_SWIM=y | 223 | CONFIG_BLK_DEV_SWIM=m |
174 | CONFIG_AMIGA_Z2RAM=y | 224 | CONFIG_AMIGA_Z2RAM=y |
175 | CONFIG_BLK_DEV_LOOP=y | 225 | CONFIG_BLK_DEV_LOOP=y |
176 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 226 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
227 | CONFIG_BLK_DEV_DRBD=m | ||
177 | CONFIG_BLK_DEV_NBD=m | 228 | CONFIG_BLK_DEV_NBD=m |
178 | CONFIG_BLK_DEV_RAM=y | 229 | CONFIG_BLK_DEV_RAM=y |
179 | CONFIG_CDROM_PKTCDVD=m | 230 | CONFIG_CDROM_PKTCDVD=m |
180 | CONFIG_ATA_OVER_ETH=m | 231 | CONFIG_ATA_OVER_ETH=m |
181 | CONFIG_IDE=y | 232 | CONFIG_IDE=y |
233 | CONFIG_IDE_GD_ATAPI=y | ||
182 | CONFIG_BLK_DEV_IDECD=y | 234 | CONFIG_BLK_DEV_IDECD=y |
183 | CONFIG_BLK_DEV_GAYLE=y | 235 | CONFIG_BLK_DEV_GAYLE=y |
184 | CONFIG_BLK_DEV_BUDDHA=y | 236 | CONFIG_BLK_DEV_BUDDHA=y |
@@ -195,11 +247,9 @@ CONFIG_BLK_DEV_SR=y | |||
195 | CONFIG_BLK_DEV_SR_VENDOR=y | 247 | CONFIG_BLK_DEV_SR_VENDOR=y |
196 | CONFIG_CHR_DEV_SG=m | 248 | CONFIG_CHR_DEV_SG=m |
197 | CONFIG_SCSI_CONSTANTS=y | 249 | CONFIG_SCSI_CONSTANTS=y |
198 | CONFIG_SCSI_SAS_LIBSAS=m | 250 | CONFIG_SCSI_SAS_ATTRS=m |
199 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
200 | CONFIG_SCSI_SRP_ATTRS=m | ||
201 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
202 | CONFIG_ISCSI_TCP=m | 251 | CONFIG_ISCSI_TCP=m |
252 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
203 | CONFIG_A3000_SCSI=y | 253 | CONFIG_A3000_SCSI=y |
204 | CONFIG_A2091_SCSI=y | 254 | CONFIG_A2091_SCSI=y |
205 | CONFIG_GVP11_SCSI=y | 255 | CONFIG_GVP11_SCSI=y |
@@ -213,21 +263,24 @@ CONFIG_MVME16x_SCSI=y | |||
213 | CONFIG_BVME6000_SCSI=y | 263 | CONFIG_BVME6000_SCSI=y |
214 | CONFIG_SUN3X_ESP=y | 264 | CONFIG_SUN3X_ESP=y |
215 | CONFIG_MD=y | 265 | CONFIG_MD=y |
216 | CONFIG_BLK_DEV_MD=m | ||
217 | CONFIG_MD_LINEAR=m | 266 | CONFIG_MD_LINEAR=m |
218 | CONFIG_MD_RAID0=m | 267 | CONFIG_MD_RAID0=m |
219 | CONFIG_MD_RAID1=m | ||
220 | CONFIG_MD_RAID456=m | ||
221 | CONFIG_BLK_DEV_DM=m | 268 | CONFIG_BLK_DEV_DM=m |
222 | CONFIG_DM_CRYPT=m | 269 | CONFIG_DM_CRYPT=m |
223 | CONFIG_DM_SNAPSHOT=m | 270 | CONFIG_DM_SNAPSHOT=m |
271 | CONFIG_DM_THIN_PROVISIONING=m | ||
272 | CONFIG_DM_CACHE=m | ||
224 | CONFIG_DM_MIRROR=m | 273 | CONFIG_DM_MIRROR=m |
274 | CONFIG_DM_RAID=m | ||
225 | CONFIG_DM_ZERO=m | 275 | CONFIG_DM_ZERO=m |
226 | CONFIG_DM_MULTIPATH=m | 276 | CONFIG_DM_MULTIPATH=m |
227 | CONFIG_DM_UEVENT=y | 277 | CONFIG_DM_UEVENT=y |
278 | CONFIG_TARGET_CORE=m | ||
279 | CONFIG_TCM_IBLOCK=m | ||
280 | CONFIG_TCM_FILEIO=m | ||
281 | CONFIG_TCM_PSCSI=m | ||
228 | CONFIG_ADB=y | 282 | CONFIG_ADB=y |
229 | CONFIG_ADB_MACII=y | 283 | CONFIG_ADB_MACII=y |
230 | CONFIG_ADB_MACIISI=y | ||
231 | CONFIG_ADB_IOP=y | 284 | CONFIG_ADB_IOP=y |
232 | CONFIG_ADB_PMU68K=y | 285 | CONFIG_ADB_PMU68K=y |
233 | CONFIG_ADB_CUDA=y | 286 | CONFIG_ADB_CUDA=y |
@@ -235,49 +288,64 @@ CONFIG_INPUT_ADBHID=y | |||
235 | CONFIG_MAC_EMUMOUSEBTN=y | 288 | CONFIG_MAC_EMUMOUSEBTN=y |
236 | CONFIG_NETDEVICES=y | 289 | CONFIG_NETDEVICES=y |
237 | CONFIG_DUMMY=m | 290 | CONFIG_DUMMY=m |
238 | CONFIG_MACVLAN=m | ||
239 | CONFIG_EQUALIZER=m | 291 | CONFIG_EQUALIZER=m |
240 | CONFIG_VETH=m | ||
241 | CONFIG_NET_ETHERNET=y | ||
242 | CONFIG_MII=y | 292 | CONFIG_MII=y |
243 | CONFIG_ARIADNE=y | 293 | CONFIG_NET_TEAM=m |
294 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
295 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
296 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
297 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
298 | CONFIG_VXLAN=m | ||
299 | CONFIG_NETCONSOLE=m | ||
300 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
301 | CONFIG_VETH=m | ||
302 | # CONFIG_NET_VENDOR_3COM is not set | ||
244 | CONFIG_A2065=y | 303 | CONFIG_A2065=y |
245 | CONFIG_HYDRA=y | 304 | CONFIG_ARIADNE=y |
246 | CONFIG_ZORRO8390=y | ||
247 | CONFIG_APNE=y | ||
248 | CONFIG_MAC8390=y | ||
249 | CONFIG_MAC89x0=y | ||
250 | CONFIG_MACSONIC=y | ||
251 | CONFIG_MACMACE=y | ||
252 | CONFIG_MVME147_NET=y | ||
253 | CONFIG_MVME16x_NET=y | ||
254 | CONFIG_BVME6000_NET=y | ||
255 | CONFIG_ATARILANCE=y | 305 | CONFIG_ATARILANCE=y |
256 | CONFIG_SUN3LANCE=y | ||
257 | CONFIG_HPLANCE=y | 306 | CONFIG_HPLANCE=y |
307 | CONFIG_MVME147_NET=y | ||
308 | CONFIG_SUN3LANCE=y | ||
309 | CONFIG_MACMACE=y | ||
310 | # CONFIG_NET_CADENCE is not set | ||
311 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
312 | CONFIG_MAC89x0=y | ||
313 | # CONFIG_NET_VENDOR_FUJITSU is not set | ||
314 | # CONFIG_NET_VENDOR_HP is not set | ||
315 | CONFIG_BVME6000_NET=y | ||
316 | CONFIG_MVME16x_NET=y | ||
317 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
318 | # CONFIG_NET_VENDOR_MICREL is not set | ||
319 | CONFIG_MACSONIC=y | ||
320 | CONFIG_HYDRA=y | ||
321 | CONFIG_MAC8390=y | ||
258 | CONFIG_NE2000=m | 322 | CONFIG_NE2000=m |
259 | # CONFIG_NETDEV_1000 is not set | 323 | CONFIG_APNE=y |
260 | # CONFIG_NETDEV_10000 is not set | 324 | CONFIG_ZORRO8390=y |
325 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
326 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
327 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
261 | CONFIG_PPP=m | 328 | CONFIG_PPP=m |
262 | CONFIG_PPP_FILTER=y | ||
263 | CONFIG_PPP_ASYNC=m | ||
264 | CONFIG_PPP_SYNC_TTY=m | ||
265 | CONFIG_PPP_DEFLATE=m | ||
266 | CONFIG_PPP_BSDCOMP=m | 329 | CONFIG_PPP_BSDCOMP=m |
330 | CONFIG_PPP_DEFLATE=m | ||
331 | CONFIG_PPP_FILTER=y | ||
267 | CONFIG_PPP_MPPE=m | 332 | CONFIG_PPP_MPPE=m |
268 | CONFIG_PPPOE=m | 333 | CONFIG_PPPOE=m |
334 | CONFIG_PPTP=m | ||
335 | CONFIG_PPPOL2TP=m | ||
336 | CONFIG_PPP_ASYNC=m | ||
337 | CONFIG_PPP_SYNC_TTY=m | ||
269 | CONFIG_SLIP=m | 338 | CONFIG_SLIP=m |
270 | CONFIG_SLIP_COMPRESSED=y | 339 | CONFIG_SLIP_COMPRESSED=y |
271 | CONFIG_SLIP_SMART=y | 340 | CONFIG_SLIP_SMART=y |
272 | CONFIG_SLIP_MODE_SLIP6=y | 341 | CONFIG_SLIP_MODE_SLIP6=y |
273 | CONFIG_NETCONSOLE=m | 342 | # CONFIG_WLAN is not set |
274 | CONFIG_NETCONSOLE_DYNAMIC=y | 343 | CONFIG_INPUT_EVDEV=m |
275 | CONFIG_INPUT_FF_MEMLESS=m | ||
276 | CONFIG_KEYBOARD_AMIGA=y | 344 | CONFIG_KEYBOARD_AMIGA=y |
277 | CONFIG_KEYBOARD_ATARI=y | 345 | CONFIG_KEYBOARD_ATARI=y |
278 | # CONFIG_KEYBOARD_ATKBD is not set | 346 | # CONFIG_KEYBOARD_ATKBD is not set |
279 | CONFIG_KEYBOARD_SUNKBD=y | 347 | CONFIG_KEYBOARD_SUNKBD=y |
280 | CONFIG_MOUSE_PS2=m | 348 | # CONFIG_MOUSE_PS2 is not set |
281 | CONFIG_MOUSE_SERIAL=m | 349 | CONFIG_MOUSE_SERIAL=m |
282 | CONFIG_MOUSE_AMIGA=m | 350 | CONFIG_MOUSE_AMIGA=m |
283 | CONFIG_MOUSE_ATARI=m | 351 | CONFIG_MOUSE_ATARI=m |
@@ -285,18 +353,20 @@ CONFIG_INPUT_JOYSTICK=y | |||
285 | CONFIG_JOYSTICK_AMIGA=m | 353 | CONFIG_JOYSTICK_AMIGA=m |
286 | CONFIG_INPUT_MISC=y | 354 | CONFIG_INPUT_MISC=y |
287 | CONFIG_INPUT_M68K_BEEP=m | 355 | CONFIG_INPUT_M68K_BEEP=m |
288 | CONFIG_HP_SDC_RTC=y | 356 | CONFIG_HP_SDC_RTC=m |
289 | # CONFIG_SERIO_SERPORT is not set | ||
290 | CONFIG_SERIO_Q40KBD=y | 357 | CONFIG_SERIO_Q40KBD=y |
291 | CONFIG_VT_HW_CONSOLE_BINDING=y | 358 | CONFIG_VT_HW_CONSOLE_BINDING=y |
359 | # CONFIG_LEGACY_PTYS is not set | ||
292 | # CONFIG_DEVKMEM is not set | 360 | # CONFIG_DEVKMEM is not set |
293 | CONFIG_SERIAL_PMACZILOG=y | 361 | CONFIG_SERIAL_PMACZILOG=y |
294 | CONFIG_SERIAL_PMACZILOG_TTYS=y | 362 | CONFIG_SERIAL_PMACZILOG_TTYS=y |
295 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y | 363 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y |
296 | CONFIG_PRINTER=m | 364 | CONFIG_PRINTER=m |
297 | # CONFIG_HW_RANDOM is not set | 365 | # CONFIG_HW_RANDOM is not set |
298 | CONFIG_GEN_RTC=y | 366 | CONFIG_NTP_PPS=y |
299 | CONFIG_GEN_RTC_X=y | 367 | CONFIG_PPS_CLIENT_LDISC=m |
368 | CONFIG_PPS_CLIENT_PARPORT=m | ||
369 | CONFIG_PTP_1588_CLOCK=m | ||
300 | # CONFIG_HWMON is not set | 370 | # CONFIG_HWMON is not set |
301 | CONFIG_FB=y | 371 | CONFIG_FB=y |
302 | CONFIG_FB_CIRRUS=y | 372 | CONFIG_FB_CIRRUS=y |
@@ -316,7 +386,20 @@ CONFIG_DMASOUND_PAULA=m | |||
316 | CONFIG_DMASOUND_Q40=m | 386 | CONFIG_DMASOUND_Q40=m |
317 | CONFIG_HID=m | 387 | CONFIG_HID=m |
318 | CONFIG_HIDRAW=y | 388 | CONFIG_HIDRAW=y |
389 | CONFIG_UHID=m | ||
390 | # CONFIG_HID_GENERIC is not set | ||
319 | # CONFIG_USB_SUPPORT is not set | 391 | # CONFIG_USB_SUPPORT is not set |
392 | CONFIG_RTC_CLASS=y | ||
393 | CONFIG_RTC_DRV_MSM6242=m | ||
394 | CONFIG_RTC_DRV_RP5C01=m | ||
395 | CONFIG_RTC_DRV_GENERIC=m | ||
396 | # CONFIG_IOMMU_SUPPORT is not set | ||
397 | CONFIG_HEARTBEAT=y | ||
398 | CONFIG_PROC_HARDWARE=y | ||
399 | CONFIG_NATFEAT=y | ||
400 | CONFIG_NFBLOCK=y | ||
401 | CONFIG_NFCON=y | ||
402 | CONFIG_NFETH=y | ||
320 | CONFIG_ATARI_DSP56K=m | 403 | CONFIG_ATARI_DSP56K=m |
321 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 404 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
322 | CONFIG_SERIAL_CONSOLE=y | 405 | CONFIG_SERIAL_CONSOLE=y |
@@ -324,42 +407,49 @@ CONFIG_EXT2_FS=y | |||
324 | CONFIG_EXT3_FS=y | 407 | CONFIG_EXT3_FS=y |
325 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 408 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
326 | # CONFIG_EXT3_FS_XATTR is not set | 409 | # CONFIG_EXT3_FS_XATTR is not set |
410 | CONFIG_EXT4_FS=y | ||
327 | CONFIG_REISERFS_FS=m | 411 | CONFIG_REISERFS_FS=m |
328 | CONFIG_JFS_FS=m | 412 | CONFIG_JFS_FS=m |
329 | CONFIG_XFS_FS=m | 413 | CONFIG_XFS_FS=m |
330 | CONFIG_OCFS2_FS=m | 414 | CONFIG_OCFS2_FS=m |
331 | # CONFIG_OCFS2_FS_STATS is not set | ||
332 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 415 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
416 | CONFIG_FANOTIFY=y | ||
333 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 417 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
334 | # CONFIG_PRINT_QUOTA_WARNING is not set | 418 | # CONFIG_PRINT_QUOTA_WARNING is not set |
335 | CONFIG_AUTOFS_FS=m | ||
336 | CONFIG_AUTOFS4_FS=m | 419 | CONFIG_AUTOFS4_FS=m |
337 | CONFIG_FUSE_FS=m | 420 | CONFIG_FUSE_FS=m |
421 | CONFIG_CUSE=m | ||
338 | CONFIG_ISO9660_FS=y | 422 | CONFIG_ISO9660_FS=y |
339 | CONFIG_JOLIET=y | 423 | CONFIG_JOLIET=y |
340 | CONFIG_ZISOFS=y | 424 | CONFIG_ZISOFS=y |
341 | CONFIG_UDF_FS=m | 425 | CONFIG_UDF_FS=m |
342 | CONFIG_MSDOS_FS=y | 426 | CONFIG_MSDOS_FS=m |
343 | CONFIG_VFAT_FS=m | 427 | CONFIG_VFAT_FS=m |
344 | CONFIG_PROC_KCORE=y | 428 | CONFIG_PROC_KCORE=y |
345 | CONFIG_TMPFS=y | 429 | CONFIG_TMPFS=y |
346 | CONFIG_AFFS_FS=m | 430 | CONFIG_AFFS_FS=m |
347 | CONFIG_HFS_FS=y | 431 | CONFIG_ECRYPT_FS=m |
348 | CONFIG_HFSPLUS_FS=y | 432 | CONFIG_ECRYPT_FS_MESSAGING=y |
433 | CONFIG_HFS_FS=m | ||
434 | CONFIG_HFSPLUS_FS=m | ||
349 | CONFIG_CRAMFS=m | 435 | CONFIG_CRAMFS=m |
350 | CONFIG_SQUASHFS=m | 436 | CONFIG_SQUASHFS=m |
351 | CONFIG_MINIX_FS=y | 437 | CONFIG_SQUASHFS_LZO=y |
438 | CONFIG_MINIX_FS=m | ||
439 | CONFIG_OMFS_FS=m | ||
352 | CONFIG_HPFS_FS=m | 440 | CONFIG_HPFS_FS=m |
441 | CONFIG_QNX4FS_FS=m | ||
442 | CONFIG_QNX6FS_FS=m | ||
353 | CONFIG_SYSV_FS=m | 443 | CONFIG_SYSV_FS=m |
354 | CONFIG_UFS_FS=m | 444 | CONFIG_UFS_FS=m |
355 | CONFIG_NFS_FS=y | 445 | CONFIG_NFS_FS=y |
356 | CONFIG_NFS_V3=y | ||
357 | CONFIG_NFS_V4=y | 446 | CONFIG_NFS_V4=y |
447 | CONFIG_NFS_SWAP=y | ||
358 | CONFIG_ROOT_NFS=y | 448 | CONFIG_ROOT_NFS=y |
359 | CONFIG_NFSD=m | 449 | CONFIG_NFSD=m |
360 | CONFIG_NFSD_V3=y | 450 | CONFIG_NFSD_V3=y |
361 | CONFIG_SMB_FS=m | 451 | CONFIG_CIFS=m |
362 | CONFIG_SMB_NLS_DEFAULT=y | 452 | # CONFIG_CIFS_DEBUG is not set |
363 | CONFIG_CODA_FS=m | 453 | CONFIG_CODA_FS=m |
364 | CONFIG_NLS_CODEPAGE_437=y | 454 | CONFIG_NLS_CODEPAGE_437=y |
365 | CONFIG_NLS_CODEPAGE_737=m | 455 | CONFIG_NLS_CODEPAGE_737=m |
@@ -398,10 +488,23 @@ CONFIG_NLS_ISO8859_14=m | |||
398 | CONFIG_NLS_ISO8859_15=m | 488 | CONFIG_NLS_ISO8859_15=m |
399 | CONFIG_NLS_KOI8_R=m | 489 | CONFIG_NLS_KOI8_R=m |
400 | CONFIG_NLS_KOI8_U=m | 490 | CONFIG_NLS_KOI8_U=m |
491 | CONFIG_NLS_MAC_ROMAN=m | ||
492 | CONFIG_NLS_MAC_CELTIC=m | ||
493 | CONFIG_NLS_MAC_CENTEURO=m | ||
494 | CONFIG_NLS_MAC_CROATIAN=m | ||
495 | CONFIG_NLS_MAC_CYRILLIC=m | ||
496 | CONFIG_NLS_MAC_GAELIC=m | ||
497 | CONFIG_NLS_MAC_GREEK=m | ||
498 | CONFIG_NLS_MAC_ICELAND=m | ||
499 | CONFIG_NLS_MAC_INUIT=m | ||
500 | CONFIG_NLS_MAC_ROMANIAN=m | ||
501 | CONFIG_NLS_MAC_TURKISH=m | ||
401 | CONFIG_DLM=m | 502 | CONFIG_DLM=m |
402 | CONFIG_MAGIC_SYSRQ=y | 503 | CONFIG_MAGIC_SYSRQ=y |
403 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 504 | CONFIG_ASYNC_RAID6_TEST=m |
404 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 505 | CONFIG_ENCRYPTED_KEYS=m |
506 | CONFIG_CRYPTO_MANAGER=y | ||
507 | CONFIG_CRYPTO_USER=m | ||
405 | CONFIG_CRYPTO_NULL=m | 508 | CONFIG_CRYPTO_NULL=m |
406 | CONFIG_CRYPTO_CRYPTD=m | 509 | CONFIG_CRYPTO_CRYPTD=m |
407 | CONFIG_CRYPTO_TEST=m | 510 | CONFIG_CRYPTO_TEST=m |
@@ -411,19 +514,16 @@ CONFIG_CRYPTO_CTS=m | |||
411 | CONFIG_CRYPTO_LRW=m | 514 | CONFIG_CRYPTO_LRW=m |
412 | CONFIG_CRYPTO_PCBC=m | 515 | CONFIG_CRYPTO_PCBC=m |
413 | CONFIG_CRYPTO_XTS=m | 516 | CONFIG_CRYPTO_XTS=m |
414 | CONFIG_CRYPTO_HMAC=y | ||
415 | CONFIG_CRYPTO_XCBC=m | 517 | CONFIG_CRYPTO_XCBC=m |
416 | CONFIG_CRYPTO_MD4=m | 518 | CONFIG_CRYPTO_VMAC=m |
417 | CONFIG_CRYPTO_MICHAEL_MIC=m | 519 | CONFIG_CRYPTO_MICHAEL_MIC=m |
418 | CONFIG_CRYPTO_RMD128=m | 520 | CONFIG_CRYPTO_RMD128=m |
419 | CONFIG_CRYPTO_RMD160=m | 521 | CONFIG_CRYPTO_RMD160=m |
420 | CONFIG_CRYPTO_RMD256=m | 522 | CONFIG_CRYPTO_RMD256=m |
421 | CONFIG_CRYPTO_RMD320=m | 523 | CONFIG_CRYPTO_RMD320=m |
422 | CONFIG_CRYPTO_SHA256=m | ||
423 | CONFIG_CRYPTO_SHA512=m | 524 | CONFIG_CRYPTO_SHA512=m |
424 | CONFIG_CRYPTO_TGR192=m | 525 | CONFIG_CRYPTO_TGR192=m |
425 | CONFIG_CRYPTO_WP512=m | 526 | CONFIG_CRYPTO_WP512=m |
426 | CONFIG_CRYPTO_AES=m | ||
427 | CONFIG_CRYPTO_ANUBIS=m | 527 | CONFIG_CRYPTO_ANUBIS=m |
428 | CONFIG_CRYPTO_BLOWFISH=m | 528 | CONFIG_CRYPTO_BLOWFISH=m |
429 | CONFIG_CRYPTO_CAMELLIA=m | 529 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -439,6 +539,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
439 | CONFIG_CRYPTO_ZLIB=m | 539 | CONFIG_CRYPTO_ZLIB=m |
440 | CONFIG_CRYPTO_LZO=m | 540 | CONFIG_CRYPTO_LZO=m |
441 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 541 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
542 | CONFIG_CRYPTO_USER_API_HASH=m | ||
543 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
442 | # CONFIG_CRYPTO_HW is not set | 544 | # CONFIG_CRYPTO_HW is not set |
443 | CONFIG_CRC16=y | ||
444 | CONFIG_CRC_T10DIF=y | 545 | CONFIG_CRC_T10DIF=y |
546 | CONFIG_XZ_DEC_X86=y | ||
547 | CONFIG_XZ_DEC_POWERPC=y | ||
548 | CONFIG_XZ_DEC_IA64=y | ||
549 | CONFIG_XZ_DEC_ARM=y | ||
550 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
551 | CONFIG_XZ_DEC_SPARC=y | ||
552 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index e2af46f530c1..5586c6529fce 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
@@ -1,52 +1,73 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-mvme147" | 1 | CONFIG_LOCALVERSION="-mvme147" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
16 | CONFIG_PARTITION_ADVANCED=y | ||
17 | CONFIG_AMIGA_PARTITION=y | ||
18 | CONFIG_ATARI_PARTITION=y | ||
19 | CONFIG_MAC_PARTITION=y | ||
20 | CONFIG_BSD_DISKLABEL=y | ||
21 | CONFIG_MINIX_SUBPARTITION=y | ||
22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
24 | CONFIG_SUN_PARTITION=y | ||
25 | # CONFIG_EFI_PARTITION is not set | ||
26 | CONFIG_IOSCHED_DEADLINE=m | ||
27 | CONFIG_M68030=y | ||
13 | CONFIG_VME=y | 28 | CONFIG_VME=y |
14 | CONFIG_MVME147=y | 29 | CONFIG_MVME147=y |
15 | CONFIG_M68030=y | 30 | # CONFIG_COMPACTION is not set |
31 | CONFIG_CLEANCACHE=y | ||
32 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
16 | CONFIG_BINFMT_AOUT=m | 33 | CONFIG_BINFMT_AOUT=m |
17 | CONFIG_BINFMT_MISC=m | 34 | CONFIG_BINFMT_MISC=m |
18 | CONFIG_PROC_HARDWARE=y | ||
19 | CONFIG_NET=y | 35 | CONFIG_NET=y |
20 | CONFIG_PACKET=y | 36 | CONFIG_PACKET=y |
37 | CONFIG_PACKET_DIAG=m | ||
21 | CONFIG_UNIX=y | 38 | CONFIG_UNIX=y |
39 | CONFIG_UNIX_DIAG=m | ||
40 | CONFIG_XFRM_MIGRATE=y | ||
22 | CONFIG_NET_KEY=y | 41 | CONFIG_NET_KEY=y |
23 | CONFIG_NET_KEY_MIGRATE=y | ||
24 | CONFIG_INET=y | 42 | CONFIG_INET=y |
25 | CONFIG_IP_PNP=y | 43 | CONFIG_IP_PNP=y |
26 | CONFIG_IP_PNP_DHCP=y | 44 | CONFIG_IP_PNP_DHCP=y |
27 | CONFIG_IP_PNP_BOOTP=y | 45 | CONFIG_IP_PNP_BOOTP=y |
28 | CONFIG_IP_PNP_RARP=y | 46 | CONFIG_IP_PNP_RARP=y |
29 | CONFIG_NET_IPIP=m | 47 | CONFIG_NET_IPIP=m |
48 | CONFIG_NET_IPGRE_DEMUX=m | ||
30 | CONFIG_NET_IPGRE=m | 49 | CONFIG_NET_IPGRE=m |
31 | CONFIG_SYN_COOKIES=y | 50 | CONFIG_SYN_COOKIES=y |
51 | CONFIG_NET_IPVTI=m | ||
32 | CONFIG_INET_AH=m | 52 | CONFIG_INET_AH=m |
33 | CONFIG_INET_ESP=m | 53 | CONFIG_INET_ESP=m |
34 | CONFIG_INET_IPCOMP=m | 54 | CONFIG_INET_IPCOMP=m |
35 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 55 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
36 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 56 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
37 | CONFIG_INET_XFRM_MODE_BEET=m | 57 | CONFIG_INET_XFRM_MODE_BEET=m |
58 | # CONFIG_INET_LRO is not set | ||
38 | CONFIG_INET_DIAG=m | 59 | CONFIG_INET_DIAG=m |
60 | CONFIG_INET_UDP_DIAG=m | ||
39 | CONFIG_IPV6_PRIVACY=y | 61 | CONFIG_IPV6_PRIVACY=y |
40 | CONFIG_IPV6_ROUTER_PREF=y | 62 | CONFIG_IPV6_ROUTER_PREF=y |
41 | CONFIG_IPV6_ROUTE_INFO=y | ||
42 | CONFIG_INET6_AH=m | 63 | CONFIG_INET6_AH=m |
43 | CONFIG_INET6_ESP=m | 64 | CONFIG_INET6_ESP=m |
44 | CONFIG_INET6_IPCOMP=m | 65 | CONFIG_INET6_IPCOMP=m |
45 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 66 | CONFIG_IPV6_GRE=m |
46 | CONFIG_IPV6_TUNNEL=m | ||
47 | CONFIG_NETFILTER=y | 67 | CONFIG_NETFILTER=y |
48 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
49 | CONFIG_NF_CONNTRACK=m | 68 | CONFIG_NF_CONNTRACK=m |
69 | CONFIG_NF_CONNTRACK_ZONES=y | ||
70 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
50 | # CONFIG_NF_CT_PROTO_DCCP is not set | 71 | # CONFIG_NF_CT_PROTO_DCCP is not set |
51 | CONFIG_NF_CT_PROTO_UDPLITE=m | 72 | CONFIG_NF_CT_PROTO_UDPLITE=m |
52 | CONFIG_NF_CONNTRACK_AMANDA=m | 73 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -54,25 +75,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
54 | CONFIG_NF_CONNTRACK_H323=m | 75 | CONFIG_NF_CONNTRACK_H323=m |
55 | CONFIG_NF_CONNTRACK_IRC=m | 76 | CONFIG_NF_CONNTRACK_IRC=m |
56 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 77 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
78 | CONFIG_NF_CONNTRACK_SNMP=m | ||
57 | CONFIG_NF_CONNTRACK_PPTP=m | 79 | CONFIG_NF_CONNTRACK_PPTP=m |
58 | CONFIG_NF_CONNTRACK_SANE=m | 80 | CONFIG_NF_CONNTRACK_SANE=m |
59 | CONFIG_NF_CONNTRACK_SIP=m | 81 | CONFIG_NF_CONNTRACK_SIP=m |
60 | CONFIG_NF_CONNTRACK_TFTP=m | 82 | CONFIG_NF_CONNTRACK_TFTP=m |
83 | CONFIG_NETFILTER_XT_SET=m | ||
84 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
61 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 85 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
62 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 86 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
63 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 87 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
88 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
89 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
90 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
64 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 91 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
65 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 92 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
66 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 93 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
94 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
95 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
67 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 96 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
68 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 97 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
69 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 98 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
99 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
100 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
70 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 101 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
71 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 102 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
72 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 103 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
104 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
73 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
74 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
75 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
108 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
76 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 109 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
77 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 110 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
78 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 111 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -83,6 +116,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
83 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 116 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
84 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 117 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
85 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 118 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
119 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
120 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
86 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 121 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
87 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 122 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
88 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 123 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -96,22 +131,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
96 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 131 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
97 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 132 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
98 | CONFIG_NETFILTER_XT_MATCH_U32=m | 133 | CONFIG_NETFILTER_XT_MATCH_U32=m |
134 | CONFIG_IP_SET=m | ||
135 | CONFIG_IP_SET_BITMAP_IP=m | ||
136 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
137 | CONFIG_IP_SET_BITMAP_PORT=m | ||
138 | CONFIG_IP_SET_HASH_IP=m | ||
139 | CONFIG_IP_SET_HASH_IPPORT=m | ||
140 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
141 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
142 | CONFIG_IP_SET_HASH_NET=m | ||
143 | CONFIG_IP_SET_HASH_NETPORT=m | ||
144 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
145 | CONFIG_IP_SET_LIST_SET=m | ||
99 | CONFIG_NF_CONNTRACK_IPV4=m | 146 | CONFIG_NF_CONNTRACK_IPV4=m |
100 | CONFIG_IP_NF_QUEUE=m | ||
101 | CONFIG_IP_NF_IPTABLES=m | 147 | CONFIG_IP_NF_IPTABLES=m |
102 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
103 | CONFIG_IP_NF_MATCH_AH=m | 148 | CONFIG_IP_NF_MATCH_AH=m |
104 | CONFIG_IP_NF_MATCH_ECN=m | 149 | CONFIG_IP_NF_MATCH_ECN=m |
150 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
105 | CONFIG_IP_NF_MATCH_TTL=m | 151 | CONFIG_IP_NF_MATCH_TTL=m |
106 | CONFIG_IP_NF_FILTER=m | 152 | CONFIG_IP_NF_FILTER=m |
107 | CONFIG_IP_NF_TARGET_REJECT=m | 153 | CONFIG_IP_NF_TARGET_REJECT=m |
108 | CONFIG_IP_NF_TARGET_LOG=m | ||
109 | CONFIG_IP_NF_TARGET_ULOG=m | 154 | CONFIG_IP_NF_TARGET_ULOG=m |
110 | CONFIG_NF_NAT=m | 155 | CONFIG_NF_NAT_IPV4=m |
111 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 156 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
112 | CONFIG_IP_NF_TARGET_NETMAP=m | 157 | CONFIG_IP_NF_TARGET_NETMAP=m |
113 | CONFIG_IP_NF_TARGET_REDIRECT=m | 158 | CONFIG_IP_NF_TARGET_REDIRECT=m |
114 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
115 | CONFIG_IP_NF_MANGLE=m | 159 | CONFIG_IP_NF_MANGLE=m |
116 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 160 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
117 | CONFIG_IP_NF_TARGET_ECN=m | 161 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -121,7 +165,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
121 | CONFIG_IP_NF_ARPFILTER=m | 165 | CONFIG_IP_NF_ARPFILTER=m |
122 | CONFIG_IP_NF_ARP_MANGLE=m | 166 | CONFIG_IP_NF_ARP_MANGLE=m |
123 | CONFIG_NF_CONNTRACK_IPV6=m | 167 | CONFIG_NF_CONNTRACK_IPV6=m |
124 | CONFIG_IP6_NF_QUEUE=m | ||
125 | CONFIG_IP6_NF_IPTABLES=m | 168 | CONFIG_IP6_NF_IPTABLES=m |
126 | CONFIG_IP6_NF_MATCH_AH=m | 169 | CONFIG_IP6_NF_MATCH_AH=m |
127 | CONFIG_IP6_NF_MATCH_EUI64=m | 170 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -130,21 +173,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
130 | CONFIG_IP6_NF_MATCH_HL=m | 173 | CONFIG_IP6_NF_MATCH_HL=m |
131 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 174 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
132 | CONFIG_IP6_NF_MATCH_MH=m | 175 | CONFIG_IP6_NF_MATCH_MH=m |
176 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
133 | CONFIG_IP6_NF_MATCH_RT=m | 177 | CONFIG_IP6_NF_MATCH_RT=m |
134 | CONFIG_IP6_NF_TARGET_HL=m | 178 | CONFIG_IP6_NF_TARGET_HL=m |
135 | CONFIG_IP6_NF_TARGET_LOG=m | ||
136 | CONFIG_IP6_NF_FILTER=m | 179 | CONFIG_IP6_NF_FILTER=m |
137 | CONFIG_IP6_NF_TARGET_REJECT=m | 180 | CONFIG_IP6_NF_TARGET_REJECT=m |
138 | CONFIG_IP6_NF_MANGLE=m | 181 | CONFIG_IP6_NF_MANGLE=m |
139 | CONFIG_IP6_NF_RAW=m | 182 | CONFIG_IP6_NF_RAW=m |
183 | CONFIG_NF_NAT_IPV6=m | ||
184 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
185 | CONFIG_IP6_NF_TARGET_NPT=m | ||
140 | CONFIG_IP_DCCP=m | 186 | CONFIG_IP_DCCP=m |
141 | # CONFIG_IP_DCCP_CCID3 is not set | 187 | # CONFIG_IP_DCCP_CCID3 is not set |
188 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
189 | CONFIG_RDS=m | ||
190 | CONFIG_RDS_TCP=m | ||
191 | CONFIG_L2TP=m | ||
142 | CONFIG_ATALK=m | 192 | CONFIG_ATALK=m |
193 | CONFIG_BATMAN_ADV=m | ||
194 | CONFIG_BATMAN_ADV_DAT=y | ||
195 | # CONFIG_WIRELESS is not set | ||
143 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 196 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
197 | CONFIG_DEVTMPFS=y | ||
144 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 198 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
199 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
145 | CONFIG_CONNECTOR=m | 200 | CONFIG_CONNECTOR=m |
146 | CONFIG_BLK_DEV_LOOP=y | 201 | CONFIG_BLK_DEV_LOOP=y |
147 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 202 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
203 | CONFIG_BLK_DEV_DRBD=m | ||
148 | CONFIG_BLK_DEV_NBD=m | 204 | CONFIG_BLK_DEV_NBD=m |
149 | CONFIG_BLK_DEV_RAM=y | 205 | CONFIG_BLK_DEV_RAM=y |
150 | CONFIG_CDROM_PKTCDVD=m | 206 | CONFIG_CDROM_PKTCDVD=m |
@@ -159,103 +215,132 @@ CONFIG_BLK_DEV_SR=y | |||
159 | CONFIG_BLK_DEV_SR_VENDOR=y | 215 | CONFIG_BLK_DEV_SR_VENDOR=y |
160 | CONFIG_CHR_DEV_SG=m | 216 | CONFIG_CHR_DEV_SG=m |
161 | CONFIG_SCSI_CONSTANTS=y | 217 | CONFIG_SCSI_CONSTANTS=y |
162 | CONFIG_SCSI_SAS_LIBSAS=m | 218 | CONFIG_SCSI_SAS_ATTRS=m |
163 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
164 | CONFIG_SCSI_SRP_ATTRS=m | ||
165 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
166 | CONFIG_ISCSI_TCP=m | 219 | CONFIG_ISCSI_TCP=m |
220 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
167 | CONFIG_MVME147_SCSI=y | 221 | CONFIG_MVME147_SCSI=y |
168 | CONFIG_MD=y | 222 | CONFIG_MD=y |
169 | CONFIG_BLK_DEV_MD=m | ||
170 | CONFIG_MD_LINEAR=m | 223 | CONFIG_MD_LINEAR=m |
171 | CONFIG_MD_RAID0=m | 224 | CONFIG_MD_RAID0=m |
172 | CONFIG_MD_RAID1=m | ||
173 | CONFIG_MD_RAID456=m | ||
174 | CONFIG_BLK_DEV_DM=m | 225 | CONFIG_BLK_DEV_DM=m |
175 | CONFIG_DM_CRYPT=m | 226 | CONFIG_DM_CRYPT=m |
176 | CONFIG_DM_SNAPSHOT=m | 227 | CONFIG_DM_SNAPSHOT=m |
228 | CONFIG_DM_THIN_PROVISIONING=m | ||
229 | CONFIG_DM_CACHE=m | ||
177 | CONFIG_DM_MIRROR=m | 230 | CONFIG_DM_MIRROR=m |
231 | CONFIG_DM_RAID=m | ||
178 | CONFIG_DM_ZERO=m | 232 | CONFIG_DM_ZERO=m |
179 | CONFIG_DM_MULTIPATH=m | 233 | CONFIG_DM_MULTIPATH=m |
180 | CONFIG_DM_UEVENT=y | 234 | CONFIG_DM_UEVENT=y |
235 | CONFIG_TARGET_CORE=m | ||
236 | CONFIG_TCM_IBLOCK=m | ||
237 | CONFIG_TCM_FILEIO=m | ||
238 | CONFIG_TCM_PSCSI=m | ||
181 | CONFIG_NETDEVICES=y | 239 | CONFIG_NETDEVICES=y |
182 | CONFIG_DUMMY=m | 240 | CONFIG_DUMMY=m |
183 | CONFIG_MACVLAN=m | ||
184 | CONFIG_EQUALIZER=m | 241 | CONFIG_EQUALIZER=m |
242 | CONFIG_NET_TEAM=m | ||
243 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
244 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
245 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
246 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
247 | CONFIG_VXLAN=m | ||
248 | CONFIG_NETCONSOLE=m | ||
249 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
185 | CONFIG_VETH=m | 250 | CONFIG_VETH=m |
186 | CONFIG_NET_ETHERNET=y | ||
187 | CONFIG_MVME147_NET=y | 251 | CONFIG_MVME147_NET=y |
188 | # CONFIG_NETDEV_1000 is not set | 252 | # CONFIG_NET_CADENCE is not set |
189 | # CONFIG_NETDEV_10000 is not set | 253 | # CONFIG_NET_VENDOR_BROADCOM is not set |
254 | # CONFIG_NET_VENDOR_INTEL is not set | ||
255 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
256 | # CONFIG_NET_VENDOR_MICREL is not set | ||
257 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
258 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
259 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
260 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
190 | CONFIG_PPP=m | 261 | CONFIG_PPP=m |
191 | CONFIG_PPP_FILTER=y | ||
192 | CONFIG_PPP_ASYNC=m | ||
193 | CONFIG_PPP_SYNC_TTY=m | ||
194 | CONFIG_PPP_DEFLATE=m | ||
195 | CONFIG_PPP_BSDCOMP=m | 262 | CONFIG_PPP_BSDCOMP=m |
263 | CONFIG_PPP_DEFLATE=m | ||
264 | CONFIG_PPP_FILTER=y | ||
196 | CONFIG_PPP_MPPE=m | 265 | CONFIG_PPP_MPPE=m |
197 | CONFIG_PPPOE=m | 266 | CONFIG_PPPOE=m |
267 | CONFIG_PPTP=m | ||
268 | CONFIG_PPPOL2TP=m | ||
269 | CONFIG_PPP_ASYNC=m | ||
270 | CONFIG_PPP_SYNC_TTY=m | ||
198 | CONFIG_SLIP=m | 271 | CONFIG_SLIP=m |
199 | CONFIG_SLIP_COMPRESSED=y | 272 | CONFIG_SLIP_COMPRESSED=y |
200 | CONFIG_SLIP_SMART=y | 273 | CONFIG_SLIP_SMART=y |
201 | CONFIG_SLIP_MODE_SLIP6=y | 274 | CONFIG_SLIP_MODE_SLIP6=y |
202 | CONFIG_NETCONSOLE=m | 275 | # CONFIG_WLAN is not set |
203 | CONFIG_NETCONSOLE_DYNAMIC=y | 276 | CONFIG_INPUT_EVDEV=m |
204 | CONFIG_INPUT_FF_MEMLESS=m | ||
205 | # CONFIG_KEYBOARD_ATKBD is not set | 277 | # CONFIG_KEYBOARD_ATKBD is not set |
206 | CONFIG_MOUSE_PS2=m | 278 | # CONFIG_MOUSE_PS2 is not set |
207 | CONFIG_MOUSE_SERIAL=m | 279 | # CONFIG_SERIO is not set |
208 | CONFIG_SERIO=m | ||
209 | # CONFIG_SERIO_SERPORT is not set | ||
210 | CONFIG_VT_HW_CONSOLE_BINDING=y | 280 | CONFIG_VT_HW_CONSOLE_BINDING=y |
281 | # CONFIG_LEGACY_PTYS is not set | ||
211 | # CONFIG_DEVKMEM is not set | 282 | # CONFIG_DEVKMEM is not set |
212 | # CONFIG_HW_RANDOM is not set | 283 | # CONFIG_HW_RANDOM is not set |
213 | CONFIG_GEN_RTC=m | 284 | CONFIG_NTP_PPS=y |
214 | CONFIG_GEN_RTC_X=y | 285 | CONFIG_PPS_CLIENT_LDISC=m |
286 | CONFIG_PTP_1588_CLOCK=m | ||
215 | # CONFIG_HWMON is not set | 287 | # CONFIG_HWMON is not set |
216 | CONFIG_HID=m | 288 | CONFIG_HID=m |
217 | CONFIG_HIDRAW=y | 289 | CONFIG_HIDRAW=y |
290 | CONFIG_UHID=m | ||
291 | # CONFIG_HID_GENERIC is not set | ||
218 | # CONFIG_USB_SUPPORT is not set | 292 | # CONFIG_USB_SUPPORT is not set |
293 | CONFIG_RTC_CLASS=y | ||
294 | CONFIG_RTC_DRV_GENERIC=m | ||
295 | # CONFIG_IOMMU_SUPPORT is not set | ||
296 | CONFIG_PROC_HARDWARE=y | ||
219 | CONFIG_EXT2_FS=y | 297 | CONFIG_EXT2_FS=y |
220 | CONFIG_EXT3_FS=y | 298 | CONFIG_EXT3_FS=y |
221 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 299 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
222 | # CONFIG_EXT3_FS_XATTR is not set | 300 | # CONFIG_EXT3_FS_XATTR is not set |
301 | CONFIG_EXT4_FS=y | ||
223 | CONFIG_REISERFS_FS=m | 302 | CONFIG_REISERFS_FS=m |
224 | CONFIG_JFS_FS=m | 303 | CONFIG_JFS_FS=m |
225 | CONFIG_XFS_FS=m | 304 | CONFIG_XFS_FS=m |
226 | CONFIG_OCFS2_FS=m | 305 | CONFIG_OCFS2_FS=m |
227 | # CONFIG_OCFS2_FS_STATS is not set | ||
228 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 306 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
307 | CONFIG_FANOTIFY=y | ||
229 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 308 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
230 | # CONFIG_PRINT_QUOTA_WARNING is not set | 309 | # CONFIG_PRINT_QUOTA_WARNING is not set |
231 | CONFIG_AUTOFS_FS=m | ||
232 | CONFIG_AUTOFS4_FS=m | 310 | CONFIG_AUTOFS4_FS=m |
233 | CONFIG_FUSE_FS=m | 311 | CONFIG_FUSE_FS=m |
312 | CONFIG_CUSE=m | ||
234 | CONFIG_ISO9660_FS=y | 313 | CONFIG_ISO9660_FS=y |
235 | CONFIG_JOLIET=y | 314 | CONFIG_JOLIET=y |
236 | CONFIG_ZISOFS=y | 315 | CONFIG_ZISOFS=y |
237 | CONFIG_UDF_FS=m | 316 | CONFIG_UDF_FS=m |
238 | CONFIG_MSDOS_FS=y | 317 | CONFIG_MSDOS_FS=m |
239 | CONFIG_VFAT_FS=m | 318 | CONFIG_VFAT_FS=m |
240 | CONFIG_PROC_KCORE=y | 319 | CONFIG_PROC_KCORE=y |
241 | CONFIG_TMPFS=y | 320 | CONFIG_TMPFS=y |
242 | CONFIG_AFFS_FS=m | 321 | CONFIG_AFFS_FS=m |
322 | CONFIG_ECRYPT_FS=m | ||
323 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
243 | CONFIG_HFS_FS=m | 324 | CONFIG_HFS_FS=m |
244 | CONFIG_HFSPLUS_FS=m | 325 | CONFIG_HFSPLUS_FS=m |
245 | CONFIG_CRAMFS=m | 326 | CONFIG_CRAMFS=m |
246 | CONFIG_SQUASHFS=m | 327 | CONFIG_SQUASHFS=m |
247 | CONFIG_MINIX_FS=y | 328 | CONFIG_SQUASHFS_LZO=y |
329 | CONFIG_MINIX_FS=m | ||
330 | CONFIG_OMFS_FS=m | ||
248 | CONFIG_HPFS_FS=m | 331 | CONFIG_HPFS_FS=m |
332 | CONFIG_QNX4FS_FS=m | ||
333 | CONFIG_QNX6FS_FS=m | ||
249 | CONFIG_SYSV_FS=m | 334 | CONFIG_SYSV_FS=m |
250 | CONFIG_UFS_FS=m | 335 | CONFIG_UFS_FS=m |
251 | CONFIG_NFS_FS=y | 336 | CONFIG_NFS_FS=y |
252 | CONFIG_NFS_V3=y | ||
253 | CONFIG_NFS_V4=y | 337 | CONFIG_NFS_V4=y |
338 | CONFIG_NFS_SWAP=y | ||
254 | CONFIG_ROOT_NFS=y | 339 | CONFIG_ROOT_NFS=y |
255 | CONFIG_NFSD=m | 340 | CONFIG_NFSD=m |
256 | CONFIG_NFSD_V3=y | 341 | CONFIG_NFSD_V3=y |
257 | CONFIG_SMB_FS=m | 342 | CONFIG_CIFS=m |
258 | CONFIG_SMB_NLS_DEFAULT=y | 343 | # CONFIG_CIFS_DEBUG is not set |
259 | CONFIG_CODA_FS=m | 344 | CONFIG_CODA_FS=m |
260 | CONFIG_NLS_CODEPAGE_437=y | 345 | CONFIG_NLS_CODEPAGE_437=y |
261 | CONFIG_NLS_CODEPAGE_737=m | 346 | CONFIG_NLS_CODEPAGE_737=m |
@@ -294,10 +379,23 @@ CONFIG_NLS_ISO8859_14=m | |||
294 | CONFIG_NLS_ISO8859_15=m | 379 | CONFIG_NLS_ISO8859_15=m |
295 | CONFIG_NLS_KOI8_R=m | 380 | CONFIG_NLS_KOI8_R=m |
296 | CONFIG_NLS_KOI8_U=m | 381 | CONFIG_NLS_KOI8_U=m |
382 | CONFIG_NLS_MAC_ROMAN=m | ||
383 | CONFIG_NLS_MAC_CELTIC=m | ||
384 | CONFIG_NLS_MAC_CENTEURO=m | ||
385 | CONFIG_NLS_MAC_CROATIAN=m | ||
386 | CONFIG_NLS_MAC_CYRILLIC=m | ||
387 | CONFIG_NLS_MAC_GAELIC=m | ||
388 | CONFIG_NLS_MAC_GREEK=m | ||
389 | CONFIG_NLS_MAC_ICELAND=m | ||
390 | CONFIG_NLS_MAC_INUIT=m | ||
391 | CONFIG_NLS_MAC_ROMANIAN=m | ||
392 | CONFIG_NLS_MAC_TURKISH=m | ||
297 | CONFIG_DLM=m | 393 | CONFIG_DLM=m |
298 | CONFIG_MAGIC_SYSRQ=y | 394 | CONFIG_MAGIC_SYSRQ=y |
299 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 395 | CONFIG_ASYNC_RAID6_TEST=m |
300 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 396 | CONFIG_ENCRYPTED_KEYS=m |
397 | CONFIG_CRYPTO_MANAGER=y | ||
398 | CONFIG_CRYPTO_USER=m | ||
301 | CONFIG_CRYPTO_NULL=m | 399 | CONFIG_CRYPTO_NULL=m |
302 | CONFIG_CRYPTO_CRYPTD=m | 400 | CONFIG_CRYPTO_CRYPTD=m |
303 | CONFIG_CRYPTO_TEST=m | 401 | CONFIG_CRYPTO_TEST=m |
@@ -307,19 +405,16 @@ CONFIG_CRYPTO_CTS=m | |||
307 | CONFIG_CRYPTO_LRW=m | 405 | CONFIG_CRYPTO_LRW=m |
308 | CONFIG_CRYPTO_PCBC=m | 406 | CONFIG_CRYPTO_PCBC=m |
309 | CONFIG_CRYPTO_XTS=m | 407 | CONFIG_CRYPTO_XTS=m |
310 | CONFIG_CRYPTO_HMAC=y | ||
311 | CONFIG_CRYPTO_XCBC=m | 408 | CONFIG_CRYPTO_XCBC=m |
312 | CONFIG_CRYPTO_MD4=m | 409 | CONFIG_CRYPTO_VMAC=m |
313 | CONFIG_CRYPTO_MICHAEL_MIC=m | 410 | CONFIG_CRYPTO_MICHAEL_MIC=m |
314 | CONFIG_CRYPTO_RMD128=m | 411 | CONFIG_CRYPTO_RMD128=m |
315 | CONFIG_CRYPTO_RMD160=m | 412 | CONFIG_CRYPTO_RMD160=m |
316 | CONFIG_CRYPTO_RMD256=m | 413 | CONFIG_CRYPTO_RMD256=m |
317 | CONFIG_CRYPTO_RMD320=m | 414 | CONFIG_CRYPTO_RMD320=m |
318 | CONFIG_CRYPTO_SHA256=m | ||
319 | CONFIG_CRYPTO_SHA512=m | 415 | CONFIG_CRYPTO_SHA512=m |
320 | CONFIG_CRYPTO_TGR192=m | 416 | CONFIG_CRYPTO_TGR192=m |
321 | CONFIG_CRYPTO_WP512=m | 417 | CONFIG_CRYPTO_WP512=m |
322 | CONFIG_CRYPTO_AES=m | ||
323 | CONFIG_CRYPTO_ANUBIS=m | 418 | CONFIG_CRYPTO_ANUBIS=m |
324 | CONFIG_CRYPTO_BLOWFISH=m | 419 | CONFIG_CRYPTO_BLOWFISH=m |
325 | CONFIG_CRYPTO_CAMELLIA=m | 420 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -335,6 +430,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
335 | CONFIG_CRYPTO_ZLIB=m | 430 | CONFIG_CRYPTO_ZLIB=m |
336 | CONFIG_CRYPTO_LZO=m | 431 | CONFIG_CRYPTO_LZO=m |
337 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 432 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
433 | CONFIG_CRYPTO_USER_API_HASH=m | ||
434 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
338 | # CONFIG_CRYPTO_HW is not set | 435 | # CONFIG_CRYPTO_HW is not set |
339 | CONFIG_CRC16=m | ||
340 | CONFIG_CRC_T10DIF=y | 436 | CONFIG_CRC_T10DIF=y |
437 | CONFIG_XZ_DEC_X86=y | ||
438 | CONFIG_XZ_DEC_POWERPC=y | ||
439 | CONFIG_XZ_DEC_IA64=y | ||
440 | CONFIG_XZ_DEC_ARM=y | ||
441 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
442 | CONFIG_XZ_DEC_SPARC=y | ||
443 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 7c9402b2097f..e5e8262bbacd 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -1,53 +1,74 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-mvme16x" | 1 | CONFIG_LOCALVERSION="-mvme16x" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_VME=y | 16 | CONFIG_PARTITION_ADVANCED=y |
14 | CONFIG_MVME16x=y | 17 | CONFIG_AMIGA_PARTITION=y |
18 | CONFIG_ATARI_PARTITION=y | ||
19 | CONFIG_MAC_PARTITION=y | ||
20 | CONFIG_BSD_DISKLABEL=y | ||
21 | CONFIG_MINIX_SUBPARTITION=y | ||
22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
24 | CONFIG_SUN_PARTITION=y | ||
25 | # CONFIG_EFI_PARTITION is not set | ||
26 | CONFIG_IOSCHED_DEADLINE=m | ||
15 | CONFIG_M68040=y | 27 | CONFIG_M68040=y |
16 | CONFIG_M68060=y | 28 | CONFIG_M68060=y |
29 | CONFIG_VME=y | ||
30 | CONFIG_MVME16x=y | ||
31 | # CONFIG_COMPACTION is not set | ||
32 | CONFIG_CLEANCACHE=y | ||
33 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
17 | CONFIG_BINFMT_AOUT=m | 34 | CONFIG_BINFMT_AOUT=m |
18 | CONFIG_BINFMT_MISC=m | 35 | CONFIG_BINFMT_MISC=m |
19 | CONFIG_PROC_HARDWARE=y | ||
20 | CONFIG_NET=y | 36 | CONFIG_NET=y |
21 | CONFIG_PACKET=y | 37 | CONFIG_PACKET=y |
38 | CONFIG_PACKET_DIAG=m | ||
22 | CONFIG_UNIX=y | 39 | CONFIG_UNIX=y |
40 | CONFIG_UNIX_DIAG=m | ||
41 | CONFIG_XFRM_MIGRATE=y | ||
23 | CONFIG_NET_KEY=y | 42 | CONFIG_NET_KEY=y |
24 | CONFIG_NET_KEY_MIGRATE=y | ||
25 | CONFIG_INET=y | 43 | CONFIG_INET=y |
26 | CONFIG_IP_PNP=y | 44 | CONFIG_IP_PNP=y |
27 | CONFIG_IP_PNP_DHCP=y | 45 | CONFIG_IP_PNP_DHCP=y |
28 | CONFIG_IP_PNP_BOOTP=y | 46 | CONFIG_IP_PNP_BOOTP=y |
29 | CONFIG_IP_PNP_RARP=y | 47 | CONFIG_IP_PNP_RARP=y |
30 | CONFIG_NET_IPIP=m | 48 | CONFIG_NET_IPIP=m |
49 | CONFIG_NET_IPGRE_DEMUX=m | ||
31 | CONFIG_NET_IPGRE=m | 50 | CONFIG_NET_IPGRE=m |
32 | CONFIG_SYN_COOKIES=y | 51 | CONFIG_SYN_COOKIES=y |
52 | CONFIG_NET_IPVTI=m | ||
33 | CONFIG_INET_AH=m | 53 | CONFIG_INET_AH=m |
34 | CONFIG_INET_ESP=m | 54 | CONFIG_INET_ESP=m |
35 | CONFIG_INET_IPCOMP=m | 55 | CONFIG_INET_IPCOMP=m |
36 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 56 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
37 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 57 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
38 | CONFIG_INET_XFRM_MODE_BEET=m | 58 | CONFIG_INET_XFRM_MODE_BEET=m |
59 | # CONFIG_INET_LRO is not set | ||
39 | CONFIG_INET_DIAG=m | 60 | CONFIG_INET_DIAG=m |
61 | CONFIG_INET_UDP_DIAG=m | ||
40 | CONFIG_IPV6_PRIVACY=y | 62 | CONFIG_IPV6_PRIVACY=y |
41 | CONFIG_IPV6_ROUTER_PREF=y | 63 | CONFIG_IPV6_ROUTER_PREF=y |
42 | CONFIG_IPV6_ROUTE_INFO=y | ||
43 | CONFIG_INET6_AH=m | 64 | CONFIG_INET6_AH=m |
44 | CONFIG_INET6_ESP=m | 65 | CONFIG_INET6_ESP=m |
45 | CONFIG_INET6_IPCOMP=m | 66 | CONFIG_INET6_IPCOMP=m |
46 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 67 | CONFIG_IPV6_GRE=m |
47 | CONFIG_IPV6_TUNNEL=m | ||
48 | CONFIG_NETFILTER=y | 68 | CONFIG_NETFILTER=y |
49 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
50 | CONFIG_NF_CONNTRACK=m | 69 | CONFIG_NF_CONNTRACK=m |
70 | CONFIG_NF_CONNTRACK_ZONES=y | ||
71 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
51 | # CONFIG_NF_CT_PROTO_DCCP is not set | 72 | # CONFIG_NF_CT_PROTO_DCCP is not set |
52 | CONFIG_NF_CT_PROTO_UDPLITE=m | 73 | CONFIG_NF_CT_PROTO_UDPLITE=m |
53 | CONFIG_NF_CONNTRACK_AMANDA=m | 74 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -55,25 +76,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
55 | CONFIG_NF_CONNTRACK_H323=m | 76 | CONFIG_NF_CONNTRACK_H323=m |
56 | CONFIG_NF_CONNTRACK_IRC=m | 77 | CONFIG_NF_CONNTRACK_IRC=m |
57 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 78 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
79 | CONFIG_NF_CONNTRACK_SNMP=m | ||
58 | CONFIG_NF_CONNTRACK_PPTP=m | 80 | CONFIG_NF_CONNTRACK_PPTP=m |
59 | CONFIG_NF_CONNTRACK_SANE=m | 81 | CONFIG_NF_CONNTRACK_SANE=m |
60 | CONFIG_NF_CONNTRACK_SIP=m | 82 | CONFIG_NF_CONNTRACK_SIP=m |
61 | CONFIG_NF_CONNTRACK_TFTP=m | 83 | CONFIG_NF_CONNTRACK_TFTP=m |
84 | CONFIG_NETFILTER_XT_SET=m | ||
85 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
62 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 86 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
63 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 87 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
64 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 88 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
89 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
90 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
91 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
65 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 92 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
66 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 93 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
67 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
95 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
96 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
68 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 97 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
69 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 98 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
70 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
100 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
101 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
71 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 102 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
72 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 103 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
73 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
105 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
74 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
75 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
76 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
109 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
77 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 110 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
78 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 111 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
79 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 112 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -84,6 +117,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
84 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 117 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
85 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 118 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
86 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 119 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
120 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
121 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
87 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 122 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
88 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 123 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
89 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 124 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -97,22 +132,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
97 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 132 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
98 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 133 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
99 | CONFIG_NETFILTER_XT_MATCH_U32=m | 134 | CONFIG_NETFILTER_XT_MATCH_U32=m |
135 | CONFIG_IP_SET=m | ||
136 | CONFIG_IP_SET_BITMAP_IP=m | ||
137 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
138 | CONFIG_IP_SET_BITMAP_PORT=m | ||
139 | CONFIG_IP_SET_HASH_IP=m | ||
140 | CONFIG_IP_SET_HASH_IPPORT=m | ||
141 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
142 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
143 | CONFIG_IP_SET_HASH_NET=m | ||
144 | CONFIG_IP_SET_HASH_NETPORT=m | ||
145 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
146 | CONFIG_IP_SET_LIST_SET=m | ||
100 | CONFIG_NF_CONNTRACK_IPV4=m | 147 | CONFIG_NF_CONNTRACK_IPV4=m |
101 | CONFIG_IP_NF_QUEUE=m | ||
102 | CONFIG_IP_NF_IPTABLES=m | 148 | CONFIG_IP_NF_IPTABLES=m |
103 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
104 | CONFIG_IP_NF_MATCH_AH=m | 149 | CONFIG_IP_NF_MATCH_AH=m |
105 | CONFIG_IP_NF_MATCH_ECN=m | 150 | CONFIG_IP_NF_MATCH_ECN=m |
151 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
106 | CONFIG_IP_NF_MATCH_TTL=m | 152 | CONFIG_IP_NF_MATCH_TTL=m |
107 | CONFIG_IP_NF_FILTER=m | 153 | CONFIG_IP_NF_FILTER=m |
108 | CONFIG_IP_NF_TARGET_REJECT=m | 154 | CONFIG_IP_NF_TARGET_REJECT=m |
109 | CONFIG_IP_NF_TARGET_LOG=m | ||
110 | CONFIG_IP_NF_TARGET_ULOG=m | 155 | CONFIG_IP_NF_TARGET_ULOG=m |
111 | CONFIG_NF_NAT=m | 156 | CONFIG_NF_NAT_IPV4=m |
112 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 157 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
113 | CONFIG_IP_NF_TARGET_NETMAP=m | 158 | CONFIG_IP_NF_TARGET_NETMAP=m |
114 | CONFIG_IP_NF_TARGET_REDIRECT=m | 159 | CONFIG_IP_NF_TARGET_REDIRECT=m |
115 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
116 | CONFIG_IP_NF_MANGLE=m | 160 | CONFIG_IP_NF_MANGLE=m |
117 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 161 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
118 | CONFIG_IP_NF_TARGET_ECN=m | 162 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -122,7 +166,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
122 | CONFIG_IP_NF_ARPFILTER=m | 166 | CONFIG_IP_NF_ARPFILTER=m |
123 | CONFIG_IP_NF_ARP_MANGLE=m | 167 | CONFIG_IP_NF_ARP_MANGLE=m |
124 | CONFIG_NF_CONNTRACK_IPV6=m | 168 | CONFIG_NF_CONNTRACK_IPV6=m |
125 | CONFIG_IP6_NF_QUEUE=m | ||
126 | CONFIG_IP6_NF_IPTABLES=m | 169 | CONFIG_IP6_NF_IPTABLES=m |
127 | CONFIG_IP6_NF_MATCH_AH=m | 170 | CONFIG_IP6_NF_MATCH_AH=m |
128 | CONFIG_IP6_NF_MATCH_EUI64=m | 171 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -131,21 +174,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
131 | CONFIG_IP6_NF_MATCH_HL=m | 174 | CONFIG_IP6_NF_MATCH_HL=m |
132 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 175 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
133 | CONFIG_IP6_NF_MATCH_MH=m | 176 | CONFIG_IP6_NF_MATCH_MH=m |
177 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
134 | CONFIG_IP6_NF_MATCH_RT=m | 178 | CONFIG_IP6_NF_MATCH_RT=m |
135 | CONFIG_IP6_NF_TARGET_HL=m | 179 | CONFIG_IP6_NF_TARGET_HL=m |
136 | CONFIG_IP6_NF_TARGET_LOG=m | ||
137 | CONFIG_IP6_NF_FILTER=m | 180 | CONFIG_IP6_NF_FILTER=m |
138 | CONFIG_IP6_NF_TARGET_REJECT=m | 181 | CONFIG_IP6_NF_TARGET_REJECT=m |
139 | CONFIG_IP6_NF_MANGLE=m | 182 | CONFIG_IP6_NF_MANGLE=m |
140 | CONFIG_IP6_NF_RAW=m | 183 | CONFIG_IP6_NF_RAW=m |
184 | CONFIG_NF_NAT_IPV6=m | ||
185 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
186 | CONFIG_IP6_NF_TARGET_NPT=m | ||
141 | CONFIG_IP_DCCP=m | 187 | CONFIG_IP_DCCP=m |
142 | # CONFIG_IP_DCCP_CCID3 is not set | 188 | # CONFIG_IP_DCCP_CCID3 is not set |
189 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
190 | CONFIG_RDS=m | ||
191 | CONFIG_RDS_TCP=m | ||
192 | CONFIG_L2TP=m | ||
143 | CONFIG_ATALK=m | 193 | CONFIG_ATALK=m |
194 | CONFIG_BATMAN_ADV=m | ||
195 | CONFIG_BATMAN_ADV_DAT=y | ||
196 | # CONFIG_WIRELESS is not set | ||
144 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 197 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
198 | CONFIG_DEVTMPFS=y | ||
145 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 199 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
200 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
146 | CONFIG_CONNECTOR=m | 201 | CONFIG_CONNECTOR=m |
147 | CONFIG_BLK_DEV_LOOP=y | 202 | CONFIG_BLK_DEV_LOOP=y |
148 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 203 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
204 | CONFIG_BLK_DEV_DRBD=m | ||
149 | CONFIG_BLK_DEV_NBD=m | 205 | CONFIG_BLK_DEV_NBD=m |
150 | CONFIG_BLK_DEV_RAM=y | 206 | CONFIG_BLK_DEV_RAM=y |
151 | CONFIG_CDROM_PKTCDVD=m | 207 | CONFIG_CDROM_PKTCDVD=m |
@@ -160,103 +216,131 @@ CONFIG_BLK_DEV_SR=y | |||
160 | CONFIG_BLK_DEV_SR_VENDOR=y | 216 | CONFIG_BLK_DEV_SR_VENDOR=y |
161 | CONFIG_CHR_DEV_SG=m | 217 | CONFIG_CHR_DEV_SG=m |
162 | CONFIG_SCSI_CONSTANTS=y | 218 | CONFIG_SCSI_CONSTANTS=y |
163 | CONFIG_SCSI_SAS_LIBSAS=m | 219 | CONFIG_SCSI_SAS_ATTRS=m |
164 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
165 | CONFIG_SCSI_SRP_ATTRS=m | ||
166 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
167 | CONFIG_ISCSI_TCP=m | 220 | CONFIG_ISCSI_TCP=m |
221 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
168 | CONFIG_MVME16x_SCSI=y | 222 | CONFIG_MVME16x_SCSI=y |
169 | CONFIG_MD=y | 223 | CONFIG_MD=y |
170 | CONFIG_BLK_DEV_MD=m | ||
171 | CONFIG_MD_LINEAR=m | 224 | CONFIG_MD_LINEAR=m |
172 | CONFIG_MD_RAID0=m | 225 | CONFIG_MD_RAID0=m |
173 | CONFIG_MD_RAID1=m | ||
174 | CONFIG_MD_RAID456=m | ||
175 | CONFIG_BLK_DEV_DM=m | 226 | CONFIG_BLK_DEV_DM=m |
176 | CONFIG_DM_CRYPT=m | 227 | CONFIG_DM_CRYPT=m |
177 | CONFIG_DM_SNAPSHOT=m | 228 | CONFIG_DM_SNAPSHOT=m |
229 | CONFIG_DM_THIN_PROVISIONING=m | ||
230 | CONFIG_DM_CACHE=m | ||
178 | CONFIG_DM_MIRROR=m | 231 | CONFIG_DM_MIRROR=m |
232 | CONFIG_DM_RAID=m | ||
179 | CONFIG_DM_ZERO=m | 233 | CONFIG_DM_ZERO=m |
180 | CONFIG_DM_MULTIPATH=m | 234 | CONFIG_DM_MULTIPATH=m |
181 | CONFIG_DM_UEVENT=y | 235 | CONFIG_DM_UEVENT=y |
236 | CONFIG_TARGET_CORE=m | ||
237 | CONFIG_TCM_IBLOCK=m | ||
238 | CONFIG_TCM_FILEIO=m | ||
239 | CONFIG_TCM_PSCSI=m | ||
182 | CONFIG_NETDEVICES=y | 240 | CONFIG_NETDEVICES=y |
183 | CONFIG_DUMMY=m | 241 | CONFIG_DUMMY=m |
184 | CONFIG_MACVLAN=m | ||
185 | CONFIG_EQUALIZER=m | 242 | CONFIG_EQUALIZER=m |
243 | CONFIG_NET_TEAM=m | ||
244 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
245 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
246 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
247 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
248 | CONFIG_VXLAN=m | ||
249 | CONFIG_NETCONSOLE=m | ||
250 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
186 | CONFIG_VETH=m | 251 | CONFIG_VETH=m |
187 | CONFIG_NET_ETHERNET=y | 252 | # CONFIG_NET_CADENCE is not set |
253 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
188 | CONFIG_MVME16x_NET=y | 254 | CONFIG_MVME16x_NET=y |
189 | # CONFIG_NETDEV_1000 is not set | 255 | # CONFIG_NET_VENDOR_MARVELL is not set |
190 | # CONFIG_NETDEV_10000 is not set | 256 | # CONFIG_NET_VENDOR_MICREL is not set |
257 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
258 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
259 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
260 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
191 | CONFIG_PPP=m | 261 | CONFIG_PPP=m |
192 | CONFIG_PPP_FILTER=y | ||
193 | CONFIG_PPP_ASYNC=m | ||
194 | CONFIG_PPP_SYNC_TTY=m | ||
195 | CONFIG_PPP_DEFLATE=m | ||
196 | CONFIG_PPP_BSDCOMP=m | 262 | CONFIG_PPP_BSDCOMP=m |
263 | CONFIG_PPP_DEFLATE=m | ||
264 | CONFIG_PPP_FILTER=y | ||
197 | CONFIG_PPP_MPPE=m | 265 | CONFIG_PPP_MPPE=m |
198 | CONFIG_PPPOE=m | 266 | CONFIG_PPPOE=m |
267 | CONFIG_PPTP=m | ||
268 | CONFIG_PPPOL2TP=m | ||
269 | CONFIG_PPP_ASYNC=m | ||
270 | CONFIG_PPP_SYNC_TTY=m | ||
199 | CONFIG_SLIP=m | 271 | CONFIG_SLIP=m |
200 | CONFIG_SLIP_COMPRESSED=y | 272 | CONFIG_SLIP_COMPRESSED=y |
201 | CONFIG_SLIP_SMART=y | 273 | CONFIG_SLIP_SMART=y |
202 | CONFIG_SLIP_MODE_SLIP6=y | 274 | CONFIG_SLIP_MODE_SLIP6=y |
203 | CONFIG_NETCONSOLE=m | 275 | # CONFIG_WLAN is not set |
204 | CONFIG_NETCONSOLE_DYNAMIC=y | 276 | CONFIG_INPUT_EVDEV=m |
205 | CONFIG_INPUT_FF_MEMLESS=m | ||
206 | # CONFIG_KEYBOARD_ATKBD is not set | 277 | # CONFIG_KEYBOARD_ATKBD is not set |
207 | CONFIG_MOUSE_PS2=m | 278 | # CONFIG_MOUSE_PS2 is not set |
208 | CONFIG_MOUSE_SERIAL=m | 279 | # CONFIG_SERIO is not set |
209 | CONFIG_SERIO=m | ||
210 | # CONFIG_SERIO_SERPORT is not set | ||
211 | CONFIG_VT_HW_CONSOLE_BINDING=y | 280 | CONFIG_VT_HW_CONSOLE_BINDING=y |
281 | # CONFIG_LEGACY_PTYS is not set | ||
212 | # CONFIG_DEVKMEM is not set | 282 | # CONFIG_DEVKMEM is not set |
213 | # CONFIG_HW_RANDOM is not set | 283 | # CONFIG_HW_RANDOM is not set |
214 | CONFIG_GEN_RTC=m | 284 | CONFIG_NTP_PPS=y |
215 | CONFIG_GEN_RTC_X=y | 285 | CONFIG_PPS_CLIENT_LDISC=m |
286 | CONFIG_PTP_1588_CLOCK=m | ||
216 | # CONFIG_HWMON is not set | 287 | # CONFIG_HWMON is not set |
217 | CONFIG_HID=m | 288 | CONFIG_HID=m |
218 | CONFIG_HIDRAW=y | 289 | CONFIG_HIDRAW=y |
290 | CONFIG_UHID=m | ||
291 | # CONFIG_HID_GENERIC is not set | ||
219 | # CONFIG_USB_SUPPORT is not set | 292 | # CONFIG_USB_SUPPORT is not set |
293 | CONFIG_RTC_CLASS=y | ||
294 | CONFIG_RTC_DRV_GENERIC=m | ||
295 | # CONFIG_IOMMU_SUPPORT is not set | ||
296 | CONFIG_PROC_HARDWARE=y | ||
220 | CONFIG_EXT2_FS=y | 297 | CONFIG_EXT2_FS=y |
221 | CONFIG_EXT3_FS=y | 298 | CONFIG_EXT3_FS=y |
222 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 299 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
223 | # CONFIG_EXT3_FS_XATTR is not set | 300 | # CONFIG_EXT3_FS_XATTR is not set |
301 | CONFIG_EXT4_FS=y | ||
224 | CONFIG_REISERFS_FS=m | 302 | CONFIG_REISERFS_FS=m |
225 | CONFIG_JFS_FS=m | 303 | CONFIG_JFS_FS=m |
226 | CONFIG_XFS_FS=m | 304 | CONFIG_XFS_FS=m |
227 | CONFIG_OCFS2_FS=m | 305 | CONFIG_OCFS2_FS=m |
228 | # CONFIG_OCFS2_FS_STATS is not set | ||
229 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 306 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
307 | CONFIG_FANOTIFY=y | ||
230 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 308 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
231 | # CONFIG_PRINT_QUOTA_WARNING is not set | 309 | # CONFIG_PRINT_QUOTA_WARNING is not set |
232 | CONFIG_AUTOFS_FS=m | ||
233 | CONFIG_AUTOFS4_FS=m | 310 | CONFIG_AUTOFS4_FS=m |
234 | CONFIG_FUSE_FS=m | 311 | CONFIG_FUSE_FS=m |
312 | CONFIG_CUSE=m | ||
235 | CONFIG_ISO9660_FS=y | 313 | CONFIG_ISO9660_FS=y |
236 | CONFIG_JOLIET=y | 314 | CONFIG_JOLIET=y |
237 | CONFIG_ZISOFS=y | 315 | CONFIG_ZISOFS=y |
238 | CONFIG_UDF_FS=m | 316 | CONFIG_UDF_FS=m |
239 | CONFIG_MSDOS_FS=y | 317 | CONFIG_MSDOS_FS=m |
240 | CONFIG_VFAT_FS=m | 318 | CONFIG_VFAT_FS=m |
241 | CONFIG_PROC_KCORE=y | 319 | CONFIG_PROC_KCORE=y |
242 | CONFIG_TMPFS=y | 320 | CONFIG_TMPFS=y |
243 | CONFIG_AFFS_FS=m | 321 | CONFIG_AFFS_FS=m |
322 | CONFIG_ECRYPT_FS=m | ||
323 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
244 | CONFIG_HFS_FS=m | 324 | CONFIG_HFS_FS=m |
245 | CONFIG_HFSPLUS_FS=m | 325 | CONFIG_HFSPLUS_FS=m |
246 | CONFIG_CRAMFS=m | 326 | CONFIG_CRAMFS=m |
247 | CONFIG_SQUASHFS=m | 327 | CONFIG_SQUASHFS=m |
248 | CONFIG_MINIX_FS=y | 328 | CONFIG_SQUASHFS_LZO=y |
329 | CONFIG_MINIX_FS=m | ||
330 | CONFIG_OMFS_FS=m | ||
249 | CONFIG_HPFS_FS=m | 331 | CONFIG_HPFS_FS=m |
332 | CONFIG_QNX4FS_FS=m | ||
333 | CONFIG_QNX6FS_FS=m | ||
250 | CONFIG_SYSV_FS=m | 334 | CONFIG_SYSV_FS=m |
251 | CONFIG_UFS_FS=m | 335 | CONFIG_UFS_FS=m |
252 | CONFIG_NFS_FS=y | 336 | CONFIG_NFS_FS=y |
253 | CONFIG_NFS_V3=y | ||
254 | CONFIG_NFS_V4=y | 337 | CONFIG_NFS_V4=y |
338 | CONFIG_NFS_SWAP=y | ||
255 | CONFIG_ROOT_NFS=y | 339 | CONFIG_ROOT_NFS=y |
256 | CONFIG_NFSD=m | 340 | CONFIG_NFSD=m |
257 | CONFIG_NFSD_V3=y | 341 | CONFIG_NFSD_V3=y |
258 | CONFIG_SMB_FS=m | 342 | CONFIG_CIFS=m |
259 | CONFIG_SMB_NLS_DEFAULT=y | 343 | # CONFIG_CIFS_DEBUG is not set |
260 | CONFIG_CODA_FS=m | 344 | CONFIG_CODA_FS=m |
261 | CONFIG_NLS_CODEPAGE_437=y | 345 | CONFIG_NLS_CODEPAGE_437=y |
262 | CONFIG_NLS_CODEPAGE_737=m | 346 | CONFIG_NLS_CODEPAGE_737=m |
@@ -295,10 +379,23 @@ CONFIG_NLS_ISO8859_14=m | |||
295 | CONFIG_NLS_ISO8859_15=m | 379 | CONFIG_NLS_ISO8859_15=m |
296 | CONFIG_NLS_KOI8_R=m | 380 | CONFIG_NLS_KOI8_R=m |
297 | CONFIG_NLS_KOI8_U=m | 381 | CONFIG_NLS_KOI8_U=m |
382 | CONFIG_NLS_MAC_ROMAN=m | ||
383 | CONFIG_NLS_MAC_CELTIC=m | ||
384 | CONFIG_NLS_MAC_CENTEURO=m | ||
385 | CONFIG_NLS_MAC_CROATIAN=m | ||
386 | CONFIG_NLS_MAC_CYRILLIC=m | ||
387 | CONFIG_NLS_MAC_GAELIC=m | ||
388 | CONFIG_NLS_MAC_GREEK=m | ||
389 | CONFIG_NLS_MAC_ICELAND=m | ||
390 | CONFIG_NLS_MAC_INUIT=m | ||
391 | CONFIG_NLS_MAC_ROMANIAN=m | ||
392 | CONFIG_NLS_MAC_TURKISH=m | ||
298 | CONFIG_DLM=m | 393 | CONFIG_DLM=m |
299 | CONFIG_MAGIC_SYSRQ=y | 394 | CONFIG_MAGIC_SYSRQ=y |
300 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 395 | CONFIG_ASYNC_RAID6_TEST=m |
301 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 396 | CONFIG_ENCRYPTED_KEYS=m |
397 | CONFIG_CRYPTO_MANAGER=y | ||
398 | CONFIG_CRYPTO_USER=m | ||
302 | CONFIG_CRYPTO_NULL=m | 399 | CONFIG_CRYPTO_NULL=m |
303 | CONFIG_CRYPTO_CRYPTD=m | 400 | CONFIG_CRYPTO_CRYPTD=m |
304 | CONFIG_CRYPTO_TEST=m | 401 | CONFIG_CRYPTO_TEST=m |
@@ -308,19 +405,16 @@ CONFIG_CRYPTO_CTS=m | |||
308 | CONFIG_CRYPTO_LRW=m | 405 | CONFIG_CRYPTO_LRW=m |
309 | CONFIG_CRYPTO_PCBC=m | 406 | CONFIG_CRYPTO_PCBC=m |
310 | CONFIG_CRYPTO_XTS=m | 407 | CONFIG_CRYPTO_XTS=m |
311 | CONFIG_CRYPTO_HMAC=y | ||
312 | CONFIG_CRYPTO_XCBC=m | 408 | CONFIG_CRYPTO_XCBC=m |
313 | CONFIG_CRYPTO_MD4=m | 409 | CONFIG_CRYPTO_VMAC=m |
314 | CONFIG_CRYPTO_MICHAEL_MIC=m | 410 | CONFIG_CRYPTO_MICHAEL_MIC=m |
315 | CONFIG_CRYPTO_RMD128=m | 411 | CONFIG_CRYPTO_RMD128=m |
316 | CONFIG_CRYPTO_RMD160=m | 412 | CONFIG_CRYPTO_RMD160=m |
317 | CONFIG_CRYPTO_RMD256=m | 413 | CONFIG_CRYPTO_RMD256=m |
318 | CONFIG_CRYPTO_RMD320=m | 414 | CONFIG_CRYPTO_RMD320=m |
319 | CONFIG_CRYPTO_SHA256=m | ||
320 | CONFIG_CRYPTO_SHA512=m | 415 | CONFIG_CRYPTO_SHA512=m |
321 | CONFIG_CRYPTO_TGR192=m | 416 | CONFIG_CRYPTO_TGR192=m |
322 | CONFIG_CRYPTO_WP512=m | 417 | CONFIG_CRYPTO_WP512=m |
323 | CONFIG_CRYPTO_AES=m | ||
324 | CONFIG_CRYPTO_ANUBIS=m | 418 | CONFIG_CRYPTO_ANUBIS=m |
325 | CONFIG_CRYPTO_BLOWFISH=m | 419 | CONFIG_CRYPTO_BLOWFISH=m |
326 | CONFIG_CRYPTO_CAMELLIA=m | 420 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -336,6 +430,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
336 | CONFIG_CRYPTO_ZLIB=m | 430 | CONFIG_CRYPTO_ZLIB=m |
337 | CONFIG_CRYPTO_LZO=m | 431 | CONFIG_CRYPTO_LZO=m |
338 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 432 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
433 | CONFIG_CRYPTO_USER_API_HASH=m | ||
434 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
339 | # CONFIG_CRYPTO_HW is not set | 435 | # CONFIG_CRYPTO_HW is not set |
340 | CONFIG_CRC16=m | ||
341 | CONFIG_CRC_T10DIF=y | 436 | CONFIG_CRC_T10DIF=y |
437 | CONFIG_XZ_DEC_X86=y | ||
438 | CONFIG_XZ_DEC_POWERPC=y | ||
439 | CONFIG_XZ_DEC_IA64=y | ||
440 | CONFIG_XZ_DEC_ARM=y | ||
441 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
442 | CONFIG_XZ_DEC_SPARC=y | ||
443 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 19d23db690a4..8982370e8b42 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
@@ -1,49 +1,74 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-q40" | 1 | CONFIG_LOCALVERSION="-q40" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_Q40=y | 16 | CONFIG_PARTITION_ADVANCED=y |
17 | CONFIG_AMIGA_PARTITION=y | ||
18 | CONFIG_ATARI_PARTITION=y | ||
19 | CONFIG_MAC_PARTITION=y | ||
20 | CONFIG_BSD_DISKLABEL=y | ||
21 | CONFIG_MINIX_SUBPARTITION=y | ||
22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
24 | CONFIG_SUN_PARTITION=y | ||
25 | # CONFIG_EFI_PARTITION is not set | ||
26 | CONFIG_SYSV68_PARTITION=y | ||
27 | CONFIG_IOSCHED_DEADLINE=m | ||
14 | CONFIG_M68040=y | 28 | CONFIG_M68040=y |
15 | CONFIG_M68060=y | 29 | CONFIG_M68060=y |
30 | CONFIG_Q40=y | ||
31 | # CONFIG_COMPACTION is not set | ||
32 | CONFIG_CLEANCACHE=y | ||
33 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
16 | CONFIG_BINFMT_AOUT=m | 34 | CONFIG_BINFMT_AOUT=m |
17 | CONFIG_BINFMT_MISC=m | 35 | CONFIG_BINFMT_MISC=m |
18 | CONFIG_HEARTBEAT=y | ||
19 | CONFIG_PROC_HARDWARE=y | ||
20 | CONFIG_NET=y | 36 | CONFIG_NET=y |
21 | CONFIG_PACKET=y | 37 | CONFIG_PACKET=y |
38 | CONFIG_PACKET_DIAG=m | ||
22 | CONFIG_UNIX=y | 39 | CONFIG_UNIX=y |
40 | CONFIG_UNIX_DIAG=m | ||
41 | CONFIG_XFRM_MIGRATE=y | ||
23 | CONFIG_NET_KEY=y | 42 | CONFIG_NET_KEY=y |
24 | CONFIG_NET_KEY_MIGRATE=y | ||
25 | CONFIG_INET=y | 43 | CONFIG_INET=y |
44 | CONFIG_IP_PNP=y | ||
45 | CONFIG_IP_PNP_DHCP=y | ||
46 | CONFIG_IP_PNP_BOOTP=y | ||
47 | CONFIG_IP_PNP_RARP=y | ||
26 | CONFIG_NET_IPIP=m | 48 | CONFIG_NET_IPIP=m |
49 | CONFIG_NET_IPGRE_DEMUX=m | ||
27 | CONFIG_NET_IPGRE=m | 50 | CONFIG_NET_IPGRE=m |
28 | CONFIG_SYN_COOKIES=y | 51 | CONFIG_SYN_COOKIES=y |
52 | CONFIG_NET_IPVTI=m | ||
29 | CONFIG_INET_AH=m | 53 | CONFIG_INET_AH=m |
30 | CONFIG_INET_ESP=m | 54 | CONFIG_INET_ESP=m |
31 | CONFIG_INET_IPCOMP=m | 55 | CONFIG_INET_IPCOMP=m |
32 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 56 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
33 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 57 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
34 | CONFIG_INET_XFRM_MODE_BEET=m | 58 | CONFIG_INET_XFRM_MODE_BEET=m |
59 | # CONFIG_INET_LRO is not set | ||
35 | CONFIG_INET_DIAG=m | 60 | CONFIG_INET_DIAG=m |
61 | CONFIG_INET_UDP_DIAG=m | ||
36 | CONFIG_IPV6_PRIVACY=y | 62 | CONFIG_IPV6_PRIVACY=y |
37 | CONFIG_IPV6_ROUTER_PREF=y | 63 | CONFIG_IPV6_ROUTER_PREF=y |
38 | CONFIG_IPV6_ROUTE_INFO=y | ||
39 | CONFIG_INET6_AH=m | 64 | CONFIG_INET6_AH=m |
40 | CONFIG_INET6_ESP=m | 65 | CONFIG_INET6_ESP=m |
41 | CONFIG_INET6_IPCOMP=m | 66 | CONFIG_INET6_IPCOMP=m |
42 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 67 | CONFIG_IPV6_GRE=m |
43 | CONFIG_IPV6_TUNNEL=m | ||
44 | CONFIG_NETFILTER=y | 68 | CONFIG_NETFILTER=y |
45 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
46 | CONFIG_NF_CONNTRACK=m | 69 | CONFIG_NF_CONNTRACK=m |
70 | CONFIG_NF_CONNTRACK_ZONES=y | ||
71 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
47 | # CONFIG_NF_CT_PROTO_DCCP is not set | 72 | # CONFIG_NF_CT_PROTO_DCCP is not set |
48 | CONFIG_NF_CT_PROTO_UDPLITE=m | 73 | CONFIG_NF_CT_PROTO_UDPLITE=m |
49 | CONFIG_NF_CONNTRACK_AMANDA=m | 74 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -51,25 +76,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
51 | CONFIG_NF_CONNTRACK_H323=m | 76 | CONFIG_NF_CONNTRACK_H323=m |
52 | CONFIG_NF_CONNTRACK_IRC=m | 77 | CONFIG_NF_CONNTRACK_IRC=m |
53 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 78 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
79 | CONFIG_NF_CONNTRACK_SNMP=m | ||
54 | CONFIG_NF_CONNTRACK_PPTP=m | 80 | CONFIG_NF_CONNTRACK_PPTP=m |
55 | CONFIG_NF_CONNTRACK_SANE=m | 81 | CONFIG_NF_CONNTRACK_SANE=m |
56 | CONFIG_NF_CONNTRACK_SIP=m | 82 | CONFIG_NF_CONNTRACK_SIP=m |
57 | CONFIG_NF_CONNTRACK_TFTP=m | 83 | CONFIG_NF_CONNTRACK_TFTP=m |
84 | CONFIG_NETFILTER_XT_SET=m | ||
85 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
58 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 86 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
59 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 87 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
60 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 88 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
89 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
90 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
91 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
61 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 92 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
62 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 93 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
63 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
95 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
96 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
64 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 97 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
65 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 98 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
66 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
100 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
101 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
67 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 102 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
68 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 103 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
69 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
105 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
70 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
71 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
72 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
109 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
73 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 110 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
74 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 111 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
75 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 112 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -80,6 +117,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
80 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 117 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
81 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 118 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
82 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 119 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
120 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
121 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
83 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 122 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
84 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 123 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
85 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 124 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -93,22 +132,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
93 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 132 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
94 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 133 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
95 | CONFIG_NETFILTER_XT_MATCH_U32=m | 134 | CONFIG_NETFILTER_XT_MATCH_U32=m |
135 | CONFIG_IP_SET=m | ||
136 | CONFIG_IP_SET_BITMAP_IP=m | ||
137 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
138 | CONFIG_IP_SET_BITMAP_PORT=m | ||
139 | CONFIG_IP_SET_HASH_IP=m | ||
140 | CONFIG_IP_SET_HASH_IPPORT=m | ||
141 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
142 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
143 | CONFIG_IP_SET_HASH_NET=m | ||
144 | CONFIG_IP_SET_HASH_NETPORT=m | ||
145 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
146 | CONFIG_IP_SET_LIST_SET=m | ||
96 | CONFIG_NF_CONNTRACK_IPV4=m | 147 | CONFIG_NF_CONNTRACK_IPV4=m |
97 | CONFIG_IP_NF_QUEUE=m | ||
98 | CONFIG_IP_NF_IPTABLES=m | 148 | CONFIG_IP_NF_IPTABLES=m |
99 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
100 | CONFIG_IP_NF_MATCH_AH=m | 149 | CONFIG_IP_NF_MATCH_AH=m |
101 | CONFIG_IP_NF_MATCH_ECN=m | 150 | CONFIG_IP_NF_MATCH_ECN=m |
151 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
102 | CONFIG_IP_NF_MATCH_TTL=m | 152 | CONFIG_IP_NF_MATCH_TTL=m |
103 | CONFIG_IP_NF_FILTER=m | 153 | CONFIG_IP_NF_FILTER=m |
104 | CONFIG_IP_NF_TARGET_REJECT=m | 154 | CONFIG_IP_NF_TARGET_REJECT=m |
105 | CONFIG_IP_NF_TARGET_LOG=m | ||
106 | CONFIG_IP_NF_TARGET_ULOG=m | 155 | CONFIG_IP_NF_TARGET_ULOG=m |
107 | CONFIG_NF_NAT=m | 156 | CONFIG_NF_NAT_IPV4=m |
108 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 157 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
109 | CONFIG_IP_NF_TARGET_NETMAP=m | 158 | CONFIG_IP_NF_TARGET_NETMAP=m |
110 | CONFIG_IP_NF_TARGET_REDIRECT=m | 159 | CONFIG_IP_NF_TARGET_REDIRECT=m |
111 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
112 | CONFIG_IP_NF_MANGLE=m | 160 | CONFIG_IP_NF_MANGLE=m |
113 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 161 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
114 | CONFIG_IP_NF_TARGET_ECN=m | 162 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -118,7 +166,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
118 | CONFIG_IP_NF_ARPFILTER=m | 166 | CONFIG_IP_NF_ARPFILTER=m |
119 | CONFIG_IP_NF_ARP_MANGLE=m | 167 | CONFIG_IP_NF_ARP_MANGLE=m |
120 | CONFIG_NF_CONNTRACK_IPV6=m | 168 | CONFIG_NF_CONNTRACK_IPV6=m |
121 | CONFIG_IP6_NF_QUEUE=m | ||
122 | CONFIG_IP6_NF_IPTABLES=m | 169 | CONFIG_IP6_NF_IPTABLES=m |
123 | CONFIG_IP6_NF_MATCH_AH=m | 170 | CONFIG_IP6_NF_MATCH_AH=m |
124 | CONFIG_IP6_NF_MATCH_EUI64=m | 171 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -127,26 +174,40 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
127 | CONFIG_IP6_NF_MATCH_HL=m | 174 | CONFIG_IP6_NF_MATCH_HL=m |
128 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 175 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
129 | CONFIG_IP6_NF_MATCH_MH=m | 176 | CONFIG_IP6_NF_MATCH_MH=m |
177 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
130 | CONFIG_IP6_NF_MATCH_RT=m | 178 | CONFIG_IP6_NF_MATCH_RT=m |
131 | CONFIG_IP6_NF_TARGET_HL=m | 179 | CONFIG_IP6_NF_TARGET_HL=m |
132 | CONFIG_IP6_NF_TARGET_LOG=m | ||
133 | CONFIG_IP6_NF_FILTER=m | 180 | CONFIG_IP6_NF_FILTER=m |
134 | CONFIG_IP6_NF_TARGET_REJECT=m | 181 | CONFIG_IP6_NF_TARGET_REJECT=m |
135 | CONFIG_IP6_NF_MANGLE=m | 182 | CONFIG_IP6_NF_MANGLE=m |
136 | CONFIG_IP6_NF_RAW=m | 183 | CONFIG_IP6_NF_RAW=m |
184 | CONFIG_NF_NAT_IPV6=m | ||
185 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
186 | CONFIG_IP6_NF_TARGET_NPT=m | ||
137 | CONFIG_IP_DCCP=m | 187 | CONFIG_IP_DCCP=m |
138 | # CONFIG_IP_DCCP_CCID3 is not set | 188 | # CONFIG_IP_DCCP_CCID3 is not set |
189 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
190 | CONFIG_RDS=m | ||
191 | CONFIG_RDS_TCP=m | ||
192 | CONFIG_L2TP=m | ||
139 | CONFIG_ATALK=m | 193 | CONFIG_ATALK=m |
194 | CONFIG_BATMAN_ADV=m | ||
195 | CONFIG_BATMAN_ADV_DAT=y | ||
196 | # CONFIG_WIRELESS is not set | ||
140 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 197 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
198 | CONFIG_DEVTMPFS=y | ||
141 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 199 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
200 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
142 | CONFIG_CONNECTOR=m | 201 | CONFIG_CONNECTOR=m |
143 | CONFIG_BLK_DEV_LOOP=y | 202 | CONFIG_BLK_DEV_LOOP=y |
144 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 203 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
204 | CONFIG_BLK_DEV_DRBD=m | ||
145 | CONFIG_BLK_DEV_NBD=m | 205 | CONFIG_BLK_DEV_NBD=m |
146 | CONFIG_BLK_DEV_RAM=y | 206 | CONFIG_BLK_DEV_RAM=y |
147 | CONFIG_CDROM_PKTCDVD=m | 207 | CONFIG_CDROM_PKTCDVD=m |
148 | CONFIG_ATA_OVER_ETH=m | 208 | CONFIG_ATA_OVER_ETH=m |
149 | CONFIG_IDE=y | 209 | CONFIG_IDE=y |
210 | CONFIG_IDE_GD_ATAPI=y | ||
150 | CONFIG_BLK_DEV_IDECD=y | 211 | CONFIG_BLK_DEV_IDECD=y |
151 | CONFIG_BLK_DEV_Q40IDE=y | 212 | CONFIG_BLK_DEV_Q40IDE=y |
152 | CONFIG_RAID_ATTRS=m | 213 | CONFIG_RAID_ATTRS=m |
@@ -159,61 +220,82 @@ CONFIG_BLK_DEV_SR=y | |||
159 | CONFIG_BLK_DEV_SR_VENDOR=y | 220 | CONFIG_BLK_DEV_SR_VENDOR=y |
160 | CONFIG_CHR_DEV_SG=m | 221 | CONFIG_CHR_DEV_SG=m |
161 | CONFIG_SCSI_CONSTANTS=y | 222 | CONFIG_SCSI_CONSTANTS=y |
162 | CONFIG_SCSI_SAS_LIBSAS=m | 223 | CONFIG_SCSI_SAS_ATTRS=m |
163 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
164 | CONFIG_SCSI_SRP_ATTRS=m | ||
165 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
166 | CONFIG_ISCSI_TCP=m | 224 | CONFIG_ISCSI_TCP=m |
225 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
167 | CONFIG_MD=y | 226 | CONFIG_MD=y |
168 | CONFIG_BLK_DEV_MD=m | ||
169 | CONFIG_MD_LINEAR=m | 227 | CONFIG_MD_LINEAR=m |
170 | CONFIG_MD_RAID0=m | 228 | CONFIG_MD_RAID0=m |
171 | CONFIG_MD_RAID1=m | ||
172 | CONFIG_MD_RAID456=m | ||
173 | CONFIG_BLK_DEV_DM=m | 229 | CONFIG_BLK_DEV_DM=m |
174 | CONFIG_DM_CRYPT=m | 230 | CONFIG_DM_CRYPT=m |
175 | CONFIG_DM_SNAPSHOT=m | 231 | CONFIG_DM_SNAPSHOT=m |
232 | CONFIG_DM_THIN_PROVISIONING=m | ||
233 | CONFIG_DM_CACHE=m | ||
176 | CONFIG_DM_MIRROR=m | 234 | CONFIG_DM_MIRROR=m |
235 | CONFIG_DM_RAID=m | ||
177 | CONFIG_DM_ZERO=m | 236 | CONFIG_DM_ZERO=m |
178 | CONFIG_DM_MULTIPATH=m | 237 | CONFIG_DM_MULTIPATH=m |
179 | CONFIG_DM_UEVENT=y | 238 | CONFIG_DM_UEVENT=y |
239 | CONFIG_TARGET_CORE=m | ||
240 | CONFIG_TCM_IBLOCK=m | ||
241 | CONFIG_TCM_FILEIO=m | ||
242 | CONFIG_TCM_PSCSI=m | ||
180 | CONFIG_NETDEVICES=y | 243 | CONFIG_NETDEVICES=y |
181 | CONFIG_DUMMY=m | 244 | CONFIG_DUMMY=m |
182 | CONFIG_MACVLAN=m | ||
183 | CONFIG_EQUALIZER=m | 245 | CONFIG_EQUALIZER=m |
246 | CONFIG_NET_TEAM=m | ||
247 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
248 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
249 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
250 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
251 | CONFIG_VXLAN=m | ||
252 | CONFIG_NETCONSOLE=m | ||
253 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
184 | CONFIG_VETH=m | 254 | CONFIG_VETH=m |
185 | CONFIG_NET_ETHERNET=y | 255 | # CONFIG_NET_VENDOR_3COM is not set |
256 | # CONFIG_NET_VENDOR_AMD is not set | ||
257 | # CONFIG_NET_CADENCE is not set | ||
258 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
259 | # CONFIG_NET_VENDOR_CIRRUS is not set | ||
260 | # CONFIG_NET_VENDOR_FUJITSU is not set | ||
261 | # CONFIG_NET_VENDOR_HP is not set | ||
262 | # CONFIG_NET_VENDOR_INTEL is not set | ||
263 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
264 | # CONFIG_NET_VENDOR_MICREL is not set | ||
186 | CONFIG_NE2000=m | 265 | CONFIG_NE2000=m |
187 | # CONFIG_NETDEV_1000 is not set | 266 | # CONFIG_NET_VENDOR_SEEQ is not set |
188 | # CONFIG_NETDEV_10000 is not set | 267 | # CONFIG_NET_VENDOR_SMSC is not set |
268 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
269 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
189 | CONFIG_PPP=m | 270 | CONFIG_PPP=m |
190 | CONFIG_PPP_FILTER=y | ||
191 | CONFIG_PPP_ASYNC=m | ||
192 | CONFIG_PPP_SYNC_TTY=m | ||
193 | CONFIG_PPP_DEFLATE=m | ||
194 | CONFIG_PPP_BSDCOMP=m | 271 | CONFIG_PPP_BSDCOMP=m |
272 | CONFIG_PPP_DEFLATE=m | ||
273 | CONFIG_PPP_FILTER=y | ||
195 | CONFIG_PPP_MPPE=m | 274 | CONFIG_PPP_MPPE=m |
196 | CONFIG_PPPOE=m | 275 | CONFIG_PPPOE=m |
276 | CONFIG_PPTP=m | ||
277 | CONFIG_PPPOL2TP=m | ||
278 | CONFIG_PPP_ASYNC=m | ||
279 | CONFIG_PPP_SYNC_TTY=m | ||
197 | CONFIG_SLIP=m | 280 | CONFIG_SLIP=m |
198 | CONFIG_SLIP_COMPRESSED=y | 281 | CONFIG_SLIP_COMPRESSED=y |
199 | CONFIG_SLIP_SMART=y | 282 | CONFIG_SLIP_SMART=y |
200 | CONFIG_SLIP_MODE_SLIP6=y | 283 | CONFIG_SLIP_MODE_SLIP6=y |
201 | CONFIG_NETCONSOLE=m | 284 | # CONFIG_WLAN is not set |
202 | CONFIG_NETCONSOLE_DYNAMIC=y | 285 | CONFIG_INPUT_EVDEV=m |
203 | CONFIG_INPUT_FF_MEMLESS=m | ||
204 | # CONFIG_KEYBOARD_ATKBD is not set | 286 | # CONFIG_KEYBOARD_ATKBD is not set |
205 | CONFIG_MOUSE_PS2=m | 287 | # CONFIG_MOUSE_PS2 is not set |
206 | CONFIG_MOUSE_SERIAL=m | 288 | CONFIG_MOUSE_SERIAL=m |
207 | CONFIG_INPUT_MISC=y | 289 | CONFIG_INPUT_MISC=y |
208 | CONFIG_INPUT_M68K_BEEP=m | 290 | CONFIG_INPUT_M68K_BEEP=m |
209 | CONFIG_SERIO=m | 291 | CONFIG_SERIO_Q40KBD=y |
210 | # CONFIG_SERIO_SERPORT is not set | ||
211 | CONFIG_SERIO_Q40KBD=m | ||
212 | CONFIG_VT_HW_CONSOLE_BINDING=y | 292 | CONFIG_VT_HW_CONSOLE_BINDING=y |
293 | # CONFIG_LEGACY_PTYS is not set | ||
213 | # CONFIG_DEVKMEM is not set | 294 | # CONFIG_DEVKMEM is not set |
214 | # CONFIG_HW_RANDOM is not set | 295 | # CONFIG_HW_RANDOM is not set |
215 | CONFIG_GEN_RTC=m | 296 | CONFIG_NTP_PPS=y |
216 | CONFIG_GEN_RTC_X=y | 297 | CONFIG_PPS_CLIENT_LDISC=m |
298 | CONFIG_PTP_1588_CLOCK=m | ||
217 | # CONFIG_HWMON is not set | 299 | # CONFIG_HWMON is not set |
218 | CONFIG_FB=y | 300 | CONFIG_FB=y |
219 | CONFIG_FRAMEBUFFER_CONSOLE=y | 301 | CONFIG_FRAMEBUFFER_CONSOLE=y |
@@ -222,46 +304,61 @@ CONFIG_SOUND=m | |||
222 | CONFIG_DMASOUND_Q40=m | 304 | CONFIG_DMASOUND_Q40=m |
223 | CONFIG_HID=m | 305 | CONFIG_HID=m |
224 | CONFIG_HIDRAW=y | 306 | CONFIG_HIDRAW=y |
307 | CONFIG_UHID=m | ||
308 | # CONFIG_HID_GENERIC is not set | ||
225 | # CONFIG_USB_SUPPORT is not set | 309 | # CONFIG_USB_SUPPORT is not set |
310 | CONFIG_RTC_CLASS=y | ||
311 | CONFIG_RTC_DRV_GENERIC=m | ||
312 | # CONFIG_IOMMU_SUPPORT is not set | ||
313 | CONFIG_HEARTBEAT=y | ||
314 | CONFIG_PROC_HARDWARE=y | ||
226 | CONFIG_EXT2_FS=y | 315 | CONFIG_EXT2_FS=y |
227 | CONFIG_EXT3_FS=y | 316 | CONFIG_EXT3_FS=y |
228 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 317 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
229 | # CONFIG_EXT3_FS_XATTR is not set | 318 | # CONFIG_EXT3_FS_XATTR is not set |
319 | CONFIG_EXT4_FS=y | ||
230 | CONFIG_REISERFS_FS=m | 320 | CONFIG_REISERFS_FS=m |
231 | CONFIG_JFS_FS=m | 321 | CONFIG_JFS_FS=m |
232 | CONFIG_XFS_FS=m | 322 | CONFIG_XFS_FS=m |
233 | CONFIG_OCFS2_FS=m | 323 | CONFIG_OCFS2_FS=m |
234 | # CONFIG_OCFS2_FS_STATS is not set | ||
235 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 324 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
325 | CONFIG_FANOTIFY=y | ||
236 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 326 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
237 | # CONFIG_PRINT_QUOTA_WARNING is not set | 327 | # CONFIG_PRINT_QUOTA_WARNING is not set |
238 | CONFIG_AUTOFS_FS=m | ||
239 | CONFIG_AUTOFS4_FS=m | 328 | CONFIG_AUTOFS4_FS=m |
240 | CONFIG_FUSE_FS=m | 329 | CONFIG_FUSE_FS=m |
330 | CONFIG_CUSE=m | ||
241 | CONFIG_ISO9660_FS=y | 331 | CONFIG_ISO9660_FS=y |
242 | CONFIG_JOLIET=y | 332 | CONFIG_JOLIET=y |
243 | CONFIG_ZISOFS=y | 333 | CONFIG_ZISOFS=y |
244 | CONFIG_UDF_FS=m | 334 | CONFIG_UDF_FS=m |
245 | CONFIG_MSDOS_FS=y | 335 | CONFIG_MSDOS_FS=m |
246 | CONFIG_VFAT_FS=m | 336 | CONFIG_VFAT_FS=m |
247 | CONFIG_PROC_KCORE=y | 337 | CONFIG_PROC_KCORE=y |
248 | CONFIG_TMPFS=y | 338 | CONFIG_TMPFS=y |
249 | CONFIG_AFFS_FS=m | 339 | CONFIG_AFFS_FS=m |
340 | CONFIG_ECRYPT_FS=m | ||
341 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
250 | CONFIG_HFS_FS=m | 342 | CONFIG_HFS_FS=m |
251 | CONFIG_HFSPLUS_FS=m | 343 | CONFIG_HFSPLUS_FS=m |
252 | CONFIG_CRAMFS=m | 344 | CONFIG_CRAMFS=m |
253 | CONFIG_SQUASHFS=m | 345 | CONFIG_SQUASHFS=m |
254 | CONFIG_MINIX_FS=y | 346 | CONFIG_SQUASHFS_LZO=y |
347 | CONFIG_MINIX_FS=m | ||
348 | CONFIG_OMFS_FS=m | ||
255 | CONFIG_HPFS_FS=m | 349 | CONFIG_HPFS_FS=m |
350 | CONFIG_QNX4FS_FS=m | ||
351 | CONFIG_QNX6FS_FS=m | ||
256 | CONFIG_SYSV_FS=m | 352 | CONFIG_SYSV_FS=m |
257 | CONFIG_UFS_FS=m | 353 | CONFIG_UFS_FS=m |
258 | CONFIG_NFS_FS=y | 354 | CONFIG_NFS_FS=y |
259 | CONFIG_NFS_V3=y | ||
260 | CONFIG_NFS_V4=y | 355 | CONFIG_NFS_V4=y |
356 | CONFIG_NFS_SWAP=y | ||
357 | CONFIG_ROOT_NFS=y | ||
261 | CONFIG_NFSD=m | 358 | CONFIG_NFSD=m |
262 | CONFIG_NFSD_V3=y | 359 | CONFIG_NFSD_V3=y |
263 | CONFIG_SMB_FS=m | 360 | CONFIG_CIFS=m |
264 | CONFIG_SMB_NLS_DEFAULT=y | 361 | # CONFIG_CIFS_DEBUG is not set |
265 | CONFIG_CODA_FS=m | 362 | CONFIG_CODA_FS=m |
266 | CONFIG_NLS_CODEPAGE_437=y | 363 | CONFIG_NLS_CODEPAGE_437=y |
267 | CONFIG_NLS_CODEPAGE_737=m | 364 | CONFIG_NLS_CODEPAGE_737=m |
@@ -300,10 +397,23 @@ CONFIG_NLS_ISO8859_14=m | |||
300 | CONFIG_NLS_ISO8859_15=m | 397 | CONFIG_NLS_ISO8859_15=m |
301 | CONFIG_NLS_KOI8_R=m | 398 | CONFIG_NLS_KOI8_R=m |
302 | CONFIG_NLS_KOI8_U=m | 399 | CONFIG_NLS_KOI8_U=m |
400 | CONFIG_NLS_MAC_ROMAN=m | ||
401 | CONFIG_NLS_MAC_CELTIC=m | ||
402 | CONFIG_NLS_MAC_CENTEURO=m | ||
403 | CONFIG_NLS_MAC_CROATIAN=m | ||
404 | CONFIG_NLS_MAC_CYRILLIC=m | ||
405 | CONFIG_NLS_MAC_GAELIC=m | ||
406 | CONFIG_NLS_MAC_GREEK=m | ||
407 | CONFIG_NLS_MAC_ICELAND=m | ||
408 | CONFIG_NLS_MAC_INUIT=m | ||
409 | CONFIG_NLS_MAC_ROMANIAN=m | ||
410 | CONFIG_NLS_MAC_TURKISH=m | ||
303 | CONFIG_DLM=m | 411 | CONFIG_DLM=m |
304 | CONFIG_MAGIC_SYSRQ=y | 412 | CONFIG_MAGIC_SYSRQ=y |
305 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 413 | CONFIG_ASYNC_RAID6_TEST=m |
306 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 414 | CONFIG_ENCRYPTED_KEYS=m |
415 | CONFIG_CRYPTO_MANAGER=y | ||
416 | CONFIG_CRYPTO_USER=m | ||
307 | CONFIG_CRYPTO_NULL=m | 417 | CONFIG_CRYPTO_NULL=m |
308 | CONFIG_CRYPTO_CRYPTD=m | 418 | CONFIG_CRYPTO_CRYPTD=m |
309 | CONFIG_CRYPTO_TEST=m | 419 | CONFIG_CRYPTO_TEST=m |
@@ -313,19 +423,16 @@ CONFIG_CRYPTO_CTS=m | |||
313 | CONFIG_CRYPTO_LRW=m | 423 | CONFIG_CRYPTO_LRW=m |
314 | CONFIG_CRYPTO_PCBC=m | 424 | CONFIG_CRYPTO_PCBC=m |
315 | CONFIG_CRYPTO_XTS=m | 425 | CONFIG_CRYPTO_XTS=m |
316 | CONFIG_CRYPTO_HMAC=y | ||
317 | CONFIG_CRYPTO_XCBC=m | 426 | CONFIG_CRYPTO_XCBC=m |
318 | CONFIG_CRYPTO_MD4=m | 427 | CONFIG_CRYPTO_VMAC=m |
319 | CONFIG_CRYPTO_MICHAEL_MIC=m | 428 | CONFIG_CRYPTO_MICHAEL_MIC=m |
320 | CONFIG_CRYPTO_RMD128=m | 429 | CONFIG_CRYPTO_RMD128=m |
321 | CONFIG_CRYPTO_RMD160=m | 430 | CONFIG_CRYPTO_RMD160=m |
322 | CONFIG_CRYPTO_RMD256=m | 431 | CONFIG_CRYPTO_RMD256=m |
323 | CONFIG_CRYPTO_RMD320=m | 432 | CONFIG_CRYPTO_RMD320=m |
324 | CONFIG_CRYPTO_SHA256=m | ||
325 | CONFIG_CRYPTO_SHA512=m | 433 | CONFIG_CRYPTO_SHA512=m |
326 | CONFIG_CRYPTO_TGR192=m | 434 | CONFIG_CRYPTO_TGR192=m |
327 | CONFIG_CRYPTO_WP512=m | 435 | CONFIG_CRYPTO_WP512=m |
328 | CONFIG_CRYPTO_AES=m | ||
329 | CONFIG_CRYPTO_ANUBIS=m | 436 | CONFIG_CRYPTO_ANUBIS=m |
330 | CONFIG_CRYPTO_BLOWFISH=m | 437 | CONFIG_CRYPTO_BLOWFISH=m |
331 | CONFIG_CRYPTO_CAMELLIA=m | 438 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -341,6 +448,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
341 | CONFIG_CRYPTO_ZLIB=m | 448 | CONFIG_CRYPTO_ZLIB=m |
342 | CONFIG_CRYPTO_LZO=m | 449 | CONFIG_CRYPTO_LZO=m |
343 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 450 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
451 | CONFIG_CRYPTO_USER_API_HASH=m | ||
452 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
344 | # CONFIG_CRYPTO_HW is not set | 453 | # CONFIG_CRYPTO_HW is not set |
345 | CONFIG_CRC16=m | ||
346 | CONFIG_CRC_T10DIF=y | 454 | CONFIG_CRC_T10DIF=y |
455 | CONFIG_XZ_DEC_X86=y | ||
456 | CONFIG_XZ_DEC_POWERPC=y | ||
457 | CONFIG_XZ_DEC_IA64=y | ||
458 | CONFIG_XZ_DEC_ARM=y | ||
459 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
460 | CONFIG_XZ_DEC_SPARC=y | ||
461 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index ca6c0b4cab77..54674d61e001 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
@@ -1,50 +1,71 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-sun3" | 1 | CONFIG_LOCALVERSION="-sun3" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
16 | CONFIG_PARTITION_ADVANCED=y | ||
17 | CONFIG_AMIGA_PARTITION=y | ||
18 | CONFIG_ATARI_PARTITION=y | ||
19 | CONFIG_MAC_PARTITION=y | ||
20 | CONFIG_BSD_DISKLABEL=y | ||
21 | CONFIG_MINIX_SUBPARTITION=y | ||
22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
24 | # CONFIG_EFI_PARTITION is not set | ||
25 | CONFIG_SYSV68_PARTITION=y | ||
26 | CONFIG_IOSCHED_DEADLINE=m | ||
13 | CONFIG_SUN3=y | 27 | CONFIG_SUN3=y |
28 | # CONFIG_COMPACTION is not set | ||
29 | CONFIG_CLEANCACHE=y | ||
30 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
14 | CONFIG_BINFMT_AOUT=m | 31 | CONFIG_BINFMT_AOUT=m |
15 | CONFIG_BINFMT_MISC=m | 32 | CONFIG_BINFMT_MISC=m |
16 | CONFIG_PROC_HARDWARE=y | ||
17 | CONFIG_NET=y | 33 | CONFIG_NET=y |
18 | CONFIG_PACKET=y | 34 | CONFIG_PACKET=y |
35 | CONFIG_PACKET_DIAG=m | ||
19 | CONFIG_UNIX=y | 36 | CONFIG_UNIX=y |
37 | CONFIG_UNIX_DIAG=m | ||
38 | CONFIG_XFRM_MIGRATE=y | ||
20 | CONFIG_NET_KEY=y | 39 | CONFIG_NET_KEY=y |
21 | CONFIG_NET_KEY_MIGRATE=y | ||
22 | CONFIG_INET=y | 40 | CONFIG_INET=y |
23 | CONFIG_IP_PNP=y | 41 | CONFIG_IP_PNP=y |
24 | CONFIG_IP_PNP_DHCP=y | 42 | CONFIG_IP_PNP_DHCP=y |
25 | CONFIG_IP_PNP_BOOTP=y | 43 | CONFIG_IP_PNP_BOOTP=y |
26 | CONFIG_IP_PNP_RARP=y | 44 | CONFIG_IP_PNP_RARP=y |
27 | CONFIG_NET_IPIP=m | 45 | CONFIG_NET_IPIP=m |
46 | CONFIG_NET_IPGRE_DEMUX=m | ||
28 | CONFIG_NET_IPGRE=m | 47 | CONFIG_NET_IPGRE=m |
29 | CONFIG_SYN_COOKIES=y | 48 | CONFIG_SYN_COOKIES=y |
49 | CONFIG_NET_IPVTI=m | ||
30 | CONFIG_INET_AH=m | 50 | CONFIG_INET_AH=m |
31 | CONFIG_INET_ESP=m | 51 | CONFIG_INET_ESP=m |
32 | CONFIG_INET_IPCOMP=m | 52 | CONFIG_INET_IPCOMP=m |
33 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 53 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
34 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 54 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
35 | CONFIG_INET_XFRM_MODE_BEET=m | 55 | CONFIG_INET_XFRM_MODE_BEET=m |
56 | # CONFIG_INET_LRO is not set | ||
36 | CONFIG_INET_DIAG=m | 57 | CONFIG_INET_DIAG=m |
58 | CONFIG_INET_UDP_DIAG=m | ||
37 | CONFIG_IPV6_PRIVACY=y | 59 | CONFIG_IPV6_PRIVACY=y |
38 | CONFIG_IPV6_ROUTER_PREF=y | 60 | CONFIG_IPV6_ROUTER_PREF=y |
39 | CONFIG_IPV6_ROUTE_INFO=y | ||
40 | CONFIG_INET6_AH=m | 61 | CONFIG_INET6_AH=m |
41 | CONFIG_INET6_ESP=m | 62 | CONFIG_INET6_ESP=m |
42 | CONFIG_INET6_IPCOMP=m | 63 | CONFIG_INET6_IPCOMP=m |
43 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 64 | CONFIG_IPV6_GRE=m |
44 | CONFIG_IPV6_TUNNEL=m | ||
45 | CONFIG_NETFILTER=y | 65 | CONFIG_NETFILTER=y |
46 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
47 | CONFIG_NF_CONNTRACK=m | 66 | CONFIG_NF_CONNTRACK=m |
67 | CONFIG_NF_CONNTRACK_ZONES=y | ||
68 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
48 | # CONFIG_NF_CT_PROTO_DCCP is not set | 69 | # CONFIG_NF_CT_PROTO_DCCP is not set |
49 | CONFIG_NF_CT_PROTO_UDPLITE=m | 70 | CONFIG_NF_CT_PROTO_UDPLITE=m |
50 | CONFIG_NF_CONNTRACK_AMANDA=m | 71 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -52,25 +73,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
52 | CONFIG_NF_CONNTRACK_H323=m | 73 | CONFIG_NF_CONNTRACK_H323=m |
53 | CONFIG_NF_CONNTRACK_IRC=m | 74 | CONFIG_NF_CONNTRACK_IRC=m |
54 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 75 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
76 | CONFIG_NF_CONNTRACK_SNMP=m | ||
55 | CONFIG_NF_CONNTRACK_PPTP=m | 77 | CONFIG_NF_CONNTRACK_PPTP=m |
56 | CONFIG_NF_CONNTRACK_SANE=m | 78 | CONFIG_NF_CONNTRACK_SANE=m |
57 | CONFIG_NF_CONNTRACK_SIP=m | 79 | CONFIG_NF_CONNTRACK_SIP=m |
58 | CONFIG_NF_CONNTRACK_TFTP=m | 80 | CONFIG_NF_CONNTRACK_TFTP=m |
81 | CONFIG_NETFILTER_XT_SET=m | ||
82 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
59 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 83 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
60 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 84 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
61 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 85 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
86 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
87 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
88 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
62 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 89 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
63 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 90 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
64 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 91 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
92 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
93 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
65 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 94 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
66 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 95 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
67 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 96 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
97 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
98 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
68 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 99 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
69 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 100 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
70 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 101 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
102 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
71 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 103 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
72 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
73 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
106 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
74 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 107 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
75 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 108 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
76 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 109 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -81,6 +114,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
81 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 114 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
82 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 115 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
83 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 116 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
117 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
118 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
84 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 119 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
85 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 120 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
86 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 121 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -94,22 +129,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
94 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 129 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
95 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 130 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
96 | CONFIG_NETFILTER_XT_MATCH_U32=m | 131 | CONFIG_NETFILTER_XT_MATCH_U32=m |
132 | CONFIG_IP_SET=m | ||
133 | CONFIG_IP_SET_BITMAP_IP=m | ||
134 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
135 | CONFIG_IP_SET_BITMAP_PORT=m | ||
136 | CONFIG_IP_SET_HASH_IP=m | ||
137 | CONFIG_IP_SET_HASH_IPPORT=m | ||
138 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
139 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
140 | CONFIG_IP_SET_HASH_NET=m | ||
141 | CONFIG_IP_SET_HASH_NETPORT=m | ||
142 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
143 | CONFIG_IP_SET_LIST_SET=m | ||
97 | CONFIG_NF_CONNTRACK_IPV4=m | 144 | CONFIG_NF_CONNTRACK_IPV4=m |
98 | CONFIG_IP_NF_QUEUE=m | ||
99 | CONFIG_IP_NF_IPTABLES=m | 145 | CONFIG_IP_NF_IPTABLES=m |
100 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
101 | CONFIG_IP_NF_MATCH_AH=m | 146 | CONFIG_IP_NF_MATCH_AH=m |
102 | CONFIG_IP_NF_MATCH_ECN=m | 147 | CONFIG_IP_NF_MATCH_ECN=m |
148 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
103 | CONFIG_IP_NF_MATCH_TTL=m | 149 | CONFIG_IP_NF_MATCH_TTL=m |
104 | CONFIG_IP_NF_FILTER=m | 150 | CONFIG_IP_NF_FILTER=m |
105 | CONFIG_IP_NF_TARGET_REJECT=m | 151 | CONFIG_IP_NF_TARGET_REJECT=m |
106 | CONFIG_IP_NF_TARGET_LOG=m | ||
107 | CONFIG_IP_NF_TARGET_ULOG=m | 152 | CONFIG_IP_NF_TARGET_ULOG=m |
108 | CONFIG_NF_NAT=m | 153 | CONFIG_NF_NAT_IPV4=m |
109 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 154 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
110 | CONFIG_IP_NF_TARGET_NETMAP=m | 155 | CONFIG_IP_NF_TARGET_NETMAP=m |
111 | CONFIG_IP_NF_TARGET_REDIRECT=m | 156 | CONFIG_IP_NF_TARGET_REDIRECT=m |
112 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
113 | CONFIG_IP_NF_MANGLE=m | 157 | CONFIG_IP_NF_MANGLE=m |
114 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 158 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
115 | CONFIG_IP_NF_TARGET_ECN=m | 159 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -119,7 +163,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
119 | CONFIG_IP_NF_ARPFILTER=m | 163 | CONFIG_IP_NF_ARPFILTER=m |
120 | CONFIG_IP_NF_ARP_MANGLE=m | 164 | CONFIG_IP_NF_ARP_MANGLE=m |
121 | CONFIG_NF_CONNTRACK_IPV6=m | 165 | CONFIG_NF_CONNTRACK_IPV6=m |
122 | CONFIG_IP6_NF_QUEUE=m | ||
123 | CONFIG_IP6_NF_IPTABLES=m | 166 | CONFIG_IP6_NF_IPTABLES=m |
124 | CONFIG_IP6_NF_MATCH_AH=m | 167 | CONFIG_IP6_NF_MATCH_AH=m |
125 | CONFIG_IP6_NF_MATCH_EUI64=m | 168 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -128,21 +171,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
128 | CONFIG_IP6_NF_MATCH_HL=m | 171 | CONFIG_IP6_NF_MATCH_HL=m |
129 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 172 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
130 | CONFIG_IP6_NF_MATCH_MH=m | 173 | CONFIG_IP6_NF_MATCH_MH=m |
174 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
131 | CONFIG_IP6_NF_MATCH_RT=m | 175 | CONFIG_IP6_NF_MATCH_RT=m |
132 | CONFIG_IP6_NF_TARGET_HL=m | 176 | CONFIG_IP6_NF_TARGET_HL=m |
133 | CONFIG_IP6_NF_TARGET_LOG=m | ||
134 | CONFIG_IP6_NF_FILTER=m | 177 | CONFIG_IP6_NF_FILTER=m |
135 | CONFIG_IP6_NF_TARGET_REJECT=m | 178 | CONFIG_IP6_NF_TARGET_REJECT=m |
136 | CONFIG_IP6_NF_MANGLE=m | 179 | CONFIG_IP6_NF_MANGLE=m |
137 | CONFIG_IP6_NF_RAW=m | 180 | CONFIG_IP6_NF_RAW=m |
181 | CONFIG_NF_NAT_IPV6=m | ||
182 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
183 | CONFIG_IP6_NF_TARGET_NPT=m | ||
138 | CONFIG_IP_DCCP=m | 184 | CONFIG_IP_DCCP=m |
139 | # CONFIG_IP_DCCP_CCID3 is not set | 185 | # CONFIG_IP_DCCP_CCID3 is not set |
186 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
187 | CONFIG_RDS=m | ||
188 | CONFIG_RDS_TCP=m | ||
189 | CONFIG_L2TP=m | ||
140 | CONFIG_ATALK=m | 190 | CONFIG_ATALK=m |
191 | CONFIG_BATMAN_ADV=m | ||
192 | CONFIG_BATMAN_ADV_DAT=y | ||
193 | # CONFIG_WIRELESS is not set | ||
141 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 194 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
195 | CONFIG_DEVTMPFS=y | ||
142 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 196 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
197 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
143 | CONFIG_CONNECTOR=m | 198 | CONFIG_CONNECTOR=m |
144 | CONFIG_BLK_DEV_LOOP=y | 199 | CONFIG_BLK_DEV_LOOP=y |
145 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 200 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
201 | CONFIG_BLK_DEV_DRBD=m | ||
146 | CONFIG_BLK_DEV_NBD=m | 202 | CONFIG_BLK_DEV_NBD=m |
147 | CONFIG_BLK_DEV_RAM=y | 203 | CONFIG_BLK_DEV_RAM=y |
148 | CONFIG_CDROM_PKTCDVD=m | 204 | CONFIG_CDROM_PKTCDVD=m |
@@ -157,107 +213,136 @@ CONFIG_BLK_DEV_SR=y | |||
157 | CONFIG_BLK_DEV_SR_VENDOR=y | 213 | CONFIG_BLK_DEV_SR_VENDOR=y |
158 | CONFIG_CHR_DEV_SG=m | 214 | CONFIG_CHR_DEV_SG=m |
159 | CONFIG_SCSI_CONSTANTS=y | 215 | CONFIG_SCSI_CONSTANTS=y |
160 | CONFIG_SCSI_SAS_LIBSAS=m | 216 | CONFIG_SCSI_SAS_ATTRS=m |
161 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
162 | CONFIG_SCSI_SRP_ATTRS=m | ||
163 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
164 | CONFIG_ISCSI_TCP=m | 217 | CONFIG_ISCSI_TCP=m |
218 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
165 | CONFIG_SUN3_SCSI=y | 219 | CONFIG_SUN3_SCSI=y |
166 | CONFIG_MD=y | 220 | CONFIG_MD=y |
167 | CONFIG_BLK_DEV_MD=m | ||
168 | CONFIG_MD_LINEAR=m | 221 | CONFIG_MD_LINEAR=m |
169 | CONFIG_MD_RAID0=m | 222 | CONFIG_MD_RAID0=m |
170 | CONFIG_MD_RAID1=m | ||
171 | CONFIG_MD_RAID456=m | ||
172 | CONFIG_BLK_DEV_DM=m | 223 | CONFIG_BLK_DEV_DM=m |
173 | CONFIG_DM_CRYPT=m | 224 | CONFIG_DM_CRYPT=m |
174 | CONFIG_DM_SNAPSHOT=m | 225 | CONFIG_DM_SNAPSHOT=m |
226 | CONFIG_DM_THIN_PROVISIONING=m | ||
227 | CONFIG_DM_CACHE=m | ||
175 | CONFIG_DM_MIRROR=m | 228 | CONFIG_DM_MIRROR=m |
229 | CONFIG_DM_RAID=m | ||
176 | CONFIG_DM_ZERO=m | 230 | CONFIG_DM_ZERO=m |
177 | CONFIG_DM_MULTIPATH=m | 231 | CONFIG_DM_MULTIPATH=m |
178 | CONFIG_DM_UEVENT=y | 232 | CONFIG_DM_UEVENT=y |
233 | CONFIG_TARGET_CORE=m | ||
234 | CONFIG_TCM_IBLOCK=m | ||
235 | CONFIG_TCM_FILEIO=m | ||
236 | CONFIG_TCM_PSCSI=m | ||
179 | CONFIG_NETDEVICES=y | 237 | CONFIG_NETDEVICES=y |
180 | CONFIG_DUMMY=m | 238 | CONFIG_DUMMY=m |
181 | CONFIG_MACVLAN=m | ||
182 | CONFIG_EQUALIZER=m | 239 | CONFIG_EQUALIZER=m |
240 | CONFIG_NET_TEAM=m | ||
241 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
242 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
243 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
244 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
245 | CONFIG_VXLAN=m | ||
246 | CONFIG_NETCONSOLE=m | ||
247 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
183 | CONFIG_VETH=m | 248 | CONFIG_VETH=m |
184 | CONFIG_NET_ETHERNET=y | ||
185 | CONFIG_SUN3LANCE=y | 249 | CONFIG_SUN3LANCE=y |
250 | # CONFIG_NET_CADENCE is not set | ||
186 | CONFIG_SUN3_82586=y | 251 | CONFIG_SUN3_82586=y |
187 | # CONFIG_NETDEV_1000 is not set | 252 | # CONFIG_NET_VENDOR_MARVELL is not set |
188 | # CONFIG_NETDEV_10000 is not set | 253 | # CONFIG_NET_VENDOR_MICREL is not set |
254 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
255 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
256 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
257 | # CONFIG_NET_VENDOR_SUN is not set | ||
258 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
189 | CONFIG_PPP=m | 259 | CONFIG_PPP=m |
190 | CONFIG_PPP_FILTER=y | ||
191 | CONFIG_PPP_ASYNC=m | ||
192 | CONFIG_PPP_SYNC_TTY=m | ||
193 | CONFIG_PPP_DEFLATE=m | ||
194 | CONFIG_PPP_BSDCOMP=m | 260 | CONFIG_PPP_BSDCOMP=m |
261 | CONFIG_PPP_DEFLATE=m | ||
262 | CONFIG_PPP_FILTER=y | ||
195 | CONFIG_PPP_MPPE=m | 263 | CONFIG_PPP_MPPE=m |
196 | CONFIG_PPPOE=m | 264 | CONFIG_PPPOE=m |
265 | CONFIG_PPTP=m | ||
266 | CONFIG_PPPOL2TP=m | ||
267 | CONFIG_PPP_ASYNC=m | ||
268 | CONFIG_PPP_SYNC_TTY=m | ||
197 | CONFIG_SLIP=m | 269 | CONFIG_SLIP=m |
198 | CONFIG_SLIP_COMPRESSED=y | 270 | CONFIG_SLIP_COMPRESSED=y |
199 | CONFIG_SLIP_SMART=y | 271 | CONFIG_SLIP_SMART=y |
200 | CONFIG_SLIP_MODE_SLIP6=y | 272 | CONFIG_SLIP_MODE_SLIP6=y |
201 | CONFIG_NETCONSOLE=m | 273 | # CONFIG_WLAN is not set |
202 | CONFIG_NETCONSOLE_DYNAMIC=y | 274 | CONFIG_INPUT_EVDEV=m |
203 | CONFIG_INPUT_FF_MEMLESS=m | ||
204 | # CONFIG_KEYBOARD_ATKBD is not set | 275 | # CONFIG_KEYBOARD_ATKBD is not set |
205 | CONFIG_KEYBOARD_SUNKBD=y | 276 | CONFIG_KEYBOARD_SUNKBD=y |
206 | CONFIG_MOUSE_PS2=m | 277 | # CONFIG_MOUSE_PS2 is not set |
207 | CONFIG_MOUSE_SERIAL=m | 278 | CONFIG_MOUSE_SERIAL=m |
208 | # CONFIG_SERIO_SERPORT is not set | ||
209 | CONFIG_VT_HW_CONSOLE_BINDING=y | 279 | CONFIG_VT_HW_CONSOLE_BINDING=y |
280 | # CONFIG_LEGACY_PTYS is not set | ||
210 | # CONFIG_DEVKMEM is not set | 281 | # CONFIG_DEVKMEM is not set |
211 | # CONFIG_HW_RANDOM is not set | 282 | # CONFIG_HW_RANDOM is not set |
212 | CONFIG_GEN_RTC=m | 283 | CONFIG_NTP_PPS=y |
213 | CONFIG_GEN_RTC_X=y | 284 | CONFIG_PPS_CLIENT_LDISC=m |
285 | CONFIG_PTP_1588_CLOCK=m | ||
214 | # CONFIG_HWMON is not set | 286 | # CONFIG_HWMON is not set |
215 | CONFIG_FB=y | 287 | CONFIG_FB=y |
216 | CONFIG_FRAMEBUFFER_CONSOLE=y | 288 | CONFIG_FRAMEBUFFER_CONSOLE=y |
217 | CONFIG_LOGO=y | 289 | CONFIG_LOGO=y |
218 | CONFIG_HID=m | 290 | CONFIG_HID=m |
219 | CONFIG_HIDRAW=y | 291 | CONFIG_HIDRAW=y |
292 | CONFIG_UHID=m | ||
293 | # CONFIG_HID_GENERIC is not set | ||
220 | # CONFIG_USB_SUPPORT is not set | 294 | # CONFIG_USB_SUPPORT is not set |
295 | CONFIG_RTC_CLASS=y | ||
296 | CONFIG_RTC_DRV_GENERIC=m | ||
297 | # CONFIG_IOMMU_SUPPORT is not set | ||
298 | CONFIG_PROC_HARDWARE=y | ||
221 | CONFIG_EXT2_FS=y | 299 | CONFIG_EXT2_FS=y |
222 | CONFIG_EXT3_FS=y | 300 | CONFIG_EXT3_FS=y |
223 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 301 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
224 | # CONFIG_EXT3_FS_XATTR is not set | 302 | # CONFIG_EXT3_FS_XATTR is not set |
303 | CONFIG_EXT4_FS=y | ||
225 | CONFIG_REISERFS_FS=m | 304 | CONFIG_REISERFS_FS=m |
226 | CONFIG_JFS_FS=m | 305 | CONFIG_JFS_FS=m |
227 | CONFIG_XFS_FS=m | 306 | CONFIG_XFS_FS=m |
228 | CONFIG_OCFS2_FS=m | 307 | CONFIG_OCFS2_FS=m |
229 | # CONFIG_OCFS2_FS_STATS is not set | ||
230 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 308 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
309 | CONFIG_FANOTIFY=y | ||
231 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 310 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
232 | # CONFIG_PRINT_QUOTA_WARNING is not set | 311 | # CONFIG_PRINT_QUOTA_WARNING is not set |
233 | CONFIG_AUTOFS_FS=m | ||
234 | CONFIG_AUTOFS4_FS=m | 312 | CONFIG_AUTOFS4_FS=m |
235 | CONFIG_FUSE_FS=m | 313 | CONFIG_FUSE_FS=m |
314 | CONFIG_CUSE=m | ||
236 | CONFIG_ISO9660_FS=y | 315 | CONFIG_ISO9660_FS=y |
237 | CONFIG_JOLIET=y | 316 | CONFIG_JOLIET=y |
238 | CONFIG_ZISOFS=y | 317 | CONFIG_ZISOFS=y |
239 | CONFIG_UDF_FS=m | 318 | CONFIG_UDF_FS=m |
240 | CONFIG_MSDOS_FS=y | 319 | CONFIG_MSDOS_FS=m |
241 | CONFIG_VFAT_FS=m | 320 | CONFIG_VFAT_FS=m |
242 | CONFIG_PROC_KCORE=y | 321 | CONFIG_PROC_KCORE=y |
243 | CONFIG_TMPFS=y | 322 | CONFIG_TMPFS=y |
244 | CONFIG_AFFS_FS=m | 323 | CONFIG_AFFS_FS=m |
324 | CONFIG_ECRYPT_FS=m | ||
325 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
245 | CONFIG_HFS_FS=m | 326 | CONFIG_HFS_FS=m |
246 | CONFIG_HFSPLUS_FS=m | 327 | CONFIG_HFSPLUS_FS=m |
247 | CONFIG_CRAMFS=m | 328 | CONFIG_CRAMFS=m |
248 | CONFIG_SQUASHFS=m | 329 | CONFIG_SQUASHFS=m |
249 | CONFIG_MINIX_FS=y | 330 | CONFIG_SQUASHFS_LZO=y |
331 | CONFIG_MINIX_FS=m | ||
332 | CONFIG_OMFS_FS=m | ||
250 | CONFIG_HPFS_FS=m | 333 | CONFIG_HPFS_FS=m |
334 | CONFIG_QNX4FS_FS=m | ||
335 | CONFIG_QNX6FS_FS=m | ||
251 | CONFIG_SYSV_FS=m | 336 | CONFIG_SYSV_FS=m |
252 | CONFIG_UFS_FS=m | 337 | CONFIG_UFS_FS=m |
253 | CONFIG_NFS_FS=y | 338 | CONFIG_NFS_FS=y |
254 | CONFIG_NFS_V3=y | ||
255 | CONFIG_NFS_V4=y | 339 | CONFIG_NFS_V4=y |
340 | CONFIG_NFS_SWAP=y | ||
256 | CONFIG_ROOT_NFS=y | 341 | CONFIG_ROOT_NFS=y |
257 | CONFIG_NFSD=m | 342 | CONFIG_NFSD=m |
258 | CONFIG_NFSD_V3=y | 343 | CONFIG_NFSD_V3=y |
259 | CONFIG_SMB_FS=m | 344 | CONFIG_CIFS=m |
260 | CONFIG_SMB_NLS_DEFAULT=y | 345 | # CONFIG_CIFS_DEBUG is not set |
261 | CONFIG_CODA_FS=m | 346 | CONFIG_CODA_FS=m |
262 | CONFIG_NLS_CODEPAGE_437=y | 347 | CONFIG_NLS_CODEPAGE_437=y |
263 | CONFIG_NLS_CODEPAGE_737=m | 348 | CONFIG_NLS_CODEPAGE_737=m |
@@ -296,10 +381,23 @@ CONFIG_NLS_ISO8859_14=m | |||
296 | CONFIG_NLS_ISO8859_15=m | 381 | CONFIG_NLS_ISO8859_15=m |
297 | CONFIG_NLS_KOI8_R=m | 382 | CONFIG_NLS_KOI8_R=m |
298 | CONFIG_NLS_KOI8_U=m | 383 | CONFIG_NLS_KOI8_U=m |
384 | CONFIG_NLS_MAC_ROMAN=m | ||
385 | CONFIG_NLS_MAC_CELTIC=m | ||
386 | CONFIG_NLS_MAC_CENTEURO=m | ||
387 | CONFIG_NLS_MAC_CROATIAN=m | ||
388 | CONFIG_NLS_MAC_CYRILLIC=m | ||
389 | CONFIG_NLS_MAC_GAELIC=m | ||
390 | CONFIG_NLS_MAC_GREEK=m | ||
391 | CONFIG_NLS_MAC_ICELAND=m | ||
392 | CONFIG_NLS_MAC_INUIT=m | ||
393 | CONFIG_NLS_MAC_ROMANIAN=m | ||
394 | CONFIG_NLS_MAC_TURKISH=m | ||
299 | CONFIG_DLM=m | 395 | CONFIG_DLM=m |
300 | CONFIG_MAGIC_SYSRQ=y | 396 | CONFIG_MAGIC_SYSRQ=y |
301 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 397 | CONFIG_ASYNC_RAID6_TEST=m |
302 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 398 | CONFIG_ENCRYPTED_KEYS=m |
399 | CONFIG_CRYPTO_MANAGER=y | ||
400 | CONFIG_CRYPTO_USER=m | ||
303 | CONFIG_CRYPTO_NULL=m | 401 | CONFIG_CRYPTO_NULL=m |
304 | CONFIG_CRYPTO_CRYPTD=m | 402 | CONFIG_CRYPTO_CRYPTD=m |
305 | CONFIG_CRYPTO_TEST=m | 403 | CONFIG_CRYPTO_TEST=m |
@@ -309,19 +407,16 @@ CONFIG_CRYPTO_CTS=m | |||
309 | CONFIG_CRYPTO_LRW=m | 407 | CONFIG_CRYPTO_LRW=m |
310 | CONFIG_CRYPTO_PCBC=m | 408 | CONFIG_CRYPTO_PCBC=m |
311 | CONFIG_CRYPTO_XTS=m | 409 | CONFIG_CRYPTO_XTS=m |
312 | CONFIG_CRYPTO_HMAC=y | ||
313 | CONFIG_CRYPTO_XCBC=m | 410 | CONFIG_CRYPTO_XCBC=m |
314 | CONFIG_CRYPTO_MD4=m | 411 | CONFIG_CRYPTO_VMAC=m |
315 | CONFIG_CRYPTO_MICHAEL_MIC=m | 412 | CONFIG_CRYPTO_MICHAEL_MIC=m |
316 | CONFIG_CRYPTO_RMD128=m | 413 | CONFIG_CRYPTO_RMD128=m |
317 | CONFIG_CRYPTO_RMD160=m | 414 | CONFIG_CRYPTO_RMD160=m |
318 | CONFIG_CRYPTO_RMD256=m | 415 | CONFIG_CRYPTO_RMD256=m |
319 | CONFIG_CRYPTO_RMD320=m | 416 | CONFIG_CRYPTO_RMD320=m |
320 | CONFIG_CRYPTO_SHA256=m | ||
321 | CONFIG_CRYPTO_SHA512=m | 417 | CONFIG_CRYPTO_SHA512=m |
322 | CONFIG_CRYPTO_TGR192=m | 418 | CONFIG_CRYPTO_TGR192=m |
323 | CONFIG_CRYPTO_WP512=m | 419 | CONFIG_CRYPTO_WP512=m |
324 | CONFIG_CRYPTO_AES=m | ||
325 | CONFIG_CRYPTO_ANUBIS=m | 420 | CONFIG_CRYPTO_ANUBIS=m |
326 | CONFIG_CRYPTO_BLOWFISH=m | 421 | CONFIG_CRYPTO_BLOWFISH=m |
327 | CONFIG_CRYPTO_CAMELLIA=m | 422 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -337,6 +432,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
337 | CONFIG_CRYPTO_ZLIB=m | 432 | CONFIG_CRYPTO_ZLIB=m |
338 | CONFIG_CRYPTO_LZO=m | 433 | CONFIG_CRYPTO_LZO=m |
339 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 434 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
435 | CONFIG_CRYPTO_USER_API_HASH=m | ||
436 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
340 | # CONFIG_CRYPTO_HW is not set | 437 | # CONFIG_CRYPTO_HW is not set |
341 | CONFIG_CRC16=m | ||
342 | CONFIG_CRC_T10DIF=y | 438 | CONFIG_CRC_T10DIF=y |
439 | CONFIG_XZ_DEC_X86=y | ||
440 | CONFIG_XZ_DEC_POWERPC=y | ||
441 | CONFIG_XZ_DEC_IA64=y | ||
442 | CONFIG_XZ_DEC_ARM=y | ||
443 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
444 | CONFIG_XZ_DEC_SPARC=y | ||
445 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index c80941c7759e..832d9539f441 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -1,50 +1,71 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_LOCALVERSION="-sun3x" | 1 | CONFIG_LOCALVERSION="-sun3x" |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
4 | CONFIG_FHANDLE=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
8 | # CONFIG_UTS_NS is not set | ||
9 | # CONFIG_IPC_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | # CONFIG_NET_NS is not set | ||
8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
16 | CONFIG_PARTITION_ADVANCED=y | ||
17 | CONFIG_AMIGA_PARTITION=y | ||
18 | CONFIG_ATARI_PARTITION=y | ||
19 | CONFIG_MAC_PARTITION=y | ||
20 | CONFIG_BSD_DISKLABEL=y | ||
21 | CONFIG_MINIX_SUBPARTITION=y | ||
22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
24 | # CONFIG_EFI_PARTITION is not set | ||
25 | CONFIG_SYSV68_PARTITION=y | ||
26 | CONFIG_IOSCHED_DEADLINE=m | ||
13 | CONFIG_SUN3X=y | 27 | CONFIG_SUN3X=y |
28 | # CONFIG_COMPACTION is not set | ||
29 | CONFIG_CLEANCACHE=y | ||
30 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
14 | CONFIG_BINFMT_AOUT=m | 31 | CONFIG_BINFMT_AOUT=m |
15 | CONFIG_BINFMT_MISC=m | 32 | CONFIG_BINFMT_MISC=m |
16 | CONFIG_PROC_HARDWARE=y | ||
17 | CONFIG_NET=y | 33 | CONFIG_NET=y |
18 | CONFIG_PACKET=y | 34 | CONFIG_PACKET=y |
35 | CONFIG_PACKET_DIAG=m | ||
19 | CONFIG_UNIX=y | 36 | CONFIG_UNIX=y |
37 | CONFIG_UNIX_DIAG=m | ||
38 | CONFIG_XFRM_MIGRATE=y | ||
20 | CONFIG_NET_KEY=y | 39 | CONFIG_NET_KEY=y |
21 | CONFIG_NET_KEY_MIGRATE=y | ||
22 | CONFIG_INET=y | 40 | CONFIG_INET=y |
23 | CONFIG_IP_PNP=y | 41 | CONFIG_IP_PNP=y |
24 | CONFIG_IP_PNP_DHCP=y | 42 | CONFIG_IP_PNP_DHCP=y |
25 | CONFIG_IP_PNP_BOOTP=y | 43 | CONFIG_IP_PNP_BOOTP=y |
26 | CONFIG_IP_PNP_RARP=y | 44 | CONFIG_IP_PNP_RARP=y |
27 | CONFIG_NET_IPIP=m | 45 | CONFIG_NET_IPIP=m |
46 | CONFIG_NET_IPGRE_DEMUX=m | ||
28 | CONFIG_NET_IPGRE=m | 47 | CONFIG_NET_IPGRE=m |
29 | CONFIG_SYN_COOKIES=y | 48 | CONFIG_SYN_COOKIES=y |
49 | CONFIG_NET_IPVTI=m | ||
30 | CONFIG_INET_AH=m | 50 | CONFIG_INET_AH=m |
31 | CONFIG_INET_ESP=m | 51 | CONFIG_INET_ESP=m |
32 | CONFIG_INET_IPCOMP=m | 52 | CONFIG_INET_IPCOMP=m |
33 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 53 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
34 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 54 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
35 | CONFIG_INET_XFRM_MODE_BEET=m | 55 | CONFIG_INET_XFRM_MODE_BEET=m |
56 | # CONFIG_INET_LRO is not set | ||
36 | CONFIG_INET_DIAG=m | 57 | CONFIG_INET_DIAG=m |
58 | CONFIG_INET_UDP_DIAG=m | ||
37 | CONFIG_IPV6_PRIVACY=y | 59 | CONFIG_IPV6_PRIVACY=y |
38 | CONFIG_IPV6_ROUTER_PREF=y | 60 | CONFIG_IPV6_ROUTER_PREF=y |
39 | CONFIG_IPV6_ROUTE_INFO=y | ||
40 | CONFIG_INET6_AH=m | 61 | CONFIG_INET6_AH=m |
41 | CONFIG_INET6_ESP=m | 62 | CONFIG_INET6_ESP=m |
42 | CONFIG_INET6_IPCOMP=m | 63 | CONFIG_INET6_IPCOMP=m |
43 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 64 | CONFIG_IPV6_GRE=m |
44 | CONFIG_IPV6_TUNNEL=m | ||
45 | CONFIG_NETFILTER=y | 65 | CONFIG_NETFILTER=y |
46 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
47 | CONFIG_NF_CONNTRACK=m | 66 | CONFIG_NF_CONNTRACK=m |
67 | CONFIG_NF_CONNTRACK_ZONES=y | ||
68 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
48 | # CONFIG_NF_CT_PROTO_DCCP is not set | 69 | # CONFIG_NF_CT_PROTO_DCCP is not set |
49 | CONFIG_NF_CT_PROTO_UDPLITE=m | 70 | CONFIG_NF_CT_PROTO_UDPLITE=m |
50 | CONFIG_NF_CONNTRACK_AMANDA=m | 71 | CONFIG_NF_CONNTRACK_AMANDA=m |
@@ -52,25 +73,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
52 | CONFIG_NF_CONNTRACK_H323=m | 73 | CONFIG_NF_CONNTRACK_H323=m |
53 | CONFIG_NF_CONNTRACK_IRC=m | 74 | CONFIG_NF_CONNTRACK_IRC=m |
54 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 75 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
76 | CONFIG_NF_CONNTRACK_SNMP=m | ||
55 | CONFIG_NF_CONNTRACK_PPTP=m | 77 | CONFIG_NF_CONNTRACK_PPTP=m |
56 | CONFIG_NF_CONNTRACK_SANE=m | 78 | CONFIG_NF_CONNTRACK_SANE=m |
57 | CONFIG_NF_CONNTRACK_SIP=m | 79 | CONFIG_NF_CONNTRACK_SIP=m |
58 | CONFIG_NF_CONNTRACK_TFTP=m | 80 | CONFIG_NF_CONNTRACK_TFTP=m |
81 | CONFIG_NETFILTER_XT_SET=m | ||
82 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
59 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 83 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
60 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 84 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
61 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 85 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
86 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
87 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
88 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
62 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 89 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
63 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 90 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
64 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 91 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
92 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
93 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
65 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 94 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
66 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 95 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
67 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 96 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
97 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
98 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
68 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 99 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
69 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 100 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
70 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 101 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
102 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
71 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 103 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
72 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
73 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
106 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
74 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 107 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
75 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 108 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
76 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 109 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
@@ -81,6 +114,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
81 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 114 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
82 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 115 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
83 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 116 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
117 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
118 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
84 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 119 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
85 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 120 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
86 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 121 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
@@ -94,22 +129,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
94 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 129 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
95 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 130 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
96 | CONFIG_NETFILTER_XT_MATCH_U32=m | 131 | CONFIG_NETFILTER_XT_MATCH_U32=m |
132 | CONFIG_IP_SET=m | ||
133 | CONFIG_IP_SET_BITMAP_IP=m | ||
134 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
135 | CONFIG_IP_SET_BITMAP_PORT=m | ||
136 | CONFIG_IP_SET_HASH_IP=m | ||
137 | CONFIG_IP_SET_HASH_IPPORT=m | ||
138 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
139 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
140 | CONFIG_IP_SET_HASH_NET=m | ||
141 | CONFIG_IP_SET_HASH_NETPORT=m | ||
142 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
143 | CONFIG_IP_SET_LIST_SET=m | ||
97 | CONFIG_NF_CONNTRACK_IPV4=m | 144 | CONFIG_NF_CONNTRACK_IPV4=m |
98 | CONFIG_IP_NF_QUEUE=m | ||
99 | CONFIG_IP_NF_IPTABLES=m | 145 | CONFIG_IP_NF_IPTABLES=m |
100 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
101 | CONFIG_IP_NF_MATCH_AH=m | 146 | CONFIG_IP_NF_MATCH_AH=m |
102 | CONFIG_IP_NF_MATCH_ECN=m | 147 | CONFIG_IP_NF_MATCH_ECN=m |
148 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
103 | CONFIG_IP_NF_MATCH_TTL=m | 149 | CONFIG_IP_NF_MATCH_TTL=m |
104 | CONFIG_IP_NF_FILTER=m | 150 | CONFIG_IP_NF_FILTER=m |
105 | CONFIG_IP_NF_TARGET_REJECT=m | 151 | CONFIG_IP_NF_TARGET_REJECT=m |
106 | CONFIG_IP_NF_TARGET_LOG=m | ||
107 | CONFIG_IP_NF_TARGET_ULOG=m | 152 | CONFIG_IP_NF_TARGET_ULOG=m |
108 | CONFIG_NF_NAT=m | 153 | CONFIG_NF_NAT_IPV4=m |
109 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 154 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
110 | CONFIG_IP_NF_TARGET_NETMAP=m | 155 | CONFIG_IP_NF_TARGET_NETMAP=m |
111 | CONFIG_IP_NF_TARGET_REDIRECT=m | 156 | CONFIG_IP_NF_TARGET_REDIRECT=m |
112 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
113 | CONFIG_IP_NF_MANGLE=m | 157 | CONFIG_IP_NF_MANGLE=m |
114 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 158 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
115 | CONFIG_IP_NF_TARGET_ECN=m | 159 | CONFIG_IP_NF_TARGET_ECN=m |
@@ -119,7 +163,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
119 | CONFIG_IP_NF_ARPFILTER=m | 163 | CONFIG_IP_NF_ARPFILTER=m |
120 | CONFIG_IP_NF_ARP_MANGLE=m | 164 | CONFIG_IP_NF_ARP_MANGLE=m |
121 | CONFIG_NF_CONNTRACK_IPV6=m | 165 | CONFIG_NF_CONNTRACK_IPV6=m |
122 | CONFIG_IP6_NF_QUEUE=m | ||
123 | CONFIG_IP6_NF_IPTABLES=m | 166 | CONFIG_IP6_NF_IPTABLES=m |
124 | CONFIG_IP6_NF_MATCH_AH=m | 167 | CONFIG_IP6_NF_MATCH_AH=m |
125 | CONFIG_IP6_NF_MATCH_EUI64=m | 168 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -128,21 +171,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
128 | CONFIG_IP6_NF_MATCH_HL=m | 171 | CONFIG_IP6_NF_MATCH_HL=m |
129 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 172 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
130 | CONFIG_IP6_NF_MATCH_MH=m | 173 | CONFIG_IP6_NF_MATCH_MH=m |
174 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
131 | CONFIG_IP6_NF_MATCH_RT=m | 175 | CONFIG_IP6_NF_MATCH_RT=m |
132 | CONFIG_IP6_NF_TARGET_HL=m | 176 | CONFIG_IP6_NF_TARGET_HL=m |
133 | CONFIG_IP6_NF_TARGET_LOG=m | ||
134 | CONFIG_IP6_NF_FILTER=m | 177 | CONFIG_IP6_NF_FILTER=m |
135 | CONFIG_IP6_NF_TARGET_REJECT=m | 178 | CONFIG_IP6_NF_TARGET_REJECT=m |
136 | CONFIG_IP6_NF_MANGLE=m | 179 | CONFIG_IP6_NF_MANGLE=m |
137 | CONFIG_IP6_NF_RAW=m | 180 | CONFIG_IP6_NF_RAW=m |
181 | CONFIG_NF_NAT_IPV6=m | ||
182 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
183 | CONFIG_IP6_NF_TARGET_NPT=m | ||
138 | CONFIG_IP_DCCP=m | 184 | CONFIG_IP_DCCP=m |
139 | # CONFIG_IP_DCCP_CCID3 is not set | 185 | # CONFIG_IP_DCCP_CCID3 is not set |
186 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
187 | CONFIG_RDS=m | ||
188 | CONFIG_RDS_TCP=m | ||
189 | CONFIG_L2TP=m | ||
140 | CONFIG_ATALK=m | 190 | CONFIG_ATALK=m |
191 | CONFIG_BATMAN_ADV=m | ||
192 | CONFIG_BATMAN_ADV_DAT=y | ||
193 | # CONFIG_WIRELESS is not set | ||
141 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 194 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
195 | CONFIG_DEVTMPFS=y | ||
142 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 196 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
197 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
143 | CONFIG_CONNECTOR=m | 198 | CONFIG_CONNECTOR=m |
144 | CONFIG_BLK_DEV_LOOP=y | 199 | CONFIG_BLK_DEV_LOOP=y |
145 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 200 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
201 | CONFIG_BLK_DEV_DRBD=m | ||
146 | CONFIG_BLK_DEV_NBD=m | 202 | CONFIG_BLK_DEV_NBD=m |
147 | CONFIG_BLK_DEV_RAM=y | 203 | CONFIG_BLK_DEV_RAM=y |
148 | CONFIG_CDROM_PKTCDVD=m | 204 | CONFIG_CDROM_PKTCDVD=m |
@@ -157,106 +213,136 @@ CONFIG_BLK_DEV_SR=y | |||
157 | CONFIG_BLK_DEV_SR_VENDOR=y | 213 | CONFIG_BLK_DEV_SR_VENDOR=y |
158 | CONFIG_CHR_DEV_SG=m | 214 | CONFIG_CHR_DEV_SG=m |
159 | CONFIG_SCSI_CONSTANTS=y | 215 | CONFIG_SCSI_CONSTANTS=y |
160 | CONFIG_SCSI_SAS_LIBSAS=m | 216 | CONFIG_SCSI_SAS_ATTRS=m |
161 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
162 | CONFIG_SCSI_SRP_ATTRS=m | ||
163 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
164 | CONFIG_ISCSI_TCP=m | 217 | CONFIG_ISCSI_TCP=m |
218 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
165 | CONFIG_SUN3X_ESP=y | 219 | CONFIG_SUN3X_ESP=y |
166 | CONFIG_MD=y | 220 | CONFIG_MD=y |
167 | CONFIG_BLK_DEV_MD=m | ||
168 | CONFIG_MD_LINEAR=m | 221 | CONFIG_MD_LINEAR=m |
169 | CONFIG_MD_RAID0=m | 222 | CONFIG_MD_RAID0=m |
170 | CONFIG_MD_RAID1=m | ||
171 | CONFIG_MD_RAID456=m | ||
172 | CONFIG_BLK_DEV_DM=m | 223 | CONFIG_BLK_DEV_DM=m |
173 | CONFIG_DM_CRYPT=m | 224 | CONFIG_DM_CRYPT=m |
174 | CONFIG_DM_SNAPSHOT=m | 225 | CONFIG_DM_SNAPSHOT=m |
226 | CONFIG_DM_THIN_PROVISIONING=m | ||
227 | CONFIG_DM_CACHE=m | ||
175 | CONFIG_DM_MIRROR=m | 228 | CONFIG_DM_MIRROR=m |
229 | CONFIG_DM_RAID=m | ||
176 | CONFIG_DM_ZERO=m | 230 | CONFIG_DM_ZERO=m |
177 | CONFIG_DM_MULTIPATH=m | 231 | CONFIG_DM_MULTIPATH=m |
178 | CONFIG_DM_UEVENT=y | 232 | CONFIG_DM_UEVENT=y |
233 | CONFIG_TARGET_CORE=m | ||
234 | CONFIG_TCM_IBLOCK=m | ||
235 | CONFIG_TCM_FILEIO=m | ||
236 | CONFIG_TCM_PSCSI=m | ||
179 | CONFIG_NETDEVICES=y | 237 | CONFIG_NETDEVICES=y |
180 | CONFIG_DUMMY=m | 238 | CONFIG_DUMMY=m |
181 | CONFIG_MACVLAN=m | ||
182 | CONFIG_EQUALIZER=m | 239 | CONFIG_EQUALIZER=m |
240 | CONFIG_NET_TEAM=m | ||
241 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
242 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
243 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
244 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
245 | CONFIG_VXLAN=m | ||
246 | CONFIG_NETCONSOLE=m | ||
247 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
183 | CONFIG_VETH=m | 248 | CONFIG_VETH=m |
184 | CONFIG_NET_ETHERNET=y | ||
185 | CONFIG_SUN3LANCE=y | 249 | CONFIG_SUN3LANCE=y |
186 | # CONFIG_NETDEV_1000 is not set | 250 | # CONFIG_NET_CADENCE is not set |
187 | # CONFIG_NETDEV_10000 is not set | 251 | # CONFIG_NET_VENDOR_BROADCOM is not set |
252 | # CONFIG_NET_VENDOR_INTEL is not set | ||
253 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
254 | # CONFIG_NET_VENDOR_MICREL is not set | ||
255 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
256 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
257 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
258 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
188 | CONFIG_PPP=m | 259 | CONFIG_PPP=m |
189 | CONFIG_PPP_FILTER=y | ||
190 | CONFIG_PPP_ASYNC=m | ||
191 | CONFIG_PPP_SYNC_TTY=m | ||
192 | CONFIG_PPP_DEFLATE=m | ||
193 | CONFIG_PPP_BSDCOMP=m | 260 | CONFIG_PPP_BSDCOMP=m |
261 | CONFIG_PPP_DEFLATE=m | ||
262 | CONFIG_PPP_FILTER=y | ||
194 | CONFIG_PPP_MPPE=m | 263 | CONFIG_PPP_MPPE=m |
195 | CONFIG_PPPOE=m | 264 | CONFIG_PPPOE=m |
265 | CONFIG_PPTP=m | ||
266 | CONFIG_PPPOL2TP=m | ||
267 | CONFIG_PPP_ASYNC=m | ||
268 | CONFIG_PPP_SYNC_TTY=m | ||
196 | CONFIG_SLIP=m | 269 | CONFIG_SLIP=m |
197 | CONFIG_SLIP_COMPRESSED=y | 270 | CONFIG_SLIP_COMPRESSED=y |
198 | CONFIG_SLIP_SMART=y | 271 | CONFIG_SLIP_SMART=y |
199 | CONFIG_SLIP_MODE_SLIP6=y | 272 | CONFIG_SLIP_MODE_SLIP6=y |
200 | CONFIG_NETCONSOLE=m | 273 | # CONFIG_WLAN is not set |
201 | CONFIG_NETCONSOLE_DYNAMIC=y | 274 | CONFIG_INPUT_EVDEV=m |
202 | CONFIG_INPUT_FF_MEMLESS=m | ||
203 | # CONFIG_KEYBOARD_ATKBD is not set | 275 | # CONFIG_KEYBOARD_ATKBD is not set |
204 | CONFIG_KEYBOARD_SUNKBD=y | 276 | CONFIG_KEYBOARD_SUNKBD=y |
205 | CONFIG_MOUSE_PS2=m | 277 | # CONFIG_MOUSE_PS2 is not set |
206 | CONFIG_MOUSE_SERIAL=m | 278 | CONFIG_MOUSE_SERIAL=m |
207 | # CONFIG_SERIO_SERPORT is not set | ||
208 | CONFIG_VT_HW_CONSOLE_BINDING=y | 279 | CONFIG_VT_HW_CONSOLE_BINDING=y |
280 | # CONFIG_LEGACY_PTYS is not set | ||
209 | # CONFIG_DEVKMEM is not set | 281 | # CONFIG_DEVKMEM is not set |
210 | # CONFIG_HW_RANDOM is not set | 282 | # CONFIG_HW_RANDOM is not set |
211 | CONFIG_GEN_RTC=m | 283 | CONFIG_NTP_PPS=y |
212 | CONFIG_GEN_RTC_X=y | 284 | CONFIG_PPS_CLIENT_LDISC=m |
285 | CONFIG_PTP_1588_CLOCK=m | ||
213 | # CONFIG_HWMON is not set | 286 | # CONFIG_HWMON is not set |
214 | CONFIG_FB=y | 287 | CONFIG_FB=y |
215 | CONFIG_FRAMEBUFFER_CONSOLE=y | 288 | CONFIG_FRAMEBUFFER_CONSOLE=y |
216 | CONFIG_LOGO=y | 289 | CONFIG_LOGO=y |
217 | CONFIG_HID=m | 290 | CONFIG_HID=m |
218 | CONFIG_HIDRAW=y | 291 | CONFIG_HIDRAW=y |
292 | CONFIG_UHID=m | ||
293 | # CONFIG_HID_GENERIC is not set | ||
219 | # CONFIG_USB_SUPPORT is not set | 294 | # CONFIG_USB_SUPPORT is not set |
295 | CONFIG_RTC_CLASS=y | ||
296 | CONFIG_RTC_DRV_GENERIC=m | ||
297 | # CONFIG_IOMMU_SUPPORT is not set | ||
298 | CONFIG_PROC_HARDWARE=y | ||
220 | CONFIG_EXT2_FS=y | 299 | CONFIG_EXT2_FS=y |
221 | CONFIG_EXT3_FS=y | 300 | CONFIG_EXT3_FS=y |
222 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 301 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
223 | # CONFIG_EXT3_FS_XATTR is not set | 302 | # CONFIG_EXT3_FS_XATTR is not set |
303 | CONFIG_EXT4_FS=y | ||
224 | CONFIG_REISERFS_FS=m | 304 | CONFIG_REISERFS_FS=m |
225 | CONFIG_JFS_FS=m | 305 | CONFIG_JFS_FS=m |
226 | CONFIG_XFS_FS=m | 306 | CONFIG_XFS_FS=m |
227 | CONFIG_OCFS2_FS=m | 307 | CONFIG_OCFS2_FS=m |
228 | # CONFIG_OCFS2_FS_STATS is not set | ||
229 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 308 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
309 | CONFIG_FANOTIFY=y | ||
230 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 310 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
231 | # CONFIG_PRINT_QUOTA_WARNING is not set | 311 | # CONFIG_PRINT_QUOTA_WARNING is not set |
232 | CONFIG_AUTOFS_FS=m | ||
233 | CONFIG_AUTOFS4_FS=m | 312 | CONFIG_AUTOFS4_FS=m |
234 | CONFIG_FUSE_FS=m | 313 | CONFIG_FUSE_FS=m |
314 | CONFIG_CUSE=m | ||
235 | CONFIG_ISO9660_FS=y | 315 | CONFIG_ISO9660_FS=y |
236 | CONFIG_JOLIET=y | 316 | CONFIG_JOLIET=y |
237 | CONFIG_ZISOFS=y | 317 | CONFIG_ZISOFS=y |
238 | CONFIG_UDF_FS=m | 318 | CONFIG_UDF_FS=m |
239 | CONFIG_MSDOS_FS=y | 319 | CONFIG_MSDOS_FS=m |
240 | CONFIG_VFAT_FS=m | 320 | CONFIG_VFAT_FS=m |
241 | CONFIG_PROC_KCORE=y | 321 | CONFIG_PROC_KCORE=y |
242 | CONFIG_TMPFS=y | 322 | CONFIG_TMPFS=y |
243 | CONFIG_AFFS_FS=m | 323 | CONFIG_AFFS_FS=m |
324 | CONFIG_ECRYPT_FS=m | ||
325 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
244 | CONFIG_HFS_FS=m | 326 | CONFIG_HFS_FS=m |
245 | CONFIG_HFSPLUS_FS=m | 327 | CONFIG_HFSPLUS_FS=m |
246 | CONFIG_CRAMFS=m | 328 | CONFIG_CRAMFS=m |
247 | CONFIG_SQUASHFS=m | 329 | CONFIG_SQUASHFS=m |
248 | CONFIG_MINIX_FS=y | 330 | CONFIG_SQUASHFS_LZO=y |
331 | CONFIG_MINIX_FS=m | ||
332 | CONFIG_OMFS_FS=m | ||
249 | CONFIG_HPFS_FS=m | 333 | CONFIG_HPFS_FS=m |
334 | CONFIG_QNX4FS_FS=m | ||
335 | CONFIG_QNX6FS_FS=m | ||
250 | CONFIG_SYSV_FS=m | 336 | CONFIG_SYSV_FS=m |
251 | CONFIG_UFS_FS=m | 337 | CONFIG_UFS_FS=m |
252 | CONFIG_NFS_FS=y | 338 | CONFIG_NFS_FS=y |
253 | CONFIG_NFS_V3=y | ||
254 | CONFIG_NFS_V4=y | 339 | CONFIG_NFS_V4=y |
340 | CONFIG_NFS_SWAP=y | ||
255 | CONFIG_ROOT_NFS=y | 341 | CONFIG_ROOT_NFS=y |
256 | CONFIG_NFSD=m | 342 | CONFIG_NFSD=m |
257 | CONFIG_NFSD_V3=y | 343 | CONFIG_NFSD_V3=y |
258 | CONFIG_SMB_FS=m | 344 | CONFIG_CIFS=m |
259 | CONFIG_SMB_NLS_DEFAULT=y | 345 | # CONFIG_CIFS_DEBUG is not set |
260 | CONFIG_CODA_FS=m | 346 | CONFIG_CODA_FS=m |
261 | CONFIG_NLS_CODEPAGE_437=y | 347 | CONFIG_NLS_CODEPAGE_437=y |
262 | CONFIG_NLS_CODEPAGE_737=m | 348 | CONFIG_NLS_CODEPAGE_737=m |
@@ -295,10 +381,23 @@ CONFIG_NLS_ISO8859_14=m | |||
295 | CONFIG_NLS_ISO8859_15=m | 381 | CONFIG_NLS_ISO8859_15=m |
296 | CONFIG_NLS_KOI8_R=m | 382 | CONFIG_NLS_KOI8_R=m |
297 | CONFIG_NLS_KOI8_U=m | 383 | CONFIG_NLS_KOI8_U=m |
384 | CONFIG_NLS_MAC_ROMAN=m | ||
385 | CONFIG_NLS_MAC_CELTIC=m | ||
386 | CONFIG_NLS_MAC_CENTEURO=m | ||
387 | CONFIG_NLS_MAC_CROATIAN=m | ||
388 | CONFIG_NLS_MAC_CYRILLIC=m | ||
389 | CONFIG_NLS_MAC_GAELIC=m | ||
390 | CONFIG_NLS_MAC_GREEK=m | ||
391 | CONFIG_NLS_MAC_ICELAND=m | ||
392 | CONFIG_NLS_MAC_INUIT=m | ||
393 | CONFIG_NLS_MAC_ROMANIAN=m | ||
394 | CONFIG_NLS_MAC_TURKISH=m | ||
298 | CONFIG_DLM=m | 395 | CONFIG_DLM=m |
299 | CONFIG_MAGIC_SYSRQ=y | 396 | CONFIG_MAGIC_SYSRQ=y |
300 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 397 | CONFIG_ASYNC_RAID6_TEST=m |
301 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 398 | CONFIG_ENCRYPTED_KEYS=m |
399 | CONFIG_CRYPTO_MANAGER=y | ||
400 | CONFIG_CRYPTO_USER=m | ||
302 | CONFIG_CRYPTO_NULL=m | 401 | CONFIG_CRYPTO_NULL=m |
303 | CONFIG_CRYPTO_CRYPTD=m | 402 | CONFIG_CRYPTO_CRYPTD=m |
304 | CONFIG_CRYPTO_TEST=m | 403 | CONFIG_CRYPTO_TEST=m |
@@ -308,19 +407,16 @@ CONFIG_CRYPTO_CTS=m | |||
308 | CONFIG_CRYPTO_LRW=m | 407 | CONFIG_CRYPTO_LRW=m |
309 | CONFIG_CRYPTO_PCBC=m | 408 | CONFIG_CRYPTO_PCBC=m |
310 | CONFIG_CRYPTO_XTS=m | 409 | CONFIG_CRYPTO_XTS=m |
311 | CONFIG_CRYPTO_HMAC=y | ||
312 | CONFIG_CRYPTO_XCBC=m | 410 | CONFIG_CRYPTO_XCBC=m |
313 | CONFIG_CRYPTO_MD4=m | 411 | CONFIG_CRYPTO_VMAC=m |
314 | CONFIG_CRYPTO_MICHAEL_MIC=m | 412 | CONFIG_CRYPTO_MICHAEL_MIC=m |
315 | CONFIG_CRYPTO_RMD128=m | 413 | CONFIG_CRYPTO_RMD128=m |
316 | CONFIG_CRYPTO_RMD160=m | 414 | CONFIG_CRYPTO_RMD160=m |
317 | CONFIG_CRYPTO_RMD256=m | 415 | CONFIG_CRYPTO_RMD256=m |
318 | CONFIG_CRYPTO_RMD320=m | 416 | CONFIG_CRYPTO_RMD320=m |
319 | CONFIG_CRYPTO_SHA256=m | ||
320 | CONFIG_CRYPTO_SHA512=m | 417 | CONFIG_CRYPTO_SHA512=m |
321 | CONFIG_CRYPTO_TGR192=m | 418 | CONFIG_CRYPTO_TGR192=m |
322 | CONFIG_CRYPTO_WP512=m | 419 | CONFIG_CRYPTO_WP512=m |
323 | CONFIG_CRYPTO_AES=m | ||
324 | CONFIG_CRYPTO_ANUBIS=m | 420 | CONFIG_CRYPTO_ANUBIS=m |
325 | CONFIG_CRYPTO_BLOWFISH=m | 421 | CONFIG_CRYPTO_BLOWFISH=m |
326 | CONFIG_CRYPTO_CAMELLIA=m | 422 | CONFIG_CRYPTO_CAMELLIA=m |
@@ -336,6 +432,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
336 | CONFIG_CRYPTO_ZLIB=m | 432 | CONFIG_CRYPTO_ZLIB=m |
337 | CONFIG_CRYPTO_LZO=m | 433 | CONFIG_CRYPTO_LZO=m |
338 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 434 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
435 | CONFIG_CRYPTO_USER_API_HASH=m | ||
436 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
339 | # CONFIG_CRYPTO_HW is not set | 437 | # CONFIG_CRYPTO_HW is not set |
340 | CONFIG_CRC16=m | ||
341 | CONFIG_CRC_T10DIF=y | 438 | CONFIG_CRC_T10DIF=y |
439 | CONFIG_XZ_DEC_X86=y | ||
440 | CONFIG_XZ_DEC_POWERPC=y | ||
441 | CONFIG_XZ_DEC_IA64=y | ||
442 | CONFIG_XZ_DEC_ARM=y | ||
443 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
444 | CONFIG_XZ_DEC_SPARC=y | ||
445 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index c7933e41f10d..09d77a862da3 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild | |||
@@ -6,7 +6,6 @@ generic-y += device.h | |||
6 | generic-y += emergency-restart.h | 6 | generic-y += emergency-restart.h |
7 | generic-y += errno.h | 7 | generic-y += errno.h |
8 | generic-y += exec.h | 8 | generic-y += exec.h |
9 | generic-y += futex.h | ||
10 | generic-y += hw_irq.h | 9 | generic-y += hw_irq.h |
11 | generic-y += ioctl.h | 10 | generic-y += ioctl.h |
12 | generic-y += ipcbuf.h | 11 | generic-y += ipcbuf.h |
diff --git a/arch/m68k/include/asm/futex.h b/arch/m68k/include/asm/futex.h new file mode 100644 index 000000000000..bc868af10c96 --- /dev/null +++ b/arch/m68k/include/asm/futex.h | |||
@@ -0,0 +1,94 @@ | |||
1 | #ifndef _ASM_M68K_FUTEX_H | ||
2 | #define _ASM_M68K_FUTEX_H | ||
3 | |||
4 | #ifdef __KERNEL__ | ||
5 | #if !defined(CONFIG_MMU) | ||
6 | #include <asm-generic/futex.h> | ||
7 | #else /* CONFIG_MMU */ | ||
8 | |||
9 | #include <linux/futex.h> | ||
10 | #include <linux/uaccess.h> | ||
11 | #include <asm/errno.h> | ||
12 | |||
13 | static inline int | ||
14 | futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | ||
15 | u32 oldval, u32 newval) | ||
16 | { | ||
17 | u32 val; | ||
18 | |||
19 | if (unlikely(get_user(val, uaddr) != 0)) | ||
20 | return -EFAULT; | ||
21 | |||
22 | if (val == oldval && unlikely(put_user(newval, uaddr) != 0)) | ||
23 | return -EFAULT; | ||
24 | |||
25 | *uval = val; | ||
26 | |||
27 | return 0; | ||
28 | } | ||
29 | |||
30 | static inline int | ||
31 | futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) | ||
32 | { | ||
33 | int op = (encoded_op >> 28) & 7; | ||
34 | int cmp = (encoded_op >> 24) & 15; | ||
35 | int oparg = (encoded_op << 8) >> 20; | ||
36 | int cmparg = (encoded_op << 20) >> 20; | ||
37 | int oldval, ret; | ||
38 | u32 tmp; | ||
39 | |||
40 | if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) | ||
41 | oparg = 1 << oparg; | ||
42 | |||
43 | pagefault_disable(); /* implies preempt_disable() */ | ||
44 | |||
45 | ret = -EFAULT; | ||
46 | if (unlikely(get_user(oldval, uaddr) != 0)) | ||
47 | goto out_pagefault_enable; | ||
48 | |||
49 | ret = 0; | ||
50 | tmp = oldval; | ||
51 | |||
52 | switch (op) { | ||
53 | case FUTEX_OP_SET: | ||
54 | tmp = oparg; | ||
55 | break; | ||
56 | case FUTEX_OP_ADD: | ||
57 | tmp += oparg; | ||
58 | break; | ||
59 | case FUTEX_OP_OR: | ||
60 | tmp |= oparg; | ||
61 | break; | ||
62 | case FUTEX_OP_ANDN: | ||
63 | tmp &= ~oparg; | ||
64 | break; | ||
65 | case FUTEX_OP_XOR: | ||
66 | tmp ^= oparg; | ||
67 | break; | ||
68 | default: | ||
69 | ret = -ENOSYS; | ||
70 | } | ||
71 | |||
72 | if (ret == 0 && unlikely(put_user(tmp, uaddr) != 0)) | ||
73 | ret = -EFAULT; | ||
74 | |||
75 | out_pagefault_enable: | ||
76 | pagefault_enable(); /* subsumes preempt_enable() */ | ||
77 | |||
78 | if (ret == 0) { | ||
79 | switch (cmp) { | ||
80 | case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break; | ||
81 | case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break; | ||
82 | case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break; | ||
83 | case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break; | ||
84 | case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break; | ||
85 | case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break; | ||
86 | default: ret = -ENOSYS; | ||
87 | } | ||
88 | } | ||
89 | return ret; | ||
90 | } | ||
91 | |||
92 | #endif /* CONFIG_MMU */ | ||
93 | #endif /* __KERNEL__ */ | ||
94 | #endif /* _ASM_M68K_FUTEX_H */ | ||
diff --git a/arch/microblaze/include/asm/futex.h b/arch/microblaze/include/asm/futex.h index ff8cde159d9a..01848f056f43 100644 --- a/arch/microblaze/include/asm/futex.h +++ b/arch/microblaze/include/asm/futex.h | |||
@@ -105,7 +105,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | |||
105 | 105 | ||
106 | __asm__ __volatile__ ("1: lwx %1, %3, r0; \ | 106 | __asm__ __volatile__ ("1: lwx %1, %3, r0; \ |
107 | cmp %2, %1, %4; \ | 107 | cmp %2, %1, %4; \ |
108 | beqi %2, 3f; \ | 108 | bnei %2, 3f; \ |
109 | 2: swx %5, %3, r0; \ | 109 | 2: swx %5, %3, r0; \ |
110 | addic %2, r0, 0; \ | 110 | addic %2, r0, 0; \ |
111 | bnei %2, 1b; \ | 111 | bnei %2, 1b; \ |
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 8cb8a8566ede..2565cb94f32f 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h | |||
@@ -123,11 +123,11 @@ static inline void writel(unsigned int v, volatile void __iomem *addr) | |||
123 | * inb_p/inw_p/... | 123 | * inb_p/inw_p/... |
124 | * The macros don't do byte-swapping. | 124 | * The macros don't do byte-swapping. |
125 | */ | 125 | */ |
126 | #define inb(port) readb((u8 *)((port))) | 126 | #define inb(port) readb((u8 *)((unsigned long)(port))) |
127 | #define outb(val, port) writeb((val), (u8 *)((unsigned long)(port))) | 127 | #define outb(val, port) writeb((val), (u8 *)((unsigned long)(port))) |
128 | #define inw(port) readw((u16 *)((port))) | 128 | #define inw(port) readw((u16 *)((unsigned long)(port))) |
129 | #define outw(val, port) writew((val), (u16 *)((unsigned long)(port))) | 129 | #define outw(val, port) writew((val), (u16 *)((unsigned long)(port))) |
130 | #define inl(port) readl((u32 *)((port))) | 130 | #define inl(port) readl((u32 *)((unsigned long)(port))) |
131 | #define outl(val, port) writel((val), (u32 *)((unsigned long)(port))) | 131 | #define outl(val, port) writel((val), (u32 *)((unsigned long)(port))) |
132 | 132 | ||
133 | #define inb_p(port) inb((port)) | 133 | #define inb_p(port) inb((port)) |
diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c index 4254514b4c8c..a6e44410672d 100644 --- a/arch/microblaze/kernel/cpu/cache.c +++ b/arch/microblaze/kernel/cpu/cache.c | |||
@@ -140,7 +140,7 @@ do { \ | |||
140 | /* It is used only first parameter for OP - for wic, wdc */ | 140 | /* It is used only first parameter for OP - for wic, wdc */ |
141 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ | 141 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ |
142 | do { \ | 142 | do { \ |
143 | int volatile temp; \ | 143 | int volatile temp = 0; \ |
144 | int align = ~(line_length - 1); \ | 144 | int align = ~(line_length - 1); \ |
145 | end = ((end & align) == end) ? end - line_length : end & align; \ | 145 | end = ((end & align) == end) ? end - line_length : end & align; \ |
146 | WARN_ON(end - start < 0); \ | 146 | WARN_ON(end - start < 0); \ |
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 8137c25c4e15..6f31cc0f1a87 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h | |||
@@ -103,4 +103,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | |||
103 | return channel ? 15 : 14; | 103 | return channel ? 15 : 14; |
104 | } | 104 | } |
105 | 105 | ||
106 | #include <asm-generic/pci_iomap.h> | ||
107 | |||
106 | #endif /* _ASM_PCI_H */ | 108 | #endif /* _ASM_PCI_H */ |
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S index 68fcab8f8f6f..222152a3f751 100644 --- a/arch/mn10300/kernel/entry.S +++ b/arch/mn10300/kernel/entry.S | |||
@@ -60,6 +60,7 @@ ENTRY(ret_from_kernel_thread) | |||
60 | mov (REG_D0,fp),d0 | 60 | mov (REG_D0,fp),d0 |
61 | mov (REG_A0,fp),a0 | 61 | mov (REG_A0,fp),a0 |
62 | calls (a0) | 62 | calls (a0) |
63 | GET_THREAD_INFO a2 # A2 must be set on return from sys_exit() | ||
63 | clr d0 | 64 | clr d0 |
64 | mov d0,(REG_D0,fp) | 65 | mov d0,(REG_D0,fp) |
65 | jmp syscall_exit | 66 | jmp syscall_exit |
@@ -107,10 +108,10 @@ syscall_exit_work: | |||
107 | and EPSW_nSL,d0 | 108 | and EPSW_nSL,d0 |
108 | beq resume_kernel # returning to supervisor mode | 109 | beq resume_kernel # returning to supervisor mode |
109 | 110 | ||
110 | btst _TIF_SYSCALL_TRACE,d2 | ||
111 | beq work_pending | ||
112 | LOCAL_IRQ_ENABLE # could let syscall_trace_exit() call | 111 | LOCAL_IRQ_ENABLE # could let syscall_trace_exit() call |
113 | # schedule() instead | 112 | # schedule() instead |
113 | btst _TIF_SYSCALL_TRACE,d2 | ||
114 | beq work_pending | ||
114 | mov fp,d0 | 115 | mov fp,d0 |
115 | call syscall_trace_exit[],0 # do_syscall_trace(regs) | 116 | call syscall_trace_exit[],0 # do_syscall_trace(regs) |
116 | jmp resume_userspace | 117 | jmp resume_userspace |
@@ -123,6 +124,7 @@ work_pending: | |||
123 | work_resched: | 124 | work_resched: |
124 | call schedule[],0 | 125 | call schedule[],0 |
125 | 126 | ||
127 | resume_userspace: | ||
126 | # make sure we don't miss an interrupt setting need_resched or | 128 | # make sure we don't miss an interrupt setting need_resched or |
127 | # sigpending between sampling and the rti | 129 | # sigpending between sampling and the rti |
128 | LOCAL_IRQ_DISABLE | 130 | LOCAL_IRQ_DISABLE |
@@ -131,6 +133,8 @@ work_resched: | |||
131 | mov (TI_flags,a2),d2 | 133 | mov (TI_flags,a2),d2 |
132 | btst _TIF_WORK_MASK,d2 | 134 | btst _TIF_WORK_MASK,d2 |
133 | beq restore_all | 135 | beq restore_all |
136 | |||
137 | LOCAL_IRQ_ENABLE | ||
134 | btst _TIF_NEED_RESCHED,d2 | 138 | btst _TIF_NEED_RESCHED,d2 |
135 | bne work_resched | 139 | bne work_resched |
136 | 140 | ||
@@ -169,17 +173,6 @@ ret_from_intr: | |||
169 | and EPSW_nSL,d0 | 173 | and EPSW_nSL,d0 |
170 | beq resume_kernel # returning to supervisor mode | 174 | beq resume_kernel # returning to supervisor mode |
171 | 175 | ||
172 | ENTRY(resume_userspace) | ||
173 | # make sure we don't miss an interrupt setting need_resched or | ||
174 | # sigpending between sampling and the rti | ||
175 | LOCAL_IRQ_DISABLE | ||
176 | |||
177 | # is there any work to be done on int/exception return? | ||
178 | mov (TI_flags,a2),d2 | ||
179 | btst _TIF_WORK_MASK,d2 | ||
180 | bne work_pending | ||
181 | jmp restore_all | ||
182 | |||
183 | #ifdef CONFIG_PREEMPT | 176 | #ifdef CONFIG_PREEMPT |
184 | ENTRY(resume_kernel) | 177 | ENTRY(resume_kernel) |
185 | LOCAL_IRQ_DISABLE | 178 | LOCAL_IRQ_DISABLE |
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c index 1adcf024bb9a..e37fac0461f3 100644 --- a/arch/mn10300/unit-asb2305/pci.c +++ b/arch/mn10300/unit-asb2305/pci.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #include <asm/irq.h> | ||
22 | #include "pci-asb2305.h" | 23 | #include "pci-asb2305.h" |
23 | 24 | ||
24 | unsigned int pci_probe = 1; | 25 | unsigned int pci_probe = 1; |
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 197690068f88..96ec3982be8d 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile | |||
@@ -66,7 +66,7 @@ KBUILD_CFLAGS_KERNEL += -mlong-calls | |||
66 | endif | 66 | endif |
67 | 67 | ||
68 | # select which processor to optimise for | 68 | # select which processor to optimise for |
69 | cflags-$(CONFIG_PA7100) += -march=1.1 -mschedule=7100 | 69 | cflags-$(CONFIG_PA7000) += -march=1.1 -mschedule=7100 |
70 | cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200 | 70 | cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200 |
71 | cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC | 71 | cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC |
72 | cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300 | 72 | cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300 |
diff --git a/arch/parisc/include/asm/mmzone.h b/arch/parisc/include/asm/mmzone.h index 0e625ab9aaec..cc50d33b7b88 100644 --- a/arch/parisc/include/asm/mmzone.h +++ b/arch/parisc/include/asm/mmzone.h | |||
@@ -39,17 +39,14 @@ extern unsigned char pfnnid_map[PFNNID_MAP_MAX]; | |||
39 | static inline int pfn_to_nid(unsigned long pfn) | 39 | static inline int pfn_to_nid(unsigned long pfn) |
40 | { | 40 | { |
41 | unsigned int i; | 41 | unsigned int i; |
42 | unsigned char r; | ||
43 | 42 | ||
44 | if (unlikely(pfn_is_io(pfn))) | 43 | if (unlikely(pfn_is_io(pfn))) |
45 | return 0; | 44 | return 0; |
46 | 45 | ||
47 | i = pfn >> PFNNID_SHIFT; | 46 | i = pfn >> PFNNID_SHIFT; |
48 | BUG_ON(i >= ARRAY_SIZE(pfnnid_map)); | 47 | BUG_ON(i >= ARRAY_SIZE(pfnnid_map)); |
49 | r = pfnnid_map[i]; | ||
50 | BUG_ON(r == 0xff); | ||
51 | 48 | ||
52 | return (int)r; | 49 | return (int)pfnnid_map[i]; |
53 | } | 50 | } |
54 | 51 | ||
55 | static inline int pfn_valid(int pfn) | 52 | static inline int pfn_valid(int pfn) |
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index 5709c5e59be8..14285caec71a 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c | |||
@@ -394,7 +394,7 @@ EXPORT_SYMBOL(print_pci_hwpath); | |||
394 | static void setup_bus_id(struct parisc_device *padev) | 394 | static void setup_bus_id(struct parisc_device *padev) |
395 | { | 395 | { |
396 | struct hardware_path path; | 396 | struct hardware_path path; |
397 | char name[20]; | 397 | char name[28]; |
398 | char *output = name; | 398 | char *output = name; |
399 | int i; | 399 | int i; |
400 | 400 | ||
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 76b63e726a53..1e95b2000ce8 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c | |||
@@ -69,7 +69,8 @@ void __init setup_cmdline(char **cmdline_p) | |||
69 | /* called from hpux boot loader */ | 69 | /* called from hpux boot loader */ |
70 | boot_command_line[0] = '\0'; | 70 | boot_command_line[0] = '\0'; |
71 | } else { | 71 | } else { |
72 | strcpy(boot_command_line, (char *)__va(boot_args[1])); | 72 | strlcpy(boot_command_line, (char *)__va(boot_args[1]), |
73 | COMMAND_LINE_SIZE); | ||
73 | 74 | ||
74 | #ifdef CONFIG_BLK_DEV_INITRD | 75 | #ifdef CONFIG_BLK_DEV_INITRD |
75 | if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ | 76 | if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ |
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h index cf4df8e2139a..0c7f2bfcf134 100644 --- a/arch/powerpc/include/asm/hvcall.h +++ b/arch/powerpc/include/asm/hvcall.h | |||
@@ -264,6 +264,7 @@ | |||
264 | #define H_GET_MPP 0x2D4 | 264 | #define H_GET_MPP 0x2D4 |
265 | #define H_HOME_NODE_ASSOCIATIVITY 0x2EC | 265 | #define H_HOME_NODE_ASSOCIATIVITY 0x2EC |
266 | #define H_BEST_ENERGY 0x2F4 | 266 | #define H_BEST_ENERGY 0x2F4 |
267 | #define H_XIRR_X 0x2FC | ||
267 | #define H_RANDOM 0x300 | 268 | #define H_RANDOM 0x300 |
268 | #define H_COP 0x304 | 269 | #define H_COP 0x304 |
269 | #define H_GET_MPP_X 0x314 | 270 | #define H_GET_MPP_X 0x314 |
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index cea8496091ff..2f1b6c5f8174 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h | |||
@@ -523,6 +523,17 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,946) | |||
523 | #define PPC440EP_ERR42 | 523 | #define PPC440EP_ERR42 |
524 | #endif | 524 | #endif |
525 | 525 | ||
526 | /* The following stops all load and store data streams associated with stream | ||
527 | * ID (ie. streams created explicitly). The embedded and server mnemonics for | ||
528 | * dcbt are different so we use machine "power4" here explicitly. | ||
529 | */ | ||
530 | #define DCBT_STOP_ALL_STREAM_IDS(scratch) \ | ||
531 | .machine push ; \ | ||
532 | .machine "power4" ; \ | ||
533 | lis scratch,0x60000000@h; \ | ||
534 | dcbt r0,scratch,0b01010; \ | ||
535 | .machine pop | ||
536 | |||
526 | /* | 537 | /* |
527 | * toreal/fromreal/tophys/tovirt macros. 32-bit BookE makes them | 538 | * toreal/fromreal/tophys/tovirt macros. 32-bit BookE makes them |
528 | * keep the address intact to be compatible with code shared with | 539 | * keep the address intact to be compatible with code shared with |
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 594db6bc093c..14a658363698 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h | |||
@@ -409,21 +409,16 @@ static inline void prefetchw(const void *x) | |||
409 | #endif | 409 | #endif |
410 | 410 | ||
411 | #ifdef CONFIG_PPC64 | 411 | #ifdef CONFIG_PPC64 |
412 | static inline unsigned long get_clean_sp(struct pt_regs *regs, int is_32) | 412 | static inline unsigned long get_clean_sp(unsigned long sp, int is_32) |
413 | { | 413 | { |
414 | unsigned long sp; | ||
415 | |||
416 | if (is_32) | 414 | if (is_32) |
417 | sp = regs->gpr[1] & 0x0ffffffffUL; | 415 | return sp & 0x0ffffffffUL; |
418 | else | ||
419 | sp = regs->gpr[1]; | ||
420 | |||
421 | return sp; | 416 | return sp; |
422 | } | 417 | } |
423 | #else | 418 | #else |
424 | static inline unsigned long get_clean_sp(struct pt_regs *regs, int is_32) | 419 | static inline unsigned long get_clean_sp(unsigned long sp, int is_32) |
425 | { | 420 | { |
426 | return regs->gpr[1]; | 421 | return sp; |
427 | } | 422 | } |
428 | #endif | 423 | #endif |
429 | 424 | ||
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index a6136515c7f2..4a9e408644fe 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h | |||
@@ -111,17 +111,6 @@ | |||
111 | #define MSR_TM_TRANSACTIONAL(x) (((x) & MSR_TS_MASK) == MSR_TS_T) | 111 | #define MSR_TM_TRANSACTIONAL(x) (((x) & MSR_TS_MASK) == MSR_TS_T) |
112 | #define MSR_TM_SUSPENDED(x) (((x) & MSR_TS_MASK) == MSR_TS_S) | 112 | #define MSR_TM_SUSPENDED(x) (((x) & MSR_TS_MASK) == MSR_TS_S) |
113 | 113 | ||
114 | /* Reason codes describing kernel causes for transaction aborts. By | ||
115 | convention, bit0 is copied to TEXASR[56] (IBM bit 7) which is set if | ||
116 | the failure is persistent. | ||
117 | */ | ||
118 | #define TM_CAUSE_RESCHED 0xfe | ||
119 | #define TM_CAUSE_TLBI 0xfc | ||
120 | #define TM_CAUSE_FAC_UNAV 0xfa | ||
121 | #define TM_CAUSE_SYSCALL 0xf9 /* Persistent */ | ||
122 | #define TM_CAUSE_MISC 0xf6 | ||
123 | #define TM_CAUSE_SIGNAL 0xf4 | ||
124 | |||
125 | #if defined(CONFIG_PPC_BOOK3S_64) | 114 | #if defined(CONFIG_PPC_BOOK3S_64) |
126 | #define MSR_64BIT MSR_SF | 115 | #define MSR_64BIT MSR_SF |
127 | 116 | ||
diff --git a/arch/powerpc/include/asm/signal.h b/arch/powerpc/include/asm/signal.h index fbe66c463891..9322c28aebd2 100644 --- a/arch/powerpc/include/asm/signal.h +++ b/arch/powerpc/include/asm/signal.h | |||
@@ -3,5 +3,8 @@ | |||
3 | 3 | ||
4 | #define __ARCH_HAS_SA_RESTORER | 4 | #define __ARCH_HAS_SA_RESTORER |
5 | #include <uapi/asm/signal.h> | 5 | #include <uapi/asm/signal.h> |
6 | #include <uapi/asm/ptrace.h> | ||
7 | |||
8 | extern unsigned long get_tm_stackpointer(struct pt_regs *regs); | ||
6 | 9 | ||
7 | #endif /* _ASM_POWERPC_SIGNAL_H */ | 10 | #endif /* _ASM_POWERPC_SIGNAL_H */ |
diff --git a/arch/powerpc/include/asm/tm.h b/arch/powerpc/include/asm/tm.h index 4b4449abf3f8..9dfbc34bdbf5 100644 --- a/arch/powerpc/include/asm/tm.h +++ b/arch/powerpc/include/asm/tm.h | |||
@@ -5,6 +5,8 @@ | |||
5 | * Copyright 2012 Matt Evans & Michael Neuling, IBM Corporation. | 5 | * Copyright 2012 Matt Evans & Michael Neuling, IBM Corporation. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <uapi/asm/tm.h> | ||
9 | |||
8 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM | 10 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM |
9 | extern void do_load_up_transact_fpu(struct thread_struct *thread); | 11 | extern void do_load_up_transact_fpu(struct thread_struct *thread); |
10 | extern void do_load_up_transact_altivec(struct thread_struct *thread); | 12 | extern void do_load_up_transact_altivec(struct thread_struct *thread); |
diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index f7bca6370745..5182c8622b54 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild | |||
@@ -40,6 +40,7 @@ header-y += statfs.h | |||
40 | header-y += swab.h | 40 | header-y += swab.h |
41 | header-y += termbits.h | 41 | header-y += termbits.h |
42 | header-y += termios.h | 42 | header-y += termios.h |
43 | header-y += tm.h | ||
43 | header-y += types.h | 44 | header-y += types.h |
44 | header-y += ucontext.h | 45 | header-y += ucontext.h |
45 | header-y += unistd.h | 46 | header-y += unistd.h |
diff --git a/arch/powerpc/include/uapi/asm/tm.h b/arch/powerpc/include/uapi/asm/tm.h new file mode 100644 index 000000000000..85059a00f560 --- /dev/null +++ b/arch/powerpc/include/uapi/asm/tm.h | |||
@@ -0,0 +1,18 @@ | |||
1 | #ifndef _ASM_POWERPC_TM_H | ||
2 | #define _ASM_POWERPC_TM_H | ||
3 | |||
4 | /* Reason codes describing kernel causes for transaction aborts. By | ||
5 | * convention, bit0 is copied to TEXASR[56] (IBM bit 7) which is set if | ||
6 | * the failure is persistent. PAPR saves 0xff-0xe0 for the hypervisor. | ||
7 | */ | ||
8 | #define TM_CAUSE_PERSISTENT 0x01 | ||
9 | #define TM_CAUSE_RESCHED 0xde | ||
10 | #define TM_CAUSE_TLBI 0xdc | ||
11 | #define TM_CAUSE_FAC_UNAV 0xda | ||
12 | #define TM_CAUSE_SYSCALL 0xd8 /* future use */ | ||
13 | #define TM_CAUSE_MISC 0xd6 /* future use */ | ||
14 | #define TM_CAUSE_SIGNAL 0xd4 | ||
15 | #define TM_CAUSE_ALIGNMENT 0xd2 | ||
16 | #define TM_CAUSE_EMULATE 0xd0 | ||
17 | |||
18 | #endif | ||
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index c60bbec25c1f..1f0937d7d4b5 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -453,7 +453,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
453 | .icache_bsize = 128, | 453 | .icache_bsize = 128, |
454 | .dcache_bsize = 128, | 454 | .dcache_bsize = 128, |
455 | .oprofile_type = PPC_OPROFILE_POWER4, | 455 | .oprofile_type = PPC_OPROFILE_POWER4, |
456 | .oprofile_cpu_type = "ppc64/ibm-compat-v1", | 456 | .oprofile_cpu_type = 0, |
457 | .cpu_setup = __setup_cpu_power8, | 457 | .cpu_setup = __setup_cpu_power8, |
458 | .cpu_restore = __restore_cpu_power8, | 458 | .cpu_restore = __restore_cpu_power8, |
459 | .platform = "power8", | 459 | .platform = "power8", |
@@ -482,7 +482,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
482 | .cpu_name = "POWER7+ (raw)", | 482 | .cpu_name = "POWER7+ (raw)", |
483 | .cpu_features = CPU_FTRS_POWER7, | 483 | .cpu_features = CPU_FTRS_POWER7, |
484 | .cpu_user_features = COMMON_USER_POWER7, | 484 | .cpu_user_features = COMMON_USER_POWER7, |
485 | .cpu_user_features = COMMON_USER2_POWER7, | 485 | .cpu_user_features2 = COMMON_USER2_POWER7, |
486 | .mmu_features = MMU_FTRS_POWER7, | 486 | .mmu_features = MMU_FTRS_POWER7, |
487 | .icache_bsize = 128, | 487 | .icache_bsize = 128, |
488 | .dcache_bsize = 128, | 488 | .dcache_bsize = 128, |
@@ -506,7 +506,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
506 | .dcache_bsize = 128, | 506 | .dcache_bsize = 128, |
507 | .num_pmcs = 6, | 507 | .num_pmcs = 6, |
508 | .pmc_type = PPC_PMC_IBM, | 508 | .pmc_type = PPC_PMC_IBM, |
509 | .oprofile_cpu_type = "ppc64/power8", | 509 | .oprofile_cpu_type = 0, |
510 | .oprofile_type = PPC_OPROFILE_POWER4, | 510 | .oprofile_type = PPC_OPROFILE_POWER4, |
511 | .cpu_setup = __setup_cpu_power8, | 511 | .cpu_setup = __setup_cpu_power8, |
512 | .cpu_restore = __restore_cpu_power8, | 512 | .cpu_restore = __restore_cpu_power8, |
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index d22e73e4618b..22b45a4955cd 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S | |||
@@ -849,7 +849,7 @@ resume_kernel: | |||
849 | /* check current_thread_info, _TIF_EMULATE_STACK_STORE */ | 849 | /* check current_thread_info, _TIF_EMULATE_STACK_STORE */ |
850 | CURRENT_THREAD_INFO(r9, r1) | 850 | CURRENT_THREAD_INFO(r9, r1) |
851 | lwz r8,TI_FLAGS(r9) | 851 | lwz r8,TI_FLAGS(r9) |
852 | andis. r8,r8,_TIF_EMULATE_STACK_STORE@h | 852 | andis. r0,r8,_TIF_EMULATE_STACK_STORE@h |
853 | beq+ 1f | 853 | beq+ 1f |
854 | 854 | ||
855 | addi r8,r1,INT_FRAME_SIZE /* Get the kprobed function entry */ | 855 | addi r8,r1,INT_FRAME_SIZE /* Get the kprobed function entry */ |
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 0e9095e47b5b..246b11c4fe7e 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
@@ -501,6 +501,13 @@ BEGIN_FTR_SECTION | |||
501 | ldarx r6,0,r1 | 501 | ldarx r6,0,r1 |
502 | END_FTR_SECTION_IFSET(CPU_FTR_STCX_CHECKS_ADDRESS) | 502 | END_FTR_SECTION_IFSET(CPU_FTR_STCX_CHECKS_ADDRESS) |
503 | 503 | ||
504 | #ifdef CONFIG_PPC_BOOK3S | ||
505 | /* Cancel all explict user streams as they will have no use after context | ||
506 | * switch and will stop the HW from creating streams itself | ||
507 | */ | ||
508 | DCBT_STOP_ALL_STREAM_IDS(r6) | ||
509 | #endif | ||
510 | |||
504 | addi r6,r4,-THREAD /* Convert THREAD to 'current' */ | 511 | addi r6,r4,-THREAD /* Convert THREAD to 'current' */ |
505 | std r6,PACACURRENT(r13) /* Set new 'current' */ | 512 | std r6,PACACURRENT(r13) /* Set new 'current' */ |
506 | 513 | ||
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index e9acf50dd5b2..7f2273cc3c7d 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
@@ -657,15 +657,6 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar, | |||
657 | * ranges. However, some machines (thanks Apple !) tend to split their | 657 | * ranges. However, some machines (thanks Apple !) tend to split their |
658 | * space into lots of small contiguous ranges. So we have to coalesce. | 658 | * space into lots of small contiguous ranges. So we have to coalesce. |
659 | * | 659 | * |
660 | * - We can only cope with all memory ranges having the same offset | ||
661 | * between CPU addresses and PCI addresses. Unfortunately, some bridges | ||
662 | * are setup for a large 1:1 mapping along with a small "window" which | ||
663 | * maps PCI address 0 to some arbitrary high address of the CPU space in | ||
664 | * order to give access to the ISA memory hole. | ||
665 | * The way out of here that I've chosen for now is to always set the | ||
666 | * offset based on the first resource found, then override it if we | ||
667 | * have a different offset and the previous was set by an ISA hole. | ||
668 | * | ||
669 | * - Some busses have IO space not starting at 0, which causes trouble with | 660 | * - Some busses have IO space not starting at 0, which causes trouble with |
670 | * the way we do our IO resource renumbering. The code somewhat deals with | 661 | * the way we do our IO resource renumbering. The code somewhat deals with |
671 | * it for 64 bits but I would expect problems on 32 bits. | 662 | * it for 64 bits but I would expect problems on 32 bits. |
@@ -680,10 +671,9 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose, | |||
680 | int rlen; | 671 | int rlen; |
681 | int pna = of_n_addr_cells(dev); | 672 | int pna = of_n_addr_cells(dev); |
682 | int np = pna + 5; | 673 | int np = pna + 5; |
683 | int memno = 0, isa_hole = -1; | 674 | int memno = 0; |
684 | u32 pci_space; | 675 | u32 pci_space; |
685 | unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size; | 676 | unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size; |
686 | unsigned long long isa_mb = 0; | ||
687 | struct resource *res; | 677 | struct resource *res; |
688 | 678 | ||
689 | printk(KERN_INFO "PCI host bridge %s %s ranges:\n", | 679 | printk(KERN_INFO "PCI host bridge %s %s ranges:\n", |
@@ -777,8 +767,6 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose, | |||
777 | } | 767 | } |
778 | /* Handles ISA memory hole space here */ | 768 | /* Handles ISA memory hole space here */ |
779 | if (pci_addr == 0) { | 769 | if (pci_addr == 0) { |
780 | isa_mb = cpu_addr; | ||
781 | isa_hole = memno; | ||
782 | if (primary || isa_mem_base == 0) | 770 | if (primary || isa_mem_base == 0) |
783 | isa_mem_base = cpu_addr; | 771 | isa_mem_base = cpu_addr; |
784 | hose->isa_mem_phys = cpu_addr; | 772 | hose->isa_mem_phys = cpu_addr; |
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index 577a8aa69c6e..457e97aa2945 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
19 | #include <asm/unistd.h> | 19 | #include <asm/unistd.h> |
20 | #include <asm/debug.h> | 20 | #include <asm/debug.h> |
21 | #include <asm/tm.h> | ||
21 | 22 | ||
22 | #include "signal.h" | 23 | #include "signal.h" |
23 | 24 | ||
@@ -30,13 +31,13 @@ int show_unhandled_signals = 1; | |||
30 | /* | 31 | /* |
31 | * Allocate space for the signal frame | 32 | * Allocate space for the signal frame |
32 | */ | 33 | */ |
33 | void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, | 34 | void __user * get_sigframe(struct k_sigaction *ka, unsigned long sp, |
34 | size_t frame_size, int is_32) | 35 | size_t frame_size, int is_32) |
35 | { | 36 | { |
36 | unsigned long oldsp, newsp; | 37 | unsigned long oldsp, newsp; |
37 | 38 | ||
38 | /* Default to using normal stack */ | 39 | /* Default to using normal stack */ |
39 | oldsp = get_clean_sp(regs, is_32); | 40 | oldsp = get_clean_sp(sp, is_32); |
40 | 41 | ||
41 | /* Check for alt stack */ | 42 | /* Check for alt stack */ |
42 | if ((ka->sa.sa_flags & SA_ONSTACK) && | 43 | if ((ka->sa.sa_flags & SA_ONSTACK) && |
@@ -175,3 +176,38 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags) | |||
175 | 176 | ||
176 | user_enter(); | 177 | user_enter(); |
177 | } | 178 | } |
179 | |||
180 | unsigned long get_tm_stackpointer(struct pt_regs *regs) | ||
181 | { | ||
182 | /* When in an active transaction that takes a signal, we need to be | ||
183 | * careful with the stack. It's possible that the stack has moved back | ||
184 | * up after the tbegin. The obvious case here is when the tbegin is | ||
185 | * called inside a function that returns before a tend. In this case, | ||
186 | * the stack is part of the checkpointed transactional memory state. | ||
187 | * If we write over this non transactionally or in suspend, we are in | ||
188 | * trouble because if we get a tm abort, the program counter and stack | ||
189 | * pointer will be back at the tbegin but our in memory stack won't be | ||
190 | * valid anymore. | ||
191 | * | ||
192 | * To avoid this, when taking a signal in an active transaction, we | ||
193 | * need to use the stack pointer from the checkpointed state, rather | ||
194 | * than the speculated state. This ensures that the signal context | ||
195 | * (written tm suspended) will be written below the stack required for | ||
196 | * the rollback. The transaction is aborted becuase of the treclaim, | ||
197 | * so any memory written between the tbegin and the signal will be | ||
198 | * rolled back anyway. | ||
199 | * | ||
200 | * For signals taken in non-TM or suspended mode, we use the | ||
201 | * normal/non-checkpointed stack pointer. | ||
202 | */ | ||
203 | |||
204 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM | ||
205 | if (MSR_TM_ACTIVE(regs->msr)) { | ||
206 | tm_enable(); | ||
207 | tm_reclaim(¤t->thread, regs->msr, TM_CAUSE_SIGNAL); | ||
208 | if (MSR_TM_TRANSACTIONAL(regs->msr)) | ||
209 | return current->thread.ckpt_regs.gpr[1]; | ||
210 | } | ||
211 | #endif | ||
212 | return regs->gpr[1]; | ||
213 | } | ||
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h index ec84c901ceab..c69b9aeb9f23 100644 --- a/arch/powerpc/kernel/signal.h +++ b/arch/powerpc/kernel/signal.h | |||
@@ -12,7 +12,7 @@ | |||
12 | 12 | ||
13 | extern void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags); | 13 | extern void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags); |
14 | 14 | ||
15 | extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, | 15 | extern void __user * get_sigframe(struct k_sigaction *ka, unsigned long sp, |
16 | size_t frame_size, int is_32); | 16 | size_t frame_size, int is_32); |
17 | 17 | ||
18 | extern int handle_signal32(unsigned long sig, struct k_sigaction *ka, | 18 | extern int handle_signal32(unsigned long sig, struct k_sigaction *ka, |
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 95068bf569ad..201385c3a1ae 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c | |||
@@ -503,12 +503,6 @@ static int save_tm_user_regs(struct pt_regs *regs, | |||
503 | { | 503 | { |
504 | unsigned long msr = regs->msr; | 504 | unsigned long msr = regs->msr; |
505 | 505 | ||
506 | /* tm_reclaim rolls back all reg states, updating thread.ckpt_regs, | ||
507 | * thread.transact_fpr[], thread.transact_vr[], etc. | ||
508 | */ | ||
509 | tm_enable(); | ||
510 | tm_reclaim(¤t->thread, msr, TM_CAUSE_SIGNAL); | ||
511 | |||
512 | /* Make sure floating point registers are stored in regs */ | 506 | /* Make sure floating point registers are stored in regs */ |
513 | flush_fp_to_thread(current); | 507 | flush_fp_to_thread(current); |
514 | 508 | ||
@@ -965,7 +959,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka, | |||
965 | 959 | ||
966 | /* Set up Signal Frame */ | 960 | /* Set up Signal Frame */ |
967 | /* Put a Real Time Context onto stack */ | 961 | /* Put a Real Time Context onto stack */ |
968 | rt_sf = get_sigframe(ka, regs, sizeof(*rt_sf), 1); | 962 | rt_sf = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*rt_sf), 1); |
969 | addr = rt_sf; | 963 | addr = rt_sf; |
970 | if (unlikely(rt_sf == NULL)) | 964 | if (unlikely(rt_sf == NULL)) |
971 | goto badframe; | 965 | goto badframe; |
@@ -1403,7 +1397,7 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka, | |||
1403 | unsigned long tramp; | 1397 | unsigned long tramp; |
1404 | 1398 | ||
1405 | /* Set up Signal Frame */ | 1399 | /* Set up Signal Frame */ |
1406 | frame = get_sigframe(ka, regs, sizeof(*frame), 1); | 1400 | frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 1); |
1407 | if (unlikely(frame == NULL)) | 1401 | if (unlikely(frame == NULL)) |
1408 | goto badframe; | 1402 | goto badframe; |
1409 | sc = (struct sigcontext __user *) &frame->sctx; | 1403 | sc = (struct sigcontext __user *) &frame->sctx; |
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index c1794286098c..345947367ec0 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
@@ -154,11 +154,12 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
154 | * As above, but Transactional Memory is in use, so deliver sigcontexts | 154 | * As above, but Transactional Memory is in use, so deliver sigcontexts |
155 | * containing checkpointed and transactional register states. | 155 | * containing checkpointed and transactional register states. |
156 | * | 156 | * |
157 | * To do this, we treclaim to gather both sets of registers and set up the | 157 | * To do this, we treclaim (done before entering here) to gather both sets of |
158 | * 'normal' sigcontext registers with rolled-back register values such that a | 158 | * registers and set up the 'normal' sigcontext registers with rolled-back |
159 | * simple signal handler sees a correct checkpointed register state. | 159 | * register values such that a simple signal handler sees a correct |
160 | * If interested, a TM-aware sighandler can examine the transactional registers | 160 | * checkpointed register state. If interested, a TM-aware sighandler can |
161 | * in the 2nd sigcontext to determine the real origin of the signal. | 161 | * examine the transactional registers in the 2nd sigcontext to determine the |
162 | * real origin of the signal. | ||
162 | */ | 163 | */ |
163 | static long setup_tm_sigcontexts(struct sigcontext __user *sc, | 164 | static long setup_tm_sigcontexts(struct sigcontext __user *sc, |
164 | struct sigcontext __user *tm_sc, | 165 | struct sigcontext __user *tm_sc, |
@@ -184,16 +185,6 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc, | |||
184 | 185 | ||
185 | BUG_ON(!MSR_TM_ACTIVE(regs->msr)); | 186 | BUG_ON(!MSR_TM_ACTIVE(regs->msr)); |
186 | 187 | ||
187 | /* tm_reclaim rolls back all reg states, saving checkpointed (older) | ||
188 | * GPRs to thread.ckpt_regs and (if used) FPRs to (newer) | ||
189 | * thread.transact_fp and/or VRs to (newer) thread.transact_vr. | ||
190 | * THEN we save out FP/VRs, if necessary, to the checkpointed (older) | ||
191 | * thread.fr[]/vr[]s. The transactional (newer) GPRs are on the | ||
192 | * stack, in *regs. | ||
193 | */ | ||
194 | tm_enable(); | ||
195 | tm_reclaim(¤t->thread, msr, TM_CAUSE_SIGNAL); | ||
196 | |||
197 | flush_fp_to_thread(current); | 188 | flush_fp_to_thread(current); |
198 | 189 | ||
199 | #ifdef CONFIG_ALTIVEC | 190 | #ifdef CONFIG_ALTIVEC |
@@ -711,7 +702,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, | |||
711 | unsigned long newsp = 0; | 702 | unsigned long newsp = 0; |
712 | long err = 0; | 703 | long err = 0; |
713 | 704 | ||
714 | frame = get_sigframe(ka, regs, sizeof(*frame), 0); | 705 | frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 0); |
715 | if (unlikely(frame == NULL)) | 706 | if (unlikely(frame == NULL)) |
716 | goto badframe; | 707 | goto badframe; |
717 | 708 | ||
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index a7a648f6b750..f18c79c324ef 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
@@ -53,6 +53,7 @@ | |||
53 | #ifdef CONFIG_PPC64 | 53 | #ifdef CONFIG_PPC64 |
54 | #include <asm/firmware.h> | 54 | #include <asm/firmware.h> |
55 | #include <asm/processor.h> | 55 | #include <asm/processor.h> |
56 | #include <asm/tm.h> | ||
56 | #endif | 57 | #endif |
57 | #include <asm/kexec.h> | 58 | #include <asm/kexec.h> |
58 | #include <asm/ppc-opcode.h> | 59 | #include <asm/ppc-opcode.h> |
@@ -932,6 +933,28 @@ static int emulate_isel(struct pt_regs *regs, u32 instword) | |||
932 | return 0; | 933 | return 0; |
933 | } | 934 | } |
934 | 935 | ||
936 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM | ||
937 | static inline bool tm_abort_check(struct pt_regs *regs, int cause) | ||
938 | { | ||
939 | /* If we're emulating a load/store in an active transaction, we cannot | ||
940 | * emulate it as the kernel operates in transaction suspended context. | ||
941 | * We need to abort the transaction. This creates a persistent TM | ||
942 | * abort so tell the user what caused it with a new code. | ||
943 | */ | ||
944 | if (MSR_TM_TRANSACTIONAL(regs->msr)) { | ||
945 | tm_enable(); | ||
946 | tm_abort(cause); | ||
947 | return true; | ||
948 | } | ||
949 | return false; | ||
950 | } | ||
951 | #else | ||
952 | static inline bool tm_abort_check(struct pt_regs *regs, int reason) | ||
953 | { | ||
954 | return false; | ||
955 | } | ||
956 | #endif | ||
957 | |||
935 | static int emulate_instruction(struct pt_regs *regs) | 958 | static int emulate_instruction(struct pt_regs *regs) |
936 | { | 959 | { |
937 | u32 instword; | 960 | u32 instword; |
@@ -971,6 +994,9 @@ static int emulate_instruction(struct pt_regs *regs) | |||
971 | 994 | ||
972 | /* Emulate load/store string insn. */ | 995 | /* Emulate load/store string insn. */ |
973 | if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) { | 996 | if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) { |
997 | if (tm_abort_check(regs, | ||
998 | TM_CAUSE_EMULATE | TM_CAUSE_PERSISTENT)) | ||
999 | return -EINVAL; | ||
974 | PPC_WARN_EMULATED(string, regs); | 1000 | PPC_WARN_EMULATED(string, regs); |
975 | return emulate_string_inst(regs, instword); | 1001 | return emulate_string_inst(regs, instword); |
976 | } | 1002 | } |
@@ -1148,6 +1174,9 @@ void alignment_exception(struct pt_regs *regs) | |||
1148 | if (!arch_irq_disabled_regs(regs)) | 1174 | if (!arch_irq_disabled_regs(regs)) |
1149 | local_irq_enable(); | 1175 | local_irq_enable(); |
1150 | 1176 | ||
1177 | if (tm_abort_check(regs, TM_CAUSE_ALIGNMENT | TM_CAUSE_PERSISTENT)) | ||
1178 | goto bail; | ||
1179 | |||
1151 | /* we don't implement logging of alignment exceptions */ | 1180 | /* we don't implement logging of alignment exceptions */ |
1152 | if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS)) | 1181 | if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS)) |
1153 | fixed = fix_alignment(regs); | 1182 | fixed = fix_alignment(regs); |
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 9de24f8e03c7..550f5928b394 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c | |||
@@ -562,6 +562,8 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) | |||
562 | case H_CPPR: | 562 | case H_CPPR: |
563 | case H_EOI: | 563 | case H_EOI: |
564 | case H_IPI: | 564 | case H_IPI: |
565 | case H_IPOLL: | ||
566 | case H_XIRR_X: | ||
565 | if (kvmppc_xics_enabled(vcpu)) { | 567 | if (kvmppc_xics_enabled(vcpu)) { |
566 | ret = kvmppc_xics_hcall(vcpu, req); | 568 | ret = kvmppc_xics_hcall(vcpu, req); |
567 | break; | 569 | break; |
diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c index b24309c6c2d5..da0e0bc268bd 100644 --- a/arch/powerpc/kvm/book3s_pr_papr.c +++ b/arch/powerpc/kvm/book3s_pr_papr.c | |||
@@ -257,6 +257,8 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) | |||
257 | case H_CPPR: | 257 | case H_CPPR: |
258 | case H_EOI: | 258 | case H_EOI: |
259 | case H_IPI: | 259 | case H_IPI: |
260 | case H_IPOLL: | ||
261 | case H_XIRR_X: | ||
260 | if (kvmppc_xics_enabled(vcpu)) | 262 | if (kvmppc_xics_enabled(vcpu)) |
261 | return kvmppc_h_pr_xics_hcall(vcpu, cmd); | 263 | return kvmppc_h_pr_xics_hcall(vcpu, cmd); |
262 | break; | 264 | break; |
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c index f7a103756618..94c1dd46b83d 100644 --- a/arch/powerpc/kvm/book3s_xics.c +++ b/arch/powerpc/kvm/book3s_xics.c | |||
@@ -650,6 +650,23 @@ static noinline int kvmppc_h_ipi(struct kvm_vcpu *vcpu, unsigned long server, | |||
650 | return H_SUCCESS; | 650 | return H_SUCCESS; |
651 | } | 651 | } |
652 | 652 | ||
653 | static int kvmppc_h_ipoll(struct kvm_vcpu *vcpu, unsigned long server) | ||
654 | { | ||
655 | union kvmppc_icp_state state; | ||
656 | struct kvmppc_icp *icp; | ||
657 | |||
658 | icp = vcpu->arch.icp; | ||
659 | if (icp->server_num != server) { | ||
660 | icp = kvmppc_xics_find_server(vcpu->kvm, server); | ||
661 | if (!icp) | ||
662 | return H_PARAMETER; | ||
663 | } | ||
664 | state = ACCESS_ONCE(icp->state); | ||
665 | kvmppc_set_gpr(vcpu, 4, ((u32)state.cppr << 24) | state.xisr); | ||
666 | kvmppc_set_gpr(vcpu, 5, state.mfrr); | ||
667 | return H_SUCCESS; | ||
668 | } | ||
669 | |||
653 | static noinline void kvmppc_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr) | 670 | static noinline void kvmppc_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr) |
654 | { | 671 | { |
655 | union kvmppc_icp_state old_state, new_state; | 672 | union kvmppc_icp_state old_state, new_state; |
@@ -787,6 +804,18 @@ int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 req) | |||
787 | if (!xics || !vcpu->arch.icp) | 804 | if (!xics || !vcpu->arch.icp) |
788 | return H_HARDWARE; | 805 | return H_HARDWARE; |
789 | 806 | ||
807 | /* These requests don't have real-mode implementations at present */ | ||
808 | switch (req) { | ||
809 | case H_XIRR_X: | ||
810 | res = kvmppc_h_xirr(vcpu); | ||
811 | kvmppc_set_gpr(vcpu, 4, res); | ||
812 | kvmppc_set_gpr(vcpu, 5, get_tb()); | ||
813 | return rc; | ||
814 | case H_IPOLL: | ||
815 | rc = kvmppc_h_ipoll(vcpu, kvmppc_get_gpr(vcpu, 4)); | ||
816 | return rc; | ||
817 | } | ||
818 | |||
790 | /* Check for real mode returning too hard */ | 819 | /* Check for real mode returning too hard */ |
791 | if (xics->real_mode) | 820 | if (xics->real_mode) |
792 | return kvmppc_xics_rm_complete(vcpu, req); | 821 | return kvmppc_xics_rm_complete(vcpu, req); |
diff --git a/arch/powerpc/lib/copypage_power7.S b/arch/powerpc/lib/copypage_power7.S index 0ef75bf0695c..395c594722a2 100644 --- a/arch/powerpc/lib/copypage_power7.S +++ b/arch/powerpc/lib/copypage_power7.S | |||
@@ -28,13 +28,14 @@ _GLOBAL(copypage_power7) | |||
28 | * aligned we don't need to clear the bottom 7 bits of either | 28 | * aligned we don't need to clear the bottom 7 bits of either |
29 | * address. | 29 | * address. |
30 | */ | 30 | */ |
31 | ori r9,r3,1 /* stream=1 */ | 31 | ori r9,r3,1 /* stream=1 => to */ |
32 | 32 | ||
33 | #ifdef CONFIG_PPC_64K_PAGES | 33 | #ifdef CONFIG_PPC_64K_PAGES |
34 | lis r7,0x0E01 /* depth=7, units=512 */ | 34 | lis r7,0x0E01 /* depth=7 |
35 | * units/cachelines=512 */ | ||
35 | #else | 36 | #else |
36 | lis r7,0x0E00 /* depth=7 */ | 37 | lis r7,0x0E00 /* depth=7 */ |
37 | ori r7,r7,0x1000 /* units=32 */ | 38 | ori r7,r7,0x1000 /* units/cachelines=32 */ |
38 | #endif | 39 | #endif |
39 | ori r10,r7,1 /* stream=1 */ | 40 | ori r10,r7,1 /* stream=1 */ |
40 | 41 | ||
@@ -43,12 +44,14 @@ _GLOBAL(copypage_power7) | |||
43 | 44 | ||
44 | .machine push | 45 | .machine push |
45 | .machine "power4" | 46 | .machine "power4" |
46 | dcbt r0,r4,0b01000 | 47 | /* setup read stream 0 */ |
47 | dcbt r0,r7,0b01010 | 48 | dcbt r0,r4,0b01000 /* addr from */ |
48 | dcbtst r0,r9,0b01000 | 49 | dcbt r0,r7,0b01010 /* length and depth from */ |
49 | dcbtst r0,r10,0b01010 | 50 | /* setup write stream 1 */ |
51 | dcbtst r0,r9,0b01000 /* addr to */ | ||
52 | dcbtst r0,r10,0b01010 /* length and depth to */ | ||
50 | eieio | 53 | eieio |
51 | dcbt r0,r8,0b01010 /* GO */ | 54 | dcbt r0,r8,0b01010 /* all streams GO */ |
52 | .machine pop | 55 | .machine pop |
53 | 56 | ||
54 | #ifdef CONFIG_ALTIVEC | 57 | #ifdef CONFIG_ALTIVEC |
diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S index 0d24ff15f5f6..d1f11795a7ad 100644 --- a/arch/powerpc/lib/copyuser_power7.S +++ b/arch/powerpc/lib/copyuser_power7.S | |||
@@ -318,12 +318,14 @@ err1; stb r0,0(r3) | |||
318 | 318 | ||
319 | .machine push | 319 | .machine push |
320 | .machine "power4" | 320 | .machine "power4" |
321 | dcbt r0,r6,0b01000 | 321 | /* setup read stream 0 */ |
322 | dcbt r0,r7,0b01010 | 322 | dcbt r0,r6,0b01000 /* addr from */ |
323 | dcbtst r0,r9,0b01000 | 323 | dcbt r0,r7,0b01010 /* length and depth from */ |
324 | dcbtst r0,r10,0b01010 | 324 | /* setup write stream 1 */ |
325 | dcbtst r0,r9,0b01000 /* addr to */ | ||
326 | dcbtst r0,r10,0b01010 /* length and depth to */ | ||
325 | eieio | 327 | eieio |
326 | dcbt r0,r8,0b01010 /* GO */ | 328 | dcbt r0,r8,0b01010 /* all streams GO */ |
327 | .machine pop | 329 | .machine pop |
328 | 330 | ||
329 | beq cr1,.Lunwind_stack_nonvmx_copy | 331 | beq cr1,.Lunwind_stack_nonvmx_copy |
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c index 6a2aead5b0e5..4c122c3f1623 100644 --- a/arch/powerpc/mm/hash_native_64.c +++ b/arch/powerpc/mm/hash_native_64.c | |||
@@ -336,11 +336,18 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp, | |||
336 | 336 | ||
337 | hpte_v = hptep->v; | 337 | hpte_v = hptep->v; |
338 | actual_psize = hpte_actual_psize(hptep, psize); | 338 | actual_psize = hpte_actual_psize(hptep, psize); |
339 | /* | ||
340 | * We need to invalidate the TLB always because hpte_remove doesn't do | ||
341 | * a tlb invalidate. If a hash bucket gets full, we "evict" a more/less | ||
342 | * random entry from it. When we do that we don't invalidate the TLB | ||
343 | * (hpte_remove) because we assume the old translation is still | ||
344 | * technically "valid". | ||
345 | */ | ||
339 | if (actual_psize < 0) { | 346 | if (actual_psize < 0) { |
340 | native_unlock_hpte(hptep); | 347 | actual_psize = psize; |
341 | return -1; | 348 | ret = -1; |
349 | goto err_out; | ||
342 | } | 350 | } |
343 | /* Even if we miss, we need to invalidate the TLB */ | ||
344 | if (!HPTE_V_COMPARE(hpte_v, want_v)) { | 351 | if (!HPTE_V_COMPARE(hpte_v, want_v)) { |
345 | DBG_LOW(" -> miss\n"); | 352 | DBG_LOW(" -> miss\n"); |
346 | ret = -1; | 353 | ret = -1; |
@@ -350,6 +357,7 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp, | |||
350 | hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | | 357 | hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | |
351 | (newpp & (HPTE_R_PP | HPTE_R_N | HPTE_R_C)); | 358 | (newpp & (HPTE_R_PP | HPTE_R_N | HPTE_R_C)); |
352 | } | 359 | } |
360 | err_out: | ||
353 | native_unlock_hpte(hptep); | 361 | native_unlock_hpte(hptep); |
354 | 362 | ||
355 | /* Ensure it is out of the tlb too. */ | 363 | /* Ensure it is out of the tlb too. */ |
@@ -409,7 +417,7 @@ static void native_hpte_updateboltedpp(unsigned long newpp, unsigned long ea, | |||
409 | hptep = htab_address + slot; | 417 | hptep = htab_address + slot; |
410 | actual_psize = hpte_actual_psize(hptep, psize); | 418 | actual_psize = hpte_actual_psize(hptep, psize); |
411 | if (actual_psize < 0) | 419 | if (actual_psize < 0) |
412 | return; | 420 | actual_psize = psize; |
413 | 421 | ||
414 | /* Update the HPTE */ | 422 | /* Update the HPTE */ |
415 | hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | | 423 | hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | |
@@ -437,21 +445,27 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long vpn, | |||
437 | hpte_v = hptep->v; | 445 | hpte_v = hptep->v; |
438 | 446 | ||
439 | actual_psize = hpte_actual_psize(hptep, psize); | 447 | actual_psize = hpte_actual_psize(hptep, psize); |
448 | /* | ||
449 | * We need to invalidate the TLB always because hpte_remove doesn't do | ||
450 | * a tlb invalidate. If a hash bucket gets full, we "evict" a more/less | ||
451 | * random entry from it. When we do that we don't invalidate the TLB | ||
452 | * (hpte_remove) because we assume the old translation is still | ||
453 | * technically "valid". | ||
454 | */ | ||
440 | if (actual_psize < 0) { | 455 | if (actual_psize < 0) { |
456 | actual_psize = psize; | ||
441 | native_unlock_hpte(hptep); | 457 | native_unlock_hpte(hptep); |
442 | local_irq_restore(flags); | 458 | goto err_out; |
443 | return; | ||
444 | } | 459 | } |
445 | /* Even if we miss, we need to invalidate the TLB */ | ||
446 | if (!HPTE_V_COMPARE(hpte_v, want_v)) | 460 | if (!HPTE_V_COMPARE(hpte_v, want_v)) |
447 | native_unlock_hpte(hptep); | 461 | native_unlock_hpte(hptep); |
448 | else | 462 | else |
449 | /* Invalidate the hpte. NOTE: this also unlocks it */ | 463 | /* Invalidate the hpte. NOTE: this also unlocks it */ |
450 | hptep->v = 0; | 464 | hptep->v = 0; |
451 | 465 | ||
466 | err_out: | ||
452 | /* Invalidate the TLB */ | 467 | /* Invalidate the TLB */ |
453 | tlbie(vpn, psize, actual_psize, ssize, local); | 468 | tlbie(vpn, psize, actual_psize, ssize, local); |
454 | |||
455 | local_irq_restore(flags); | 469 | local_irq_restore(flags); |
456 | } | 470 | } |
457 | 471 | ||
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index 426180b84978..845c867444e6 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c | |||
@@ -110,7 +110,7 @@ static inline void power_pmu_bhrb_read(struct cpu_hw_events *cpuhw) {} | |||
110 | 110 | ||
111 | static bool regs_use_siar(struct pt_regs *regs) | 111 | static bool regs_use_siar(struct pt_regs *regs) |
112 | { | 112 | { |
113 | return !!(regs->result & 1); | 113 | return !!regs->result; |
114 | } | 114 | } |
115 | 115 | ||
116 | /* | 116 | /* |
@@ -136,22 +136,30 @@ static inline unsigned long perf_ip_adjust(struct pt_regs *regs) | |||
136 | * If we're not doing instruction sampling, give them the SDAR | 136 | * If we're not doing instruction sampling, give them the SDAR |
137 | * (sampled data address). If we are doing instruction sampling, then | 137 | * (sampled data address). If we are doing instruction sampling, then |
138 | * only give them the SDAR if it corresponds to the instruction | 138 | * only give them the SDAR if it corresponds to the instruction |
139 | * pointed to by SIAR; this is indicated by the [POWER6_]MMCRA_SDSYNC or | 139 | * pointed to by SIAR; this is indicated by the [POWER6_]MMCRA_SDSYNC, the |
140 | * the [POWER7P_]MMCRA_SDAR_VALID bit in MMCRA. | 140 | * [POWER7P_]MMCRA_SDAR_VALID bit in MMCRA, or the SDAR_VALID bit in SIER. |
141 | */ | 141 | */ |
142 | static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp) | 142 | static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp) |
143 | { | 143 | { |
144 | unsigned long mmcra = regs->dsisr; | 144 | unsigned long mmcra = regs->dsisr; |
145 | unsigned long sdsync; | 145 | bool sdar_valid; |
146 | 146 | ||
147 | if (ppmu->flags & PPMU_SIAR_VALID) | 147 | if (ppmu->flags & PPMU_HAS_SIER) |
148 | sdsync = POWER7P_MMCRA_SDAR_VALID; | 148 | sdar_valid = regs->dar & SIER_SDAR_VALID; |
149 | else if (ppmu->flags & PPMU_ALT_SIPR) | 149 | else { |
150 | sdsync = POWER6_MMCRA_SDSYNC; | 150 | unsigned long sdsync; |
151 | else | 151 | |
152 | sdsync = MMCRA_SDSYNC; | 152 | if (ppmu->flags & PPMU_SIAR_VALID) |
153 | sdsync = POWER7P_MMCRA_SDAR_VALID; | ||
154 | else if (ppmu->flags & PPMU_ALT_SIPR) | ||
155 | sdsync = POWER6_MMCRA_SDSYNC; | ||
156 | else | ||
157 | sdsync = MMCRA_SDSYNC; | ||
158 | |||
159 | sdar_valid = mmcra & sdsync; | ||
160 | } | ||
153 | 161 | ||
154 | if (!(mmcra & MMCRA_SAMPLE_ENABLE) || (mmcra & sdsync)) | 162 | if (!(mmcra & MMCRA_SAMPLE_ENABLE) || sdar_valid) |
155 | *addrp = mfspr(SPRN_SDAR); | 163 | *addrp = mfspr(SPRN_SDAR); |
156 | } | 164 | } |
157 | 165 | ||
@@ -181,11 +189,6 @@ static bool regs_sipr(struct pt_regs *regs) | |||
181 | return !!(regs->dsisr & sipr); | 189 | return !!(regs->dsisr & sipr); |
182 | } | 190 | } |
183 | 191 | ||
184 | static bool regs_no_sipr(struct pt_regs *regs) | ||
185 | { | ||
186 | return !!(regs->result & 2); | ||
187 | } | ||
188 | |||
189 | static inline u32 perf_flags_from_msr(struct pt_regs *regs) | 192 | static inline u32 perf_flags_from_msr(struct pt_regs *regs) |
190 | { | 193 | { |
191 | if (regs->msr & MSR_PR) | 194 | if (regs->msr & MSR_PR) |
@@ -208,7 +211,7 @@ static inline u32 perf_get_misc_flags(struct pt_regs *regs) | |||
208 | * SIAR which should give slightly more reliable | 211 | * SIAR which should give slightly more reliable |
209 | * results | 212 | * results |
210 | */ | 213 | */ |
211 | if (regs_no_sipr(regs)) { | 214 | if (ppmu->flags & PPMU_NO_SIPR) { |
212 | unsigned long siar = mfspr(SPRN_SIAR); | 215 | unsigned long siar = mfspr(SPRN_SIAR); |
213 | if (siar >= PAGE_OFFSET) | 216 | if (siar >= PAGE_OFFSET) |
214 | return PERF_RECORD_MISC_KERNEL; | 217 | return PERF_RECORD_MISC_KERNEL; |
@@ -239,22 +242,9 @@ static inline void perf_read_regs(struct pt_regs *regs) | |||
239 | int use_siar; | 242 | int use_siar; |
240 | 243 | ||
241 | regs->dsisr = mmcra; | 244 | regs->dsisr = mmcra; |
242 | regs->result = 0; | ||
243 | |||
244 | if (ppmu->flags & PPMU_NO_SIPR) | ||
245 | regs->result |= 2; | ||
246 | |||
247 | /* | ||
248 | * On power8 if we're in random sampling mode, the SIER is updated. | ||
249 | * If we're in continuous sampling mode, we don't have SIPR. | ||
250 | */ | ||
251 | if (ppmu->flags & PPMU_HAS_SIER) { | ||
252 | if (marked) | ||
253 | regs->dar = mfspr(SPRN_SIER); | ||
254 | else | ||
255 | regs->result |= 2; | ||
256 | } | ||
257 | 245 | ||
246 | if (ppmu->flags & PPMU_HAS_SIER) | ||
247 | regs->dar = mfspr(SPRN_SIER); | ||
258 | 248 | ||
259 | /* | 249 | /* |
260 | * If this isn't a PMU exception (eg a software event) the SIAR is | 250 | * If this isn't a PMU exception (eg a software event) the SIAR is |
@@ -279,12 +269,12 @@ static inline void perf_read_regs(struct pt_regs *regs) | |||
279 | use_siar = 1; | 269 | use_siar = 1; |
280 | else if ((ppmu->flags & PPMU_NO_CONT_SAMPLING)) | 270 | else if ((ppmu->flags & PPMU_NO_CONT_SAMPLING)) |
281 | use_siar = 0; | 271 | use_siar = 0; |
282 | else if (!regs_no_sipr(regs) && regs_sipr(regs)) | 272 | else if (!(ppmu->flags & PPMU_NO_SIPR) && regs_sipr(regs)) |
283 | use_siar = 0; | 273 | use_siar = 0; |
284 | else | 274 | else |
285 | use_siar = 1; | 275 | use_siar = 1; |
286 | 276 | ||
287 | regs->result |= use_siar; | 277 | regs->result = use_siar; |
288 | } | 278 | } |
289 | 279 | ||
290 | /* | 280 | /* |
@@ -308,8 +298,13 @@ static inline int siar_valid(struct pt_regs *regs) | |||
308 | unsigned long mmcra = regs->dsisr; | 298 | unsigned long mmcra = regs->dsisr; |
309 | int marked = mmcra & MMCRA_SAMPLE_ENABLE; | 299 | int marked = mmcra & MMCRA_SAMPLE_ENABLE; |
310 | 300 | ||
311 | if ((ppmu->flags & PPMU_SIAR_VALID) && marked) | 301 | if (marked) { |
312 | return mmcra & POWER7P_MMCRA_SIAR_VALID; | 302 | if (ppmu->flags & PPMU_HAS_SIER) |
303 | return regs->dar & SIER_SIAR_VALID; | ||
304 | |||
305 | if (ppmu->flags & PPMU_SIAR_VALID) | ||
306 | return mmcra & POWER7P_MMCRA_SIAR_VALID; | ||
307 | } | ||
313 | 308 | ||
314 | return 1; | 309 | return 1; |
315 | } | 310 | } |
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 023b288f895b..4459eff7a75a 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig | |||
@@ -19,6 +19,8 @@ config PPC_PSERIES | |||
19 | select ZLIB_DEFLATE | 19 | select ZLIB_DEFLATE |
20 | select PPC_DOORBELL | 20 | select PPC_DOORBELL |
21 | select HAVE_CONTEXT_TRACKING | 21 | select HAVE_CONTEXT_TRACKING |
22 | select HOTPLUG if SMP | ||
23 | select HOTPLUG_CPU if SMP | ||
22 | default y | 24 | default y |
23 | 25 | ||
24 | config PPC_SPLPAR | 26 | config PPC_SPLPAR |
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 0a13ecb270c7..3cc2f9159ab1 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -54,7 +54,7 @@ static DEFINE_RAW_SPINLOCK(mpic_lock); | |||
54 | 54 | ||
55 | #ifdef CONFIG_PPC32 /* XXX for now */ | 55 | #ifdef CONFIG_PPC32 /* XXX for now */ |
56 | #ifdef CONFIG_IRQ_ALL_CPUS | 56 | #ifdef CONFIG_IRQ_ALL_CPUS |
57 | #define distribute_irqs (!(mpic->flags & MPIC_SINGLE_DEST_CPU)) | 57 | #define distribute_irqs (1) |
58 | #else | 58 | #else |
59 | #define distribute_irqs (0) | 59 | #define distribute_irqs (0) |
60 | #endif | 60 | #endif |
@@ -1703,7 +1703,7 @@ void mpic_setup_this_cpu(void) | |||
1703 | * it differently, then we should make sure we also change the default | 1703 | * it differently, then we should make sure we also change the default |
1704 | * values of irq_desc[].affinity in irq.c. | 1704 | * values of irq_desc[].affinity in irq.c. |
1705 | */ | 1705 | */ |
1706 | if (distribute_irqs) { | 1706 | if (distribute_irqs && !(mpic->flags & MPIC_SINGLE_DEST_CPU)) { |
1707 | for (i = 0; i < mpic->num_sources ; i++) | 1707 | for (i = 0; i < mpic->num_sources ; i++) |
1708 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), | 1708 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), |
1709 | mpic_irq_read(i, MPIC_INFO(IRQ_DESTINATION)) | msk); | 1709 | mpic_irq_read(i, MPIC_INFO(IRQ_DESTINATION)) | msk); |
diff --git a/arch/x86/crypto/crc32-pclmul_asm.S b/arch/x86/crypto/crc32-pclmul_asm.S index 94c27df8a549..f247304299a2 100644 --- a/arch/x86/crypto/crc32-pclmul_asm.S +++ b/arch/x86/crypto/crc32-pclmul_asm.S | |||
@@ -240,7 +240,7 @@ fold_64: | |||
240 | pand %xmm3, %xmm1 | 240 | pand %xmm3, %xmm1 |
241 | PCLMULQDQ 0x00, CONSTANT, %xmm1 | 241 | PCLMULQDQ 0x00, CONSTANT, %xmm1 |
242 | pxor %xmm2, %xmm1 | 242 | pxor %xmm2, %xmm1 |
243 | pextrd $0x01, %xmm1, %eax | 243 | PEXTRD 0x01, %xmm1, %eax |
244 | 244 | ||
245 | ret | 245 | ret |
246 | ENDPROC(crc32_pclmul_le_16) | 246 | ENDPROC(crc32_pclmul_le_16) |
diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S index 56610c4bf31b..642f15687a0a 100644 --- a/arch/x86/crypto/sha256-avx-asm.S +++ b/arch/x86/crypto/sha256-avx-asm.S | |||
@@ -118,7 +118,7 @@ y2 = %r15d | |||
118 | 118 | ||
119 | _INP_END_SIZE = 8 | 119 | _INP_END_SIZE = 8 |
120 | _INP_SIZE = 8 | 120 | _INP_SIZE = 8 |
121 | _XFER_SIZE = 8 | 121 | _XFER_SIZE = 16 |
122 | _XMM_SAVE_SIZE = 0 | 122 | _XMM_SAVE_SIZE = 0 |
123 | 123 | ||
124 | _INP_END = 0 | 124 | _INP_END = 0 |
diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S index 98d3c391da81..f833b74d902b 100644 --- a/arch/x86/crypto/sha256-ssse3-asm.S +++ b/arch/x86/crypto/sha256-ssse3-asm.S | |||
@@ -111,7 +111,7 @@ y2 = %r15d | |||
111 | 111 | ||
112 | _INP_END_SIZE = 8 | 112 | _INP_END_SIZE = 8 |
113 | _INP_SIZE = 8 | 113 | _INP_SIZE = 8 |
114 | _XFER_SIZE = 8 | 114 | _XFER_SIZE = 16 |
115 | _XMM_SAVE_SIZE = 0 | 115 | _XMM_SAVE_SIZE = 0 |
116 | 116 | ||
117 | _INP_END = 0 | 117 | _INP_END = 0 |
diff --git a/arch/x86/include/asm/inst.h b/arch/x86/include/asm/inst.h index 280bf7fb6aba..3e115273ed88 100644 --- a/arch/x86/include/asm/inst.h +++ b/arch/x86/include/asm/inst.h | |||
@@ -9,12 +9,68 @@ | |||
9 | 9 | ||
10 | #define REG_NUM_INVALID 100 | 10 | #define REG_NUM_INVALID 100 |
11 | 11 | ||
12 | #define REG_TYPE_R64 0 | 12 | #define REG_TYPE_R32 0 |
13 | #define REG_TYPE_XMM 1 | 13 | #define REG_TYPE_R64 1 |
14 | #define REG_TYPE_XMM 2 | ||
14 | #define REG_TYPE_INVALID 100 | 15 | #define REG_TYPE_INVALID 100 |
15 | 16 | ||
17 | .macro R32_NUM opd r32 | ||
18 | \opd = REG_NUM_INVALID | ||
19 | .ifc \r32,%eax | ||
20 | \opd = 0 | ||
21 | .endif | ||
22 | .ifc \r32,%ecx | ||
23 | \opd = 1 | ||
24 | .endif | ||
25 | .ifc \r32,%edx | ||
26 | \opd = 2 | ||
27 | .endif | ||
28 | .ifc \r32,%ebx | ||
29 | \opd = 3 | ||
30 | .endif | ||
31 | .ifc \r32,%esp | ||
32 | \opd = 4 | ||
33 | .endif | ||
34 | .ifc \r32,%ebp | ||
35 | \opd = 5 | ||
36 | .endif | ||
37 | .ifc \r32,%esi | ||
38 | \opd = 6 | ||
39 | .endif | ||
40 | .ifc \r32,%edi | ||
41 | \opd = 7 | ||
42 | .endif | ||
43 | #ifdef CONFIG_X86_64 | ||
44 | .ifc \r32,%r8d | ||
45 | \opd = 8 | ||
46 | .endif | ||
47 | .ifc \r32,%r9d | ||
48 | \opd = 9 | ||
49 | .endif | ||
50 | .ifc \r32,%r10d | ||
51 | \opd = 10 | ||
52 | .endif | ||
53 | .ifc \r32,%r11d | ||
54 | \opd = 11 | ||
55 | .endif | ||
56 | .ifc \r32,%r12d | ||
57 | \opd = 12 | ||
58 | .endif | ||
59 | .ifc \r32,%r13d | ||
60 | \opd = 13 | ||
61 | .endif | ||
62 | .ifc \r32,%r14d | ||
63 | \opd = 14 | ||
64 | .endif | ||
65 | .ifc \r32,%r15d | ||
66 | \opd = 15 | ||
67 | .endif | ||
68 | #endif | ||
69 | .endm | ||
70 | |||
16 | .macro R64_NUM opd r64 | 71 | .macro R64_NUM opd r64 |
17 | \opd = REG_NUM_INVALID | 72 | \opd = REG_NUM_INVALID |
73 | #ifdef CONFIG_X86_64 | ||
18 | .ifc \r64,%rax | 74 | .ifc \r64,%rax |
19 | \opd = 0 | 75 | \opd = 0 |
20 | .endif | 76 | .endif |
@@ -63,6 +119,7 @@ | |||
63 | .ifc \r64,%r15 | 119 | .ifc \r64,%r15 |
64 | \opd = 15 | 120 | \opd = 15 |
65 | .endif | 121 | .endif |
122 | #endif | ||
66 | .endm | 123 | .endm |
67 | 124 | ||
68 | .macro XMM_NUM opd xmm | 125 | .macro XMM_NUM opd xmm |
@@ -118,10 +175,13 @@ | |||
118 | .endm | 175 | .endm |
119 | 176 | ||
120 | .macro REG_TYPE type reg | 177 | .macro REG_TYPE type reg |
178 | R32_NUM reg_type_r32 \reg | ||
121 | R64_NUM reg_type_r64 \reg | 179 | R64_NUM reg_type_r64 \reg |
122 | XMM_NUM reg_type_xmm \reg | 180 | XMM_NUM reg_type_xmm \reg |
123 | .if reg_type_r64 <> REG_NUM_INVALID | 181 | .if reg_type_r64 <> REG_NUM_INVALID |
124 | \type = REG_TYPE_R64 | 182 | \type = REG_TYPE_R64 |
183 | .elseif reg_type_r32 <> REG_NUM_INVALID | ||
184 | \type = REG_TYPE_R32 | ||
125 | .elseif reg_type_xmm <> REG_NUM_INVALID | 185 | .elseif reg_type_xmm <> REG_NUM_INVALID |
126 | \type = REG_TYPE_XMM | 186 | \type = REG_TYPE_XMM |
127 | .else | 187 | .else |
@@ -162,6 +222,16 @@ | |||
162 | .byte \imm8 | 222 | .byte \imm8 |
163 | .endm | 223 | .endm |
164 | 224 | ||
225 | .macro PEXTRD imm8 xmm gpr | ||
226 | R32_NUM extrd_opd1 \gpr | ||
227 | XMM_NUM extrd_opd2 \xmm | ||
228 | PFX_OPD_SIZE | ||
229 | PFX_REX extrd_opd1 extrd_opd2 | ||
230 | .byte 0x0f, 0x3a, 0x16 | ||
231 | MODRM 0xc0 extrd_opd1 extrd_opd2 | ||
232 | .byte \imm8 | ||
233 | .endm | ||
234 | |||
165 | .macro AESKEYGENASSIST rcon xmm1 xmm2 | 235 | .macro AESKEYGENASSIST rcon xmm1 xmm2 |
166 | XMM_NUM aeskeygen_opd1 \xmm1 | 236 | XMM_NUM aeskeygen_opd1 \xmm1 |
167 | XMM_NUM aeskeygen_opd2 \xmm2 | 237 | XMM_NUM aeskeygen_opd2 \xmm2 |
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 08f7e8039099..321d65ebaffe 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
@@ -115,8 +115,10 @@ startup_64: | |||
115 | movq %rdi, %rax | 115 | movq %rdi, %rax |
116 | shrq $PUD_SHIFT, %rax | 116 | shrq $PUD_SHIFT, %rax |
117 | andl $(PTRS_PER_PUD-1), %eax | 117 | andl $(PTRS_PER_PUD-1), %eax |
118 | movq %rdx, (4096+0)(%rbx,%rax,8) | 118 | movq %rdx, 4096(%rbx,%rax,8) |
119 | movq %rdx, (4096+8)(%rbx,%rax,8) | 119 | incl %eax |
120 | andl $(PTRS_PER_PUD-1), %eax | ||
121 | movq %rdx, 4096(%rbx,%rax,8) | ||
120 | 122 | ||
121 | addq $8192, %rbx | 123 | addq $8192, %rbx |
122 | movq %rdi, %rax | 124 | movq %rdi, %rax |
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index 245a71db401a..cb339097b9ea 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c | |||
@@ -22,23 +22,19 @@ | |||
22 | /* | 22 | /* |
23 | * Were we in an interrupt that interrupted kernel mode? | 23 | * Were we in an interrupt that interrupted kernel mode? |
24 | * | 24 | * |
25 | * For now, with eagerfpu we will return interrupted kernel FPU | ||
26 | * state as not-idle. TBD: Ideally we can change the return value | ||
27 | * to something like __thread_has_fpu(current). But we need to | ||
28 | * be careful of doing __thread_clear_has_fpu() before saving | ||
29 | * the FPU etc for supporting nested uses etc. For now, take | ||
30 | * the simple route! | ||
31 | * | ||
32 | * On others, we can do a kernel_fpu_begin/end() pair *ONLY* if that | 25 | * On others, we can do a kernel_fpu_begin/end() pair *ONLY* if that |
33 | * pair does nothing at all: the thread must not have fpu (so | 26 | * pair does nothing at all: the thread must not have fpu (so |
34 | * that we don't try to save the FPU state), and TS must | 27 | * that we don't try to save the FPU state), and TS must |
35 | * be set (so that the clts/stts pair does nothing that is | 28 | * be set (so that the clts/stts pair does nothing that is |
36 | * visible in the interrupted kernel thread). | 29 | * visible in the interrupted kernel thread). |
30 | * | ||
31 | * Except for the eagerfpu case when we return 1 unless we've already | ||
32 | * been eager and saved the state in kernel_fpu_begin(). | ||
37 | */ | 33 | */ |
38 | static inline bool interrupted_kernel_fpu_idle(void) | 34 | static inline bool interrupted_kernel_fpu_idle(void) |
39 | { | 35 | { |
40 | if (use_eager_fpu()) | 36 | if (use_eager_fpu()) |
41 | return 0; | 37 | return __thread_has_fpu(current); |
42 | 38 | ||
43 | return !__thread_has_fpu(current) && | 39 | return !__thread_has_fpu(current) && |
44 | (read_cr0() & X86_CR0_TS); | 40 | (read_cr0() & X86_CR0_TS); |
@@ -78,8 +74,8 @@ void __kernel_fpu_begin(void) | |||
78 | struct task_struct *me = current; | 74 | struct task_struct *me = current; |
79 | 75 | ||
80 | if (__thread_has_fpu(me)) { | 76 | if (__thread_has_fpu(me)) { |
81 | __save_init_fpu(me); | ||
82 | __thread_clear_has_fpu(me); | 77 | __thread_clear_has_fpu(me); |
78 | __save_init_fpu(me); | ||
83 | /* We do 'stts()' in __kernel_fpu_end() */ | 79 | /* We do 'stts()' in __kernel_fpu_end() */ |
84 | } else if (!use_eager_fpu()) { | 80 | } else if (!use_eager_fpu()) { |
85 | this_cpu_write(fpu_owner_task, NULL); | 81 | this_cpu_write(fpu_owner_task, NULL); |
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 55856b2310d3..82089d8b1954 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c | |||
@@ -206,7 +206,7 @@ static efi_status_t virt_efi_get_next_variable(unsigned long *name_size, | |||
206 | } | 206 | } |
207 | 207 | ||
208 | if (boot_used_size && !finished) { | 208 | if (boot_used_size && !finished) { |
209 | unsigned long size; | 209 | unsigned long size = 0; |
210 | u32 attr; | 210 | u32 attr; |
211 | efi_status_t s; | 211 | efi_status_t s; |
212 | void *tmp; | 212 | void *tmp; |
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 8ff37995d54e..fb44426fe931 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
@@ -576,24 +576,22 @@ void xen_send_IPI_mask_allbutself(const struct cpumask *mask, | |||
576 | { | 576 | { |
577 | unsigned cpu; | 577 | unsigned cpu; |
578 | unsigned int this_cpu = smp_processor_id(); | 578 | unsigned int this_cpu = smp_processor_id(); |
579 | int xen_vector = xen_map_vector(vector); | ||
579 | 580 | ||
580 | if (!(num_online_cpus() > 1)) | 581 | if (!(num_online_cpus() > 1) || (xen_vector < 0)) |
581 | return; | 582 | return; |
582 | 583 | ||
583 | for_each_cpu_and(cpu, mask, cpu_online_mask) { | 584 | for_each_cpu_and(cpu, mask, cpu_online_mask) { |
584 | if (this_cpu == cpu) | 585 | if (this_cpu == cpu) |
585 | continue; | 586 | continue; |
586 | 587 | ||
587 | xen_smp_send_call_function_single_ipi(cpu); | 588 | xen_send_IPI_one(cpu, xen_vector); |
588 | } | 589 | } |
589 | } | 590 | } |
590 | 591 | ||
591 | void xen_send_IPI_allbutself(int vector) | 592 | void xen_send_IPI_allbutself(int vector) |
592 | { | 593 | { |
593 | int xen_vector = xen_map_vector(vector); | 594 | xen_send_IPI_mask_allbutself(cpu_online_mask, vector); |
594 | |||
595 | if (xen_vector >= 0) | ||
596 | xen_send_IPI_mask_allbutself(cpu_online_mask, xen_vector); | ||
597 | } | 595 | } |
598 | 596 | ||
599 | static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id) | 597 | static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id) |
diff --git a/arch/x86/xen/smp.h b/arch/x86/xen/smp.h index 8981a76d081a..c7c2d89efd76 100644 --- a/arch/x86/xen/smp.h +++ b/arch/x86/xen/smp.h | |||
@@ -5,7 +5,6 @@ extern void xen_send_IPI_mask(const struct cpumask *mask, | |||
5 | extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask, | 5 | extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask, |
6 | int vector); | 6 | int vector); |
7 | extern void xen_send_IPI_allbutself(int vector); | 7 | extern void xen_send_IPI_allbutself(int vector); |
8 | extern void physflat_send_IPI_allbutself(int vector); | ||
9 | extern void xen_send_IPI_all(int vector); | 8 | extern void xen_send_IPI_all(int vector); |
10 | extern void xen_send_IPI_self(int vector); | 9 | extern void xen_send_IPI_self(int vector); |
11 | 10 | ||