upgrade avr32 to 2.6.32
SVN-Revision: 19432
This commit is contained in:
Imre Kaloz
parent
4aadb74cc1
commit
882284f5fb
3 changed files with 24 additions and 44 deletions
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (C) 2007 OpenWrt.org
|
||||
# Copyright (C) 2007-2010 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
|
|
@ -10,7 +10,7 @@ ARCH:=avr32
|
|||
BOARD:=avr32
|
||||
BOARDNAME:=Atmel AVR32
|
||||
FEATURES:=squashfs
|
||||
LINUX_VERSION:=2.6.30.10
|
||||
LINUX_VERSION:=2.6.32.7
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -9,75 +9,75 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
|||
# CONFIG_ARCH_SPARSEMEM_ENABLE is not set
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||
# CONFIG_ASYNC_TX_DMA is not set
|
||||
CONFIG_AT32AP700X_WDT=m
|
||||
# CONFIG_ATMEL_PWM is not set
|
||||
# CONFIG_ATMEL_SSC is not set
|
||||
CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
|
||||
CONFIG_ATMEL_TCB_CLKSRC=y
|
||||
CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
|
||||
CONFIG_ATMEL_TCLIB=y
|
||||
CONFIG_AVR32=y
|
||||
CONFIG_BITREVERSE=y
|
||||
# CONFIG_BOARD_ATNGW100_EVKLCD10X is not set
|
||||
CONFIG_BOARD_ATNGW100=y
|
||||
CONFIG_BOARD_ATNGW100_ADDON_NONE=y
|
||||
# CONFIG_BOARD_ATNGW100_EVKLCD10X is not set
|
||||
# CONFIG_BOARD_ATNGW100_MRMT is not set
|
||||
# CONFIG_BOARD_ATSTK1000 is not set
|
||||
# CONFIG_BOARD_FAVR_32 is not set
|
||||
# CONFIG_BOARD_HAMMERHEAD is not set
|
||||
# CONFIG_BOARD_MERISC is not set
|
||||
# CONFIG_BOARD_MIMC200 is not set
|
||||
CONFIG_CLASSIC_RCU=y
|
||||
CONFIG_CFG80211_DEFAULT_PS_VALUE=0
|
||||
CONFIG_CPU_AT32AP7000=y
|
||||
CONFIG_CPU_AT32AP700X=y
|
||||
CONFIG_DMADEVICES=y
|
||||
CONFIG_DMA_ENGINE=y
|
||||
CONFIG_DW_DMAC=y
|
||||
CONFIG_ENTRY_ADDRESS=0x90000000
|
||||
# CONFIG_FSNOTIFY is not set
|
||||
CONFIG_GENERIC_ALLOCATOR=y
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_FIND_LAST_BIT=y
|
||||
CONFIG_GENERIC_GPIO=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_HARDIRQS_SW_RESEND=y
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
# CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set
|
||||
# CONFIG_HAVE_ARCH_BOOTMEM is not set
|
||||
CONFIG_HAVE_CLK=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_HAVE_KPROBES=y
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
CONFIG_I2C_BOARDINFO=y
|
||||
CONFIG_I2C=m
|
||||
CONFIG_I2C_BOARDINFO=y
|
||||
# CONFIG_I2C_DESIGNWARE is not set
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_LEDS_GPIO=y
|
||||
CONFIG_LOAD_ADDRESS=0x10000000
|
||||
CONFIG_LOADER_U_BOOT=y
|
||||
CONFIG_LOAD_ADDRESS=0x10000000
|
||||
CONFIG_MACB=y
|
||||
# CONFIG_MMC_ATMELMCI_DMA is not set
|
||||
CONFIG_MMC_ATMELMCI=m
|
||||
CONFIG_MMC_BLOCK=m
|
||||
CONFIG_MMC=m
|
||||
# CONFIG_MMC_AT91 is not set
|
||||
CONFIG_MMC_ATMELMCI=m
|
||||
# CONFIG_MMC_ATMELMCI_DMA is not set
|
||||
CONFIG_MMC_BLOCK=m
|
||||
# CONFIG_MTD_CFI_INTELEXT is not set
|
||||
CONFIG_MTD_CMDLINE_PARTS=y
|
||||
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
|
||||
CONFIG_MTD_DATAFLASH=y
|
||||
# CONFIG_MTD_DATAFLASH_OTP is not set
|
||||
# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
|
||||
CONFIG_MTD_DATAFLASH=y
|
||||
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
|
||||
CONFIG_MTD_PHYSMAP_LEN=0x0
|
||||
CONFIG_MTD_PHYSMAP_START=0x80000000
|
||||
CONFIG_MTD_PHYSMAP=y
|
||||
# CONFIG_NEED_NODE_MEMMAP_SIZE is not set
|
||||
# CONFIG_NET_DMA is not set
|
||||
CONFIG_NF_CT_ACCT=y
|
||||
# CONFIG_NMI_DEBUGGING is not set
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_NR_QUICK=2
|
||||
# CONFIG_OWNERSHIP_TRACE is not set
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
# CONFIG_PCI is not set
|
||||
CONFIG_PERFORMANCE_COUNTERS=y
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_PHYS_OFFSET=0x10000000
|
||||
|
|
@ -85,20 +85,22 @@ CONFIG_PLATFORM_AT32AP=y
|
|||
CONFIG_QUICKLIST=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_DRV_AT32AP700X=y
|
||||
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
|
||||
CONFIG_SCHED_HRTICK=y
|
||||
# CONFIG_SCSI_DMA is not set
|
||||
# CONFIG_SDIO_UART is not set
|
||||
# CONFIG_SERIAL_8250 is not set
|
||||
CONFIG_SERIAL_ATMEL=y
|
||||
CONFIG_SERIAL_ATMEL_CONSOLE=y
|
||||
CONFIG_SERIAL_ATMEL_PDC=y
|
||||
# CONFIG_SERIAL_ATMEL_TTYAT is not set
|
||||
CONFIG_SERIAL_ATMEL=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_ATMEL=y
|
||||
# CONFIG_SPI_BITBANG is not set
|
||||
# CONFIG_SPI_GPIO is not set
|
||||
CONFIG_SPI_MASTER=y
|
||||
# CONFIG_SPI_SPIDEV is not set
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SUBARCH_AVR32B=y
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_TREE_PREEMPT_RCU is not set
|
||||
CONFIG_TREE_RCU=y
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
Fix clash in ATMEL_USART_ flags
|
||||
|
||||
At the moment ATMEL_USART_{RTS,CTS,CLK} have the values
|
||||
1, 2 and 3 respectively. Given these are used in bitmasks,
|
||||
trying to turn on the CLK line will in fact turn on the
|
||||
RTS and CTS lines as well.
|
||||
|
||||
Change the value of ATMEL_USART_CLK to 4.
|
||||
|
||||
Signed-off-by: Ben Nizette <bn@niasdigital.com>
|
||||
---
|
||||
--- a/arch/avr32/mach-at32ap/include/mach/board.h
|
||||
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
|
||||
@@ -29,7 +29,7 @@ extern struct platform_device *atmel_def
|
||||
/* Flags for selecting USART extra pins */
|
||||
#define ATMEL_USART_RTS 0x01
|
||||
#define ATMEL_USART_CTS 0x02
|
||||
-#define ATMEL_USART_CLK 0x03
|
||||
+#define ATMEL_USART_CLK 0x04
|
||||
|
||||
struct atmel_uart_data {
|
||||
short use_dma_tx; /* use transmit DMA? */
|
||||
Loading…
Reference in a new issue