* Patches by David Müller, 12 Jun 2003:
- rewrite of the S3C24X0 register definitions stuff
- "driver" for the built-in S3C24X0 RTC
* Patches by Yuli Barcohen, 12 Jun 2003:
- Add MII support and Ethernet PHY initialization for MPC8260ADS board
- Fix incorrect SIUMCR initialisation caused by wrong Hard Reset
configuration word supplied by FPGA on some MPC8260ADS boards
* Patch by Pantelis Antoniou, 10 Jun 2003:
Unify status LED interface
diff --git a/cpu/mpc8260/Makefile b/cpu/mpc8260/Makefile
index 81f74ec..b4c269f 100644
--- a/cpu/mpc8260/Makefile
+++ b/cpu/mpc8260/Makefile
@@ -28,7 +28,7 @@
START = start.o kgdb.o
OBJS = traps.o serial_smc.o serial_scc.o cpu.o cpu_init.o speed.o \
interrupts.o ether_scc.o ether_fcc.o i2c.o commproc.o \
- bedbug_603e.o status_led.o pci.o spi.o
+ bedbug_603e.o pci.o spi.o
all: .depend $(START) $(LIB)
diff --git a/cpu/mpc8260/ether_scc.c b/cpu/mpc8260/ether_scc.c
index ff164fe..8b6af31 100644
--- a/cpu/mpc8260/ether_scc.c
+++ b/cpu/mpc8260/ether_scc.c
@@ -333,7 +333,7 @@
immr->im_scc[CONFIG_ETHER_INDEX-1].scc_gsmrl |= (SCC_GSMRL_ENR |
SCC_GSMRL_ENT);
- return 1;
+ return 0;
}
diff --git a/cpu/mpc8260/start.S b/cpu/mpc8260/start.S
index 0e6b963..2070ecc 100644
--- a/cpu/mpc8260/start.S
+++ b/cpu/mpc8260/start.S
@@ -161,6 +161,7 @@
.globl _start
_start:
li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH*/
+ nop
b boot_cold
. = EXC_OFF_SYS_RESET + 0x10
@@ -171,6 +172,18 @@
b boot_warm
boot_cold:
+#if defined(CONFIG_MPC8260ADS)
+ lis r3, CFG_DEFAULT_IMMR@h
+ nop
+ lwz r4, 0(r3)
+ nop
+ rlwinm r4, r4, 0, 8, 5
+ nop
+ oris r4, r4, 0x0200
+ nop
+ stw r4, 0(r3)
+ nop
+#endif /* CONFIG_MPC8260ADS */
boot_warm:
mfmsr r5 /* save msr contents */
diff --git a/cpu/mpc8260/status_led.c b/cpu/mpc8260/status_led.c
deleted file mode 100644
index 0174e39..0000000
--- a/cpu/mpc8260/status_led.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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 program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <status_led.h>
-
-/*
- * The purpose of this code is to signal the operational status of a
- * target which usually boots over the network; while running in
- * PCBoot, a status LED is blinking. As soon as a valid BOOTP reply
- * message has been received, the LED is turned off. The Linux
- * kernel, once it is running, will start blinking the LED again,
- * with another frequency.
- */
-
-/* ------------------------------------------------------------------------- */
-
-#ifdef CONFIG_STATUS_LED
-
-typedef struct {
- ulong mask;
- int state;
- int period;
- int cnt;
-} led_dev_t;
-
-led_dev_t led_dev[] = {
- { STATUS_LED_BIT,
- STATUS_LED_STATE,
- STATUS_LED_PERIOD,
- 0,
- },
-#if defined(STATUS_LED_BIT1)
- { STATUS_LED_BIT1,
- STATUS_LED_STATE1,
- STATUS_LED_PERIOD1,
- 0,
- },
-#endif
-#if defined(STATUS_LED_BIT2)
- { STATUS_LED_BIT2,
- STATUS_LED_STATE2,
- STATUS_LED_PERIOD2,
- 0,
- },
-#endif
-};
-
-#define MAX_LED_DEV (sizeof(led_dev)/sizeof(led_dev_t))
-
-static int status_led_init_done = 0;
-
-static void status_led_init (void)
-{
- volatile immap_t *immr = (immap_t *)CFG_IMMR;
- int i;
-
- for (i=0; i<MAX_LED_DEV; ++i) {
- led_dev_t *ld = &led_dev[i];
-
- immr->STATUS_LED_PAR &= ~(ld->mask);
-#ifdef STATUS_LED_ODR
- immr->STATUS_LED_ODR &= ~(ld->mask);
-#endif
-#if (STATUS_LED_ACTIVE == 0)
- if (ld->state == STATUS_LED_ON)
- immr->STATUS_LED_DAT &= ~(ld->mask);
- else
- immr->STATUS_LED_DAT |= ld->mask ;
-#else
- if (ld->state == STATUS_LED_ON)
- immr->STATUS_LED_DAT |= ld->mask ;
- else
- immr->STATUS_LED_DAT &= ~(ld->mask);
-#endif
- immr->STATUS_LED_DIR |= ld->mask ;
- }
-
- status_led_init_done = 1;
-}
-
-void status_led_tick (ulong timestamp)
-{
- volatile immap_t *immr = (immap_t *)CFG_IMMR;
- int i;
-
- if (!status_led_init_done)
- status_led_init();
-
- for (i=0; i<MAX_LED_DEV; ++i) {
- led_dev_t *ld = &led_dev[i];
-
- if (ld->state != STATUS_LED_BLINKING)
- continue;
-
- if (++(ld->cnt) >= ld->period) {
- immr->STATUS_LED_DAT ^= ld->mask;
- ld->cnt -= ld->period;
- }
- }
-}
-
-void status_led_set (int led, int state)
-{
- volatile immap_t *immr = (immap_t *)CFG_IMMR;
- led_dev_t *ld;
-
- if (led < 0 || led >= MAX_LED_DEV)
- return;
-
- if (!status_led_init_done)
- status_led_init();
-
- ld = &led_dev[led];
-
- switch (state) {
- default:
- return;
- case STATUS_LED_BLINKING:
- ld->cnt = 0; /* always start with full period */
- /* fall through */ /* always start with LED _ON_ */
- case STATUS_LED_ON:
-#if (STATUS_LED_ACTIVE == 0)
- immr->STATUS_LED_DAT &= ~(ld->mask);
-#else
- immr->STATUS_LED_DAT |= ld->mask ;
-#endif
- break;
- case STATUS_LED_OFF:
-#if (STATUS_LED_ACTIVE == 0)
- immr->STATUS_LED_DAT |= ld->mask ;
-#else
- immr->STATUS_LED_DAT &= ~(ld->mask);
-#endif
- break;
- }
- ld->state = state;
-}
-
-#endif /* CONFIG_STATUS_LED */