aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2017-05-30 02:30:35 -0400
committerMichal Simek <michal.simek@xilinx.com>2017-06-22 09:36:58 -0400
commite0d4fa5f7a500cb5d1909b1bc3257031d73c2759 (patch)
tree4d9ead01e463035450fc54e2b799c9572c11e72c
parenta753499d43603d7b882cdd835aea9bc7183457fc (diff)
microblaze: Update defconfigs
Run "make savedefconfig" to bring up to date. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat
-rw-r--r--arch/microblaze/configs/mmu_defconfig12
-rw-r--r--arch/microblaze/configs/nommu_defconfig17
2 files changed, 6 insertions, 23 deletions
diff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig
index dc5dd5b69fde..f5bc8e1876d5 100644
--- a/arch/microblaze/configs/mmu_defconfig
+++ b/arch/microblaze/configs/mmu_defconfig
@@ -1,8 +1,6 @@
1CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_POSIX_MQUEUE=y 2CONFIG_POSIX_MQUEUE=y
3CONFIG_FHANDLE=y
4CONFIG_AUDIT=y 3CONFIG_AUDIT=y
5CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
6CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
8CONFIG_SYSFS_DEPRECATED=y 6CONFIG_SYSFS_DEPRECATED=y
@@ -33,10 +31,8 @@ CONFIG_NET=y
33CONFIG_PACKET=y 31CONFIG_PACKET=y
34CONFIG_UNIX=y 32CONFIG_UNIX=y
35CONFIG_INET=y 33CONFIG_INET=y
36# CONFIG_INET_LRO is not set
37# CONFIG_IPV6 is not set 34# CONFIG_IPV6 is not set
38CONFIG_MTD=y 35CONFIG_MTD=y
39CONFIG_PROC_DEVICETREE=y
40CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
41CONFIG_BLK_DEV_RAM_SIZE=8192 37CONFIG_BLK_DEV_RAM_SIZE=8192
42CONFIG_NETDEVICES=y 38CONFIG_NETDEVICES=y
@@ -47,9 +43,9 @@ CONFIG_XILINX_LL_TEMAC=y
47# CONFIG_VT is not set 43# CONFIG_VT is not set
48CONFIG_SERIAL_8250=y 44CONFIG_SERIAL_8250=y
49CONFIG_SERIAL_8250_CONSOLE=y 45CONFIG_SERIAL_8250_CONSOLE=y
46CONFIG_SERIAL_OF_PLATFORM=y
50CONFIG_SERIAL_UARTLITE=y 47CONFIG_SERIAL_UARTLITE=y
51CONFIG_SERIAL_UARTLITE_CONSOLE=y 48CONFIG_SERIAL_UARTLITE_CONSOLE=y
52CONFIG_SERIAL_OF_PLATFORM=y
53# CONFIG_HW_RANDOM is not set 49# CONFIG_HW_RANDOM is not set
54CONFIG_XILINX_HWICAP=y 50CONFIG_XILINX_HWICAP=y
55CONFIG_I2C=y 51CONFIG_I2C=y
@@ -66,7 +62,6 @@ CONFIG_FB=y
66CONFIG_FB_XILINX=y 62CONFIG_FB_XILINX=y
67# CONFIG_USB_SUPPORT is not set 63# CONFIG_USB_SUPPORT is not set
68CONFIG_UIO=y 64CONFIG_UIO=y
69CONFIG_UIO_PDRV=y
70CONFIG_UIO_PDRV_GENIRQ=y 65CONFIG_UIO_PDRV_GENIRQ=y
71CONFIG_UIO_DMEM_GENIRQ=y 66CONFIG_UIO_DMEM_GENIRQ=y
72CONFIG_EXT2_FS=y 67CONFIG_EXT2_FS=y
@@ -77,14 +72,13 @@ CONFIG_NFS_FS=y
77CONFIG_CIFS=y 72CONFIG_CIFS=y
78CONFIG_CIFS_STATS=y 73CONFIG_CIFS_STATS=y
79CONFIG_CIFS_STATS2=y 74CONFIG_CIFS_STATS2=y
80CONFIG_DETECT_HUNG_TASK=y 75CONFIG_DEBUG_INFO=y
81CONFIG_DEBUG_SLAB=y 76CONFIG_DEBUG_SLAB=y
77CONFIG_DETECT_HUNG_TASK=y
82CONFIG_DEBUG_SPINLOCK=y 78CONFIG_DEBUG_SPINLOCK=y
83CONFIG_DEBUG_INFO=y
84CONFIG_KGDB=y 79CONFIG_KGDB=y
85CONFIG_KGDB_TESTS=y 80CONFIG_KGDB_TESTS=y
86CONFIG_KGDB_KDB=y 81CONFIG_KGDB_KDB=y
87CONFIG_EARLY_PRINTK=y 82CONFIG_EARLY_PRINTK=y
88CONFIG_KEYS=y 83CONFIG_KEYS=y
89CONFIG_ENCRYPTED_KEYS=y 84CONFIG_ENCRYPTED_KEYS=y
90# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/microblaze/configs/nommu_defconfig b/arch/microblaze/configs/nommu_defconfig
index 4cdaf565e638..06d69a6e192d 100644
--- a/arch/microblaze/configs/nommu_defconfig
+++ b/arch/microblaze/configs/nommu_defconfig
@@ -1,9 +1,6 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 2CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_AUDIT=y 3CONFIG_AUDIT=y
6CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
7CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
9CONFIG_IKCONFIG=y 6CONFIG_IKCONFIG=y
@@ -34,18 +31,15 @@ CONFIG_NET=y
34CONFIG_PACKET=y 31CONFIG_PACKET=y
35CONFIG_UNIX=y 32CONFIG_UNIX=y
36CONFIG_INET=y 33CONFIG_INET=y
37# CONFIG_INET_LRO is not set
38# CONFIG_IPV6 is not set 34# CONFIG_IPV6 is not set
39CONFIG_MTD=y 35CONFIG_MTD=y
40CONFIG_MTD_CMDLINE_PARTS=y 36CONFIG_MTD_CMDLINE_PARTS=y
41CONFIG_MTD_CHAR=y
42CONFIG_MTD_BLOCK=y 37CONFIG_MTD_BLOCK=y
43CONFIG_MTD_CFI=y 38CONFIG_MTD_CFI=y
44CONFIG_MTD_CFI_INTELEXT=y 39CONFIG_MTD_CFI_INTELEXT=y
45CONFIG_MTD_CFI_AMDSTD=y 40CONFIG_MTD_CFI_AMDSTD=y
46CONFIG_MTD_RAM=y 41CONFIG_MTD_RAM=y
47CONFIG_MTD_UCLINUX=y 42CONFIG_MTD_UCLINUX=y
48CONFIG_PROC_DEVICETREE=y
49CONFIG_BLK_DEV_RAM=y 43CONFIG_BLK_DEV_RAM=y
50CONFIG_BLK_DEV_RAM_SIZE=8192 44CONFIG_BLK_DEV_RAM_SIZE=8192
51CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
@@ -56,9 +50,9 @@ CONFIG_XILINX_LL_TEMAC=y
56# CONFIG_VT is not set 50# CONFIG_VT is not set
57CONFIG_SERIAL_8250=y 51CONFIG_SERIAL_8250=y
58CONFIG_SERIAL_8250_CONSOLE=y 52CONFIG_SERIAL_8250_CONSOLE=y
53CONFIG_SERIAL_OF_PLATFORM=y
59CONFIG_SERIAL_UARTLITE=y 54CONFIG_SERIAL_UARTLITE=y
60CONFIG_SERIAL_UARTLITE_CONSOLE=y 55CONFIG_SERIAL_UARTLITE_CONSOLE=y
61CONFIG_SERIAL_OF_PLATFORM=y
62# CONFIG_HW_RANDOM is not set 56# CONFIG_HW_RANDOM is not set
63CONFIG_XILINX_HWICAP=y 57CONFIG_XILINX_HWICAP=y
64CONFIG_I2C=y 58CONFIG_I2C=y
@@ -74,10 +68,6 @@ CONFIG_XILINX_WATCHDOG=y
74CONFIG_FB=y 68CONFIG_FB=y
75CONFIG_FB_XILINX=y 69CONFIG_FB_XILINX=y
76# CONFIG_USB_SUPPORT is not set 70# CONFIG_USB_SUPPORT is not set
77CONFIG_UIO=y
78CONFIG_UIO_PDRV=y
79CONFIG_UIO_PDRV_GENIRQ=y
80CONFIG_UIO_DMEM_GENIRQ=y
81CONFIG_EXT2_FS=y 71CONFIG_EXT2_FS=y
82# CONFIG_DNOTIFY is not set 72# CONFIG_DNOTIFY is not set
83CONFIG_CRAMFS=y 73CONFIG_CRAMFS=y
@@ -85,10 +75,10 @@ CONFIG_ROMFS_FS=y
85CONFIG_NFS_FS=y 75CONFIG_NFS_FS=y
86CONFIG_NFS_V3_ACL=y 76CONFIG_NFS_V3_ACL=y
87CONFIG_NLS=y 77CONFIG_NLS=y
88CONFIG_DETECT_HUNG_TASK=y 78CONFIG_DEBUG_INFO=y
89CONFIG_DEBUG_SLAB=y 79CONFIG_DEBUG_SLAB=y
80CONFIG_DETECT_HUNG_TASK=y
90CONFIG_DEBUG_SPINLOCK=y 81CONFIG_DEBUG_SPINLOCK=y
91CONFIG_DEBUG_INFO=y
92CONFIG_EARLY_PRINTK=y 82CONFIG_EARLY_PRINTK=y
93CONFIG_KEYS=y 83CONFIG_KEYS=y
94CONFIG_ENCRYPTED_KEYS=y 84CONFIG_ENCRYPTED_KEYS=y
@@ -97,4 +87,3 @@ CONFIG_CRYPTO_MD4=y
97CONFIG_CRYPTO_MD5=y 87CONFIG_CRYPTO_MD5=y
98CONFIG_CRYPTO_ARC4=y 88CONFIG_CRYPTO_ARC4=y
99CONFIG_CRYPTO_DES=y 89CONFIG_CRYPTO_DES=y
100# CONFIG_CRYPTO_ANSI_CPRNG is not set
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-27 09:26:49 -0400