mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 17:45:32 +02:00
gemini: remove 2.6.37 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31700 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
1d2df477ff
commit
501390d552
@ -1,124 +0,0 @@
|
||||
CONFIG_ALIGNMENT_TRAP=y
|
||||
CONFIG_ARCH_FLATMEM_HAS_HOLES=y
|
||||
CONFIG_ARCH_GEMINI=y
|
||||
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
|
||||
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
|
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
|
||||
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||
CONFIG_ARM=y
|
||||
# CONFIG_ARPD is not set
|
||||
CONFIG_ATA=m
|
||||
# CONFIG_BINARY_PRINTF is not set
|
||||
CONFIG_BITREVERSE=y
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,19200 mem=32M"
|
||||
CONFIG_CPU_32v4=y
|
||||
CONFIG_CPU_32=y
|
||||
CONFIG_CPU_ABRT_EV4=y
|
||||
# CONFIG_CPU_BPREDICT_DISABLE is not set
|
||||
CONFIG_CPU_CACHE_FA=y
|
||||
CONFIG_CPU_CACHE_VIVT=y
|
||||
CONFIG_CPU_COPY_FA=y
|
||||
CONFIG_CPU_CP15_MMU=y
|
||||
CONFIG_CPU_CP15=y
|
||||
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
|
||||
CONFIG_CPU_FA526=y
|
||||
# CONFIG_CPU_ICACHE_DISABLE is not set
|
||||
CONFIG_CPU_PABRT_NOIFAR=y
|
||||
CONFIG_CPU_TLB_FA=y
|
||||
# CONFIG_DEBUG_USER is not set
|
||||
CONFIG_DECOMPRESS_LZMA=y
|
||||
CONFIG_DEVPORT=y
|
||||
CONFIG_DLCI=m
|
||||
CONFIG_DLCI_MAX=8
|
||||
# CONFIG_DM9000 is not set
|
||||
CONFIG_DMADEVICES=y
|
||||
CONFIG_DNOTIFY=y
|
||||
# CONFIG_DSCC4 is not set
|
||||
# CONFIG_FARSYNC is not set
|
||||
# CONFIG_FPE_FASTFPE is not set
|
||||
# CONFIG_FPE_NWFPE is not set
|
||||
CONFIG_FRAME_POINTER=y
|
||||
CONFIG_GEMINI_MEM_SWAP=y
|
||||
CONFIG_GEMINI_NET_ENGINE_GMAC=y
|
||||
CONFIG_GEMINI_WATCHDOG=y
|
||||
# CONFIG_GENERIC_CLOCKEVENTS is not set
|
||||
CONFIG_GENERIC_FIND_LAST_BIT=y
|
||||
CONFIG_GENERIC_GPIO=y
|
||||
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
|
||||
# CONFIG_GENERIC_TIME is not set
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
# CONFIG_HAMRADIO is not set
|
||||
CONFIG_HARDIRQS_SW_RESEND=y
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
CONFIG_HAVE_AOUT=y
|
||||
CONFIG_HAVE_ARCH_KGDB=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
|
||||
CONFIG_HAVE_IDE=y
|
||||
CONFIG_HAVE_KPROBES=y
|
||||
CONFIG_HAVE_KRETPROBES=y
|
||||
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
|
||||
CONFIG_HAVE_MLOCK=y
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_HDLC_CISCO=m
|
||||
CONFIG_HDLC_FR=m
|
||||
CONFIG_HDLC=m
|
||||
CONFIG_HDLC_PPP=m
|
||||
CONFIG_HDLC_RAW=m
|
||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||
CONFIG_HWMON=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_I2C_BOARDINFO=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
# CONFIG_IP_ADVANCED_ROUTER is not set
|
||||
CONFIG_IP_MROUTE=y
|
||||
CONFIG_IP_PIMSM_V1=y
|
||||
CONFIG_IP_PIMSM_V2=y
|
||||
# CONFIG_LEDS_GPIO is not set
|
||||
CONFIG_LEGACY_PTY_COUNT=256
|
||||
CONFIG_LEGACY_PTYS=y
|
||||
# CONFIG_LIB80211 is not set
|
||||
# CONFIG_MACH_NAS4220B is not set
|
||||
# CONFIG_MACH_RUT100 is not set
|
||||
CONFIG_MACH_WBD111=y
|
||||
CONFIG_MACH_WBD222=y
|
||||
CONFIG_MDIO_BITBANG=y
|
||||
CONFIG_MDIO_GPIO=y
|
||||
# CONFIG_MG_DISK is not set
|
||||
CONFIG_MTD_PHYSMAP=y
|
||||
CONFIG_MTD_REDBOOT_PARTS=y
|
||||
CONFIG_NLATTR=y
|
||||
# CONFIG_NO_IOPORT is not set
|
||||
# CONFIG_OUTER_CACHE is not set
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_PAGE_OFFSET=0xC0000000
|
||||
CONFIG_PCI=y
|
||||
# CONFIG_PCI_STUB is not set
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_SCSI=m
|
||||
# CONFIG_SCSI_MULTI_LUN is not set
|
||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||
# CONFIG_SLOW_WORK is not set
|
||||
CONFIG_SPLIT_PTLOCK_CPUS=4096
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
CONFIG_TRACING_SUPPORT=y
|
||||
CONFIG_UID16=y
|
||||
# CONFIG_USB_EHCI_HCD is not set
|
||||
CONFIG_USB=m
|
||||
CONFIG_USB_SUPPORT=y
|
||||
# CONFIG_USB_UHCI_HCD is not set
|
||||
CONFIG_VECTORS_BASE=0xffff0000
|
||||
CONFIG_VM_EVENT_COUNTERS=y
|
||||
CONFIG_WAN=y
|
||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||
CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
File diff suppressed because it is too large
Load Diff
@ -1,30 +0,0 @@
|
||||
--- a/arch/arm/mach-gemini/board-nas4220b.c
|
||||
+++ b/arch/arm/mach-gemini/board-nas4220b.c
|
||||
@@ -95,6 +95,7 @@ static void __init ib4220b_init(void)
|
||||
{
|
||||
gemini_gpio_init();
|
||||
platform_register_uart();
|
||||
+ platform_register_watchdog();
|
||||
platform_register_pflash(SZ_16M, NULL, 0);
|
||||
platform_device_register(&ib4220b_led_device);
|
||||
platform_device_register(&ib4220b_key_device);
|
||||
--- a/arch/arm/mach-gemini/board-wbd111.c
|
||||
+++ b/arch/arm/mach-gemini/board-wbd111.c
|
||||
@@ -126,6 +126,7 @@ static void __init wbd111_init(void)
|
||||
{
|
||||
gemini_gpio_init();
|
||||
platform_register_uart();
|
||||
+ platform_register_watchdog();
|
||||
platform_register_pflash(SZ_8M, wbd111_partitions,
|
||||
wbd111_num_partitions);
|
||||
platform_device_register(&wbd111_leds_device);
|
||||
--- a/arch/arm/mach-gemini/board-wbd222.c
|
||||
+++ b/arch/arm/mach-gemini/board-wbd222.c
|
||||
@@ -126,6 +126,7 @@ static void __init wbd222_init(void)
|
||||
{
|
||||
gemini_gpio_init();
|
||||
platform_register_uart();
|
||||
+ platform_register_watchdog();
|
||||
platform_register_pflash(SZ_8M, wbd222_partitions,
|
||||
wbd222_num_partitions);
|
||||
platform_device_register(&wbd222_leds_device);
|
@ -1,86 +0,0 @@
|
||||
--- a/arch/arm/mach-gemini/board-wbd111.c
|
||||
+++ b/arch/arm/mach-gemini/board-wbd111.c
|
||||
@@ -22,9 +22,29 @@
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
+#include <mach/gmac.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
+static struct mdio_gpio_platform_data wbd111_mdio = {
|
||||
+ .mdc = 22,
|
||||
+ .mdio = 21,
|
||||
+ .phy_mask = ~(1 << 1),
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wbd111_phy_device = {
|
||||
+ .name = "mdio-gpio",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &wbd111_mdio,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct gemini_gmac_platform_data gmac_data = {
|
||||
+ .bus_id[0] = "0:01",
|
||||
+ .interface[0] = PHY_INTERFACE_MODE_MII,
|
||||
+};
|
||||
+
|
||||
static struct gpio_keys_button wbd111_keys[] = {
|
||||
{
|
||||
.code = KEY_SETUP,
|
||||
@@ -131,6 +151,8 @@ static void __init wbd111_init(void)
|
||||
wbd111_num_partitions);
|
||||
platform_device_register(&wbd111_leds_device);
|
||||
platform_device_register(&wbd111_keys_device);
|
||||
+ platform_device_register(&wbd111_phy_device);
|
||||
+ platform_register_ethernet(&gmac_data);
|
||||
}
|
||||
|
||||
MACHINE_START(WBD111, "Wiliboard WBD-111")
|
||||
--- a/arch/arm/mach-gemini/board-wbd222.c
|
||||
+++ b/arch/arm/mach-gemini/board-wbd222.c
|
||||
@@ -22,9 +22,31 @@
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
+#include <mach/gmac.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
+static struct mdio_gpio_platform_data wbd222_mdio = {
|
||||
+ .mdc = 22,
|
||||
+ .mdio = 21,
|
||||
+ .phy_mask = ~((1 << 1) | (1 << 3)),
|
||||
+};
|
||||
+
|
||||
+static struct platform_device wbd222_phy_device = {
|
||||
+ .name = "mdio-gpio",
|
||||
+ .id = 0,
|
||||
+ .dev = {
|
||||
+ .platform_data = &wbd222_mdio,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct gemini_gmac_platform_data gmac_data = {
|
||||
+ .bus_id[0] = "0:01",
|
||||
+ .interface[0] = PHY_INTERFACE_MODE_MII,
|
||||
+ .bus_id[1] = "0:03",
|
||||
+ .interface[1] = PHY_INTERFACE_MODE_MII,
|
||||
+};
|
||||
+
|
||||
static struct gpio_keys_button wbd222_keys[] = {
|
||||
{
|
||||
.code = KEY_SETUP,
|
||||
@@ -131,6 +153,10 @@ static void __init wbd222_init(void)
|
||||
wbd222_num_partitions);
|
||||
platform_device_register(&wbd222_leds_device);
|
||||
platform_device_register(&wbd222_keys_device);
|
||||
+ platform_device_register(&wbd222_phy_device);
|
||||
+ platform_register_ethernet(&gmac_data);
|
||||
+ platform_register_usb(0);
|
||||
+ platform_register_usb(1);
|
||||
}
|
||||
|
||||
MACHINE_START(WBD222, "Wiliboard WBD-222")
|
@ -1,24 +0,0 @@
|
||||
--- a/drivers/watchdog/gemini_wdt.c
|
||||
+++ b/drivers/watchdog/gemini_wdt.c
|
||||
@@ -224,6 +224,7 @@ static int __init gemini_wdt_probe(struc
|
||||
struct resource *res;
|
||||
void __iomem *base;
|
||||
struct gemini_wdt_struct *gemini_wdt;
|
||||
+ unsigned int reg;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
@@ -267,6 +268,13 @@ static int __init gemini_wdt_probe(struc
|
||||
|
||||
gemini_wdt_miscdev.parent = &pdev->dev;
|
||||
|
||||
+ reg = __raw_readw(gemini_wdt->base + GEMINI_WDCR);
|
||||
+ if (reg & WDCR_ENABLE) {
|
||||
+ /* Watchdog was enabled by the bootloader, disable it. */
|
||||
+ reg &= ~(WDCR_ENABLE);
|
||||
+ __raw_writel(reg, gemini_wdt->base + GEMINI_WDCR);
|
||||
+ }
|
||||
+
|
||||
ret = misc_register(&gemini_wdt_miscdev);
|
||||
if (ret)
|
||||
goto fail2;
|
@ -1,39 +0,0 @@
|
||||
--- a/arch/arm/mach-gemini/devices.c
|
||||
+++ b/arch/arm/mach-gemini/devices.c
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/serial_8250.h>
|
||||
#include <linux/mtd/physmap.h>
|
||||
+#include <linux/skbuff.h>
|
||||
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/hardware.h>
|
||||
@@ -147,7 +148,7 @@ int platform_register_ethernet(struct ge
|
||||
if (pdata->bus_id[1])
|
||||
reg |= GMAC_1_ENABLE;
|
||||
else if (pdata->interface[0] == PHY_INTERFACE_MODE_GMII)
|
||||
- reg |= GMAC_GMII;
|
||||
+ reg |= GMAC_GMII;
|
||||
|
||||
__raw_writel(reg, IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);
|
||||
|
||||
--- a/drivers/net/phy/mdio-bitbang.c
|
||||
+++ b/drivers/net/phy/mdio-bitbang.c
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
+#include <linux/skbuff.h>
|
||||
#include <linux/mdio-bitbang.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/delay.h>
|
||||
--- a/drivers/net/phy/mdio-gpio.c
|
||||
+++ b/drivers/net/phy/mdio-gpio.c
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/platform_device.h>
|
||||
+#include <linux/skbuff.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/mdio-gpio.h>
|
||||
|
@ -1,21 +0,0 @@
|
||||
--- a/arch/arm/mach-gemini/board-wbd111.c
|
||||
+++ b/arch/arm/mach-gemini/board-wbd111.c
|
||||
@@ -147,6 +147,7 @@ static void __init wbd111_init(void)
|
||||
gemini_gpio_init();
|
||||
platform_register_uart();
|
||||
platform_register_watchdog();
|
||||
+ platform_register_usb(0);
|
||||
platform_register_pflash(SZ_8M, wbd111_partitions,
|
||||
wbd111_num_partitions);
|
||||
platform_device_register(&wbd111_leds_device);
|
||||
--- a/drivers/usb/host/ehci-hcd.c
|
||||
+++ b/drivers/usb/host/ehci-hcd.c
|
||||
@@ -103,7 +103,7 @@ module_param (park, uint, S_IRUGO);
|
||||
MODULE_PARM_DESC (park, "park setting; 1-3 back-to-back async packets");
|
||||
|
||||
/* for flakey hardware, ignore overcurrent indicators */
|
||||
-static int ignore_oc = 0;
|
||||
+static int ignore_oc = 1;
|
||||
module_param (ignore_oc, bool, S_IRUGO);
|
||||
MODULE_PARM_DESC (ignore_oc, "ignore bogus hardware overcurrent indications");
|
||||
|
@ -1,30 +0,0 @@
|
||||
--- a/drivers/mtd/maps/physmap.c
|
||||
+++ b/drivers/mtd/maps/physmap.c
|
||||
@@ -173,6 +173,13 @@ static int physmap_flash_probe(struct pl
|
||||
goto err_out;
|
||||
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
+ if (physmap_data->nr_parts) {
|
||||
+ printk(KERN_NOTICE "Using physmap partition information\n");
|
||||
+ add_mtd_partitions(info->cmtd, physmap_data->parts,
|
||||
+ physmap_data->nr_parts);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
err = parse_mtd_partitions(info->cmtd, part_probe_types,
|
||||
&info->parts, 0);
|
||||
if (err > 0) {
|
||||
@@ -180,13 +187,6 @@ static int physmap_flash_probe(struct pl
|
||||
info->nr_parts = err;
|
||||
return 0;
|
||||
}
|
||||
-
|
||||
- if (physmap_data->nr_parts) {
|
||||
- printk(KERN_NOTICE "Using physmap partition information\n");
|
||||
- add_mtd_partitions(info->cmtd, physmap_data->parts,
|
||||
- physmap_data->nr_parts);
|
||||
- return 0;
|
||||
- }
|
||||
#endif
|
||||
|
||||
add_mtd_device(info->cmtd);
|
@ -1,11 +0,0 @@
|
||||
--- a/drivers/net/gemini_negmac/gm_gmac.c
|
||||
+++ b/drivers/net/gemini_negmac/gm_gmac.c
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "gm_gmac.h"
|
||||
|
||||
/* #define GMAX_TX_INTR_DISABLED */
|
||||
-#define DO_HW_CHKSUM
|
||||
+/* #define DO_HW_CHKSUM */
|
||||
/* #define ENABLE_TSO */
|
||||
#define GMAC_USE_TXQ0
|
||||
/* #define GMAC_LEN_1_2_ISSUE */
|
Loading…
Reference in New Issue
Block a user