diff options
Diffstat (limited to 'arch/avr32')
-rw-r--r-- | arch/avr32/boards/favr-32/flash.c | 2 | ||||
-rw-r--r-- | arch/avr32/boards/favr-32/setup.c | 8 | ||||
-rw-r--r-- | arch/avr32/boot/images/Makefile | 2 | ||||
-rw-r--r-- | arch/avr32/configs/atstk1006_defconfig | 134 | ||||
-rw-r--r-- | arch/avr32/kernel/init_task.c | 1 | ||||
-rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 8 |
6 files changed, 107 insertions, 48 deletions
diff --git a/arch/avr32/boards/favr-32/flash.c b/arch/avr32/boards/favr-32/flash.c index 5f139b7cb5f7..604bbd5e41d9 100644 --- a/arch/avr32/boards/favr-32/flash.c +++ b/arch/avr32/boards/favr-32/flash.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <linux/mtd/partitions.h> | 13 | #include <linux/mtd/partitions.h> |
14 | #include <linux/mtd/physmap.h> | 14 | #include <linux/mtd/physmap.h> |
15 | 15 | ||
16 | #include <asm/arch/smc.h> | 16 | #include <mach/smc.h> |
17 | 17 | ||
18 | static struct smc_timing flash_timing __initdata = { | 18 | static struct smc_timing flash_timing __initdata = { |
19 | .ncs_read_setup = 0, | 19 | .ncs_read_setup = 0, |
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c index 7538f3d2b9e0..1ee4faf0742d 100644 --- a/arch/avr32/boards/favr-32/setup.c +++ b/arch/avr32/boards/favr-32/setup.c | |||
@@ -25,10 +25,10 @@ | |||
25 | 25 | ||
26 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
27 | 27 | ||
28 | #include <asm/arch/at32ap700x.h> | 28 | #include <mach/at32ap700x.h> |
29 | #include <asm/arch/init.h> | 29 | #include <mach/init.h> |
30 | #include <asm/arch/board.h> | 30 | #include <mach/board.h> |
31 | #include <asm/arch/portmux.h> | 31 | #include <mach/portmux.h> |
32 | 32 | ||
33 | /* Oscillator frequencies. These are board-specific */ | 33 | /* Oscillator frequencies. These are board-specific */ |
34 | unsigned long at32_board_osc_rates[3] = { | 34 | unsigned long at32_board_osc_rates[3] = { |
diff --git a/arch/avr32/boot/images/Makefile b/arch/avr32/boot/images/Makefile index 219720a47bf9..1848bf0d7f62 100644 --- a/arch/avr32/boot/images/Makefile +++ b/arch/avr32/boot/images/Makefile | |||
@@ -10,7 +10,7 @@ MKIMAGE := $(srctree)/scripts/mkuboot.sh | |||
10 | 10 | ||
11 | extra-y := vmlinux.bin vmlinux.gz | 11 | extra-y := vmlinux.bin vmlinux.gz |
12 | 12 | ||
13 | OBJCOPYFLAGS_vmlinux.bin := -O binary | 13 | OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note.gnu.build-id |
14 | $(obj)/vmlinux.bin: vmlinux FORCE | 14 | $(obj)/vmlinux.bin: vmlinux FORCE |
15 | $(call if_changed,objcopy) | 15 | $(call if_changed,objcopy) |
16 | 16 | ||
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig index 8b6e54c9946a..6c45a3b77aa3 100644 --- a/arch/avr32/configs/atstk1006_defconfig +++ b/arch/avr32/configs/atstk1006_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc1 | 3 | # Linux kernel version: 2.6.28-rc8 |
4 | # Tue Aug 5 15:40:26 2008 | 4 | # Thu Dec 18 11:22:23 2008 |
5 | # | 5 | # |
6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
@@ -67,6 +67,7 @@ CONFIG_SIGNALFD=y | |||
67 | CONFIG_TIMERFD=y | 67 | CONFIG_TIMERFD=y |
68 | CONFIG_EVENTFD=y | 68 | CONFIG_EVENTFD=y |
69 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
70 | CONFIG_AIO=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | 71 | CONFIG_VM_EVENT_COUNTERS=y |
71 | CONFIG_SLUB_DEBUG=y | 72 | CONFIG_SLUB_DEBUG=y |
72 | # CONFIG_SLAB is not set | 73 | # CONFIG_SLAB is not set |
@@ -77,15 +78,8 @@ CONFIG_PROFILING=y | |||
77 | CONFIG_OPROFILE=m | 78 | CONFIG_OPROFILE=m |
78 | CONFIG_HAVE_OPROFILE=y | 79 | CONFIG_HAVE_OPROFILE=y |
79 | CONFIG_KPROBES=y | 80 | CONFIG_KPROBES=y |
80 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
81 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
82 | CONFIG_HAVE_KPROBES=y | 81 | CONFIG_HAVE_KPROBES=y |
83 | # CONFIG_HAVE_KRETPROBES is not set | ||
84 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
85 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
86 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
87 | CONFIG_HAVE_CLK=y | 82 | CONFIG_HAVE_CLK=y |
88 | CONFIG_PROC_PAGE_MONITOR=y | ||
89 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 83 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
90 | CONFIG_SLABINFO=y | 84 | CONFIG_SLABINFO=y |
91 | CONFIG_RT_MUTEXES=y | 85 | CONFIG_RT_MUTEXES=y |
@@ -118,6 +112,7 @@ CONFIG_DEFAULT_CFQ=y | |||
118 | # CONFIG_DEFAULT_NOOP is not set | 112 | # CONFIG_DEFAULT_NOOP is not set |
119 | CONFIG_DEFAULT_IOSCHED="cfq" | 113 | CONFIG_DEFAULT_IOSCHED="cfq" |
120 | CONFIG_CLASSIC_RCU=y | 114 | CONFIG_CLASSIC_RCU=y |
115 | CONFIG_FREEZER=y | ||
121 | 116 | ||
122 | # | 117 | # |
123 | # System Type and features | 118 | # System Type and features |
@@ -134,6 +129,8 @@ CONFIG_CPU_AT32AP700X=y | |||
134 | CONFIG_CPU_AT32AP7000=y | 129 | CONFIG_CPU_AT32AP7000=y |
135 | CONFIG_BOARD_ATSTK1000=y | 130 | CONFIG_BOARD_ATSTK1000=y |
136 | # CONFIG_BOARD_ATNGW100 is not set | 131 | # CONFIG_BOARD_ATNGW100 is not set |
132 | # CONFIG_BOARD_FAVR_32 is not set | ||
133 | # CONFIG_BOARD_MIMC200 is not set | ||
137 | # CONFIG_BOARD_ATSTK1002 is not set | 134 | # CONFIG_BOARD_ATSTK1002 is not set |
138 | # CONFIG_BOARD_ATSTK1003 is not set | 135 | # CONFIG_BOARD_ATSTK1003 is not set |
139 | # CONFIG_BOARD_ATSTK1004 is not set | 136 | # CONFIG_BOARD_ATSTK1004 is not set |
@@ -171,14 +168,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
171 | # CONFIG_SPARSEMEM_MANUAL is not set | 168 | # CONFIG_SPARSEMEM_MANUAL is not set |
172 | CONFIG_FLATMEM=y | 169 | CONFIG_FLATMEM=y |
173 | CONFIG_FLAT_NODE_MEM_MAP=y | 170 | CONFIG_FLAT_NODE_MEM_MAP=y |
174 | # CONFIG_SPARSEMEM_STATIC is not set | ||
175 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
176 | CONFIG_PAGEFLAGS_EXTENDED=y | 171 | CONFIG_PAGEFLAGS_EXTENDED=y |
177 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 172 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
178 | # CONFIG_RESOURCES_64BIT is not set | 173 | # CONFIG_RESOURCES_64BIT is not set |
174 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
179 | CONFIG_ZONE_DMA_FLAG=0 | 175 | CONFIG_ZONE_DMA_FLAG=0 |
180 | CONFIG_NR_QUICK=2 | 176 | CONFIG_NR_QUICK=2 |
181 | CONFIG_VIRT_TO_BUS=y | 177 | CONFIG_VIRT_TO_BUS=y |
178 | CONFIG_UNEVICTABLE_LRU=y | ||
182 | # CONFIG_OWNERSHIP_TRACE is not set | 179 | # CONFIG_OWNERSHIP_TRACE is not set |
183 | CONFIG_NMI_DEBUGGING=y | 180 | CONFIG_NMI_DEBUGGING=y |
184 | # CONFIG_HZ_100 is not set | 181 | # CONFIG_HZ_100 is not set |
@@ -186,7 +183,7 @@ CONFIG_HZ_250=y | |||
186 | # CONFIG_HZ_300 is not set | 183 | # CONFIG_HZ_300 is not set |
187 | # CONFIG_HZ_1000 is not set | 184 | # CONFIG_HZ_1000 is not set |
188 | CONFIG_HZ=250 | 185 | CONFIG_HZ=250 |
189 | # CONFIG_SCHED_HRTICK is not set | 186 | CONFIG_SCHED_HRTICK=y |
190 | CONFIG_CMDLINE="" | 187 | CONFIG_CMDLINE="" |
191 | 188 | ||
192 | # | 189 | # |
@@ -228,6 +225,8 @@ CONFIG_CPU_FREQ_AT32AP=y | |||
228 | # Executable file formats | 225 | # Executable file formats |
229 | # | 226 | # |
230 | CONFIG_BINFMT_ELF=y | 227 | CONFIG_BINFMT_ELF=y |
228 | CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y | ||
229 | # CONFIG_HAVE_AOUT is not set | ||
231 | # CONFIG_BINFMT_MISC is not set | 230 | # CONFIG_BINFMT_MISC is not set |
232 | CONFIG_NET=y | 231 | CONFIG_NET=y |
233 | 232 | ||
@@ -299,6 +298,7 @@ CONFIG_IPV6_TUNNEL=m | |||
299 | # CONFIG_ATM is not set | 298 | # CONFIG_ATM is not set |
300 | CONFIG_STP=m | 299 | CONFIG_STP=m |
301 | CONFIG_BRIDGE=m | 300 | CONFIG_BRIDGE=m |
301 | # CONFIG_NET_DSA is not set | ||
302 | # CONFIG_VLAN_8021Q is not set | 302 | # CONFIG_VLAN_8021Q is not set |
303 | # CONFIG_DECNET is not set | 303 | # CONFIG_DECNET is not set |
304 | CONFIG_LLC=m | 304 | CONFIG_LLC=m |
@@ -321,14 +321,8 @@ CONFIG_LLC=m | |||
321 | # CONFIG_IRDA is not set | 321 | # CONFIG_IRDA is not set |
322 | # CONFIG_BT is not set | 322 | # CONFIG_BT is not set |
323 | # CONFIG_AF_RXRPC is not set | 323 | # CONFIG_AF_RXRPC is not set |
324 | 324 | # CONFIG_PHONET is not set | |
325 | # | 325 | # CONFIG_WIRELESS is not set |
326 | # Wireless | ||
327 | # | ||
328 | # CONFIG_CFG80211 is not set | ||
329 | # CONFIG_WIRELESS_EXT is not set | ||
330 | # CONFIG_MAC80211 is not set | ||
331 | # CONFIG_IEEE80211 is not set | ||
332 | # CONFIG_RFKILL is not set | 326 | # CONFIG_RFKILL is not set |
333 | # CONFIG_NET_9P is not set | 327 | # CONFIG_NET_9P is not set |
334 | 328 | ||
@@ -359,6 +353,7 @@ CONFIG_MTD_CMDLINE_PARTS=y | |||
359 | # User Modules And Translation Layers | 353 | # User Modules And Translation Layers |
360 | # | 354 | # |
361 | CONFIG_MTD_CHAR=y | 355 | CONFIG_MTD_CHAR=y |
356 | CONFIG_HAVE_MTD_OTP=y | ||
362 | CONFIG_MTD_BLKDEVS=y | 357 | CONFIG_MTD_BLKDEVS=y |
363 | CONFIG_MTD_BLOCK=y | 358 | CONFIG_MTD_BLOCK=y |
364 | # CONFIG_FTL is not set | 359 | # CONFIG_FTL is not set |
@@ -407,6 +402,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
407 | # Self-contained MTD device drivers | 402 | # Self-contained MTD device drivers |
408 | # | 403 | # |
409 | CONFIG_MTD_DATAFLASH=m | 404 | CONFIG_MTD_DATAFLASH=m |
405 | # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set | ||
406 | CONFIG_MTD_DATAFLASH_OTP=y | ||
410 | CONFIG_MTD_M25P80=m | 407 | CONFIG_MTD_M25P80=m |
411 | CONFIG_M25PXX_USE_FAST_READ=y | 408 | CONFIG_M25PXX_USE_FAST_READ=y |
412 | # CONFIG_MTD_SLRAM is not set | 409 | # CONFIG_MTD_SLRAM is not set |
@@ -464,9 +461,10 @@ CONFIG_ATMEL_TCLIB=y | |||
464 | CONFIG_ATMEL_TCB_CLKSRC=y | 461 | CONFIG_ATMEL_TCB_CLKSRC=y |
465 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 | 462 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 |
466 | # CONFIG_EEPROM_93CX6 is not set | 463 | # CONFIG_EEPROM_93CX6 is not set |
464 | # CONFIG_ICS932S401 is not set | ||
467 | CONFIG_ATMEL_SSC=m | 465 | CONFIG_ATMEL_SSC=m |
468 | # CONFIG_ENCLOSURE_SERVICES is not set | 466 | # CONFIG_ENCLOSURE_SERVICES is not set |
469 | # CONFIG_HAVE_IDE is not set | 467 | # CONFIG_C2PORT is not set |
470 | 468 | ||
471 | # | 469 | # |
472 | # SCSI device support | 470 | # SCSI device support |
@@ -548,6 +546,9 @@ CONFIG_MACB=y | |||
548 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 546 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
549 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 547 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
550 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 548 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
549 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
550 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
551 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
551 | # CONFIG_B44 is not set | 552 | # CONFIG_B44 is not set |
552 | # CONFIG_NETDEV_1000 is not set | 553 | # CONFIG_NETDEV_1000 is not set |
553 | # CONFIG_NETDEV_10000 is not set | 554 | # CONFIG_NETDEV_10000 is not set |
@@ -653,6 +654,7 @@ CONFIG_UNIX98_PTYS=y | |||
653 | CONFIG_I2C=m | 654 | CONFIG_I2C=m |
654 | CONFIG_I2C_BOARDINFO=y | 655 | CONFIG_I2C_BOARDINFO=y |
655 | CONFIG_I2C_CHARDEV=m | 656 | CONFIG_I2C_CHARDEV=m |
657 | CONFIG_I2C_HELPER_AUTO=y | ||
656 | CONFIG_I2C_ALGOBIT=m | 658 | CONFIG_I2C_ALGOBIT=m |
657 | 659 | ||
658 | # | 660 | # |
@@ -717,6 +719,10 @@ CONFIG_GPIOLIB=y | |||
717 | CONFIG_GPIO_SYSFS=y | 719 | CONFIG_GPIO_SYSFS=y |
718 | 720 | ||
719 | # | 721 | # |
722 | # Memory mapped GPIO expanders: | ||
723 | # | ||
724 | |||
725 | # | ||
720 | # I2C GPIO expanders: | 726 | # I2C GPIO expanders: |
721 | # | 727 | # |
722 | # CONFIG_GPIO_MAX732X is not set | 728 | # CONFIG_GPIO_MAX732X is not set |
@@ -745,11 +751,11 @@ CONFIG_WATCHDOG=y | |||
745 | # | 751 | # |
746 | # CONFIG_SOFT_WATCHDOG is not set | 752 | # CONFIG_SOFT_WATCHDOG is not set |
747 | CONFIG_AT32AP700X_WDT=y | 753 | CONFIG_AT32AP700X_WDT=y |
754 | CONFIG_SSB_POSSIBLE=y | ||
748 | 755 | ||
749 | # | 756 | # |
750 | # Sonics Silicon Backplane | 757 | # Sonics Silicon Backplane |
751 | # | 758 | # |
752 | CONFIG_SSB_POSSIBLE=y | ||
753 | # CONFIG_SSB is not set | 759 | # CONFIG_SSB is not set |
754 | 760 | ||
755 | # | 761 | # |
@@ -758,6 +764,10 @@ CONFIG_SSB_POSSIBLE=y | |||
758 | # CONFIG_MFD_CORE is not set | 764 | # CONFIG_MFD_CORE is not set |
759 | # CONFIG_MFD_SM501 is not set | 765 | # CONFIG_MFD_SM501 is not set |
760 | # CONFIG_HTC_PASIC3 is not set | 766 | # CONFIG_HTC_PASIC3 is not set |
767 | # CONFIG_MFD_TMIO is not set | ||
768 | # CONFIG_MFD_WM8400 is not set | ||
769 | # CONFIG_MFD_WM8350_I2C is not set | ||
770 | # CONFIG_REGULATOR is not set | ||
761 | 771 | ||
762 | # | 772 | # |
763 | # Multimedia devices | 773 | # Multimedia devices |
@@ -783,6 +793,7 @@ CONFIG_SSB_POSSIBLE=y | |||
783 | CONFIG_FB=y | 793 | CONFIG_FB=y |
784 | # CONFIG_FIRMWARE_EDID is not set | 794 | # CONFIG_FIRMWARE_EDID is not set |
785 | # CONFIG_FB_DDC is not set | 795 | # CONFIG_FB_DDC is not set |
796 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
786 | CONFIG_FB_CFB_FILLRECT=y | 797 | CONFIG_FB_CFB_FILLRECT=y |
787 | CONFIG_FB_CFB_COPYAREA=y | 798 | CONFIG_FB_CFB_COPYAREA=y |
788 | CONFIG_FB_CFB_IMAGEBLIT=y | 799 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -804,10 +815,13 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
804 | # CONFIG_FB_S1D13XXX is not set | 815 | # CONFIG_FB_S1D13XXX is not set |
805 | CONFIG_FB_ATMEL=y | 816 | CONFIG_FB_ATMEL=y |
806 | # CONFIG_FB_VIRTUAL is not set | 817 | # CONFIG_FB_VIRTUAL is not set |
818 | # CONFIG_FB_METRONOME is not set | ||
819 | # CONFIG_FB_MB862XX is not set | ||
807 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 820 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
808 | CONFIG_LCD_CLASS_DEVICE=y | 821 | CONFIG_LCD_CLASS_DEVICE=y |
809 | CONFIG_LCD_LTV350QV=y | 822 | CONFIG_LCD_LTV350QV=y |
810 | # CONFIG_LCD_ILI9320 is not set | 823 | # CONFIG_LCD_ILI9320 is not set |
824 | # CONFIG_LCD_TDO24M is not set | ||
811 | # CONFIG_LCD_VGG2432A4 is not set | 825 | # CONFIG_LCD_VGG2432A4 is not set |
812 | # CONFIG_LCD_PLATFORM is not set | 826 | # CONFIG_LCD_PLATFORM is not set |
813 | # CONFIG_BACKLIGHT_CLASS_DEVICE is not set | 827 | # CONFIG_BACKLIGHT_CLASS_DEVICE is not set |
@@ -818,6 +832,7 @@ CONFIG_LCD_LTV350QV=y | |||
818 | # CONFIG_DISPLAY_SUPPORT is not set | 832 | # CONFIG_DISPLAY_SUPPORT is not set |
819 | # CONFIG_LOGO is not set | 833 | # CONFIG_LOGO is not set |
820 | CONFIG_SOUND=m | 834 | CONFIG_SOUND=m |
835 | CONFIG_SOUND_OSS_CORE=y | ||
821 | CONFIG_SND=m | 836 | CONFIG_SND=m |
822 | CONFIG_SND_TIMER=m | 837 | CONFIG_SND_TIMER=m |
823 | CONFIG_SND_PCM=m | 838 | CONFIG_SND_PCM=m |
@@ -848,28 +863,32 @@ CONFIG_USB_SUPPORT=y | |||
848 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 863 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
849 | # CONFIG_USB_OTG_WHITELIST is not set | 864 | # CONFIG_USB_OTG_WHITELIST is not set |
850 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 865 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
866 | # CONFIG_USB_MUSB_HDRC is not set | ||
867 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
851 | 868 | ||
852 | # | 869 | # |
853 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 870 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
854 | # | 871 | # |
855 | CONFIG_USB_GADGET=y | 872 | CONFIG_USB_GADGET=y |
856 | # CONFIG_USB_GADGET_DEBUG is not set | 873 | # CONFIG_USB_GADGET_DEBUG is not set |
857 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 874 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
858 | # CONFIG_USB_GADGET_DEBUG_FS is not set | 875 | # CONFIG_USB_GADGET_DEBUG_FS is not set |
876 | CONFIG_USB_GADGET_VBUS_DRAW=2 | ||
859 | CONFIG_USB_GADGET_SELECTED=y | 877 | CONFIG_USB_GADGET_SELECTED=y |
860 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 878 | # CONFIG_USB_GADGET_AT91 is not set |
861 | CONFIG_USB_GADGET_ATMEL_USBA=y | 879 | CONFIG_USB_GADGET_ATMEL_USBA=y |
862 | CONFIG_USB_ATMEL_USBA=y | 880 | CONFIG_USB_ATMEL_USBA=y |
863 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 881 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
864 | # CONFIG_USB_GADGET_NET2280 is not set | ||
865 | # CONFIG_USB_GADGET_PXA25X is not set | ||
866 | # CONFIG_USB_GADGET_M66592 is not set | ||
867 | # CONFIG_USB_GADGET_PXA27X is not set | ||
868 | # CONFIG_USB_GADGET_GOKU is not set | ||
869 | # CONFIG_USB_GADGET_LH7A40X is not set | 882 | # CONFIG_USB_GADGET_LH7A40X is not set |
870 | # CONFIG_USB_GADGET_OMAP is not set | 883 | # CONFIG_USB_GADGET_OMAP is not set |
884 | # CONFIG_USB_GADGET_PXA25X is not set | ||
885 | # CONFIG_USB_GADGET_PXA27X is not set | ||
871 | # CONFIG_USB_GADGET_S3C2410 is not set | 886 | # CONFIG_USB_GADGET_S3C2410 is not set |
872 | # CONFIG_USB_GADGET_AT91 is not set | 887 | # CONFIG_USB_GADGET_M66592 is not set |
888 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
889 | # CONFIG_USB_GADGET_FSL_QE is not set | ||
890 | # CONFIG_USB_GADGET_NET2280 is not set | ||
891 | # CONFIG_USB_GADGET_GOKU is not set | ||
873 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 892 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
874 | CONFIG_USB_GADGET_DUALSPEED=y | 893 | CONFIG_USB_GADGET_DUALSPEED=y |
875 | CONFIG_USB_ZERO=m | 894 | CONFIG_USB_ZERO=m |
@@ -887,7 +906,7 @@ CONFIG_MMC=y | |||
887 | # CONFIG_MMC_UNSAFE_RESUME is not set | 906 | # CONFIG_MMC_UNSAFE_RESUME is not set |
888 | 907 | ||
889 | # | 908 | # |
890 | # MMC/SD Card Drivers | 909 | # MMC/SD/SDIO Card Drivers |
891 | # | 910 | # |
892 | CONFIG_MMC_BLOCK=y | 911 | CONFIG_MMC_BLOCK=y |
893 | CONFIG_MMC_BLOCK_BOUNCE=y | 912 | CONFIG_MMC_BLOCK_BOUNCE=y |
@@ -895,10 +914,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
895 | # CONFIG_MMC_TEST is not set | 914 | # CONFIG_MMC_TEST is not set |
896 | 915 | ||
897 | # | 916 | # |
898 | # MMC/SD Host Controller Drivers | 917 | # MMC/SD/SDIO Host Controller Drivers |
899 | # | 918 | # |
900 | # CONFIG_MMC_SDHCI is not set | 919 | # CONFIG_MMC_SDHCI is not set |
901 | CONFIG_MMC_ATMELMCI=y | 920 | CONFIG_MMC_ATMELMCI=y |
921 | # CONFIG_MMC_ATMELMCI_DMA is not set | ||
902 | CONFIG_MMC_SPI=m | 922 | CONFIG_MMC_SPI=m |
903 | # CONFIG_MEMSTICK is not set | 923 | # CONFIG_MEMSTICK is not set |
904 | CONFIG_NEW_LEDS=y | 924 | CONFIG_NEW_LEDS=y |
@@ -918,6 +938,7 @@ CONFIG_LEDS_GPIO=m | |||
918 | CONFIG_LEDS_TRIGGERS=y | 938 | CONFIG_LEDS_TRIGGERS=y |
919 | CONFIG_LEDS_TRIGGER_TIMER=m | 939 | CONFIG_LEDS_TRIGGER_TIMER=m |
920 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 940 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m |
941 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
921 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m | 942 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m |
922 | # CONFIG_ACCESSIBILITY is not set | 943 | # CONFIG_ACCESSIBILITY is not set |
923 | CONFIG_RTC_LIB=y | 944 | CONFIG_RTC_LIB=y |
@@ -950,25 +971,31 @@ CONFIG_RTC_INTF_DEV=y | |||
950 | # CONFIG_RTC_DRV_M41T80 is not set | 971 | # CONFIG_RTC_DRV_M41T80 is not set |
951 | # CONFIG_RTC_DRV_S35390A is not set | 972 | # CONFIG_RTC_DRV_S35390A is not set |
952 | # CONFIG_RTC_DRV_FM3130 is not set | 973 | # CONFIG_RTC_DRV_FM3130 is not set |
974 | # CONFIG_RTC_DRV_RX8581 is not set | ||
953 | 975 | ||
954 | # | 976 | # |
955 | # SPI RTC drivers | 977 | # SPI RTC drivers |
956 | # | 978 | # |
957 | # CONFIG_RTC_DRV_M41T94 is not set | 979 | # CONFIG_RTC_DRV_M41T94 is not set |
958 | # CONFIG_RTC_DRV_DS1305 is not set | 980 | # CONFIG_RTC_DRV_DS1305 is not set |
981 | # CONFIG_RTC_DRV_DS1390 is not set | ||
959 | # CONFIG_RTC_DRV_MAX6902 is not set | 982 | # CONFIG_RTC_DRV_MAX6902 is not set |
960 | # CONFIG_RTC_DRV_R9701 is not set | 983 | # CONFIG_RTC_DRV_R9701 is not set |
961 | # CONFIG_RTC_DRV_RS5C348 is not set | 984 | # CONFIG_RTC_DRV_RS5C348 is not set |
985 | # CONFIG_RTC_DRV_DS3234 is not set | ||
962 | 986 | ||
963 | # | 987 | # |
964 | # Platform RTC drivers | 988 | # Platform RTC drivers |
965 | # | 989 | # |
990 | # CONFIG_RTC_DRV_DS1286 is not set | ||
966 | # CONFIG_RTC_DRV_DS1511 is not set | 991 | # CONFIG_RTC_DRV_DS1511 is not set |
967 | # CONFIG_RTC_DRV_DS1553 is not set | 992 | # CONFIG_RTC_DRV_DS1553 is not set |
968 | # CONFIG_RTC_DRV_DS1742 is not set | 993 | # CONFIG_RTC_DRV_DS1742 is not set |
969 | # CONFIG_RTC_DRV_STK17TA8 is not set | 994 | # CONFIG_RTC_DRV_STK17TA8 is not set |
970 | # CONFIG_RTC_DRV_M48T86 is not set | 995 | # CONFIG_RTC_DRV_M48T86 is not set |
996 | # CONFIG_RTC_DRV_M48T35 is not set | ||
971 | # CONFIG_RTC_DRV_M48T59 is not set | 997 | # CONFIG_RTC_DRV_M48T59 is not set |
998 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
972 | # CONFIG_RTC_DRV_V3020 is not set | 999 | # CONFIG_RTC_DRV_V3020 is not set |
973 | 1000 | ||
974 | # | 1001 | # |
@@ -989,6 +1016,8 @@ CONFIG_DMA_ENGINE=y | |||
989 | # CONFIG_NET_DMA is not set | 1016 | # CONFIG_NET_DMA is not set |
990 | CONFIG_DMATEST=m | 1017 | CONFIG_DMATEST=m |
991 | # CONFIG_UIO is not set | 1018 | # CONFIG_UIO is not set |
1019 | # CONFIG_STAGING is not set | ||
1020 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
992 | 1021 | ||
993 | # | 1022 | # |
994 | # File systems | 1023 | # File systems |
@@ -998,12 +1027,17 @@ CONFIG_EXT2_FS=m | |||
998 | # CONFIG_EXT2_FS_XIP is not set | 1027 | # CONFIG_EXT2_FS_XIP is not set |
999 | CONFIG_EXT3_FS=m | 1028 | CONFIG_EXT3_FS=m |
1000 | # CONFIG_EXT3_FS_XATTR is not set | 1029 | # CONFIG_EXT3_FS_XATTR is not set |
1001 | # CONFIG_EXT4DEV_FS is not set | 1030 | CONFIG_EXT4_FS=m |
1031 | CONFIG_EXT4DEV_COMPAT=y | ||
1032 | # CONFIG_EXT4_FS_XATTR is not set | ||
1002 | CONFIG_JBD=m | 1033 | CONFIG_JBD=m |
1003 | # CONFIG_JBD_DEBUG is not set | 1034 | # CONFIG_JBD_DEBUG is not set |
1035 | CONFIG_JBD2=m | ||
1036 | # CONFIG_JBD2_DEBUG is not set | ||
1004 | # CONFIG_REISERFS_FS is not set | 1037 | # CONFIG_REISERFS_FS is not set |
1005 | # CONFIG_JFS_FS is not set | 1038 | # CONFIG_JFS_FS is not set |
1006 | # CONFIG_FS_POSIX_ACL is not set | 1039 | # CONFIG_FS_POSIX_ACL is not set |
1040 | CONFIG_FILE_LOCKING=y | ||
1007 | # CONFIG_XFS_FS is not set | 1041 | # CONFIG_XFS_FS is not set |
1008 | # CONFIG_OCFS2_FS is not set | 1042 | # CONFIG_OCFS2_FS is not set |
1009 | # CONFIG_DNOTIFY is not set | 1043 | # CONFIG_DNOTIFY is not set |
@@ -1036,6 +1070,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1036 | CONFIG_PROC_FS=y | 1070 | CONFIG_PROC_FS=y |
1037 | CONFIG_PROC_KCORE=y | 1071 | CONFIG_PROC_KCORE=y |
1038 | CONFIG_PROC_SYSCTL=y | 1072 | CONFIG_PROC_SYSCTL=y |
1073 | CONFIG_PROC_PAGE_MONITOR=y | ||
1039 | CONFIG_SYSFS=y | 1074 | CONFIG_SYSFS=y |
1040 | CONFIG_TMPFS=y | 1075 | CONFIG_TMPFS=y |
1041 | # CONFIG_TMPFS_POSIX_ACL is not set | 1076 | # CONFIG_TMPFS_POSIX_ACL is not set |
@@ -1054,7 +1089,8 @@ CONFIG_TMPFS=y | |||
1054 | # CONFIG_EFS_FS is not set | 1089 | # CONFIG_EFS_FS is not set |
1055 | CONFIG_JFFS2_FS=y | 1090 | CONFIG_JFFS2_FS=y |
1056 | CONFIG_JFFS2_FS_DEBUG=0 | 1091 | CONFIG_JFFS2_FS_DEBUG=0 |
1057 | # CONFIG_JFFS2_FS_WRITEBUFFER is not set | 1092 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
1093 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
1058 | # CONFIG_JFFS2_SUMMARY is not set | 1094 | # CONFIG_JFFS2_SUMMARY is not set |
1059 | # CONFIG_JFFS2_FS_XATTR is not set | 1095 | # CONFIG_JFFS2_FS_XATTR is not set |
1060 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 1096 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
@@ -1088,6 +1124,7 @@ CONFIG_LOCKD=y | |||
1088 | CONFIG_LOCKD_V4=y | 1124 | CONFIG_LOCKD_V4=y |
1089 | CONFIG_NFS_COMMON=y | 1125 | CONFIG_NFS_COMMON=y |
1090 | CONFIG_SUNRPC=y | 1126 | CONFIG_SUNRPC=y |
1127 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
1091 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1128 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1092 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1129 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1093 | # CONFIG_SMB_FS is not set | 1130 | # CONFIG_SMB_FS is not set |
@@ -1185,10 +1222,21 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1185 | CONFIG_FRAME_POINTER=y | 1222 | CONFIG_FRAME_POINTER=y |
1186 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1223 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1187 | # CONFIG_RCU_TORTURE_TEST is not set | 1224 | # CONFIG_RCU_TORTURE_TEST is not set |
1225 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1188 | # CONFIG_KPROBES_SANITY_TEST is not set | 1226 | # CONFIG_KPROBES_SANITY_TEST is not set |
1189 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1227 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1228 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1190 | # CONFIG_LKDTM is not set | 1229 | # CONFIG_LKDTM is not set |
1191 | # CONFIG_FAULT_INJECTION is not set | 1230 | # CONFIG_FAULT_INJECTION is not set |
1231 | |||
1232 | # | ||
1233 | # Tracers | ||
1234 | # | ||
1235 | # CONFIG_IRQSOFF_TRACER is not set | ||
1236 | # CONFIG_SCHED_TRACER is not set | ||
1237 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1238 | # CONFIG_BOOT_TRACER is not set | ||
1239 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1192 | # CONFIG_SAMPLES is not set | 1240 | # CONFIG_SAMPLES is not set |
1193 | 1241 | ||
1194 | # | 1242 | # |
@@ -1196,17 +1244,26 @@ CONFIG_FRAME_POINTER=y | |||
1196 | # | 1244 | # |
1197 | # CONFIG_KEYS is not set | 1245 | # CONFIG_KEYS is not set |
1198 | # CONFIG_SECURITY is not set | 1246 | # CONFIG_SECURITY is not set |
1247 | # CONFIG_SECURITYFS is not set | ||
1199 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1248 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1200 | CONFIG_CRYPTO=y | 1249 | CONFIG_CRYPTO=y |
1201 | 1250 | ||
1202 | # | 1251 | # |
1203 | # Crypto core or helper | 1252 | # Crypto core or helper |
1204 | # | 1253 | # |
1254 | CONFIG_CRYPTO_FIPS=y | ||
1205 | CONFIG_CRYPTO_ALGAPI=y | 1255 | CONFIG_CRYPTO_ALGAPI=y |
1256 | CONFIG_CRYPTO_ALGAPI2=y | ||
1206 | CONFIG_CRYPTO_AEAD=m | 1257 | CONFIG_CRYPTO_AEAD=m |
1258 | CONFIG_CRYPTO_AEAD2=y | ||
1207 | CONFIG_CRYPTO_BLKCIPHER=m | 1259 | CONFIG_CRYPTO_BLKCIPHER=m |
1260 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
1208 | CONFIG_CRYPTO_HASH=m | 1261 | CONFIG_CRYPTO_HASH=m |
1262 | CONFIG_CRYPTO_HASH2=y | ||
1263 | CONFIG_CRYPTO_RNG=m | ||
1264 | CONFIG_CRYPTO_RNG2=y | ||
1209 | CONFIG_CRYPTO_MANAGER=m | 1265 | CONFIG_CRYPTO_MANAGER=m |
1266 | CONFIG_CRYPTO_MANAGER2=y | ||
1210 | # CONFIG_CRYPTO_GF128MUL is not set | 1267 | # CONFIG_CRYPTO_GF128MUL is not set |
1211 | # CONFIG_CRYPTO_NULL is not set | 1268 | # CONFIG_CRYPTO_NULL is not set |
1212 | # CONFIG_CRYPTO_CRYPTD is not set | 1269 | # CONFIG_CRYPTO_CRYPTD is not set |
@@ -1257,7 +1314,7 @@ CONFIG_CRYPTO_SHA1=m | |||
1257 | # | 1314 | # |
1258 | # Ciphers | 1315 | # Ciphers |
1259 | # | 1316 | # |
1260 | # CONFIG_CRYPTO_AES is not set | 1317 | CONFIG_CRYPTO_AES=m |
1261 | # CONFIG_CRYPTO_ANUBIS is not set | 1318 | # CONFIG_CRYPTO_ANUBIS is not set |
1262 | # CONFIG_CRYPTO_ARC4 is not set | 1319 | # CONFIG_CRYPTO_ARC4 is not set |
1263 | # CONFIG_CRYPTO_BLOWFISH is not set | 1320 | # CONFIG_CRYPTO_BLOWFISH is not set |
@@ -1278,14 +1335,17 @@ CONFIG_CRYPTO_DES=m | |||
1278 | # | 1335 | # |
1279 | CONFIG_CRYPTO_DEFLATE=y | 1336 | CONFIG_CRYPTO_DEFLATE=y |
1280 | CONFIG_CRYPTO_LZO=y | 1337 | CONFIG_CRYPTO_LZO=y |
1338 | |||
1339 | # | ||
1340 | # Random Number Generation | ||
1341 | # | ||
1342 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
1281 | # CONFIG_CRYPTO_HW is not set | 1343 | # CONFIG_CRYPTO_HW is not set |
1282 | 1344 | ||
1283 | # | 1345 | # |
1284 | # Library routines | 1346 | # Library routines |
1285 | # | 1347 | # |
1286 | CONFIG_BITREVERSE=y | 1348 | CONFIG_BITREVERSE=y |
1287 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1288 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1289 | CONFIG_CRC_CCITT=m | 1349 | CONFIG_CRC_CCITT=m |
1290 | CONFIG_CRC16=y | 1350 | CONFIG_CRC16=y |
1291 | CONFIG_CRC_T10DIF=m | 1351 | CONFIG_CRC_T10DIF=m |
diff --git a/arch/avr32/kernel/init_task.c b/arch/avr32/kernel/init_task.c index 44058469c6ec..993d56ee3cf3 100644 --- a/arch/avr32/kernel/init_task.c +++ b/arch/avr32/kernel/init_task.c | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
15 | 15 | ||
16 | static struct fs_struct init_fs = INIT_FS; | ||
17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 0c6e02f80a31..066252eebf61 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c | |||
@@ -967,28 +967,28 @@ static inline void configure_usart0_pins(void) | |||
967 | { | 967 | { |
968 | u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */ | 968 | u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */ |
969 | 969 | ||
970 | select_peripheral(PIOA, pin_mask, PERIPH_B, 0); | 970 | select_peripheral(PIOA, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); |
971 | } | 971 | } |
972 | 972 | ||
973 | static inline void configure_usart1_pins(void) | 973 | static inline void configure_usart1_pins(void) |
974 | { | 974 | { |
975 | u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */ | 975 | u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */ |
976 | 976 | ||
977 | select_peripheral(PIOA, pin_mask, PERIPH_A, 0); | 977 | select_peripheral(PIOA, pin_mask, PERIPH_A, AT32_GPIOF_PULLUP); |
978 | } | 978 | } |
979 | 979 | ||
980 | static inline void configure_usart2_pins(void) | 980 | static inline void configure_usart2_pins(void) |
981 | { | 981 | { |
982 | u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */ | 982 | u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */ |
983 | 983 | ||
984 | select_peripheral(PIOB, pin_mask, PERIPH_B, 0); | 984 | select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); |
985 | } | 985 | } |
986 | 986 | ||
987 | static inline void configure_usart3_pins(void) | 987 | static inline void configure_usart3_pins(void) |
988 | { | 988 | { |
989 | u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */ | 989 | u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */ |
990 | 990 | ||
991 | select_peripheral(PIOB, pin_mask, PERIPH_B, 0); | 991 | select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); |
992 | } | 992 | } |
993 | 993 | ||
994 | static struct platform_device *__initdata at32_usarts[4]; | 994 | static struct platform_device *__initdata at32_usarts[4]; |