aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/nhk8815_defconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-02-27 17:32:41 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-03-06 20:48:03 -0500
commit1187ed87723899816128ec9f75edf4fad9c07dc6 (patch)
treec6df0ae7afb190b7577a6d13e15f1ea2415f9596 /arch/arm/configs/nhk8815_defconfig
parent266c347924f59b642d0f016e7f9891fdd7463108 (diff)
ARM: nomadik: convert to multiplatform
This converts the Nomadik to run in multiplatform mode, including the defconfig change. After this the "uImage" target in the kernel tree will no longer work, but we do not care about this. Instead we generate the uImage from the zImage using mkimage or update the bootloader to accept bootz. Some minor updates to the defconfig are done as part of this. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/configs/nhk8815_defconfig')
-rw-r--r--arch/arm/configs/nhk8815_defconfig42
1 files changed, 19 insertions, 23 deletions
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig
index 86cfd2959c47..b01e7632ed2e 100644
--- a/arch/arm/configs/nhk8815_defconfig
+++ b/arch/arm/configs/nhk8815_defconfig
@@ -1,11 +1,9 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
8CONFIG_SYSFS_DEPRECATED_V2=y
9CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
10CONFIG_EXPERT=y 8CONFIG_EXPERT=y
11CONFIG_KALLSYMS_ALL=y 9CONFIG_KALLSYMS_ALL=y
@@ -13,6 +11,7 @@ CONFIG_SLAB=y
13CONFIG_MODULES=y 11CONFIG_MODULES=y
14CONFIG_MODULE_UNLOAD=y 12CONFIG_MODULE_UNLOAD=y
15# CONFIG_BLK_DEV_BSG is not set 13# CONFIG_BLK_DEV_BSG is not set
14# CONFIG_ARCH_MULTI_V7 is not set
16CONFIG_ARCH_NOMADIK=y 15CONFIG_ARCH_NOMADIK=y
17CONFIG_MACH_NOMADIK_8815NHK=y 16CONFIG_MACH_NOMADIK_8815NHK=y
18CONFIG_PREEMPT=y 17CONFIG_PREEMPT=y
@@ -20,7 +19,6 @@ CONFIG_AEABI=y
20CONFIG_ZBOOT_ROM_TEXT=0x0 19CONFIG_ZBOOT_ROM_TEXT=0x0
21CONFIG_ZBOOT_ROM_BSS=0x0 20CONFIG_ZBOOT_ROM_BSS=0x0
22CONFIG_FPE_NWFPE=y 21CONFIG_FPE_NWFPE=y
23CONFIG_PM=y
24CONFIG_NET=y 22CONFIG_NET=y
25CONFIG_PACKET=y 23CONFIG_PACKET=y
26CONFIG_UNIX=y 24CONFIG_UNIX=y
@@ -32,14 +30,10 @@ CONFIG_IP_PNP=y
32CONFIG_IP_PNP_DHCP=y 30CONFIG_IP_PNP_DHCP=y
33CONFIG_IP_PNP_BOOTP=y 31CONFIG_IP_PNP_BOOTP=y
34CONFIG_NET_IPIP=y 32CONFIG_NET_IPIP=y
35CONFIG_NET_IPGRE=y
36CONFIG_NET_IPGRE_BROADCAST=y
37CONFIG_IP_MROUTE=y 33CONFIG_IP_MROUTE=y
38# CONFIG_INET_LRO is not set 34# CONFIG_INET_LRO is not set
39# CONFIG_IPV6 is not set 35# CONFIG_IPV6 is not set
40CONFIG_BT=m 36CONFIG_BT=m
41CONFIG_BT_L2CAP=m
42CONFIG_BT_SCO=m
43CONFIG_BT_RFCOMM=m 37CONFIG_BT_RFCOMM=m
44CONFIG_BT_RFCOMM_TTY=y 38CONFIG_BT_RFCOMM_TTY=y
45CONFIG_BT_BNEP=m 39CONFIG_BT_BNEP=m
@@ -53,14 +47,16 @@ CONFIG_BT_HCIVHCI=m
53CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 47CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
54CONFIG_MTD=y 48CONFIG_MTD=y
55CONFIG_MTD_TESTS=m 49CONFIG_MTD_TESTS=m
50CONFIG_MTD_CMDLINE_PARTS=y
56CONFIG_MTD_CHAR=y 51CONFIG_MTD_CHAR=y
57CONFIG_MTD_BLOCK=y 52CONFIG_MTD_BLOCK=y
58CONFIG_MTD_NAND=y
59CONFIG_MTD_NAND_ECC_SMC=y 53CONFIG_MTD_NAND_ECC_SMC=y
54CONFIG_MTD_NAND=y
60CONFIG_MTD_NAND_FSMC=y 55CONFIG_MTD_NAND_FSMC=y
61CONFIG_MTD_ONENAND=y 56CONFIG_MTD_ONENAND=y
62CONFIG_MTD_ONENAND_VERIFY_WRITE=y 57CONFIG_MTD_ONENAND_VERIFY_WRITE=y
63CONFIG_MTD_ONENAND_GENERIC=y 58CONFIG_MTD_ONENAND_GENERIC=y
59CONFIG_PROC_DEVICETREE=y
64CONFIG_BLK_DEV_LOOP=y 60CONFIG_BLK_DEV_LOOP=y
65CONFIG_BLK_DEV_CRYPTOLOOP=y 61CONFIG_BLK_DEV_CRYPTOLOOP=y
66CONFIG_BLK_DEV_RAM=y 62CONFIG_BLK_DEV_RAM=y
@@ -72,47 +68,48 @@ CONFIG_SCSI_CONSTANTS=y
72CONFIG_SCSI_LOGGING=y 68CONFIG_SCSI_LOGGING=y
73CONFIG_SCSI_SCAN_ASYNC=y 69CONFIG_SCSI_SCAN_ASYNC=y
74CONFIG_NETDEVICES=y 70CONFIG_NETDEVICES=y
71CONFIG_NETCONSOLE=m
75CONFIG_TUN=y 72CONFIG_TUN=y
76CONFIG_NET_ETHERNET=y
77CONFIG_SMC91X=y 73CONFIG_SMC91X=y
78CONFIG_PPP=m 74CONFIG_PPP=m
79CONFIG_PPP_ASYNC=m
80CONFIG_PPP_SYNC_TTY=m
81CONFIG_PPP_DEFLATE=m
82CONFIG_PPP_BSDCOMP=m 75CONFIG_PPP_BSDCOMP=m
76CONFIG_PPP_DEFLATE=m
83CONFIG_PPP_MPPE=m 77CONFIG_PPP_MPPE=m
84CONFIG_PPPOE=m 78CONFIG_PPPOE=m
85CONFIG_NETCONSOLE=m 79CONFIG_PPP_ASYNC=m
80CONFIG_PPP_SYNC_TTY=m
86# CONFIG_INPUT_MOUSEDEV is not set 81# CONFIG_INPUT_MOUSEDEV is not set
87CONFIG_INPUT_EVDEV=y 82CONFIG_INPUT_EVDEV=y
88# CONFIG_KEYBOARD_ATKBD is not set 83# CONFIG_KEYBOARD_ATKBD is not set
89# CONFIG_MOUSE_PS2 is not set 84# CONFIG_MOUSE_PS2 is not set
90# CONFIG_SERIO is not set 85# CONFIG_SERIO is not set
86# CONFIG_LEGACY_PTYS is not set
91CONFIG_SERIAL_AMBA_PL011=y 87CONFIG_SERIAL_AMBA_PL011=y
92CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 88CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
93# CONFIG_LEGACY_PTYS is not set 89CONFIG_HW_RANDOM=y
94# CONFIG_HW_RANDOM is not set 90CONFIG_HW_RANDOM_NOMADIK=y
95CONFIG_I2C=y
96CONFIG_I2C_CHARDEV=y 91CONFIG_I2C_CHARDEV=y
97CONFIG_I2C_GPIO=y 92CONFIG_I2C_GPIO=y
93CONFIG_I2C_NOMADIK=y
98CONFIG_DEBUG_GPIO=y 94CONFIG_DEBUG_GPIO=y
99CONFIG_PINCTRL_NOMADIK=y
100# CONFIG_HWMON is not set 95# CONFIG_HWMON is not set
101# CONFIG_VGA_CONSOLE is not set 96CONFIG_MMC=y
97CONFIG_MMC_CLKGATE=y
98CONFIG_MMC_ARMMMCI=y
102CONFIG_RTC_CLASS=y 99CONFIG_RTC_CLASS=y
100CONFIG_RTC_DRV_PL031=y
101CONFIG_DMADEVICES=y
102CONFIG_AMBA_PL08X=y
103CONFIG_EXT2_FS=y 103CONFIG_EXT2_FS=y
104CONFIG_EXT3_FS=y 104CONFIG_EXT3_FS=y
105CONFIG_INOTIFY=y
106CONFIG_FUSE_FS=y 105CONFIG_FUSE_FS=y
107CONFIG_MSDOS_FS=y 106CONFIG_MSDOS_FS=y
108CONFIG_VFAT_FS=y 107CONFIG_VFAT_FS=y
109CONFIG_TMPFS=y 108CONFIG_TMPFS=y
110CONFIG_JFFS2_FS=y 109CONFIG_JFFS2_FS=y
111CONFIG_NFS_FS=y 110CONFIG_NFS_FS=y
112CONFIG_NFS_V3=y
113CONFIG_NFS_V3_ACL=y 111CONFIG_NFS_V3_ACL=y
114CONFIG_ROOT_NFS=y 112CONFIG_ROOT_NFS=y
115CONFIG_SMB_FS=m
116CONFIG_CIFS=m 113CONFIG_CIFS=m
117CONFIG_CIFS_WEAK_PW_HASH=y 114CONFIG_CIFS_WEAK_PW_HASH=y
118CONFIG_NLS_CODEPAGE_437=y 115CONFIG_NLS_CODEPAGE_437=y
@@ -120,12 +117,11 @@ CONFIG_NLS_ASCII=y
120CONFIG_NLS_ISO8859_1=y 117CONFIG_NLS_ISO8859_1=y
121CONFIG_NLS_ISO8859_15=y 118CONFIG_NLS_ISO8859_15=y
122# CONFIG_ENABLE_MUST_CHECK is not set 119# CONFIG_ENABLE_MUST_CHECK is not set
123CONFIG_DEBUG_KERNEL=y 120CONFIG_DEBUG_FS=y
124# CONFIG_SCHED_DEBUG is not set 121# CONFIG_SCHED_DEBUG is not set
125# CONFIG_DEBUG_PREEMPT is not set 122# CONFIG_DEBUG_PREEMPT is not set
126# CONFIG_DEBUG_BUGVERBOSE is not set 123# CONFIG_DEBUG_BUGVERBOSE is not set
127CONFIG_DEBUG_INFO=y 124CONFIG_DEBUG_INFO=y
128# CONFIG_RCU_CPU_STALL_DETECTOR is not set
129CONFIG_CRYPTO_MD5=y 125CONFIG_CRYPTO_MD5=y
130CONFIG_CRYPTO_SHA1=y 126CONFIG_CRYPTO_SHA1=y
131CONFIG_CRYPTO_DES=y 127CONFIG_CRYPTO_DES=y