From 80705b9fb1f77285f0ed1098d5cba928913754c9 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 19 Apr 2012 21:23:02 +0000 Subject: [PATCH] avr32: switch to 3.3.2 uClibc-0.9.33 causes segfaults at least in iptables. The segfaults are present with 2.6.39 as well, so it makes no sense to stick to that version. SVN-Revision: 31351 --- target/linux/avr32/Makefile | 2 +- target/linux/avr32/config-3.3 | 112 ++++++++++++++++++ .../patches-3.3/110-openwrt_flashmap.patch | 19 +++ 3 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 target/linux/avr32/config-3.3 create mode 100644 target/linux/avr32/patches-3.3/110-openwrt_flashmap.patch diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 5729570507..da146dcd86 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.39.4 +LINUX_VERSION:=3.3.2 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/config-3.3 b/target/linux/avr32/config-3.3 new file mode 100644 index 0000000000..4b0833b8b7 --- /dev/null +++ b/target/linux/avr32/config-3.3 @@ -0,0 +1,112 @@ +CONFIG_AP700X_16_BIT_SMC=y +# CONFIG_AP700X_32_BIT_SMC is not set +# CONFIG_AP700X_8_BIT_SMC is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +# CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +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_AT32AP700X_WDT=m +# CONFIG_ATMEL_PWM is not set +# CONFIG_ATMEL_SSC is not set +CONFIG_ATMEL_TCB_CLKSRC=y +CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 +CONFIG_ATMEL_TCLIB=y +CONFIG_AVR32=y +CONFIG_BCMA_POSSIBLE=y +CONFIG_BOARD_ATNGW100_ADDON_NONE=y +CONFIG_BOARD_ATNGW100_COMMON=y +# CONFIG_BOARD_ATNGW100_EVKLCD10X is not set +CONFIG_BOARD_ATNGW100_MKI=y +# CONFIG_BOARD_ATNGW100_MKII 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_CPU_AT32AP7000=y +CONFIG_CPU_AT32AP700X=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DMADEVICES=y +CONFIG_DMA_ENGINE=y +CONFIG_DW_DMAC=y +CONFIG_ENTRY_ADDRESS=0x90000000 +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_IRQ_SHOW=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 is not set +CONFIG_HAVE_CLK=y +CONFIG_HAVE_FB_ATMEL=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y +CONFIG_HAVE_NET_MACB=y +CONFIG_HAVE_OPROFILE=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +# CONFIG_I2C_PXA_PCI is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_LEDS_GPIO=y +CONFIG_LOADER_U_BOOT=y +CONFIG_LOAD_ADDRESS=0x10000000 +CONFIG_MACB=y +CONFIG_MDIO_BOARDINFO=y +CONFIG_MMC=m +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_PHYSMAP=y +# CONFIG_NEED_NODE_MEMMAP_SIZE is not set +CONFIG_NEED_PER_CPU_KM=y +# CONFIG_NET_DMA is not set +# 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_PERFORMANCE_COUNTERS=y +CONFIG_PHYLIB=y +CONFIG_PHYS_OFFSET=0x10000000 +CONFIG_PLATFORM_AT32AP=y +# CONFIG_PREEMPT_RCU is not set +CONFIG_QUICKLIST=y +# CONFIG_QUOTACTL is not set +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_SPI=y +CONFIG_SPI_ATMEL=y +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_MASTER=y +CONFIG_SUBARCH_AVR32B=y +CONFIG_XZ_DEC=y +CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/avr32/patches-3.3/110-openwrt_flashmap.patch b/target/linux/avr32/patches-3.3/110-openwrt_flashmap.patch new file mode 100644 index 0000000000..98669bc473 --- /dev/null +++ b/target/linux/avr32/patches-3.3/110-openwrt_flashmap.patch @@ -0,0 +1,19 @@ +--- a/arch/avr32/boards/atngw100/flash.c ++++ b/arch/avr32/boards/atngw100/flash.c +@@ -45,9 +45,14 @@ static struct mtd_partition flash_parts[ + .mask_flags = MTD_WRITEABLE, + }, + { +- .name = "root", ++ .name = "kernel", + .offset = 0x00020000, +- .size = 0x007d0000, ++ .size = 0x00100000, ++ }, ++ { ++ .name = "rootfs", ++ .offset = 0x00120000, ++ .size = 0x006d0000, + }, + { + .name = "env",