Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c62ed90 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: defconfig synchronization 



Kconfig structure has changed that's why make sense to do synchronization.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 6be76fd9

arch/microblaze/configs/mmu_defconfig

+8 −11
Original line number Diff line number Diff line
@@ -5,15 +5,10 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_BASE_FULL is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1

CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1

CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
@@ -25,14 +20,19 @@ CONFIG_MMU=y 
CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE_FORCE=y

CONFIG_HIGHMEM=y

CONFIG_PCI=y

CONFIG_PCI_XILINX=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_BRIDGE=m

CONFIG_PCI=y

CONFIG_MTD=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y
@@ -75,8 +75,8 @@ CONFIG_CRAMFS=y 
CONFIG_ROMFS_FS=y

CONFIG_NFS_FS=y

CONFIG_CIFS=y

CONFIG_CIFS_STATS=y

CONFIG_CIFS_STATS2=y

CONFIG_ENCRYPTED_KEYS=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y
@@ -84,6 +84,3 @@ CONFIG_DEBUG_SPINLOCK=y 
CONFIG_KGDB=y

CONFIG_KGDB_TESTS=y

CONFIG_KGDB_KDB=y
 
CONFIG_EARLY_PRINTK=y

CONFIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=y

arch/microblaze/configs/nommu_defconfig

+11 −12
Original line number Diff line number Diff line
@@ -7,15 +7,10 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_BASE_FULL is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1

CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1

CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
@@ -25,13 +20,18 @@ CONFIG_XILINX_MICROBLAZE0_USE_FPU=2 
CONFIG_HZ_100=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE_FORCE=y

CONFIG_PCI=y

CONFIG_PCI_XILINX=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_EFI_PARTITION is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_PCI=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y
@@ -75,11 +75,6 @@ CONFIG_ROMFS_FS=y 
CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NLS=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_EARLY_PRINTK=y

CONFIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=y

CONFIG_CRYPTO_ECB=y
@@ -87,3 +82,7 @@ CONFIG_CRYPTO_MD4=y 
CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_DES=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK=y