summaryrefslogtreecommitdiff
path: root/target/linux/etrax/patches-2.6.32
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-12-18 17:54:04 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-12-18 17:54:04 +0000
commit1080f68b2b422f1e72e402765a45d0cc3c550825 (patch)
treebd66621cafaf19ba323210d4fe7242b5ea71d458 /target/linux/etrax/patches-2.6.32
parentb86e82e5cc54f03f9207411197e15f431d2173ff (diff)
downloadmtk-20170518-1080f68b2b422f1e72e402765a45d0cc3c550825.zip
mtk-20170518-1080f68b2b422f1e72e402765a45d0cc3c550825.tar.gz
mtk-20170518-1080f68b2b422f1e72e402765a45d0cc3c550825.tar.bz2
etrax: R.I.P.
It is broken and it is not maintained by anyone since long time. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34768
Diffstat (limited to 'target/linux/etrax/patches-2.6.32')
-rw-r--r--target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch53
-rw-r--r--target/linux/etrax/patches-2.6.32/201-flashsize.patch88
-rw-r--r--target/linux/etrax/patches-2.6.32/300-usb_support.patch20
-rw-r--r--target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch86
-rw-r--r--target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch54
-rw-r--r--target/linux/etrax/patches-2.6.32/600-create-device-serial.patch44
-rw-r--r--target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch50
-rw-r--r--target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch32
-rw-r--r--target/linux/etrax/patches-2.6.32/985-cris-headers.patch27
9 files changed, 0 insertions, 454 deletions
diff --git a/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch b/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch
deleted file mode 100644
index fbcb7fa..0000000
--- a/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/arch/cris/boot/compressed/Makefile
-+++ b/arch/cris/boot/compressed/Makefile
-@@ -18,7 +18,7 @@ ldflags-y += -T $(srctree)/$(src)/decomp
- OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
- OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
- OBJECTS= $(OBJECTS-y) $(obj)/misc.o
--OBJCOPYFLAGS = -O binary --remove-section=.bss
-+#OBJCOPYFLAGS = -O binary --remove-section=.bss
-
- quiet_cmd_image = BUILD $@
- cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
---- a/arch/cris/boot/Makefile
-+++ b/arch/cris/boot/Makefile
-@@ -5,7 +5,7 @@
- objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
- objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss
-
--OBJCOPYFLAGS = -O binary $(objcopyflags-y)
-+#OBJCOPYFLAGS = -O binary $(objcopyflags-y)
-
-
- subdir- := compressed rescue
-@@ -17,7 +17,7 @@ $(obj)/Image: vmlinux FORCE
-
- $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- $(Q)$(MAKE) $(build)=$(obj)/compressed $@
-- $(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin
-+# $(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin
-
- $(obj)/zImage: $(obj)/compressed/vmlinux
- @cp $< $@
---- a/arch/cris/boot/rescue/Makefile
-+++ b/arch/cris/boot/rescue/Makefile
-@@ -14,7 +14,7 @@ arch-$(CONFIG_ETRAX_ARCH_V10) = v10
- arch-$(CONFIG_ETRAX_ARCH_V32) = v32
-
- ldflags-y += -T $(srctree)/$(src)/rescue_$(arch-y).lds
--OBJCOPYFLAGS = -O binary --remove-section=.bss
-+#OBJCOPYFLAGS = -O binary --remove-section=.bss
- obj-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
- obj-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
- OBJECTS := $(obj-y)
---- a/arch/cris/Makefile
-+++ b/arch/cris/Makefile
-@@ -40,7 +40,7 @@ endif
-
- LD = $(CROSS_COMPILE)ld -mcrislinux
-
--OBJCOPYFLAGS := -O binary -R .note -R .comment -S
-+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
-
- KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
- KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
diff --git a/target/linux/etrax/patches-2.6.32/201-flashsize.patch b/target/linux/etrax/patches-2.6.32/201-flashsize.patch
deleted file mode 100644
index 42a467f..0000000
--- a/target/linux/etrax/patches-2.6.32/201-flashsize.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/arch/cris/arch-v10/drivers/axisflashmap.c
-+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
-@@ -113,7 +113,7 @@ static struct map_info map_cse1 = {
-
- /* If no partition-table was found, we use this default-set. */
- #define MAX_PARTITIONS 7
--#define NUM_DEFAULT_PARTITIONS 3
-+#define NUM_DEFAULT_PARTITIONS 2
-
- /*
- * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the
-@@ -122,19 +122,14 @@ static struct map_info map_cse1 = {
- */
- static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
- {
-- .name = "boot firmware",
-- .size = CONFIG_ETRAX_PTABLE_SECTOR,
-- .offset = 0
-- },
-- {
- .name = "kernel",
-- .size = 0x200000 - (6 * CONFIG_ETRAX_PTABLE_SECTOR),
-- .offset = CONFIG_ETRAX_PTABLE_SECTOR
-+ .size = 0x00,
-+ .offset = 0
- },
- {
-- .name = "filesystem",
-- .size = 5 * CONFIG_ETRAX_PTABLE_SECTOR,
-- .offset = 0x200000 - (5 * CONFIG_ETRAX_PTABLE_SECTOR)
-+ .name = "rootfs",
-+ .size = 0x200000,
-+ .offset = 0x200000
- }
- };
-
-@@ -281,6 +276,11 @@ static int __init init_axis_flash(void)
- struct partitiontable_entry *ptable;
- int use_default_ptable = 1; /* Until proven otherwise. */
- const char pmsg[] = " /dev/flash%d at 0x%08x, size 0x%08x\n";
-+ unsigned int kernel_part_size = 0;
-+ unsigned char *flash_mem = (unsigned char*)(FLASH_CACHED_ADDR);
-+ unsigned int flash_scan_count = 0;
-+ const char *part_magic = "ACME_PART_MAGIC";
-+ unsigned int magic_len = strlen(part_magic);
-
- if (!(mymtd = flash_probe())) {
- /* There's no reason to use this module if no flash chip can
-@@ -293,6 +293,31 @@ static int __init init_axis_flash(void)
- axisflash_mtd = mymtd;
- }
-
-+ /* scan flash to findout where out partition starts */
-+
-+ printk(KERN_INFO "Scanning flash for end of kernel magic\n");
-+ for(flash_scan_count = 0; flash_scan_count < 100000; flash_scan_count++) {
-+ if(strncmp(&flash_mem[flash_scan_count], part_magic, magic_len - 1) == 0) {
-+ kernel_part_size = flash_mem[flash_scan_count + magic_len ];
-+ kernel_part_size <<= 8;
-+ kernel_part_size += flash_mem[flash_scan_count + magic_len + 2];
-+ kernel_part_size <<= 8;
-+ kernel_part_size += flash_mem[flash_scan_count + magic_len + 1];
-+ kernel_part_size <<= 8;
-+ kernel_part_size += flash_mem[flash_scan_count + magic_len + 3];
-+ printk(KERN_INFO "Kernel ends at 0x%.08X\n", kernel_part_size);
-+ flash_scan_count = 1100000;
-+ }
-+ }
-+
-+
-+ if(kernel_part_size){
-+ kernel_part_size = (kernel_part_size & 0xffff0000);
-+ axis_default_partitions[0].size = kernel_part_size;
-+ axis_default_partitions[1].size = mymtd->size - axis_default_partitions[0].size;
-+ axis_default_partitions[1].offset = axis_default_partitions[0].size;
-+ }
-+
- if (mymtd) {
- mymtd->owner = THIS_MODULE;
- ptable_head = (struct partitiontable_head *)(FLASH_CACHED_ADDR +
---- a/arch/cris/arch-v10/lib/hw_settings.S
-+++ b/arch/cris/arch-v10/lib/hw_settings.S
-@@ -60,3 +60,5 @@
- .dword R_PORT_PB_SET
- .dword PB_SET_VALUE
- .dword 0 ; No more register values
-+ .ascii "ACME_PART_MAGIC"
-+ .dword 0xdeadc0de
diff --git a/target/linux/etrax/patches-2.6.32/300-usb_support.patch b/target/linux/etrax/patches-2.6.32/300-usb_support.patch
deleted file mode 100644
index 681bccc..0000000
--- a/target/linux/etrax/patches-2.6.32/300-usb_support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/usb/host/Makefile
-+++ b/drivers/usb/host/Makefile
-@@ -28,6 +28,7 @@ obj-$(CONFIG_USB_FHCI_HCD) += fhci.o
- obj-$(CONFIG_USB_XHCI_HCD) += xhci.o
- obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o
- obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o
-+obj-$(CONFIG_ETRAX_USB_HOST) += hc-crisv10.o
- obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o
- obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
- obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
---- a/drivers/usb/Makefile
-+++ b/drivers/usb/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_U132_HCD) += host/
- obj-$(CONFIG_USB_R8A66597_HCD) += host/
- obj-$(CONFIG_USB_HWA_HCD) += host/
- obj-$(CONFIG_USB_ISP1760_HCD) += host/
-+obj-$(CONFIG_ETRAX_USB_HOST) += host/
-
- obj-$(CONFIG_USB_C67X00_HCD) += c67x00/
-
diff --git a/target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch b/target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch
deleted file mode 100644
index 16f87e8..0000000
--- a/target/linux/etrax/patches-2.6.32/400-Kconfig_source.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/arch/cris/Kconfig
-+++ b/arch/cris/Kconfig
-@@ -649,6 +649,8 @@ endchoice
-
- endmenu
-
-+menu "Device Drivers"
-+
- source "drivers/base/Kconfig"
-
- # standard linux drivers
-@@ -660,13 +662,19 @@ source "drivers/pnp/Kconfig"
-
- source "drivers/block/Kconfig"
-
-+# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
-+
-+source "drivers/misc/Kconfig"
-+
- source "drivers/ide/Kconfig"
-
--source "drivers/net/Kconfig"
-+source "drivers/scsi/Kconfig"
-
--source "drivers/i2c/Kconfig"
-+source "drivers/ata/Kconfig"
-
--source "drivers/rtc/Kconfig"
-+source "drivers/net/Kconfig"
-+
-+source "drivers/isdn/Kconfig"
-
- #
- # input before char - char/joystick depends on it. As does USB.
-@@ -675,14 +683,50 @@ source "drivers/input/Kconfig"
-
- source "drivers/char/Kconfig"
-
--source "fs/Kconfig"
-+source "drivers/i2c/Kconfig"
-+
-+#source "drivers/spi/Kconfig"
-+
-+source "drivers/gpio/Kconfig"
-+
-+source "drivers/w1/Kconfig"
-+
-+source "drivers/power/Kconfig"
-+
-+source "drivers/hwmon/Kconfig"
-+
-+source "drivers/thermal/Kconfig"
-+
-+source "drivers/watchdog/Kconfig"
-+
-+source "drivers/ssb/Kconfig"
-+
-+#source "drivers/l3/Kconfig"
-+
-+source "drivers/mfd/Kconfig"
-+
-+source "drivers/media/Kconfig"
-+
-+source "drivers/video/Kconfig"
-+
-+source "sound/Kconfig"
-+
-+source "drivers/hid/Kconfig"
-
- source "drivers/usb/Kconfig"
-
- source "drivers/uwb/Kconfig"
-
-+source "drivers/leds/Kconfig"
-+
-+source "drivers/rtc/Kconfig"
-+
- source "drivers/staging/Kconfig"
-
-+endmenu
-+
-+source "fs/Kconfig"
-+
- source "arch/cris/Kconfig.debug"
-
- source "security/Kconfig"
diff --git a/target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch b/target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch
deleted file mode 100644
index 16f9b93..0000000
--- a/target/linux/etrax/patches-2.6.32/500-i2c_gvc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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);
-
-+config ETRAX_I2C_GVC
-+ bool "I2C GVC support"
-+ depends on ETRAX_ARCH_V10 && !ETRAX_I2C
-+ select ETRAX_I2C_USES_PB_NOT_PB_I2C
-+ help
-+ Enables an I2C driver with Geert Vancompernolle improvement.
-+
-+config ETRAX_I2C_SLAVE_DELAY
-+ bool "I2C Slave delay support"
-+ depends on ETRAX_I2C_GVC && EXPERIMENTAL
-+ help
-+ Enable this to enhanced master/slave dialog
-+ Improvement by Positive Going (www.positivegoing.it) and BK srl (www.b-k.it)
-+
-+config ETRAX_I2C_DYN_ALLOC
-+ bool "I2C major device dynamic alloc"
-+ depends on ETRAX_I2C_GVC && EXPERIMENTAL
-+ help
-+ Enable this to dynamicaly alloc major i2c device number
-+
- # this is true for most products since PB-I2C seems to be somewhat
- # flawed..
- config ETRAX_I2C_USES_PB_NOT_PB_I2C
- bool "I2C uses PB not PB-I2C"
-- depends on ETRAX_I2C
-+ depends on ETRAX_I2C || ETRAX_I2C_GVC
- 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 @@ config ETRAX_I2C_CLK_PORT
-
- config ETRAX_I2C_EEPROM
- bool "I2C EEPROM (non-volatile RAM) support"
-- depends on ETRAX_I2C
-+ depends on ETRAX_I2C || ETRAX_I2C_GVC
- help
- Enables I2C EEPROM (non-volatile RAM) on PB0 and PB1 using the I2C
- driver. Select size option: Probed, 2k, 8k, 16k.
---- a/arch/cris/arch-v10/drivers/Makefile
-+++ b/arch/cris/arch-v10/drivers/Makefile
-@@ -4,6 +4,7 @@
-
- obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o
- obj-$(CONFIG_ETRAX_I2C) += i2c.o
-+obj-$(CONFIG_ETRAX_I2C_GVC) += i2c_gvc.o
- obj-$(CONFIG_ETRAX_I2C_EEPROM) += eeprom.o
- obj-$(CONFIG_ETRAX_GPIO) += gpio.o
- obj-$(CONFIG_ETRAX_DS1302) += ds1302.o
diff --git a/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch b/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch
deleted file mode 100644
index 58817e0..0000000
--- a/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/serial/crisv10.c
-+++ b/drivers/serial/crisv10.c
-@@ -32,6 +32,7 @@ static char *serial_version = "$Revision
- #include <linux/module.h>
- #include <linux/uaccess.h>
- #include <linux/io.h>
-+#include <linux/device.h>
-
- #include <asm/irq.h>
- #include <asm/dma.h>
-@@ -4415,6 +4416,8 @@ static const struct tty_operations rs_op
- #endif
- };
-
-+static struct class *rs_class;
-+
- static int __init rs_init(void)
- {
- int i;
-@@ -4548,6 +4551,24 @@ static int __init rs_init(void)
- #endif
- #endif /* CONFIG_SVINTO_SIM */
-
-+ rs_class = class_create(THIS_MODULE, "rs_tty");
-+#ifdef CONFIG_ETRAX_SERIAL_PORT0
-+ device_create(rs_class, NULL,
-+ MKDEV(TTY_MAJOR, 64), NULL, "ttyS0");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT1
-+ device_create(rs_class, NULL,
-+ MKDEV(TTY_MAJOR, 65), NULL, "ttyS1");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT2
-+ device_create(rs_class, NULL,
-+ MKDEV(TTY_MAJOR, 66), NULL, "ttyS2");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT3
-+ device_create(rs_class, NULL,
-+ MKDEV(TTY_MAJOR, 67), NULL, "ttyS3");
-+#endif
-+
- return 0;
- }
-
diff --git a/target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch b/target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch
deleted file mode 100644
index 27e13c2..0000000
--- a/target/linux/etrax/patches-2.6.32/610-create-the-gpio-devices.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/cris/arch-v10/drivers/gpio.c
-+++ b/arch/cris/arch-v10/drivers/gpio.c
-@@ -21,6 +21,7 @@
- #include <linux/poll.h>
- #include <linux/init.h>
- #include <linux/interrupt.h>
-+#include <linux/device.h>
-
- #include <asm/etraxgpio.h>
- #include <arch/svinto.h>
-@@ -771,6 +772,8 @@ static void ioif_watcher(const unsigned
-
- /* main driver initialization routine, called from mem.c */
-
-+static struct class *gp_class;
-+
- static int __init gpio_init(void)
- {
- int res;
-@@ -784,6 +787,8 @@ static int __init gpio_init(void)
- return res;
- }
-
-+ gp_class = class_create(THIS_MODULE, "gpio_etrax");
-+
- /* Clear all leds */
- #if defined (CONFIG_ETRAX_CSP0_LEDS) || defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
- CRIS_LED_NETWORK_SET(0);
-@@ -796,6 +801,8 @@ static int __init gpio_init(void)
- CRIS_LED_BIT_SET(i);
- #endif
-
-+ device_create(gp_class, NULL,
-+ MKDEV(GPIO_MAJOR, 2), NULL, "leds");
- #endif
- /* The I/O interface allocation watcher will be called when
- * registering it. */
-@@ -822,6 +829,12 @@ static int __init gpio_init(void)
- if (res)
- printk(KERN_CRIT "err: PA irq for gpio\n");
-
-+ device_create(gp_class, NULL,
-+ MKDEV(GPIO_MAJOR, 0), NULL, "gpioa");
-+ device_create(gp_class, NULL,
-+ MKDEV(GPIO_MAJOR, 1), NULL, "gpiob");
-+ device_create(gp_class, NULL,
-+ MKDEV(GPIO_MAJOR, 3), NULL, "gpiog");
- return res;
- }
-
diff --git a/target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch b/target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch
deleted file mode 100644
index 9c2e37a..0000000
--- a/target/linux/etrax/patches-2.6.32/620-create-the-i2c-devices.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/arch/cris/arch-v10/drivers/i2c.c
-+++ b/arch/cris/arch-v10/drivers/i2c.c
-@@ -21,6 +21,7 @@
- #include <linux/fs.h>
- #include <linux/string.h>
- #include <linux/init.h>
-+#include <linux/device.h>
-
- #include <asm/etraxi2c.h>
-
-@@ -678,6 +679,8 @@ i2c_init(void)
- return res;
- }
-
-+static struct class *i2c_class;
-+
- static int __init
- i2c_register(void)
- {
-@@ -693,7 +696,11 @@ i2c_register(void)
- }
-
- printk(KERN_INFO "I2C driver v2.2, (c) 1999-2004 Axis Communications AB\n");
--
-+
-+ i2c_class = class_create(THIS_MODULE, "i2c_etrax");
-+ device_create(i2c_class, NULL,
-+ MKDEV(I2C_MAJOR, 0), NULL, "i2c");
-+
- return 0;
- }
-
diff --git a/target/linux/etrax/patches-2.6.32/985-cris-headers.patch b/target/linux/etrax/patches-2.6.32/985-cris-headers.patch
deleted file mode 100644
index 73ede93..0000000
--- a/target/linux/etrax/patches-2.6.32/985-cris-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/cris/include/arch-v10/arch/Kbuild
-+++ b/arch/cris/include/arch-v10/arch/Kbuild
-@@ -1,3 +1,5 @@
-+header-y += elf.h
-+header-y += ptrace.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
---- a/arch/cris/include/asm/Kbuild
-+++ b/arch/cris/include/asm/Kbuild
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
-
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
-
-+header-y += elf.h
- header-y += ethernet.h
-+header-y += page.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += user.h
-
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h