KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update 2.6.35.x to 2.6.35.7

Browse source 
SVN-Revision: 23213
This commit is contained in:
Lars-Peter Clausen 2010-10-04 07:42:32 +00:00
parent 0fda5f7507
commit 83d6a36019
6 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/kernel-version.mk
View file

@ -20,8 +20,8 @@ endif
ifeq ($(LINUX_VERSION),2.6.34.5) ifeq ($(LINUX_VERSION),2.6.34.5)
LINUX_KERNEL_MD5SUM:=d280b596b32f7497bbe9dd54669c99d6 LINUX_KERNEL_MD5SUM:=d280b596b32f7497bbe9dd54669c99d6
endif endif
ifeq ($(LINUX_VERSION),2.6.35.4) ifeq ($(LINUX_VERSION),2.6.35.7)
LINUX_KERNEL_MD5SUM:=0bb2cd59c13d7412f813c8fbc0769eec LINUX_KERNEL_MD5SUM:=f741879bcd3a5366a1bbe0ad5cdb7935
endif endif
# disable the md5sum check for unknown kernel versions # disable the md5sum check for unknown kernel versions

2
target/linux/brcm63xx/Makefile
View file

@ -10,7 +10,7 @@ ARCH:=mips
BOARD:=brcm63xx BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM63xx BOARDNAME:=Broadcom BCM63xx
FEATURES:=squashfs jffs2 usb atm pci pcmcia FEATURES:=squashfs jffs2 usb atm pci pcmcia
LINUX_VERSION:=2.6.35.4 LINUX_VERSION:=2.6.35.7
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/kirkwood/Makefile
View file

@ -11,7 +11,7 @@ BOARD:=kirkwood
BOARDNAME:=Marvell Kirkwood BOARDNAME:=Marvell Kirkwood
FEATURES:=targz usb jffs2 FEATURES:=targz usb jffs2
LINUX_VERSION:=2.6.35.4 LINUX_VERSION:=2.6.35.7
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/malta/Makefile
View file

@ -12,7 +12,7 @@ CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
SUBTARGETS:=le be SUBTARGETS:=le be
INITRAMFS_EXTRA_FILES:= INITRAMFS_EXTRA_FILES:=
LINUX_VERSION:=2.6.35.4 LINUX_VERSION:=2.6.35.7
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/xburst/Makefile
View file

@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst
FEATURES:=jffs2 targz ubifs audio FEATURES:=jffs2 targz ubifs audio
SUBTARGETS:=qi_lb60 n516 n526 id800wt SUBTARGETS:=qi_lb60 n516 n526 id800wt
LINUX_VERSION:=2.6.35.4 LINUX_VERSION:=2.6.35.7
DEVICE_TYPE=other DEVICE_TYPE=other

19
target/linux/xburst/patches-2.6.35/054-mmc.patch
View file

@ -21,9 +21,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
create mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h create mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
create mode 100644 drivers/mmc/host/jz4740_mmc.c create mode 100644 drivers/mmc/host/jz4740_mmc.c
diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h b/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
new file mode 100644
index 0000000..8543f43
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h +++ b/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
@ -42,11 +39,9 @@ index 0000000..8543f43
+}; +};
+ +
+#endif +#endif
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index f06d06e..d25e22c 100644
--- a/drivers/mmc/host/Kconfig --- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig
@@ -432,3 +432,12 @@ config MMC_SH_MMCIF @@ -457,3 +457,12 @@ config MMC_SH_MMCIF
This selects the MMC Host Interface controler (MMCIF). This selects the MMC Host Interface controler (MMCIF).
This driver supports MMCIF in sh7724/sh7757/sh7372. This driver supports MMCIF in sh7724/sh7757/sh7372.
@ -59,21 +54,16 @@ index f06d06e..d25e22c 100644
+ SoCs. + SoCs.
+ If you have a board based on such a SoC and with a SD/MMC slot, + If you have a board based on such a SoC and with a SD/MMC slot,
+ say Y or M here. + say Y or M here.
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index e30c2ee..f4e53c9 100644
--- a/drivers/mmc/host/Makefile --- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_MMC_CB710) += cb710-mmc.o @@ -37,6 +37,7 @@ obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc
obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o obj-$(CONFIG_GPIOMMC) += gpiommc.o
obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o
+obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o +obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o
obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o
sdhci-of-y := sdhci-of-core.o sdhci-of-y := sdhci-of-core.o
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
new file mode 100644
index 0000000..ad4f987
--- /dev/null --- /dev/null
+++ b/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c
@@ -0,0 +1,1029 @@ @@ -0,0 +1,1029 @@
@ -1106,6 +1096,3 @@ index 0000000..ad4f987
+MODULE_DESCRIPTION("JZ4740 SD/MMC controller driver"); +MODULE_DESCRIPTION("JZ4740 SD/MMC controller driver");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>"); +MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
--
1.5.6.5