summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2019-09-04 04:42:12 -0400
committerMichal Simek <michal.simek@xilinx.com>2019-09-18 03:51:40 -0400
commit1c62ed908363e249f3b0e1879d9d982e8431fb3f (patch)
treec25d248e66bffe92cd2d289a0e8789a1bb1e7dce
parent6be76fd94ba31dae3f62e77d687614ddb75d6b3a (diff)
microblaze: defconfig synchronization
Kconfig structure has changed that's why make sense to do synchronization. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat
-rw-r--r--arch/microblaze/configs/mmu_defconfig19
-rw-r--r--arch/microblaze/configs/nommu_defconfig23
2 files changed, 19 insertions, 23 deletions
diff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig
index 990f23d5fe50..b83aff1e86cd 100644
--- a/arch/microblaze/configs/mmu_defconfig
+++ b/arch/microblaze/configs/mmu_defconfig
@@ -5,15 +5,10 @@ CONFIG_IKCONFIG=y
5CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
6CONFIG_SYSFS_DEPRECATED=y 6CONFIG_SYSFS_DEPRECATED=y
7CONFIG_SYSFS_DEPRECATED_V2=y 7CONFIG_SYSFS_DEPRECATED_V2=y
8CONFIG_KALLSYMS_ALL=y
9# CONFIG_BASE_FULL is not set 8# CONFIG_BASE_FULL is not set
9CONFIG_KALLSYMS_ALL=y
10CONFIG_EMBEDDED=y 10CONFIG_EMBEDDED=y
11CONFIG_SLAB=y 11CONFIG_SLAB=y
12CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y
14# CONFIG_BLK_DEV_BSG is not set
15CONFIG_PARTITION_ADVANCED=y
16# CONFIG_EFI_PARTITION is not set
17CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 12CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
18CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 13CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
19CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 14CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
@@ -25,14 +20,19 @@ CONFIG_MMU=y
25CONFIG_CMDLINE_BOOL=y 20CONFIG_CMDLINE_BOOL=y
26CONFIG_CMDLINE_FORCE=y 21CONFIG_CMDLINE_FORCE=y
27CONFIG_HIGHMEM=y 22CONFIG_HIGHMEM=y
28CONFIG_PCI=y
29CONFIG_PCI_XILINX=y 23CONFIG_PCI_XILINX=y
24CONFIG_MODULES=y
25CONFIG_MODULE_UNLOAD=y
26# CONFIG_BLK_DEV_BSG is not set
27CONFIG_PARTITION_ADVANCED=y
28# CONFIG_EFI_PARTITION is not set
30CONFIG_NET=y 29CONFIG_NET=y
31CONFIG_PACKET=y 30CONFIG_PACKET=y
32CONFIG_UNIX=y 31CONFIG_UNIX=y
33CONFIG_INET=y 32CONFIG_INET=y
34# CONFIG_IPV6 is not set 33# CONFIG_IPV6 is not set
35CONFIG_BRIDGE=m 34CONFIG_BRIDGE=m
35CONFIG_PCI=y
36CONFIG_MTD=y 36CONFIG_MTD=y
37CONFIG_MTD_CFI=y 37CONFIG_MTD_CFI=y
38CONFIG_MTD_CFI_INTELEXT=y 38CONFIG_MTD_CFI_INTELEXT=y
@@ -75,8 +75,8 @@ CONFIG_CRAMFS=y
75CONFIG_ROMFS_FS=y 75CONFIG_ROMFS_FS=y
76CONFIG_NFS_FS=y 76CONFIG_NFS_FS=y
77CONFIG_CIFS=y 77CONFIG_CIFS=y
78CONFIG_CIFS_STATS=y
79CONFIG_CIFS_STATS2=y 78CONFIG_CIFS_STATS2=y
79CONFIG_ENCRYPTED_KEYS=y
80CONFIG_DEBUG_INFO=y 80CONFIG_DEBUG_INFO=y
81CONFIG_DEBUG_SLAB=y 81CONFIG_DEBUG_SLAB=y
82CONFIG_DETECT_HUNG_TASK=y 82CONFIG_DETECT_HUNG_TASK=y
@@ -84,6 +84,3 @@ CONFIG_DEBUG_SPINLOCK=y
84CONFIG_KGDB=y 84CONFIG_KGDB=y
85CONFIG_KGDB_TESTS=y 85CONFIG_KGDB_TESTS=y
86CONFIG_KGDB_KDB=y 86CONFIG_KGDB_KDB=y
87CONFIG_EARLY_PRINTK=y
88CONFIG_KEYS=y
89CONFIG_ENCRYPTED_KEYS=y
diff --git a/arch/microblaze/configs/nommu_defconfig b/arch/microblaze/configs/nommu_defconfig
index 06d69a6e192d..dc102eb65fca 100644
--- a/arch/microblaze/configs/nommu_defconfig
+++ b/arch/microblaze/configs/nommu_defconfig
@@ -7,15 +7,10 @@ CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 7CONFIG_IKCONFIG_PROC=y
8CONFIG_SYSFS_DEPRECATED=y 8CONFIG_SYSFS_DEPRECATED=y
9CONFIG_SYSFS_DEPRECATED_V2=y 9CONFIG_SYSFS_DEPRECATED_V2=y
10CONFIG_KALLSYMS_ALL=y
11# CONFIG_BASE_FULL is not set 10# CONFIG_BASE_FULL is not set
11CONFIG_KALLSYMS_ALL=y
12CONFIG_EMBEDDED=y 12CONFIG_EMBEDDED=y
13CONFIG_SLAB=y 13CONFIG_SLAB=y
14CONFIG_MODULES=y
15CONFIG_MODULE_UNLOAD=y
16# CONFIG_BLK_DEV_BSG is not set
17CONFIG_PARTITION_ADVANCED=y
18# CONFIG_EFI_PARTITION is not set
19CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 14CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
20CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 15CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
21CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 16CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
@@ -25,13 +20,18 @@ CONFIG_XILINX_MICROBLAZE0_USE_FPU=2
25CONFIG_HZ_100=y 20CONFIG_HZ_100=y
26CONFIG_CMDLINE_BOOL=y 21CONFIG_CMDLINE_BOOL=y
27CONFIG_CMDLINE_FORCE=y 22CONFIG_CMDLINE_FORCE=y
28CONFIG_PCI=y
29CONFIG_PCI_XILINX=y 23CONFIG_PCI_XILINX=y
24CONFIG_MODULES=y
25CONFIG_MODULE_UNLOAD=y
26# CONFIG_BLK_DEV_BSG is not set
27CONFIG_PARTITION_ADVANCED=y
28# CONFIG_EFI_PARTITION is not set
30CONFIG_NET=y 29CONFIG_NET=y
31CONFIG_PACKET=y 30CONFIG_PACKET=y
32CONFIG_UNIX=y 31CONFIG_UNIX=y
33CONFIG_INET=y 32CONFIG_INET=y
34# CONFIG_IPV6 is not set 33# CONFIG_IPV6 is not set
34CONFIG_PCI=y
35CONFIG_MTD=y 35CONFIG_MTD=y
36CONFIG_MTD_CMDLINE_PARTS=y 36CONFIG_MTD_CMDLINE_PARTS=y
37CONFIG_MTD_BLOCK=y 37CONFIG_MTD_BLOCK=y
@@ -75,11 +75,6 @@ CONFIG_ROMFS_FS=y
75CONFIG_NFS_FS=y 75CONFIG_NFS_FS=y
76CONFIG_NFS_V3_ACL=y 76CONFIG_NFS_V3_ACL=y
77CONFIG_NLS=y 77CONFIG_NLS=y
78CONFIG_DEBUG_INFO=y
79CONFIG_DEBUG_SLAB=y
80CONFIG_DETECT_HUNG_TASK=y
81CONFIG_DEBUG_SPINLOCK=y
82CONFIG_EARLY_PRINTK=y
83CONFIG_KEYS=y 78CONFIG_KEYS=y
84CONFIG_ENCRYPTED_KEYS=y 79CONFIG_ENCRYPTED_KEYS=y
85CONFIG_CRYPTO_ECB=y 80CONFIG_CRYPTO_ECB=y
@@ -87,3 +82,7 @@ CONFIG_CRYPTO_MD4=y
87CONFIG_CRYPTO_MD5=y 82CONFIG_CRYPTO_MD5=y
88CONFIG_CRYPTO_ARC4=y 83CONFIG_CRYPTO_ARC4=y
89CONFIG_CRYPTO_DES=y 84CONFIG_CRYPTO_DES=y
85CONFIG_DEBUG_INFO=y
86CONFIG_DEBUG_SLAB=y
87CONFIG_DETECT_HUNG_TASK=y
88CONFIG_DEBUG_SPINLOCK=y
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-11 06:50:29 -0400