Skip to content

Commit a2f0bb0

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 update from Hans-Christian Egtvedt. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32: avr32: update all default configurations avr32: remove fake at91 cpu identification avr32: wire up missing syscalls
2 parents 41cbc01 + 89422ad commit a2f0bb0

20 files changed

+209
-338
lines changed

‎arch/avr32/configs/atngw100_defconfig

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,28 @@
1-
CONFIG_EXPERIMENTAL=y
21
# CONFIG_LOCALVERSION_AUTO is not set
32
CONFIG_SYSVIPC=y
43
CONFIG_POSIX_MQUEUE=y
4+
CONFIG_NO_HZ=y
5+
CONFIG_HIGH_RES_TIMERS=y
56
CONFIG_LOG_BUF_SHIFT=14
67
CONFIG_RELAY=y
78
CONFIG_BLK_DEV_INITRD=y
89
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
9-
# CONFIG_SYSCTL_SYSCALL is not set
1010
# CONFIG_BASE_FULL is not set
1111
# CONFIG_COMPAT_BRK is not set
1212
CONFIG_PROFILING=y
1313
CONFIG_OPROFILE=m
14-
# CONFIG_KPROBES is not set
1514
CONFIG_MODULES=y
1615
CONFIG_MODULE_UNLOAD=y
1716
# CONFIG_BLK_DEV_BSG is not set
1817
# CONFIG_IOSCHED_DEADLINE is not set
19-
CONFIG_NO_HZ=y
20-
CONFIG_HIGH_RES_TIMERS=y
2118
CONFIG_BOARD_ATNGW100_MKI=y
2219
# CONFIG_OWNERSHIP_TRACE is not set
2320
CONFIG_NMI_DEBUGGING=y
24-
CONFIG_PM=y
2521
CONFIG_CPU_FREQ=y
2622
# CONFIG_CPU_FREQ_STAT is not set
2723
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
2824
CONFIG_CPU_FREQ_GOV_USERSPACE=y
2925
CONFIG_AVR32_AT32AP_CPUFREQ=y
30-
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
3126
CONFIG_NET=y
3227
CONFIG_PACKET=y
3328
CONFIG_UNIX=y
@@ -52,15 +47,13 @@ CONFIG_INET6_IPCOMP=y
5247
CONFIG_NETFILTER=y
5348
# CONFIG_NETFILTER_ADVANCED is not set
5449
CONFIG_NETFILTER_XTABLES=y
55-
# CONFIG_IP_NF_TARGET_ULOG is not set
5650
CONFIG_BRIDGE=m
5751
CONFIG_VLAN_8021Q=m
5852
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
5953
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
6054
# CONFIG_FW_LOADER is not set
6155
CONFIG_MTD=y
6256
CONFIG_MTD_CMDLINE_PARTS=y
63-
CONFIG_MTD_CHAR=y
6457
CONFIG_MTD_BLOCK=y
6558
CONFIG_MTD_CFI=y
6659
CONFIG_MTD_CFI_AMDSTD=y
@@ -70,28 +63,24 @@ CONFIG_MTD_UBI=y
7063
CONFIG_BLK_DEV_LOOP=m
7164
CONFIG_BLK_DEV_NBD=m
7265
CONFIG_BLK_DEV_RAM=m
73-
CONFIG_MISC_DEVICES=y
7466
CONFIG_ATMEL_TCLIB=y
7567
CONFIG_NETDEVICES=y
7668
CONFIG_TUN=m
77-
CONFIG_NET_ETHERNET=y
7869
CONFIG_MACB=y
79-
# CONFIG_NETDEV_1000 is not set
80-
# CONFIG_NETDEV_10000 is not set
8170
CONFIG_PPP=m
82-
CONFIG_PPP_FILTER=y
83-
CONFIG_PPP_ASYNC=m
84-
CONFIG_PPP_DEFLATE=m
8571
CONFIG_PPP_BSDCOMP=m
72+
CONFIG_PPP_DEFLATE=m
73+
CONFIG_PPP_FILTER=y
8674
CONFIG_PPP_MPPE=m
8775
CONFIG_PPPOE=m
76+
CONFIG_PPP_ASYNC=m
8877
# CONFIG_INPUT is not set
8978
# CONFIG_SERIO is not set
9079
# CONFIG_VT is not set
80+
# CONFIG_LEGACY_PTYS is not set
9181
# CONFIG_DEVKMEM is not set
9282
CONFIG_SERIAL_ATMEL=y
9383
CONFIG_SERIAL_ATMEL_CONSOLE=y
94-
# CONFIG_LEGACY_PTYS is not set
9584
# CONFIG_HW_RANDOM is not set
9685
CONFIG_I2C=m
9786
CONFIG_I2C_CHARDEV=m
@@ -128,7 +117,6 @@ CONFIG_EXT3_FS=y
128117
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
129118
# CONFIG_EXT3_FS_XATTR is not set
130119
CONFIG_EXT4_FS=y
131-
# CONFIG_EXT4_FS_XATTR is not set
132120
# CONFIG_DNOTIFY is not set
133121
CONFIG_FUSE_FS=m
134122
CONFIG_MSDOS_FS=m
@@ -140,7 +128,6 @@ CONFIG_CONFIGFS_FS=y
140128
CONFIG_JFFS2_FS=y
141129
CONFIG_UBIFS_FS=y
142130
CONFIG_NFS_FS=y
143-
CONFIG_NFS_V3=y
144131
CONFIG_ROOT_NFS=y
145132
CONFIG_NFSD=m
146133
CONFIG_NFSD_V3=y
@@ -149,8 +136,7 @@ CONFIG_NLS_CODEPAGE_437=m
149136
CONFIG_NLS_CODEPAGE_850=m
150137
CONFIG_NLS_ISO8859_1=m
151138
CONFIG_NLS_UTF8=m
152-
CONFIG_MAGIC_SYSRQ=y
153139
CONFIG_DEBUG_FS=y
154-
CONFIG_DEBUG_KERNEL=y
155-
CONFIG_DETECT_HUNG_TASK=y
156140
CONFIG_FRAME_POINTER=y
141+
CONFIG_MAGIC_SYSRQ=y
142+
CONFIG_DETECT_HUNG_TASK=y

