mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
Update to 2.6.35.7
SVN-Revision: 23400
This commit is contained in:
parent
ee533340ac
commit
cdf8f92776
@ -12,7 +12,7 @@ BOARDNAME:=Atmel AT91
|
|||||||
FEATURES:=squashfs jffs2 targz
|
FEATURES:=squashfs jffs2 targz
|
||||||
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time
|
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.34.7
|
LINUX_VERSION:=2.6.35.7
|
||||||
DEVICE_TYPE=
|
DEVICE_TYPE=
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
@ -12,16 +12,19 @@ CONFIG_ARCH_AT91SAM9G20=y
|
|||||||
# CONFIG_ARCH_AT91SAM9G45 is not set
|
# CONFIG_ARCH_AT91SAM9G45 is not set
|
||||||
# CONFIG_ARCH_AT91SAM9RL is not set
|
# CONFIG_ARCH_AT91SAM9RL is not set
|
||||||
# CONFIG_ARCH_AT91X40 is not set
|
# CONFIG_ARCH_AT91X40 is not set
|
||||||
|
# CONFIG_ARCH_CNS3XXX is not set
|
||||||
# CONFIG_ARCH_NUC93X is not set
|
# CONFIG_ARCH_NUC93X is not set
|
||||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||||
# CONFIG_ARCH_S5P6440 is not set
|
# CONFIG_ARCH_S5P6440 is not set
|
||||||
# CONFIG_ARCH_S5P6442 is not set
|
# CONFIG_ARCH_S5P6442 is not set
|
||||||
|
# CONFIG_ARCH_S5PC100 is not set
|
||||||
# CONFIG_ARCH_S5PV210 is not set
|
# CONFIG_ARCH_S5PV210 is not set
|
||||||
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
|
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
|
||||||
# CONFIG_ARCH_SHMOBILE is not set
|
# CONFIG_ARCH_SHMOBILE is not set
|
||||||
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
|
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
|
||||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||||
|
# CONFIG_ARCH_VEXPRESS is not set
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_ARM_L1_CACHE_SHIFT=5
|
CONFIG_ARM_L1_CACHE_SHIFT=5
|
||||||
CONFIG_ARM_THUMB=y
|
CONFIG_ARM_THUMB=y
|
||||||
@ -72,10 +75,8 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
|||||||
CONFIG_GENERIC_FIND_LAST_BIT=y
|
CONFIG_GENERIC_FIND_LAST_BIT=y
|
||||||
CONFIG_GENERIC_GPIO=y
|
CONFIG_GENERIC_GPIO=y
|
||||||
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
|
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
|
||||||
CONFIG_GENERIC_PWM=y
|
|
||||||
CONFIG_GPIOLIB=y
|
CONFIG_GPIOLIB=y
|
||||||
CONFIG_GPIO_DEVICE=y
|
CONFIG_GPIO_DEVICE=y
|
||||||
# CONFIG_GPIO_PWM is not set
|
|
||||||
CONFIG_GPIO_SYSFS=y
|
CONFIG_GPIO_SYSFS=y
|
||||||
# CONFIG_HAMRADIO is not set
|
# CONFIG_HAMRADIO is not set
|
||||||
CONFIG_HARDIRQS_SW_RESEND=y
|
CONFIG_HARDIRQS_SW_RESEND=y
|
||||||
@ -110,6 +111,8 @@ CONFIG_MACB=y
|
|||||||
# CONFIG_MACH_AT91SAM9G20EK_2MMC is not set
|
# CONFIG_MACH_AT91SAM9G20EK_2MMC is not set
|
||||||
# CONFIG_MACH_CPU9G20 is not set
|
# CONFIG_MACH_CPU9G20 is not set
|
||||||
CONFIG_MACH_NETUS_FOXBOARD=y
|
CONFIG_MACH_NETUS_FOXBOARD=y
|
||||||
|
# CONFIG_MACH_PORTUXG20 is not set
|
||||||
|
# CONFIG_MACH_STAMP9G20 is not set
|
||||||
# CONFIG_MFD_T7L66XB is not set
|
# CONFIG_MFD_T7L66XB is not set
|
||||||
# CONFIG_MII is not set
|
# CONFIG_MII is not set
|
||||||
CONFIG_MMC=y
|
CONFIG_MMC=y
|
||||||
@ -121,6 +124,7 @@ CONFIG_MTD_DATAFLASH=y
|
|||||||
# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
|
# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
|
||||||
CONFIG_NEED_DMA_MAP_STATE=y
|
CONFIG_NEED_DMA_MAP_STATE=y
|
||||||
# CONFIG_NETDEV_1000 is not set
|
# CONFIG_NETDEV_1000 is not set
|
||||||
|
# CONFIG_NETUS_FOXGM is not set
|
||||||
CONFIG_NETUS_HEARTBEAT_LED=y
|
CONFIG_NETUS_HEARTBEAT_LED=y
|
||||||
CONFIG_NETUS_SERIALS=y
|
CONFIG_NETUS_SERIALS=y
|
||||||
# CONFIG_NETUS_USE_DATAFLASH is not set
|
# CONFIG_NETUS_USE_DATAFLASH is not set
|
||||||
@ -131,10 +135,12 @@ CONFIG_PAGE_OFFSET=0xC0000000
|
|||||||
# CONFIG_PCI_SYSCALL is not set
|
# CONFIG_PCI_SYSCALL is not set
|
||||||
CONFIG_PERF_USE_VMALLOC=y
|
CONFIG_PERF_USE_VMALLOC=y
|
||||||
CONFIG_PHYLIB=y
|
CONFIG_PHYLIB=y
|
||||||
|
# CONFIG_PLAT_SPEAR is not set
|
||||||
CONFIG_RTC_CLASS=y
|
CONFIG_RTC_CLASS=y
|
||||||
CONFIG_RTC_DRV_AT91SAM9=y
|
CONFIG_RTC_DRV_AT91SAM9=y
|
||||||
CONFIG_RTC_DRV_AT91SAM9_GPBR=0
|
CONFIG_RTC_DRV_AT91SAM9_GPBR=0
|
||||||
CONFIG_RTC_DRV_AT91SAM9_RTT=0
|
CONFIG_RTC_DRV_AT91SAM9_RTT=0
|
||||||
|
# CONFIG_RTC_DRV_CMOS is not set
|
||||||
# CONFIG_SCSI_DMA is not set
|
# CONFIG_SCSI_DMA is not set
|
||||||
CONFIG_SCSI_MOD=y
|
CONFIG_SCSI_MOD=y
|
||||||
# CONFIG_SDIO_UART is not set
|
# CONFIG_SDIO_UART is not set
|
||||||
|
@ -14,16 +14,17 @@
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# ----------------------------------------------------------
|
# ----------------------------------------------------------
|
||||||
@@ -444,6 +451,26 @@
|
@@ -444,6 +451,40 @@
|
||||||
On AT91SAM926x boards both types of NAND flash can be present
|
On AT91SAM926x boards both types of NAND flash can be present
|
||||||
(8 and 16 bit data bus width).
|
(8 and 16 bit data bus width).
|
||||||
|
|
||||||
+config NETUS_HEARTBEAT_LED
|
+config NETUS_HEARTBEAT_LED
|
||||||
+ bool "Use heartbeat trigger for led"
|
+ bool "Use heartbeat trigger for led"
|
||||||
+ depends on MACH_NETUS_FOXBOARD
|
+ depends on MACH_NETUS_FOXBOARD
|
||||||
|
+ select LEDS_TRIGGER_HEARTBEAT
|
||||||
+ help
|
+ help
|
||||||
+ Select this option to enable default trigger heartbeart for
|
+ Select this option to enable default trigger heartbeart for
|
||||||
+ FoxBoardG20 red led.
|
+ FoxBoardG20 user led.
|
||||||
+
|
+
|
||||||
+config NETUS_SERIALS
|
+config NETUS_SERIALS
|
||||||
+ bool "Enable serials"
|
+ bool "Enable serials"
|
||||||
@ -34,6 +35,11 @@
|
|||||||
+
|
+
|
||||||
+config NETUS_USE_DATAFLASH
|
+config NETUS_USE_DATAFLASH
|
||||||
+ bool "Enable the dataflash"
|
+ bool "Enable the dataflash"
|
||||||
|
+ select MTD_DATAFLASH
|
||||||
|
+ select MTD_PARTITIONS
|
||||||
|
+ select MTD_CMDLINE_PARTS
|
||||||
|
+ select MTD_CHAR
|
||||||
|
+ select MTD_BLOCK
|
||||||
+ depends on MACH_NETUS_FOXBOARD
|
+ depends on MACH_NETUS_FOXBOARD
|
||||||
+ help
|
+ help
|
||||||
+ Select this option to use the dataflash.
|
+ Select this option to use the dataflash.
|
||||||
@ -49,12 +55,12 @@
|
|||||||
# ----------------------------------------------------------
|
# ----------------------------------------------------------
|
||||||
|
|
||||||
comment "AT91 Feature Selections"
|
comment "AT91 Feature Selections"
|
||||||
--- a/arch/arm/mach-at91/Makefile
|
--- linux-2.6.35.4.orig/arch/arm/mach-at91/Makefile 2010-09-18 13:29:33.000000000 +0200
|
||||||
+++ b/arch/arm/mach-at91/Makefile
|
+++ linux-2.6.35.4/arch/arm/mach-at91/Makefile 2010-09-18 13:31:31.000000000 +0200
|
||||||
@@ -62,6 +62,7 @@ obj-$(CONFIG_MACH_AT91SAM9RLEK) += board
|
@@ -65,6 +65,7 @@
|
||||||
obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o
|
|
||||||
obj-$(CONFIG_MACH_AT91SAM9G20EK_2MMC) += board-sam9g20ek-2slot-mmc.o
|
|
||||||
obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o
|
obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o
|
||||||
|
obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o
|
||||||
|
obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o
|
||||||
+obj-$(CONFIG_MACH_NETUS_FOXBOARD) += board-netus-foxboard.o
|
+obj-$(CONFIG_MACH_NETUS_FOXBOARD) += board-netus-foxboard.o
|
||||||
|
|
||||||
# AT91SAM9G45 board-specific support
|
# AT91SAM9G45 board-specific support
|
||||||
|
Loading…
Reference in New Issue
Block a user