diff options
| -rw-r--r-- | target/linux/etrax/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/etrax/config-default (renamed from target/linux/etrax/config-2.6.30) | 29 | ||||
| -rw-r--r-- | target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch (renamed from target/linux/etrax/patches-2.6.30/100-cris-makefiles.patch) | 0 | ||||
| -rw-r--r-- | target/linux/etrax/patches-2.6.32/200-samsung_flash.patch (renamed from target/linux/etrax/patches-2.6.30/200-samsung_flash.patch) | 0 | ||||
| -rw-r--r-- | target/linux/etrax/patches-2.6.32/201-flashsize.patch (renamed from target/linux/etrax/patches-2.6.30/201-flashsize.patch) | 0 | ||||
| -rw-r--r-- | target/linux/etrax/patches-2.6.32/300-usb_support.patch (renamed from target/linux/etrax/patches-2.6.30/300-usb_support.patch) | 0 | ||||
| -rw-r--r-- | target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch (renamed from target/linux/etrax/patches-2.6.30/400-Kconfig_source.patch) | 0 | ||||
| -rw-r--r-- | target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch (renamed from target/linux/etrax/patches-2.6.30/500-i2c_gvc.patch) | 16 | ||||
| -rw-r--r-- | target/linux/etrax/patches-2.6.32/600-create-device-serial.patch (renamed from target/linux/etrax/patches-2.6.30/600-create-device-serial.patch) | 0 | ||||
| -rw-r--r-- | target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch (renamed from target/linux/etrax/patches-2.6.30/610-create-the-gpio-devices.patch) | 0 | ||||
| -rw-r--r-- | target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch (renamed from target/linux/etrax/patches-2.6.30/620-create-the-i2c-devices.patch) | 0 | ||||
| -rw-r--r-- | target/linux/etrax/profiles/100-generic.mk | 2 |
12 files changed, 23 insertions, 26 deletions
diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile index df0d690431..88430c18d5 100644 --- a/target/linux/etrax/Makefile +++ b/target/linux/etrax/Makefile @@ -10,7 +10,7 @@ ARCH:=cris BOARD:=etrax BOARDNAME:=Foxboard (ETRAX 100LX) FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.30.10 +LINUX_VERSION:=2.6.32.7 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/etrax/config-2.6.30 b/target/linux/etrax/config-default index 4b26517a9a..e5515a65f8 100644 --- a/target/linux/etrax/config-2.6.30 +++ b/target/linux/etrax/config-default @@ -1,15 +1,17 @@ # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set -# CONFIG_BINARY_PRINTF is not set CONFIG_BITREVERSE=y # CONFIG_BLK_DEV_INITRD is not set CONFIG_BOUNCE=y # CONFIG_BRIDGE is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_CRIS_MACH_ARTPEC3 is not set +CONFIG_CFG80211_DEFAULT_PS_VALUE=0 CONFIG_CRIS=y +# CONFIG_CRIS_MACH_ARTPEC3 is not set +CONFIG_DECOMPRESS_LZMA=y # CONFIG_ETRAX100LX is not set CONFIG_ETRAX100LX_V2=y +# CONFIG_ETRAXFS is not set CONFIG_ETRAX_ARCH_V10=y # CONFIG_ETRAX_ARCH_V32 is not set CONFIG_ETRAX_AXISFLASHMAP=y @@ -35,10 +37,9 @@ CONFIG_ETRAX_ETHERNET=y CONFIG_ETRAX_FAST_TIMER=y CONFIG_ETRAX_FLASH1_SIZE=0 CONFIG_ETRAX_FLASH_BUSWIDTH=2 -# CONFIG_ETRAXFS is not set CONFIG_ETRAX_GPIO=y -# CONFIG_ETRAX_I2C_GVC is not set # CONFIG_ETRAX_I2C is not set +# CONFIG_ETRAX_I2C_GVC is not set # CONFIG_ETRAX_KMALLOCED_MODULES is not set CONFIG_ETRAX_LED1G=2 CONFIG_ETRAX_LED1R=2 @@ -100,23 +101,25 @@ CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_NONE=y # CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PB is not set CONFIG_ETRAX_SER3_RI_ON_PA_BIT=-1 CONFIG_ETRAX_SER3_RI_ON_PB_BIT=-1 +CONFIG_ETRAX_SERIAL=y # CONFIG_ETRAX_SERIAL_FAST_TIMER is not set # CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is not set +CONFIG_ETRAX_SERIAL_PORT0=y # CONFIG_ETRAX_SERIAL_PORT0_DMA0_OUT is not set # CONFIG_ETRAX_SERIAL_PORT0_DMA1_IN is not set # CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT is not set # CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN is not set CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN=y CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT=y -CONFIG_ETRAX_SERIAL_PORT0=y # CONFIG_ETRAX_SERIAL_PORT1 is not set +CONFIG_ETRAX_SERIAL_PORT2=y CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT=y CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN=y # CONFIG_ETRAX_SERIAL_PORT2_DMA6_OUT is not set # CONFIG_ETRAX_SERIAL_PORT2_DMA7_IN is not set # CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN is not set # CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT is not set -CONFIG_ETRAX_SERIAL_PORT2=y +CONFIG_ETRAX_SERIAL_PORT3=y # CONFIG_ETRAX_SERIAL_PORT3_DMA2_OUT is not set # CONFIG_ETRAX_SERIAL_PORT3_DMA3_IN is not set CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT=y @@ -125,15 +128,14 @@ CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN=y # CONFIG_ETRAX_SERIAL_PORT3_DMA9_IN is not set # CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_IN is not set # CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_OUT is not set -CONFIG_ETRAX_SERIAL_PORT3=y CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS=5 -CONFIG_ETRAX_SERIAL=y # CONFIG_ETRAX_SOFT_SHUTDOWN is not set # CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set # CONFIG_ETRAX_USB_HOST is not set # CONFIG_ETRAX_VCS_SIM is not set # CONFIG_ETRAX_WATCHDOG is not set CONFIG_FORCE_MAX_ZONEORDER=6 +# CONFIG_FSNOTIFY is not set CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_IOMAP=y @@ -143,25 +145,24 @@ CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_HAVE_IDE=y -CONFIG_HAVE_MLOCK=y # CONFIG_HW_RANDOM is not set -# CONFIG_MTD_CFI_INTELEXT is not set -CONFIG_MTD_CONCAT=y -CONFIG_MTD_MTDRAM=y CONFIG_MTDRAM_ABS_POS=0 CONFIG_MTDRAM_ERASE_SIZE=128 CONFIG_MTDRAM_TOTAL_SIZE=0 +# CONFIG_MTD_CFI_INTELEXT is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_MTDRAM=y # CONFIG_NETDEV_1000 is not set CONFIG_NO_IOPORT=y # CONFIG_OOM_REBOOT is not set CONFIG_PAGEFLAGS_EXTENDED=y -# CONFIG_PCI is not set # CONFIG_RTC is not set # CONFIG_SCSI_DMA is not set # CONFIG_SERIAL_8250 is not set -# CONFIG_SLOW_WORK is not set # CONFIG_SVINTO_SIM is not set # CONFIG_SYSTEM_PROFILER is not set +# CONFIG_TREE_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y CONFIG_UID16=y # CONFIG_USB_ARCH_HAS_EHCI is not set # CONFIG_USB_ARCH_HAS_HCD is not set diff --git a/target/linux/etrax/patches-2.6.30/100-cris-makefiles.patch b/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch index f837ff58fe..f837ff58fe 100644 --- a/target/linux/etrax/patches-2.6.30/100-cris-makefiles.patch +++ b/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch diff --git a/target/linux/etrax/patches-2.6.30/200-samsung_flash.patch b/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch index 4176ec3950..4176ec3950 100644 --- a/target/linux/etrax/patches-2.6.30/200-samsung_flash.patch +++ b/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch diff --git a/target/linux/etrax/patches-2.6.30/201-flashsize.patch b/target/linux/etrax/patches-2.6.32/201-flashsize.patch index 42a467f749..42a467f749 100644 --- a/target/linux/etrax/patches-2.6.30/201-flashsize.patch +++ b/target/linux/etrax/patches-2.6.32/201-flashsize.patch diff --git a/target/linux/etrax/patches-2.6.30/300-usb_support.patch b/target/linux/etrax/patches-2.6.32/300-usb_support.patch index 7b2972656a..7b2972656a 100644 --- a/target/linux/etrax/patches-2.6.30/300-usb_support.patch +++ b/target/linux/etrax/patches-2.6.32/300-usb_support.patch diff --git a/target/linux/etrax/patches-2.6.30/400-Kconfig_source.patch b/target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch index 16f87e84d5..16f87e84d5 100644 --- a/target/linux/etrax/patches-2.6.30/400-Kconfig_source.patch +++ b/target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch diff --git a/target/linux/etrax/patches-2.6.30/500-i2c_gvc.patch b/target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch index 115fd1c9b9..16f9b93a02 100644 --- a/target/linux/etrax/patches-2.6.30/500-i2c_gvc.patch +++ b/target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.30.8/arch/cris/arch-v10/drivers/Kconfig -=================================================================== ---- linux-2.6.30.8.orig/arch/cris/arch-v10/drivers/Kconfig 2009-10-02 11:31:49.000000000 +0200 -+++ linux-2.6.30.8/arch/cris/arch-v10/drivers/Kconfig 2009-10-06 10:36:23.000000000 +0200 -@@ -450,11 +450,31 @@ +--- a/arch/cris/arch-v10/drivers/Kconfig ++++ b/arch/cris/arch-v10/drivers/Kconfig +@@ -450,11 +450,31 @@ config ETRAX_I2C i2c_arg = I2C_READARG(STA013_READ_ADDR, reg); val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg); @@ -35,7 +33,7 @@ Index: linux-2.6.30.8/arch/cris/arch-v10/drivers/Kconfig help Select whether to use the special I2C mode in the PB I/O register or not. This option needs to be selected in order to use some drivers -@@ -478,7 +498,7 @@ +@@ -478,7 +498,7 @@ config ETRAX_I2C_CLK_PORT config ETRAX_I2C_EEPROM bool "I2C EEPROM (non-volatile RAM) support" @@ -44,10 +42,8 @@ Index: linux-2.6.30.8/arch/cris/arch-v10/drivers/Kconfig help Enables I2C EEPROM (non-volatile RAM) on PB0 and PB1 using the I2C driver. Select size option: Probed, 2k, 8k, 16k. -Index: linux-2.6.30.8/arch/cris/arch-v10/drivers/Makefile -=================================================================== ---- linux-2.6.30.8.orig/arch/cris/arch-v10/drivers/Makefile 2009-10-02 11:31:14.000000000 +0200 -+++ linux-2.6.30.8/arch/cris/arch-v10/drivers/Makefile 2009-10-02 11:31:50.000000000 +0200 +--- a/arch/cris/arch-v10/drivers/Makefile ++++ b/arch/cris/arch-v10/drivers/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o diff --git a/target/linux/etrax/patches-2.6.30/600-create-device-serial.patch b/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch index 516b98471f..516b98471f 100644 --- a/target/linux/etrax/patches-2.6.30/600-create-device-serial.patch +++ b/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch diff --git a/target/linux/etrax/patches-2.6.30/610-create-the-gpio-devices.patch b/target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch index 27e13c2baf..27e13c2baf 100644 --- a/target/linux/etrax/patches-2.6.30/610-create-the-gpio-devices.patch +++ b/target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch diff --git a/target/linux/etrax/patches-2.6.30/620-create-the-i2c-devices.patch b/target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch index 9c2e37ae98..9c2e37ae98 100644 --- a/target/linux/etrax/patches-2.6.30/620-create-the-i2c-devices.patch +++ b/target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch diff --git a/target/linux/etrax/profiles/100-generic.mk b/target/linux/etrax/profiles/100-generic.mk index 9d0fc72f88..a3a044d6eb 100644 --- a/target/linux/etrax/profiles/100-generic.mk +++ b/target/linux/etrax/profiles/100-generic.mk @@ -10,7 +10,7 @@ define Profile/default endef define Profile/default/Description - Normal Foxboard setup (no vhdl) + Normal Foxboard setup endef $(eval $(call Profile,default)) |