diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-27 21:49:56 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-27 21:49:56 +0000 |
| commit | c2ffdb04c4dbeac68495850314b01e5f53c69c53 (patch) | |
| tree | f1d9a4d85a20913a4bddd2dfcbb2e820233c28d7 /target/linux/adm8668/files/arch/mips/adm8668 | |
| parent | af36ffaaebbd092d418cd6dbca49c7f0d544e9dd (diff) | |
[adm8668] clean up mach-adm8668 includes
This patch cleans up the include directory, as they were from vendors
2.4 GPL source. Now only what's used is there.
Signed-off-by: Scott Nicholas <scott.nicholas@scottn.us>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25175 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm8668/files/arch/mips/adm8668')
| -rw-r--r-- | target/linux/adm8668/files/arch/mips/adm8668/platform.c | 6 | ||||
| -rw-r--r-- | target/linux/adm8668/files/arch/mips/adm8668/prom.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/adm8668/files/arch/mips/adm8668/platform.c b/target/linux/adm8668/files/arch/mips/adm8668/platform.c index e97ad6ab2..4de38fd38 100644 --- a/target/linux/adm8668/files/arch/mips/adm8668/platform.c +++ b/target/linux/adm8668/files/arch/mips/adm8668/platform.c @@ -85,9 +85,9 @@ static void adm8668_restart(char *cmd) int i; /* stop eth0 and eth1 */ - ADM8668_LAN_REG(NETCSR6) = BIT_1|BIT_13; + ADM8668_LAN_REG(NETCSR6) = (1 << 13) | (1 << 1); ADM8668_LAN_REG(NETCSR7) = 0; - ADM8668_WAN_REG(NETCSR6) = BIT_1|BIT_13; + ADM8668_WAN_REG(NETCSR6) = (1 << 13) | (1 << 1); ADM8668_WAN_REG(NETCSR7) = 0; /* reset PHY */ @@ -105,7 +105,7 @@ static void adm8668_restart(char *cmd) /* the real deal */ for (i = 0; i < 1000; i++) ; - ADM8668_CONFIG_REG(ADM8668_CR1) = BIT_0; + ADM8668_CONFIG_REG(ADM8668_CR1) = 1; } int __devinit adm8668_devs_register(void) diff --git a/target/linux/adm8668/files/arch/mips/adm8668/prom.c b/target/linux/adm8668/files/arch/mips/adm8668/prom.c index 53731c1b1..7187f2982 100644 --- a/target/linux/adm8668/files/arch/mips/adm8668/prom.c +++ b/target/linux/adm8668/files/arch/mips/adm8668/prom.c @@ -96,7 +96,7 @@ void __init prom_setup_cmdline(void) prom_argv[i] = (char *)KSEG0ADDR(prom_argv[i]); /* default bootargs has "console=/dev/ttyS0" yet console won't - * show up at all if you do this ... */ + * show up at all if you include the '/dev/' nowadays ... */ if (match_tag(prom_argv[i], "console=/dev/")) { char *ptr = prom_argv[i] + strlen("console=/dev/"); @@ -128,7 +128,6 @@ void __init prom_init(void) memsize = bd->bi_memsize; printk("Board info:\n"); - printk(" Board ID: %#lx\n", bd->bi_arch_number); printk(" RAM size: %d MB\n", (int)memsize/(1024*1024)); printk(" NOR start: %#lx\n", bd->bi_flashstart); printk(" NOR size: %#lx\n", bd->bi_flashsize); |