From 715e8021a2c5f52f596196b7e0a7e031443d4ca4 Mon Sep 17 00:00:00 2001 From: mbm Date: Mon, 18 Jun 2007 17:55:27 +0000 Subject: remove target git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7669 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/aruba-2.6/files/arch/mips/aruba/Makefile | 49 --- .../aruba-2.6/files/arch/mips/aruba/flash_lock.c | 27 -- target/linux/aruba-2.6/files/arch/mips/aruba/irq.c | 285 --------------- .../aruba-2.6/files/arch/mips/aruba/nvram/Makefile | 46 --- .../files/arch/mips/aruba/nvram/nvram434.c | 392 --------------------- .../files/arch/mips/aruba/nvram/nvram434.h | 66 ---- .../linux/aruba-2.6/files/arch/mips/aruba/prom.c | 112 ------ .../linux/aruba-2.6/files/arch/mips/aruba/serial.c | 94 ----- .../linux/aruba-2.6/files/arch/mips/aruba/setup.c | 181 ---------- .../linux/aruba-2.6/files/arch/mips/aruba/time.c | 110 ------ 10 files changed, 1362 deletions(-) delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/Makefile delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/flash_lock.c delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/irq.c delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/nvram/Makefile delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/nvram/nvram434.c delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/nvram/nvram434.h delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/prom.c delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/serial.c delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/setup.c delete mode 100644 target/linux/aruba-2.6/files/arch/mips/aruba/time.c (limited to 'target/linux/aruba-2.6/files/arch/mips/aruba') diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/Makefile b/target/linux/aruba-2.6/files/arch/mips/aruba/Makefile deleted file mode 100644 index 94a55757e..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# -# BRIEF MODULE DESCRIPTION -# Makefile for IDT EB434 BSP -# -# Copyright 2004 IDT Inc. (rischelp@idt.com) -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -# NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 675 Mass Ave, Cambridge, MA 02139, USA. -# -# -############################################################################### -# May 2004 rkt, neb -# -# Initial Release -# -# -# -############################################################################### - - -# .S.s: -# $(CPP) $(CFLAGS) $< -o $*.s -# .S.o: -# $(CC) $(CFLAGS) -c $< -o $*.o - -obj-y := prom.o setup.o irq.o time.o flash_lock.o -obj-$(CONFIG_SERIAL_8250) += serial.o - -subdir-y += nvram -obj-y += nvram/built-in.o - diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/flash_lock.c b/target/linux/aruba-2.6/files/arch/mips/aruba/flash_lock.c deleted file mode 100644 index 48c762db5..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/flash_lock.c +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include -#include - -#define AP70_PROT_ADDR 0xb8010008 -#define AP70_PROT_DATA 0x8 -#define AP60_PROT_ADDR 0xB8400000 -#define AP60_PROT_DATA 0x04000000 - -void unlock_ap60_70_flash(void) -{ - volatile __u32 val; - switch (mips_machtype) { - case MACH_ARUBA_AP70: - val = *(volatile __u32 *)AP70_PROT_ADDR; - val &= ~(AP70_PROT_DATA); - *(volatile __u32 *)AP70_PROT_ADDR = val; - break; - case MACH_ARUBA_AP65: - case MACH_ARUBA_AP60: - default: - val = *(volatile __u32 *)AP60_PROT_ADDR; - val &= ~(AP60_PROT_DATA); - *(volatile __u32 *)AP60_PROT_ADDR = val; - break; - } -} diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/irq.c b/target/linux/aruba-2.6/files/arch/mips/aruba/irq.c deleted file mode 100644 index a80c2cf1b..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/irq.c +++ /dev/null @@ -1,285 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include - -extern void aruba_timer_interrupt(struct pt_regs *regs); - -typedef struct { - u32 mask; - volatile u32 *base_addr; -} intr_group_t; - -static const intr_group_t intr_group_merlot[NUM_INTR_GROUPS] = { - {0x00000000, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 0)}, -}; - -#define READ_PEND_MERLOT(base) (*((volatile unsigned long *)(0xbc003010))) -#define READ_MASK_MERLOT(base) (*((volatile unsigned long *)(0xbc003014))) -#define WRITE_MASK_MERLOT(base, val) ((*((volatile unsigned long *)(0xbc003014))) = (val), READ_MASK_MERLOT()) - -static const intr_group_t intr_group_muscat[NUM_INTR_GROUPS] = { - {0x0000efff, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 0 * IC_GROUP_OFFSET)}, - {0x00001fff, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 1 * IC_GROUP_OFFSET)}, - {0x00000007, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 2 * IC_GROUP_OFFSET)}, - {0x0003ffff, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 3 * IC_GROUP_OFFSET)}, - {0xffffffff, (u32 *) KSEG1ADDR(IC_GROUP0_PEND + 4 * IC_GROUP_OFFSET)} -}; - -#define READ_PEND_MUSCAT(base) (*(base)) -#define READ_MASK_MUSCAT(base) (*(base + 2)) -#define WRITE_MASK_MUSCAT(base, val) (*(base + 2) = (val)) - -static inline int group_to_ip(unsigned int group) -{ - switch (mips_machtype) { - case MACH_ARUBA_AP70: - return group + 2; - case MACH_ARUBA_AP65: - case MACH_ARUBA_AP60: - default: - return 6; - } -} - -static inline void enable_local_irq(unsigned int irq) -{ - clear_c0_cause(0x100 << irq); - set_c0_status(0x100 << irq); - irq_enable_hazard(); -} - -static inline void disable_local_irq(unsigned int irq) -{ - clear_c0_status(0x100 << irq); - clear_c0_cause(0x100 << irq); - irq_disable_hazard(); -} - -static inline void aruba_irq_enable(unsigned int irq) -{ - unsigned long flags; - unsigned int group, intr_bit; - volatile unsigned int *addr; - - local_irq_save(flags); - - if (irq < GROUP0_IRQ_BASE) { - enable_local_irq(irq); - } else { - int ip = irq - GROUP0_IRQ_BASE; - switch (mips_machtype) { - case MACH_ARUBA_AP70: - if (irq >= GROUP4_IRQ_BASE) - idt_gpio->gpioistat &= ~(1 << (irq - GROUP4_IRQ_BASE)); - - // irqs are in groups of 32 - // ip is set to the remainder - group = ip >> 5; - ip &= 0x1f; - - // bit -> 0 = unmask - intr_bit = 1 << ip; - addr = intr_group_muscat[group].base_addr; - WRITE_MASK_MUSCAT(addr, READ_MASK_MUSCAT(addr) & ~intr_bit); - break; - - case MACH_ARUBA_AP65: - case MACH_ARUBA_AP60: - group = 0; - - // bit -> 1 = unmasked - intr_bit = 1 << ip; - addr = intr_group_merlot[group].base_addr; - WRITE_MASK_MERLOT(addr, READ_MASK_MERLOT(addr) | intr_bit); - break; - } - enable_local_irq(group_to_ip(group)); - } - - back_to_back_c0_hazard(); - local_irq_restore(flags); -} - -static void aruba_irq_disable(unsigned int irq) -{ - unsigned long flags; - unsigned int group, intr_bit, mask; - volatile unsigned int *addr; - - local_irq_save(flags); - - if (irq < GROUP0_IRQ_BASE) { - disable_local_irq(irq); - } else { - int ip = irq - GROUP0_IRQ_BASE; - switch (mips_machtype) { - case MACH_ARUBA_AP70: - idt_gpio->gpioistat &= ~(1 << ip); - - // irqs are in groups of 32 - // ip is set to the remainder - group = ip >> 5; - ip &= 0x1f; - - // bit -> 1 = mask - intr_bit = 1 << ip; - addr = intr_group_muscat[group].base_addr; - - mask = READ_MASK_MUSCAT(addr); - mask |= intr_bit; - WRITE_MASK_MUSCAT(addr, mask); - - if (mask == intr_group_muscat[group].mask) { - disable_local_irq(group_to_ip(group)); - } - break; - - case MACH_ARUBA_AP65: - case MACH_ARUBA_AP60: - group = 0; - - // bit -> 0 = masked - intr_bit = 1 << ip; - addr = intr_group_merlot[group].base_addr; - - mask = READ_MASK_MERLOT(addr); - mask &= ~intr_bit; - WRITE_MASK_MERLOT(addr, mask); - - if (mask == intr_group_merlot[group].mask) { - disable_local_irq(group_to_ip(group)); - } - break; - } - } - - back_to_back_c0_hazard(); - local_irq_restore(flags); -} - -static unsigned int aruba_irq_startup(unsigned int irq) -{ - aruba_irq_enable(irq); - return 0; -} - -#define aruba_irq_shutdown aruba_irq_disable - -static void aruba_irq_ack(unsigned int irq) -{ - aruba_irq_disable(irq); -} - -static void aruba_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - aruba_irq_enable(irq); -} - -static struct hw_interrupt_type aruba_irq_type = { - .typename = "ARUBA", - .startup = aruba_irq_startup, - .shutdown = aruba_irq_shutdown, - .enable = aruba_irq_enable, - .disable = aruba_irq_disable, - .ack = aruba_irq_ack, - .end = aruba_irq_end, -}; - -void __init arch_init_irq(void) -{ - int i; - printk("Initializing IRQ's: %d out of %d\n", RC32434_NR_IRQS, NR_IRQS); - memset(irq_desc, 0, sizeof(irq_desc)); - - for (i = 0; i < RC32434_NR_IRQS; i++) { - irq_desc[i].status = IRQ_DISABLED; - irq_desc[i].action = NULL; - irq_desc[i].depth = 1; - irq_desc[i].chip = &aruba_irq_type; - spin_lock_init(&irq_desc[i].lock); - } -} - -/* Main Interrupt dispatcher */ - -void plat_irq_dispatch(struct pt_regs *regs) -{ - unsigned int pend, group, ip; - volatile unsigned int *addr; - unsigned long cp0_cause = read_c0_cause() & read_c0_status() & CAUSEF_IP; - - if (cp0_cause & CAUSEF_IP7) - return aruba_timer_interrupt(regs); - - if(cp0_cause == 0) { - printk("INTERRUPT(S) FIRED WHILE MASKED\n"); -#ifdef ARUBA_DEBUG - // debuging use -- figure out which interrupt(s) fired - cp0_cause = read_c0_cause() & CAUSEF_IP; - while (cp0_cause) { - unsigned long intr_bit; - unsigned int irq_nr; - intr_bit = (31 - rc32434_clz(cp0_cause)); - irq_nr = intr_bit - GROUP0_IRQ_BASE; - printk(" ---> MASKED IRQ %d\n",irq_nr); - cp0_cause &= ~(1 << intr_bit); - } -#endif - return; - } - - switch (mips_machtype) { - case MACH_ARUBA_AP70: - if ((ip = (cp0_cause & 0x7c00))) { - group = 21 - rc32434_clz(ip); - - addr = intr_group_muscat[group].base_addr; - - pend = READ_PEND_MUSCAT(addr); - pend &= ~READ_MASK_MUSCAT(addr); // only unmasked interrupts - pend = 39 - rc32434_clz(pend); - do_IRQ(pend + (group << 5)); - } - break; - case MACH_ARUBA_AP65: - case MACH_ARUBA_AP60: - default: - if (cp0_cause & 0x4000) { // 1 << (8 +6) == irq 6 - // Misc Interrupt - group = 0; - - addr = intr_group_merlot[group].base_addr; - - pend = READ_PEND_MERLOT(addr); - pend &= READ_MASK_MERLOT(addr); // only unmasked interrupts - pend = 31 - rc32434_clz(pend); - do_IRQ(pend + GROUP0_IRQ_BASE); - } - if ((ip = (cp0_cause & 0x3c00))) { // irq 2-5 - pend = 31 - rc32434_clz(ip); - do_IRQ(pend - GROUP0_IRQ_BASE); - } - break; - } -} diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/nvram/Makefile b/target/linux/aruba-2.6/files/arch/mips/aruba/nvram/Makefile deleted file mode 100644 index 14beb1ca8..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/nvram/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################### -# -# BRIEF MODULE DESCRIPTION -# Makefile for IDT EB434 nvram access routines -# -# Copyright 2004 IDT Inc. (rischelp@idt.com) -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -# NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 675 Mass Ave, Cambridge, MA 02139, USA. -# -# -############################################################################### -# May 2004 rkt, neb -# -# Initial Release -# -# -# -############################################################################### - -obj-y := nvram434.o -obj-m := $(O_TARGET) - - - - - - - diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/nvram/nvram434.c b/target/linux/aruba-2.6/files/arch/mips/aruba/nvram/nvram434.c deleted file mode 100644 index 5883fcdab..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/nvram/nvram434.c +++ /dev/null @@ -1,392 +0,0 @@ -/************************************************************************** - * - * BRIEF MODULE DESCRIPTION - * nvram interface routines. - * - * Copyright 2004 IDT Inc. (rischelp@idt.com) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - * - ************************************************************************** - * May 2004 rkt, neb - * - * Initial Release - * - * - * - ************************************************************************** - */ - -#include -#include - -//#include -#include "nvram434.h" -#define NVRAM_BASE 0xbfff8000 - -extern void setenv (char *e, char *v, int rewrite); -extern void unsetenv (char *e); -extern void mapenv (int (*func)(char *, char *)); -extern char *getenv (char *s); -extern void purgeenv(void); - -static void nvram_initenv(void); - -static unsigned char -nvram_getbyte(int offs) -{ - return(*((unsigned char*)(NVRAM_BASE + offs))); -} - -static void -nvram_setbyte(int offs, unsigned char val) -{ - unsigned char* nvramDataPointer = (unsigned char*)(NVRAM_BASE + offs); - - *nvramDataPointer = val; -} - -/* - * BigEndian! - */ -static unsigned short -nvram_getshort(int offs) -{ - return((nvram_getbyte(offs) << 8) | nvram_getbyte(offs + 1)); -} - -static void -nvram_setshort(int offs, unsigned short val) -{ - nvram_setbyte(offs, (unsigned char)((val >> 8) & 0xff)); - nvram_setbyte(offs + 1, (unsigned char)(val & 0xff)); -} -#if 0 -static unsigned int -nvram_getint(int offs) -{ - unsigned int val; - val = nvram_getbyte(offs) << 24; - val |= nvram_getbyte(offs + 1) << 16; - val |= nvram_getbyte(offs + 2) << 8; - val |= nvram_getbyte(offs + 3); - return(val); -} - -static void -nvram_setint(int offs, unsigned int val) -{ - nvram_setbyte(offs, val >> 24); - nvram_setbyte(offs + 1, val >> 16); - nvram_setbyte(offs + 2, val >> 8); - nvram_setbyte(offs + 3, val); -} -#endif -/* - * calculate NVRAM checksum - */ -static unsigned short -nvram_calcsum(void) -{ - unsigned short sum = NV_MAGIC; - int i; - - for (i = ENV_BASE; i < ENV_TOP; i += 2) - sum += nvram_getshort(i); - return(sum); -} - -/* - * update the nvram checksum - */ -static void -nvram_updatesum (void) -{ - nvram_setshort(NVOFF_CSUM, nvram_calcsum()); -} - -/* - * test validity of nvram by checksumming it - */ -static int -nvram_isvalid(void) -{ - static int is_valid; - - if (is_valid) - return(1); - - if (nvram_getshort(NVOFF_MAGIC) != NV_MAGIC) { - printk("nvram_isvalid FAILED\n"); - //nvram_initenv(); - } - is_valid = 1; - return(1); -} - -/* return nvram address of environment string */ -static int -nvram_matchenv(char *s) -{ - int envsize, envp, n, i, varsize; - char *var; - - envsize = nvram_getshort(NVOFF_ENVSIZE); - - if (envsize > ENV_AVAIL) - return(0); /* sanity */ - - envp = ENV_BASE; - - if ((n = strlen (s)) > 255) - return(0); - - while (envsize > 0) { - varsize = nvram_getbyte(envp); - if (varsize == 0 || (envp + varsize) > ENV_TOP) - return(0); /* sanity */ - for (i = envp + 1, var = s; i <= envp + n; i++, var++) { - char c1 = nvram_getbyte(i); - char c2 = *var; - if (islower(c1)) - c1 = toupper(c1); - if (islower(c2)) - c2 = toupper(c2); - if (c1 != c2) - break; - } - if (i > envp + n) { /* match so far */ - if (n == varsize - 1) /* match on boolean */ - return(envp); - if (nvram_getbyte(i) == '=') /* exact match on variable */ - return(envp); - } - envsize -= varsize; - envp += varsize; - } - return(0); -} - -static void nvram_initenv(void) -{ - nvram_setshort(NVOFF_MAGIC, NV_MAGIC); - nvram_setshort(NVOFF_ENVSIZE, 0); - - nvram_updatesum(); -} - -static void -nvram_delenv(char *s) -{ - int nenvp, envp, envsize, nbytes; - - envp = nvram_matchenv(s); - if (envp == 0) - return; - - nenvp = envp + nvram_getbyte(envp); - envsize = nvram_getshort(NVOFF_ENVSIZE); - nbytes = envsize - (nenvp - ENV_BASE); - nvram_setshort(NVOFF_ENVSIZE, envsize - (nenvp - envp)); - while (nbytes--) { - nvram_setbyte(envp, nvram_getbyte(nenvp)); - envp++; - nenvp++; - } - nvram_updatesum(); -} - -static int -nvram_setenv(char *s, char *v) -{ - int ns, nv, total; - int envp; - - if (!nvram_isvalid()) - return(-1); - - nvram_delenv(s); - ns = strlen(s); - if (ns == 0) - return (-1); - if (v && *v) { - nv = strlen(v); - total = ns + nv + 2; - } - else { - nv = 0; - total = ns + 1; - } - if (total > 255 || total > ENV_AVAIL - nvram_getshort(NVOFF_ENVSIZE)) - return(-1); - - envp = ENV_BASE + nvram_getshort(NVOFF_ENVSIZE); - - nvram_setbyte(envp, (unsigned char) total); - envp++; - - while (ns--) { - nvram_setbyte(envp, *s); - envp++; - s++; - } - - if (nv) { - nvram_setbyte(envp, '='); - envp++; - while (nv--) { - nvram_setbyte(envp, *v); - envp++; - v++; - } - } - nvram_setshort(NVOFF_ENVSIZE, envp-ENV_BASE); - nvram_updatesum(); - return 0; -} - -static char * -nvram_getenv(char *s) -{ - static char buf[256]; /* FIXME: this cannot be static */ - int envp, ns, nbytes, i; - - if (!nvram_isvalid()) - return "INVALID NVRAM"; //((char *)0); - - envp = nvram_matchenv(s); - if (envp == 0) - return "NOT FOUND"; //((char *)0); - ns = strlen(s); - if (nvram_getbyte(envp) == ns + 1) /* boolean */ - buf[0] = '\0'; - else { - nbytes = nvram_getbyte(envp) - (ns + 2); - envp += ns + 2; - for (i = 0; i < nbytes; i++) - buf[i] = nvram_getbyte(envp++); - buf[i] = '\0'; - } - return(buf); -} - -static void -nvram_unsetenv(char *s) -{ - if (!nvram_isvalid()) - return; - - nvram_delenv(s); -} - -/* - * apply func to each string in environment - */ -static void -nvram_mapenv(int (*func)(char *, char *)) -{ - int envsize, envp, n, i, seeneql; - char name[256], value[256]; - char c, *s; - - if (!nvram_isvalid()) - return; - - envsize = nvram_getshort(NVOFF_ENVSIZE); - envp = ENV_BASE; - - while (envsize > 0) { - value[0] = '\0'; - seeneql = 0; - s = name; - n = nvram_getbyte(envp); - for (i = envp + 1; i < envp + n; i++) { - c = nvram_getbyte(i); - if ((c == '=') && !seeneql) { - *s = '\0'; - s = value; - seeneql = 1; - continue; - } - *s++ = c; - } - *s = '\0'; - (*func)(name, value); - envsize -= n; - envp += n; - } -} -#if 0 -static unsigned int -digit(char c) -{ - if ('0' <= c && c <= '9') - return (c - '0'); - if ('A' <= c && c <= 'Z') - return (10 + c - 'A'); - if ('a' <= c && c <= 'z') - return (10 + c - 'a'); - return (~0); -} -#endif -/* - * Wrappers to allow 'special' environment variables to get processed - */ -void -setenv(char *e, char *v, int rewrite) -{ - if (nvram_getenv(e) && !rewrite) - return; - - nvram_setenv(e, v); -} - -char * -getenv(char *e) -{ - return(nvram_getenv(e)); -} - -void -unsetenv(char *e) -{ - nvram_unsetenv(e); -} - -void -purgeenv() -{ - int i; - unsigned char* nvramDataPointer = (unsigned char*)(NVRAM_BASE); - - for (i = ENV_BASE; i < ENV_TOP; i++) - *nvramDataPointer++ = 0; - nvram_setshort(NVOFF_MAGIC, NV_MAGIC); - nvram_setshort(NVOFF_ENVSIZE, 0); - nvram_setshort(NVOFF_CSUM, NV_MAGIC); -} - -void -mapenv(int (*func)(char *, char *)) -{ - nvram_mapenv(func); -} diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/nvram/nvram434.h b/target/linux/aruba-2.6/files/arch/mips/aruba/nvram/nvram434.h deleted file mode 100644 index 77b1ef986..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/nvram/nvram434.h +++ /dev/null @@ -1,66 +0,0 @@ -/************************************************************************** - * - * BRIEF MODULE DESCRIPTION - * nvram definitions. - * - * Copyright 2004 IDT Inc. (rischelp@idt.com) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - * - ************************************************************************** - * May 2004 rkt, neb - * - * Initial Release - * - * - * - ************************************************************************** - */ - - -#ifndef _NVRAM_ -#define _NVRAM_ -#define NVOFFSET 0 /* use all of NVRAM */ - -/* Offsets to reserved locations */ - /* size description */ -#define NVOFF_MAGIC (NVOFFSET + 0) /* 2 magic value */ -#define NVOFF_CSUM (NVOFFSET + 2) /* 2 NVRAM environment checksum */ -#define NVOFF_ENVSIZE (NVOFFSET + 4) /* 2 size of 'environment' */ -#define NVOFF_TEST (NVOFFSET + 5) /* 1 cold start test byte */ -#define NVOFF_ETHADDR (NVOFFSET + 6) /* 6 decoded ethernet address */ -#define NVOFF_UNUSED (NVOFFSET + 12) /* 0 current end of table */ - -#define NV_MAGIC 0xdeaf /* nvram magic number */ -#define NV_RESERVED 6 /* number of reserved bytes */ - -#undef NVOFF_ETHADDR -#define NVOFF_ETHADDR (NVOFFSET + NV_RESERVED - 6) - -/* number of bytes available for environment */ -#define ENV_BASE (NVOFFSET + NV_RESERVED) -#define ENV_TOP 0x2000 -#define ENV_AVAIL (ENV_TOP - ENV_BASE) - -#endif /* _NVRAM_ */ - - diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/prom.c b/target/linux/aruba-2.6/files/arch/mips/aruba/prom.c deleted file mode 100644 index 5cd4ca075..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/prom.c +++ /dev/null @@ -1,112 +0,0 @@ -/************************************************************************** - * - * BRIEF MODULE DESCRIPTION - * prom interface routines - * - * Copyright 2004 IDT Inc. (rischelp@idt.com) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - * - ************************************************************************** - * May 2004 rkt, neb - * - * Initial Release - * - * - * - ************************************************************************** - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -unsigned int idt_cpu_freq; -EXPORT_SYMBOL(idt_cpu_freq); - -unsigned int arch_has_pci=0; - -/* Kernel Boot parameters */ -static unsigned char bootparm[] = - "root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,9600 init=/etc/preinit"; - -extern unsigned long mips_machgroup; -extern unsigned long mips_machtype; - -extern void setup_serial_port(void); -extern char * getenv(char *e); - -/* IDT 79EB434 memory map -- we really should be auto sizing it */ -#define RAM_SIZE 32*1024*1024 - -char *__init prom_getcmdline(void) -{ - return &(arcs_cmdline[0]); -} - -void __init prom_init(void) -{ - char *boardname; - sprintf(arcs_cmdline, "%s", bootparm); - - /* set our arch type */ - mips_machgroup = MACH_GROUP_ARUBA; - mips_machtype = MACH_ARUBA_UNKNOWN; - - boardname=getenv("boardname"); - - if (!strcmp(boardname,"Muscat")) { - mips_machtype = MACH_ARUBA_AP70; - idt_cpu_freq = 133000000; - arch_has_pci=1; - } else if (!strcmp(boardname,"Mataro")) { - mips_machtype = MACH_ARUBA_AP65; - idt_cpu_freq = 110000000; - } else if (!strcmp(boardname,"Merlot")) { - mips_machtype = MACH_ARUBA_AP60; - idt_cpu_freq = 90000000; - } - - /* turn on the console */ - setup_serial_port(); - - /* - * give all RAM to boot allocator, - * except where the kernel was loaded - */ - add_memory_region(0,RAM_SIZE,BOOT_MEM_RAM); -} - -void prom_free_prom_memory(void) -{ - printk("stubbed prom_free_prom_memory()\n"); -} diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/serial.c b/target/linux/aruba-2.6/files/arch/mips/aruba/serial.c deleted file mode 100644 index ec21867d1..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/serial.c +++ /dev/null @@ -1,94 +0,0 @@ -/************************************************************************** - * - * BRIEF MODULE DESCRIPTION - * Serial port initialisation. - * - * Copyright 2004 IDT Inc. (rischelp@idt.com) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - * - ************************************************************************** - * May 2004 rkt, neb - * - * Initial Release - * - * - * - ************************************************************************** - */ - - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include - -extern int __init early_serial_setup(struct uart_port *port); - -#define BASE_BAUD (1843200 / 16) - -extern unsigned int idt_cpu_freq; - -extern int __init setup_serial_port(void) -{ - static struct uart_port serial_req[2]; - - memset(serial_req, 0, sizeof(serial_req)); - serial_req[0].type = PORT_16550A; - serial_req[0].line = 0; - serial_req[0].flags = STD_COM_FLAGS; - serial_req[0].iotype = SERIAL_IO_MEM; - serial_req[0].regshift = 2; - - switch (mips_machtype) { - case MACH_ARUBA_AP70: - serial_req[0].irq = 104; - serial_req[0].mapbase = KSEG1ADDR(0x18058003); - serial_req[0].membase = (char *) KSEG1ADDR(0x18058003); - serial_req[0].uartclk = idt_cpu_freq; - break; - case MACH_ARUBA_AP65: - case MACH_ARUBA_AP60: - default: - serial_req[0].irq = 12; - serial_req[0].mapbase = KSEG1ADDR(0xbc000003); - serial_req[0].membase = (char *) KSEG1ADDR(0xbc000003); - serial_req[0].uartclk = idt_cpu_freq / 2; - break; - } - - early_serial_setup(&serial_req[0]); - - return(0); -} diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/setup.c b/target/linux/aruba-2.6/files/arch/mips/aruba/setup.c deleted file mode 100644 index 4d438ad85..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/setup.c +++ /dev/null @@ -1,181 +0,0 @@ -/************************************************************************** - * - * BRIEF MODULE DESCRIPTION - * setup routines for IDT EB434 boards - * - * Copyright 2004 IDT Inc. (rischelp@idt.com) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - * - ************************************************************************** - * May 2004 rkt, neb - * - * Initial Release - * - * - * - ************************************************************************** - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* for KSEG1ADDR() */ -#include -#include -#include -#include -#include - -extern char *__init prom_getcmdline(void); - -extern void (*board_time_init) (void); -extern void aruba_time_init(void); -extern void aruba_reset(void); - -#define epldMask ((volatile unsigned char *)0xB900000d) - -static void aruba_machine_restart(char *command) -{ - switch (mips_machtype) { - case MACH_ARUBA_AP70: - *(volatile u32 *)KSEG1ADDR(0x18008000) = 0x80000001; - break; - case MACH_ARUBA_AP65: - case MACH_ARUBA_AP60: - default: - /* Reset*/ - *((volatile u32 *)KSEG1ADDR(0x1c003020)) = 0x00080350; // reset everything in sight - udelay(100); - *((volatile u32 *)KSEG1ADDR(0x1c003020)) = 0; // reset everything in sight - udelay(100); - *((volatile u32 *)KSEG1ADDR(0x1c003020)) = 0x3; // cold reset the cpu & system - break; - } -} - -static void aruba_machine_halt(void) -{ - for (;;) continue; -} - -extern char * getenv(char *e); - -extern void unlock_ap60_70_flash(void); - -static struct resource aruba_flash_resource = { - .start = 0x1fc00000, - .end = 0x1fffffffULL, - .flags = IORESOURCE_MEM, -}; - -static struct mtd_partition aruba_flash_parts[] = { - { - .name = "kernel", - .offset = 0x80000, - .size = 0x370000, - }, - { - .name = "rootfs", - .offset = 0x140000, - .size = 0x2B0000, - }, - { - .name = "NVRAM", - .offset = 0x3f8000, - .size = 0x2000, - } -}; - -static struct physmap_flash_data aruba_flash_data = { - .width = 1, - .parts = aruba_flash_parts, - .nr_parts = ARRAY_SIZE(aruba_flash_parts), -}; - -static struct platform_device aruba_flash_device = { - .name = "physmap-flash", - .id = 0, - .dev = { - .platform_data = &aruba_flash_data, - }, - .num_resources = 1, - .resource = &aruba_flash_resource, -}; - -static int aruba_setup_flash(void) -{ - platform_device_register(&aruba_flash_device); - - return 0; -}; - -arch_initcall (aruba_setup_flash); - -void __init plat_mem_setup(void) -{ - board_time_init = aruba_time_init; - - _machine_restart = aruba_machine_restart; - _machine_halt = aruba_machine_halt; - pm_power_off = aruba_machine_halt; - - set_io_port_base(KSEG1); - - /* Enable PCI interrupts in EPLD Mask register */ - *epldMask = 0x0; - *(epldMask + 1) = 0x0; - - write_c0_wired(0); - unlock_ap60_70_flash(); - - printk("BOARD - %s\n",getenv("boardname")); -} - -int page_is_ram(unsigned long pagenr) -{ - return 1; -} - -const char *get_system_type(void) -{ - switch (mips_machtype) { - case MACH_ARUBA_AP70: - return "Aruba AP70"; - case MACH_ARUBA_AP65: - return "Aruba AP65"; - case MACH_ARUBA_AP60: - return "Aruba AP60/AP61"; - default: - return "Aruba UNKNOWN"; - } -} - -EXPORT_SYMBOL(get_system_type); diff --git a/target/linux/aruba-2.6/files/arch/mips/aruba/time.c b/target/linux/aruba-2.6/files/arch/mips/aruba/time.c deleted file mode 100644 index 3c6381631..000000000 --- a/target/linux/aruba-2.6/files/arch/mips/aruba/time.c +++ /dev/null @@ -1,110 +0,0 @@ -/************************************************************************** - * - * BRIEF MODULE DESCRIPTION - * timer routines for IDT EB434 boards - * - * Copyright 2004 IDT Inc. (rischelp@idt.com) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - * - ************************************************************************** - * May 2004 rkt, neb - * - * Initial Release - * - * - * - ************************************************************************** - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -static unsigned long r4k_offset; /* Amount to incr compare reg each time */ -static unsigned long r4k_cur; /* What counter should be at next timer irq */ - -extern unsigned int idt_cpu_freq; - -static unsigned long __init cal_r4koff(void) -{ - mips_hpt_frequency = idt_cpu_freq * IDT_CLOCK_MULT / 2; - return (mips_hpt_frequency / HZ); -} - -void __init aruba_time_init(void) -{ - unsigned int est_freq, flags; - local_irq_save(flags); - - printk("calculating r4koff... "); - r4k_offset = cal_r4koff(); - printk("%08lx(%d)\n", r4k_offset, (int)r4k_offset); - - est_freq = 2 * r4k_offset * HZ; - est_freq += 5000; /* round */ - est_freq -= est_freq % 10000; - printk("CPU frequency %d.%02d MHz\n", est_freq / 1000000, - (est_freq % 1000000) * 100 / 1000000); - local_irq_restore(flags); - -} - -void __init plat_timer_setup(struct irqaction *irq) -{ - /* we are using the cpu counter for timer interrupts */ - setup_irq(MIPS_CPU_TIMER_IRQ, irq); - - /* to generate the first timer interrupt */ - r4k_cur = (read_c0_count() + r4k_offset); - write_c0_compare(r4k_cur); - -} - -asmlinkage void aruba_timer_interrupt(struct pt_regs *regs) -{ - int irq = MIPS_CPU_TIMER_IRQ; - - irq_enter(); - kstat_this_cpu.irqs[irq]++; - - timer_interrupt(irq, NULL); - irq_exit(); -} -- cgit v1.2.3