diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-02-27 17:32:41 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-03-06 20:48:03 -0500 |
commit | 1187ed87723899816128ec9f75edf4fad9c07dc6 (patch) | |
tree | c6df0ae7afb190b7577a6d13e15f1ea2415f9596 /arch/arm/configs/nhk8815_defconfig | |
parent | 266c347924f59b642d0f016e7f9891fdd7463108 (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_defconfig | 42 |
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 @@ | |||
1 | CONFIG_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 |
4 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
5 | CONFIG_IKCONFIG=y | 4 | CONFIG_IKCONFIG=y |
6 | CONFIG_IKCONFIG_PROC=y | 5 | CONFIG_IKCONFIG_PROC=y |
7 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_LOG_BUF_SHIFT=14 |
8 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
9 | CONFIG_BLK_DEV_INITRD=y | 7 | CONFIG_BLK_DEV_INITRD=y |
10 | CONFIG_EXPERT=y | 8 | CONFIG_EXPERT=y |
11 | CONFIG_KALLSYMS_ALL=y | 9 | CONFIG_KALLSYMS_ALL=y |
@@ -13,6 +11,7 @@ CONFIG_SLAB=y | |||
13 | CONFIG_MODULES=y | 11 | CONFIG_MODULES=y |
14 | CONFIG_MODULE_UNLOAD=y | 12 | CONFIG_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 | ||
16 | CONFIG_ARCH_NOMADIK=y | 15 | CONFIG_ARCH_NOMADIK=y |
17 | CONFIG_MACH_NOMADIK_8815NHK=y | 16 | CONFIG_MACH_NOMADIK_8815NHK=y |
18 | CONFIG_PREEMPT=y | 17 | CONFIG_PREEMPT=y |
@@ -20,7 +19,6 @@ CONFIG_AEABI=y | |||
20 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 19 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
21 | CONFIG_ZBOOT_ROM_BSS=0x0 | 20 | CONFIG_ZBOOT_ROM_BSS=0x0 |
22 | CONFIG_FPE_NWFPE=y | 21 | CONFIG_FPE_NWFPE=y |
23 | CONFIG_PM=y | ||
24 | CONFIG_NET=y | 22 | CONFIG_NET=y |
25 | CONFIG_PACKET=y | 23 | CONFIG_PACKET=y |
26 | CONFIG_UNIX=y | 24 | CONFIG_UNIX=y |
@@ -32,14 +30,10 @@ CONFIG_IP_PNP=y | |||
32 | CONFIG_IP_PNP_DHCP=y | 30 | CONFIG_IP_PNP_DHCP=y |
33 | CONFIG_IP_PNP_BOOTP=y | 31 | CONFIG_IP_PNP_BOOTP=y |
34 | CONFIG_NET_IPIP=y | 32 | CONFIG_NET_IPIP=y |
35 | CONFIG_NET_IPGRE=y | ||
36 | CONFIG_NET_IPGRE_BROADCAST=y | ||
37 | CONFIG_IP_MROUTE=y | 33 | CONFIG_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 |
40 | CONFIG_BT=m | 36 | CONFIG_BT=m |
41 | CONFIG_BT_L2CAP=m | ||
42 | CONFIG_BT_SCO=m | ||
43 | CONFIG_BT_RFCOMM=m | 37 | CONFIG_BT_RFCOMM=m |
44 | CONFIG_BT_RFCOMM_TTY=y | 38 | CONFIG_BT_RFCOMM_TTY=y |
45 | CONFIG_BT_BNEP=m | 39 | CONFIG_BT_BNEP=m |
@@ -53,14 +47,16 @@ CONFIG_BT_HCIVHCI=m | |||
53 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 47 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
54 | CONFIG_MTD=y | 48 | CONFIG_MTD=y |
55 | CONFIG_MTD_TESTS=m | 49 | CONFIG_MTD_TESTS=m |
50 | CONFIG_MTD_CMDLINE_PARTS=y | ||
56 | CONFIG_MTD_CHAR=y | 51 | CONFIG_MTD_CHAR=y |
57 | CONFIG_MTD_BLOCK=y | 52 | CONFIG_MTD_BLOCK=y |
58 | CONFIG_MTD_NAND=y | ||
59 | CONFIG_MTD_NAND_ECC_SMC=y | 53 | CONFIG_MTD_NAND_ECC_SMC=y |
54 | CONFIG_MTD_NAND=y | ||
60 | CONFIG_MTD_NAND_FSMC=y | 55 | CONFIG_MTD_NAND_FSMC=y |
61 | CONFIG_MTD_ONENAND=y | 56 | CONFIG_MTD_ONENAND=y |
62 | CONFIG_MTD_ONENAND_VERIFY_WRITE=y | 57 | CONFIG_MTD_ONENAND_VERIFY_WRITE=y |
63 | CONFIG_MTD_ONENAND_GENERIC=y | 58 | CONFIG_MTD_ONENAND_GENERIC=y |
59 | CONFIG_PROC_DEVICETREE=y | ||
64 | CONFIG_BLK_DEV_LOOP=y | 60 | CONFIG_BLK_DEV_LOOP=y |
65 | CONFIG_BLK_DEV_CRYPTOLOOP=y | 61 | CONFIG_BLK_DEV_CRYPTOLOOP=y |
66 | CONFIG_BLK_DEV_RAM=y | 62 | CONFIG_BLK_DEV_RAM=y |
@@ -72,47 +68,48 @@ CONFIG_SCSI_CONSTANTS=y | |||
72 | CONFIG_SCSI_LOGGING=y | 68 | CONFIG_SCSI_LOGGING=y |
73 | CONFIG_SCSI_SCAN_ASYNC=y | 69 | CONFIG_SCSI_SCAN_ASYNC=y |
74 | CONFIG_NETDEVICES=y | 70 | CONFIG_NETDEVICES=y |
71 | CONFIG_NETCONSOLE=m | ||
75 | CONFIG_TUN=y | 72 | CONFIG_TUN=y |
76 | CONFIG_NET_ETHERNET=y | ||
77 | CONFIG_SMC91X=y | 73 | CONFIG_SMC91X=y |
78 | CONFIG_PPP=m | 74 | CONFIG_PPP=m |
79 | CONFIG_PPP_ASYNC=m | ||
80 | CONFIG_PPP_SYNC_TTY=m | ||
81 | CONFIG_PPP_DEFLATE=m | ||
82 | CONFIG_PPP_BSDCOMP=m | 75 | CONFIG_PPP_BSDCOMP=m |
76 | CONFIG_PPP_DEFLATE=m | ||
83 | CONFIG_PPP_MPPE=m | 77 | CONFIG_PPP_MPPE=m |
84 | CONFIG_PPPOE=m | 78 | CONFIG_PPPOE=m |
85 | CONFIG_NETCONSOLE=m | 79 | CONFIG_PPP_ASYNC=m |
80 | CONFIG_PPP_SYNC_TTY=m | ||
86 | # CONFIG_INPUT_MOUSEDEV is not set | 81 | # CONFIG_INPUT_MOUSEDEV is not set |
87 | CONFIG_INPUT_EVDEV=y | 82 | CONFIG_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 | ||
91 | CONFIG_SERIAL_AMBA_PL011=y | 87 | CONFIG_SERIAL_AMBA_PL011=y |
92 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 88 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
93 | # CONFIG_LEGACY_PTYS is not set | 89 | CONFIG_HW_RANDOM=y |
94 | # CONFIG_HW_RANDOM is not set | 90 | CONFIG_HW_RANDOM_NOMADIK=y |
95 | CONFIG_I2C=y | ||
96 | CONFIG_I2C_CHARDEV=y | 91 | CONFIG_I2C_CHARDEV=y |
97 | CONFIG_I2C_GPIO=y | 92 | CONFIG_I2C_GPIO=y |
93 | CONFIG_I2C_NOMADIK=y | ||
98 | CONFIG_DEBUG_GPIO=y | 94 | CONFIG_DEBUG_GPIO=y |
99 | CONFIG_PINCTRL_NOMADIK=y | ||
100 | # CONFIG_HWMON is not set | 95 | # CONFIG_HWMON is not set |
101 | # CONFIG_VGA_CONSOLE is not set | 96 | CONFIG_MMC=y |
97 | CONFIG_MMC_CLKGATE=y | ||
98 | CONFIG_MMC_ARMMMCI=y | ||
102 | CONFIG_RTC_CLASS=y | 99 | CONFIG_RTC_CLASS=y |
100 | CONFIG_RTC_DRV_PL031=y | ||
101 | CONFIG_DMADEVICES=y | ||
102 | CONFIG_AMBA_PL08X=y | ||
103 | CONFIG_EXT2_FS=y | 103 | CONFIG_EXT2_FS=y |
104 | CONFIG_EXT3_FS=y | 104 | CONFIG_EXT3_FS=y |
105 | CONFIG_INOTIFY=y | ||
106 | CONFIG_FUSE_FS=y | 105 | CONFIG_FUSE_FS=y |
107 | CONFIG_MSDOS_FS=y | 106 | CONFIG_MSDOS_FS=y |
108 | CONFIG_VFAT_FS=y | 107 | CONFIG_VFAT_FS=y |
109 | CONFIG_TMPFS=y | 108 | CONFIG_TMPFS=y |
110 | CONFIG_JFFS2_FS=y | 109 | CONFIG_JFFS2_FS=y |
111 | CONFIG_NFS_FS=y | 110 | CONFIG_NFS_FS=y |
112 | CONFIG_NFS_V3=y | ||
113 | CONFIG_NFS_V3_ACL=y | 111 | CONFIG_NFS_V3_ACL=y |
114 | CONFIG_ROOT_NFS=y | 112 | CONFIG_ROOT_NFS=y |
115 | CONFIG_SMB_FS=m | ||
116 | CONFIG_CIFS=m | 113 | CONFIG_CIFS=m |
117 | CONFIG_CIFS_WEAK_PW_HASH=y | 114 | CONFIG_CIFS_WEAK_PW_HASH=y |
118 | CONFIG_NLS_CODEPAGE_437=y | 115 | CONFIG_NLS_CODEPAGE_437=y |
@@ -120,12 +117,11 @@ CONFIG_NLS_ASCII=y | |||
120 | CONFIG_NLS_ISO8859_1=y | 117 | CONFIG_NLS_ISO8859_1=y |
121 | CONFIG_NLS_ISO8859_15=y | 118 | CONFIG_NLS_ISO8859_15=y |
122 | # CONFIG_ENABLE_MUST_CHECK is not set | 119 | # CONFIG_ENABLE_MUST_CHECK is not set |
123 | CONFIG_DEBUG_KERNEL=y | 120 | CONFIG_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 |
127 | CONFIG_DEBUG_INFO=y | 124 | CONFIG_DEBUG_INFO=y |
128 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
129 | CONFIG_CRYPTO_MD5=y | 125 | CONFIG_CRYPTO_MD5=y |
130 | CONFIG_CRYPTO_SHA1=y | 126 | CONFIG_CRYPTO_SHA1=y |
131 | CONFIG_CRYPTO_DES=y | 127 | CONFIG_CRYPTO_DES=y |