‎arch/avr32/configs/atngw100_evklcd100_defconfig

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,30 @@
1-
CONFIG_EXPERIMENTAL=y
21
# CONFIG_LOCALVERSION_AUTO is not set
32
CONFIG_SYSVIPC=y
43
CONFIG_POSIX_MQUEUE=y
4+
CONFIG_NO_HZ=y
5+
CONFIG_HIGH_RES_TIMERS=y
56
CONFIG_LOG_BUF_SHIFT=14
67
CONFIG_RELAY=y
78
CONFIG_BLK_DEV_INITRD=y
89
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
9-
# CONFIG_SYSCTL_SYSCALL is not set
1010
# CONFIG_BASE_FULL is not set
1111
# CONFIG_COMPAT_BRK is not set
1212
CONFIG_PROFILING=y
1313
CONFIG_OPROFILE=m
14-
# CONFIG_KPROBES is not set
1514
CONFIG_MODULES=y
1615
CONFIG_MODULE_UNLOAD=y
1716
# CONFIG_BLK_DEV_BSG is not set
1817
# CONFIG_IOSCHED_DEADLINE is not set
19-
CONFIG_NO_HZ=y
20-
CONFIG_HIGH_RES_TIMERS=y
2118
CONFIG_BOARD_ATNGW100_MKI=y
2219
CONFIG_BOARD_ATNGW100_EVKLCD10X=y
2320
CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA=y
2421
# CONFIG_OWNERSHIP_TRACE is not set
2522
CONFIG_NMI_DEBUGGING=y
26-
CONFIG_PM=y
2723
CONFIG_CPU_FREQ=y
2824
# CONFIG_CPU_FREQ_STAT is not set
2925
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
3026
CONFIG_CPU_FREQ_GOV_USERSPACE=y
3127
CONFIG_AVR32_AT32AP_CPUFREQ=y
32-
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
3328
CONFIG_NET=y
3429
CONFIG_PACKET=y
3530
CONFIG_UNIX=y
@@ -54,15 +49,13 @@ CONFIG_INET6_IPCOMP=y
5449
CONFIG_NETFILTER=y
5550
# CONFIG_NETFILTER_ADVANCED is not set
5651
CONFIG_NETFILTER_XTABLES=y
57-
# CONFIG_IP_NF_TARGET_ULOG is not set
5852
CONFIG_BRIDGE=m
5953
CONFIG_VLAN_8021Q=m
6054
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
6155
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
6256
# CONFIG_FW_LOADER is not set
6357
CONFIG_MTD=y
6458
CONFIG_MTD_CMDLINE_PARTS=y
65-
CONFIG_MTD_CHAR=y
6659
CONFIG_MTD_BLOCK=y
6760
CONFIG_MTD_CFI=y
6861
CONFIG_MTD_CFI_AMDSTD=y
@@ -72,31 +65,27 @@ CONFIG_MTD_UBI=y
7265
CONFIG_BLK_DEV_LOOP=m
7366
CONFIG_BLK_DEV_NBD=m
7467
CONFIG_BLK_DEV_RAM=m
75-
CONFIG_MISC_DEVICES=y
7668
CONFIG_ATMEL_TCLIB=y
7769
CONFIG_NETDEVICES=y
7870
CONFIG_TUN=m
79-
CONFIG_NET_ETHERNET=y
8071
CONFIG_MACB=y
81-
# CONFIG_NETDEV_1000 is not set
82-
# CONFIG_NETDEV_10000 is not set
8372
CONFIG_PPP=m
84-
CONFIG_PPP_FILTER=y
85-
CONFIG_PPP_ASYNC=m
86-
CONFIG_PPP_DEFLATE=m
8773
CONFIG_PPP_BSDCOMP=m
74+
CONFIG_PPP_DEFLATE=m
75+
CONFIG_PPP_FILTER=y
8876
CONFIG_PPP_MPPE=m
8977
CONFIG_PPPOE=m
78+
CONFIG_PPP_ASYNC=m
9079
# CONFIG_INPUT_MOUSEDEV is not set
9180
CONFIG_INPUT_EVDEV=m
9281
# CONFIG_INPUT_KEYBOARD is not set
9382
# CONFIG_INPUT_MOUSE is not set
9483
CONFIG_INPUT_TOUCHSCREEN=y
9584
CONFIG_TOUCHSCREEN_WM97XX=m
9685
# CONFIG_SERIO is not set
86+
# CONFIG_LEGACY_PTYS is not set
9787
CONFIG_SERIAL_ATMEL=y
9888
CONFIG_SERIAL_ATMEL_CONSOLE=y
99-
# CONFIG_LEGACY_PTYS is not set
10089
# CONFIG_HW_RANDOM is not set
10190
CONFIG_I2C=m
10291
CONFIG_I2C_CHARDEV=m
@@ -144,7 +133,6 @@ CONFIG_EXT3_FS=y
144133
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
145134
# CONFIG_EXT3_FS_XATTR is not set
146135
CONFIG_EXT4_FS=y
147-
# CONFIG_EXT4_FS_XATTR is not set
148136
# CONFIG_DNOTIFY is not set
149137
CONFIG_FUSE_FS=m
150138
CONFIG_MSDOS_FS=m
@@ -156,7 +144,6 @@ CONFIG_CONFIGFS_FS=y
156144
CONFIG_JFFS2_FS=y
157145
CONFIG_UBIFS_FS=y
158146
CONFIG_NFS_FS=y
159-
CONFIG_NFS_V3=y
160147
CONFIG_ROOT_NFS=y
161148
CONFIG_NFSD=m
162149
CONFIG_NFSD_V3=y
@@ -165,8 +152,7 @@ CONFIG_NLS_CODEPAGE_437=m
165152
CONFIG_NLS_CODEPAGE_850=m
166153
CONFIG_NLS_ISO8859_1=m
167154
CONFIG_NLS_UTF8=m
168-
CONFIG_MAGIC_SYSRQ=y
169155
CONFIG_DEBUG_FS=y
170-
CONFIG_DEBUG_KERNEL=y
171-
CONFIG_DETECT_HUNG_TASK=y
172156
CONFIG_FRAME_POINTER=y
157+
CONFIG_MAGIC_SYSRQ=y
158+
CONFIG_DETECT_HUNG_TASK=y

