diff options
Diffstat (limited to 'arch/arm/configs/shannon_defconfig')
| -rw-r--r-- | arch/arm/configs/shannon_defconfig | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/configs/shannon_defconfig b/arch/arm/configs/shannon_defconfig index de33abdeb6fa..dfcea70b8034 100644 --- a/arch/arm/configs/shannon_defconfig +++ b/arch/arm/configs/shannon_defconfig @@ -1,20 +1,22 @@ CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y +CONFIG_ARCH_MULTI_V4=y +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_SA1100=y CONFIG_SA1100_SHANNON=y -CONFIG_PCCARD=y -CONFIG_PCMCIA_SA1100=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_UNUSED_BOARD_FILES=y CONFIG_CMDLINE="console=ttySA0,9600 console=tty1 root=/dev/mtdblock2 init=/linuxrc" CONFIG_FPE_NWFPE=y +CONFIG_MODULES=y +CONFIG_PARTITION_ADVANCED=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_IPV6 is not set +CONFIG_PCCARD=y +CONFIG_PCMCIA_SA1100=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y @@ -40,5 +42,4 @@ CONFIG_VFAT_FS=y CONFIG_JFFS2_FS=y CONFIG_MINIX_FS=y CONFIG_NFS_FS=y -CONFIG_PARTITION_ADVANCED=y CONFIG_DEBUG_USER=y |