‎arch/avr32/configs/atngw100_evklcd101_defconfig

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
1-
CONFIG_EXPERIMENTAL=y
21
# CONFIG_LOCALVERSION_AUTO is not set
32
CONFIG_SYSVIPC=y
43
CONFIG_POSIX_MQUEUE=y
4+
CONFIG_NO_HZ=y
5+
CONFIG_HIGH_RES_TIMERS=y
56
CONFIG_LOG_BUF_SHIFT=14
67
CONFIG_RELAY=y
78
CONFIG_BLK_DEV_INITRD=y
89
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
9-
# CONFIG_SYSCTL_SYSCALL is not set
1010
# CONFIG_BASE_FULL is not set
1111
# CONFIG_COMPAT_BRK is not set
1212
CONFIG_PROFILING=y
1313
CONFIG_OPROFILE=m
14-
# CONFIG_KPROBES is not set
1514
CONFIG_MODULES=y
1615
CONFIG_MODULE_UNLOAD=y
1716
# CONFIG_BLK_DEV_BSG is not set
1817
# CONFIG_IOSCHED_DEADLINE is not set
19-
CONFIG_NO_HZ=y
20-
CONFIG_HIGH_RES_TIMERS=y
2118
CONFIG_BOARD_ATNGW100_MKI=y
2219
CONFIG_BOARD_ATNGW100_EVKLCD10X=y
2320
# CONFIG_OWNERSHIP_TRACE is not set
2421
CONFIG_NMI_DEBUGGING=y
25-
CONFIG_PM=y
2622
CONFIG_CPU_FREQ=y
2723
# CONFIG_CPU_FREQ_STAT is not set
2824
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
2925
CONFIG_CPU_FREQ_GOV_USERSPACE=y
3026
CONFIG_AVR32_AT32AP_CPUFREQ=y
31-
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
3227
CONFIG_NET=y
3328
CONFIG_PACKET=y
3429
CONFIG_UNIX=y
@@ -53,15 +48,13 @@ CONFIG_INET6_IPCOMP=y
5348
CONFIG_NETFILTER=y
5449
# CONFIG_NETFILTER_ADVANCED is not set
5550
CONFIG_NETFILTER_XTABLES=y
56-
# CONFIG_IP_NF_TARGET_ULOG is not set
5751
CONFIG_BRIDGE=m
5852
CONFIG_VLAN_8021Q=m
5953
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
6054
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
6155
# CONFIG_FW_LOADER is not set
6256
CONFIG_MTD=y
6357
CONFIG_MTD_CMDLINE_PARTS=y
64-
CONFIG_MTD_CHAR=y
6558
CONFIG_MTD_BLOCK=y
6659
CONFIG_MTD_CFI=y
6760
CONFIG_MTD_CFI_AMDSTD=y
@@ -71,31 +64,27 @@ CONFIG_MTD_UBI=y
7164
CONFIG_BLK_DEV_LOOP=m
7265
CONFIG_BLK_DEV_NBD=m
7366
CONFIG_BLK_DEV_RAM=m
74-
CONFIG_MISC_DEVICES=y
7567
CONFIG_ATMEL_TCLIB=y
7668
CONFIG_NETDEVICES=y
7769
CONFIG_TUN=m
78-
CONFIG_NET_ETHERNET=y
7970
CONFIG_MACB=y
80-
# CONFIG_NETDEV_1000 is not set
81-
# CONFIG_NETDEV_10000 is not set
8271
CONFIG_PPP=m
83-
CONFIG_PPP_FILTER=y
84-
CONFIG_PPP_ASYNC=m
85-
CONFIG_PPP_DEFLATE=m
8672
CONFIG_PPP_BSDCOMP=m
73+
CONFIG_PPP_DEFLATE=m
74+
CONFIG_PPP_FILTER=y
8775
CONFIG_PPP_MPPE=m
8876
CONFIG_PPPOE=m
77+
CONFIG_PPP_ASYNC=m
8978
# CONFIG_INPUT_MOUSEDEV is not set
9079
CONFIG_INPUT_EVDEV=m
9180
# CONFIG_INPUT_KEYBOARD is not set
9281
# CONFIG_INPUT_MOUSE is not set
9382
CONFIG_INPUT_TOUCHSCREEN=y
9483
CONFIG_TOUCHSCREEN_WM97XX=m
9584
# CONFIG_SERIO is not set
85+
# CONFIG_LEGACY_PTYS is not set
9686
CONFIG_SERIAL_ATMEL=y
9787
CONFIG_SERIAL_ATMEL_CONSOLE=y
98-
# CONFIG_LEGACY_PTYS is not set
9988
# CONFIG_HW_RANDOM is not set
10089
CONFIG_I2C=m
10190
CONFIG_I2C_CHARDEV=m
@@ -143,7 +132,6 @@ CONFIG_EXT3_FS=y
143132
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
144133
# CONFIG_EXT3_FS_XATTR is not set
145134
CONFIG_EXT4_FS=y
146-
# CONFIG_EXT4_FS_XATTR is not set
147135
# CONFIG_DNOTIFY is not set
148136
CONFIG_FUSE_FS=m
149137
CONFIG_MSDOS_FS=m
@@ -155,7 +143,6 @@ CONFIG_CONFIGFS_FS=y
155143
CONFIG_JFFS2_FS=y
156144
CONFIG_UBIFS_FS=y
157145
CONFIG_NFS_FS=y
158-
CONFIG_NFS_V3=y
159146
CONFIG_ROOT_NFS=y
160147
CONFIG_NFSD=m
161148
CONFIG_NFSD_V3=y
@@ -164,8 +151,7 @@ CONFIG_NLS_CODEPAGE_437=m
164151
CONFIG_NLS_CODEPAGE_850=m
165152
CONFIG_NLS_ISO8859_1=m
166153
CONFIG_NLS_UTF8=m
167-
CONFIG_MAGIC_SYSRQ=y
168154
CONFIG_DEBUG_FS=y
169-
CONFIG_DEBUG_KERNEL=y
170-
CONFIG_DETECT_HUNG_TASK=y
171155
CONFIG_FRAME_POINTER=y
156+
CONFIG_MAGIC_SYSRQ=y
157+
CONFIG_DETECT_HUNG_TASK=y

0 commit comments

Comments
 (0)