Merge with git://www.denx.de/git/u-boot.git
This commit is contained in:
commit
8f085e324a
59
CHANGELOG
59
CHANGELOG
|
@ -1,3 +1,62 @@
|
|||
commit 011595307731a7a67a7445d107c279d031e8ab97
|
||||
Author: Heiko Schocher <hs@pollux.denx.de>
|
||||
Date: Sat Jul 14 01:06:58 2007 +0200
|
||||
|
||||
[PCS440EP] - fix compile error, if BUILD_DIR is used
|
||||
|
||||
commit fad63407154f46246ce80d53a9c669a44362ac67
|
||||
Author: Heiko Schocher <hs@pollux.denx.de>
|
||||
Date: Fri Jul 13 09:54:17 2007 +0200
|
||||
|
||||
make show_boot_progress () weak.
|
||||
|
||||
Signed-off-by: Heiko Schocher <hs@denx.de>
|
||||
|
||||
commit 907902472391b6ca1876ec300687562ecaf459b1
|
||||
Author: Heiko Schocher <hs@pollux.denx.de>
|
||||
Date: Fri Jul 13 08:26:05 2007 +0200
|
||||
|
||||
[PCS440EP] - The DIAG LEDs are now blinking, if an error occur
|
||||
- fix compile error, if BUILD_DIR is used
|
||||
|
||||
Signed-off-by: Heiko Schocher <hs@denx.de>
|
||||
|
||||
commit 239f05ee4dd4cfe0b50f251b533dcebe9e67c360
|
||||
Author: Wolfgang Denk <wd@denx.de>
|
||||
Date: Thu Jul 12 01:45:34 2007 +0200
|
||||
|
||||
Update CHANGELOG, minor coding style cleanup.
|
||||
|
||||
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
||||
|
||||
commit fa1df308926a6f70e3504c57514ef27ac31fd13a
|
||||
Author: Bartlomiej Sieka <tur@semihalf.com>
|
||||
Date: Wed Jul 11 20:11:07 2007 +0200
|
||||
|
||||
CM1.QP1: Support for the Schindler CM1.QP1 board.
|
||||
|
||||
Signed-off-by: Piotr Kruszynski <ppk@semihalf.com>
|
||||
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
|
||||
|
||||
commit 96e1d75be8193ca79e4215a368bf9d7f2362450f
|
||||
Author: Heiko Schocher <hs@pollux.denx.de>
|
||||
Date: Wed Jul 11 18:39:11 2007 +0200
|
||||
|
||||
[PCS440EP] - Show on the DIAG LEDs, if the SHA1 check failed
|
||||
- now the Flash ST M29W040B is supported (not tested)
|
||||
- fix the "led" command
|
||||
- fix compile error, if BUILD_DIR is used
|
||||
|
||||
Signed-off-by: Heiko Schocher <hs@denx.de>
|
||||
|
||||
commit 4ef218f6fdf8d747f4589da5252b004e7d2c2876
|
||||
Author: Wolfgang Denk <wd@denx.de>
|
||||
Date: Tue Jul 10 00:01:28 2007 +0200
|
||||
|
||||
Coding style cleanup; update CHANGELOG.
|
||||
|
||||
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
||||
|
||||
commit f1152f8c28db4a22087c21c618a3f7baa48e9a4f
|
||||
Author: Wolfgang Denk <wd@denx.de>
|
||||
Date: Fri Jul 6 02:50:19 2007 +0200
|
||||
|
|
12
MAKEALL
12
MAKEALL
|
@ -35,12 +35,12 @@ LIST_5xx=" \
|
|||
#########################################################################
|
||||
|
||||
LIST_5xxx=" \
|
||||
BC3450 cpci5200 EVAL5200 fo300 \
|
||||
icecube_5100 icecube_5200 lite5200b mcc200 \
|
||||
mecp5200 motionpro o2dnt pf5200 \
|
||||
PM520 TB5200 Total5100 Total5200 \
|
||||
Total5200_Rev2 TQM5200 TQM5200_B TQM5200S \
|
||||
v38b \
|
||||
BC3450 cm1_qp1 cpci5200 EVAL5200 \
|
||||
fo300 icecube_5100 icecube_5200 lite5200b \
|
||||
mcc200 mecp5200 motionpro o2dnt \
|
||||
pf5200 PM520 TB5200 Total5100 \
|
||||
Total5200 Total5200_Rev2 TQM5200 TQM5200_B \
|
||||
TQM5200S v38b \
|
||||
"
|
||||
|
||||
#########################################################################
|
||||
|
|
10
Makefile
10
Makefile
|
@ -268,7 +268,7 @@ $(obj)u-boot.img: $(obj)u-boot.bin
|
|||
-d $< $@
|
||||
|
||||
$(obj)u-boot.sha1: $(obj)u-boot.bin
|
||||
./tools/ubsha1 $(obj)u-boot.bin
|
||||
$(obj)tools/ubsha1 $(obj)u-boot.bin
|
||||
|
||||
$(obj)u-boot.dis: $(obj)u-boot
|
||||
$(OBJDUMP) -d $< > $@
|
||||
|
@ -532,6 +532,14 @@ PM520_ROMBOOT_DDR_config: unconfig
|
|||
smmaco4_config: unconfig
|
||||
@$(MKCONFIG) -a smmaco4 ppc mpc5xxx tqm5200
|
||||
|
||||
cm1_qp1_config: unconfig
|
||||
@ >include/config.h
|
||||
@[ -z "$(findstring cm1_qp1,$@)" ] || \
|
||||
{ echo "... with 64 MByte SDRAM" ; \
|
||||
echo "... with 32 MByte Flash" ; \
|
||||
}
|
||||
@./mkconfig -a cm1_qp1 ppc mpc5xxx cm1_qp1
|
||||
|
||||
spieval_config: unconfig
|
||||
@$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200
|
||||
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
#
|
||||
# (C) Copyright 2003-2007
|
||||
# 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 $(TOPDIR)/config.mk
|
||||
|
||||
LIB = $(obj)lib$(BOARD).a
|
||||
|
||||
COBJS := $(BOARD).o cmd_cm1_qp1.o fwupdate.o
|
||||
|
||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(COBJS))
|
||||
SOBJS := $(addprefix $(obj),$(SOBJS))
|
||||
|
||||
$(LIB): $(obj).depend $(OBJS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJS)
|
||||
|
||||
clean:
|
||||
rm -f $(SOBJS) $(OBJS)
|
||||
|
||||
distclean: clean
|
||||
rm -f $(LIB) core *.bak .depend
|
||||
|
||||
#########################################################################
|
||||
|
||||
# defines $(obj).depend target
|
||||
include $(SRCTREE)/rules.mk
|
||||
|
||||
sinclude $(obj).depend
|
||||
|
||||
#########################################################################
|
|
@ -0,0 +1,222 @@
|
|||
/*
|
||||
* (C) Copyright 2003-2007
|
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||
*
|
||||
* (C) Copyright 2004
|
||||
* Mark Jonas, Freescale Semiconductor, mark.jonas@motorola.com.
|
||||
*
|
||||
* (C) Copyright 2004-2005
|
||||
* Martin Krause, TQ-Systems GmbH, martin.krause@tqs.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 <mpc5xxx.h>
|
||||
#include <pci.h>
|
||||
#include <asm/processor.h>
|
||||
#include <i2c.h>
|
||||
#ifdef CONFIG_OF_FLAT_TREE
|
||||
#include <ft_build.h>
|
||||
#endif /* CONFIG_OF_FLAT_TREE */
|
||||
|
||||
#include "fwupdate.h"
|
||||
|
||||
#ifndef CFG_RAMBOOT
|
||||
/*
|
||||
* Helper function to initialize SDRAM controller.
|
||||
*/
|
||||
static void sdram_start(int hi_addr)
|
||||
{
|
||||
long hi_addr_bit = hi_addr ? 0x01000000 : 0;
|
||||
|
||||
/* unlock mode register */
|
||||
*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | 0x80000000 |
|
||||
hi_addr_bit;
|
||||
|
||||
/* precharge all banks */
|
||||
*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | 0x80000002 |
|
||||
hi_addr_bit;
|
||||
|
||||
/* auto refresh */
|
||||
*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | 0x80000004 |
|
||||
hi_addr_bit;
|
||||
|
||||
/* auto refresh, second time */
|
||||
*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | 0x80000004 |
|
||||
hi_addr_bit;
|
||||
|
||||
/* set mode register */
|
||||
*(vu_long *)MPC5XXX_SDRAM_MODE = SDRAM_MODE;
|
||||
|
||||
/* normal operation */
|
||||
*(vu_long *)MPC5XXX_SDRAM_CTRL = SDRAM_CONTROL | hi_addr_bit;
|
||||
}
|
||||
#endif /* CFG_RAMBOOT */
|
||||
|
||||
/*
|
||||
* Initalize SDRAM - configure SDRAM controller, detect memory size.
|
||||
*/
|
||||
long int initdram(int board_type)
|
||||
{
|
||||
ulong dramsize = 0;
|
||||
#ifndef CFG_RAMBOOT
|
||||
ulong test1, test2;
|
||||
|
||||
/* configure SDRAM start/end for detection */
|
||||
*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x0000001e; /* 2G at 0x0 */
|
||||
|
||||
/* setup config registers */
|
||||
*(vu_long *)MPC5XXX_SDRAM_CONFIG1 = SDRAM_CONFIG1;
|
||||
*(vu_long *)MPC5XXX_SDRAM_CONFIG2 = SDRAM_CONFIG2;
|
||||
|
||||
sdram_start(0);
|
||||
test1 = get_ram_size((long *)CFG_SDRAM_BASE, 0x80000000);
|
||||
sdram_start(1);
|
||||
test2 = get_ram_size((long *)CFG_SDRAM_BASE, 0x80000000);
|
||||
if (test1 > test2) {
|
||||
sdram_start(0);
|
||||
dramsize = test1;
|
||||
} else
|
||||
dramsize = test2;
|
||||
|
||||
/* memory smaller than 1MB is impossible */
|
||||
if (dramsize < (1 << 20))
|
||||
dramsize = 0;
|
||||
|
||||
/* set SDRAM CS0 size according to the amount of RAM found */
|
||||
if (dramsize > 0) {
|
||||
*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x13 +
|
||||
__builtin_ffs(dramsize >> 20) - 1;
|
||||
} else
|
||||
*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0; /* disabled */
|
||||
#else /* CFG_RAMBOOT */
|
||||
/* retrieve size of memory connected to SDRAM CS0 */
|
||||
dramsize = *(vu_long *)MPC5XXX_SDRAM_CS0CFG & 0xFF;
|
||||
if (dramsize >= 0x13)
|
||||
dramsize = (1 << (dramsize - 0x13)) << 20;
|
||||
else
|
||||
dramsize = 0;
|
||||
#endif /* CFG_RAMBOOT */
|
||||
|
||||
/*
|
||||
* On MPC5200B we need to set the special configuration delay in the
|
||||
* DDR controller. Refer to chapter 8.7.5 SDelay--MBAR + 0x0190 of
|
||||
* the MPC5200B User's Manual.
|
||||
*/
|
||||
*(vu_long *)MPC5XXX_SDRAM_SDELAY = 0x04;
|
||||
__asm__ volatile ("sync");
|
||||
|
||||
return dramsize;
|
||||
}
|
||||
|
||||
|
||||
int checkboard(void)
|
||||
{
|
||||
puts("Board: CM1.QP1\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int board_early_init_r(void)
|
||||
{
|
||||
/*
|
||||
* Now, when we are in RAM, enable flash write access for detection
|
||||
* process. Note that CS_BOOT cannot be cleared when executing in
|
||||
* flash.
|
||||
*/
|
||||
*(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_POST
|
||||
int post_hotkeys_pressed(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_POST */
|
||||
|
||||
|
||||
#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
|
||||
void post_word_store(ulong a)
|
||||
{
|
||||
vu_long *save_addr = (vu_long *)(MPC5XXX_SRAM + MPC5XXX_SRAM_POST_SIZE);
|
||||
*save_addr = a;
|
||||
}
|
||||
|
||||
|
||||
ulong post_word_load(void)
|
||||
{
|
||||
vu_long *save_addr = (vu_long *)(MPC5XXX_SRAM + MPC5XXX_SRAM_POST_SIZE);
|
||||
return *save_addr;
|
||||
}
|
||||
#endif /* CONFIG_POST || CONFIG_LOGBUFFER */
|
||||
|
||||
|
||||
#ifdef CONFIG_MISC_INIT_R
|
||||
int misc_init_r(void)
|
||||
{
|
||||
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
|
||||
uchar buf[6];
|
||||
char str[18];
|
||||
|
||||
/* Read ethaddr from EEPROM */
|
||||
if (i2c_read(CFG_I2C_EEPROM, CONFIG_MAC_OFFSET, 2, buf, 6) == 0) {
|
||||
sprintf(str, "%02X:%02X:%02X:%02X:%02X:%02X",
|
||||
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);
|
||||
/* Check if MAC addr is owned by Schindler */
|
||||
if (strstr(str, "00:06:C3") != str) {
|
||||
printf(LOG_PREFIX "Warning - Illegal MAC address (%s)"
|
||||
" in EEPROM.\n", str);
|
||||
printf(LOG_PREFIX "Using MAC from environment\n");
|
||||
} else {
|
||||
printf(LOG_PREFIX "Using MAC (%s) from I2C EEPROM\n",
|
||||
str);
|
||||
setenv("ethaddr", str);
|
||||
}
|
||||
} else {
|
||||
printf(LOG_PREFIX "Warning - Unable to read MAC from I2C"
|
||||
" device at address %02X:%04X\n", CFG_I2C_EEPROM,
|
||||
CONFIG_MAC_OFFSET);
|
||||
printf(LOG_PREFIX "Using MAC from environment\n");
|
||||
}
|
||||
return 0;
|
||||
#endif /* defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) */
|
||||
}
|
||||
#endif /* CONFIG_MISC_INIT_R */
|
||||
|
||||
|
||||
#ifdef CONFIG_LAST_STAGE_INIT
|
||||
int last_stage_init(void)
|
||||
{
|
||||
#ifdef CONFIG_USB_STORAGE
|
||||
cm1_fwupdate();
|
||||
#endif /* CONFIG_USB_STORAGE */
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_LAST_STAGE_INIT */
|
||||
|
||||
|
||||
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP)
|
||||
void ft_board_setup(void *blob, bd_t *bd)
|
||||
{
|
||||
ft_cpu_setup(blob, bd);
|
||||
}
|
||||
#endif /* defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) */
|
|
@ -0,0 +1,446 @@
|
|||
/*
|
||||
* (C) Copyright 2007 Markus Kappeler <markus.kappeler@objectxp.com>
|
||||
*
|
||||
* 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 <command.h>
|
||||
#include <i2c.h>
|
||||
#include <usb.h>
|
||||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
|
||||
|
||||
int do_i2c(char *argv[])
|
||||
{
|
||||
unsigned char temp, temp1;
|
||||
|
||||
printf("Starting I2C Test\n"
|
||||
"Please set Jumper:\nI2C SDA 2-3\nI2C SCL 2-3\n\n"
|
||||
"Please press any key to start\n\n");
|
||||
getc();
|
||||
|
||||
temp = 0xf0; /* set io 0-4 as output */
|
||||
i2c_write(CFG_I2C_IO, 3, 1, (uchar *)&temp, 1);
|
||||
|
||||
printf("Press I2C4-7. LED I2C0-3 should have the same state\n\n"
|
||||
"Press any key to stop\n\n");
|
||||
|
||||
while (!tstc()) {
|
||||
i2c_read(CFG_I2C_IO, 0, 1, (uchar *)&temp, 1);
|
||||
temp1 = (temp >> 4) & 0x03;
|
||||
temp1 |= (temp >> 3) & 0x08; /* S302 -> LED303 */
|
||||
temp1 |= (temp >> 5) & 0x04; /* S303 -> LED302 */
|
||||
temp = temp1;
|
||||
i2c_write(CFG_I2C_IO, 1, 1, (uchar *)&temp, 1);
|
||||
}
|
||||
getc();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int do_usbtest(char *argv[])
|
||||
{
|
||||
int i;
|
||||
static int usb_stor_curr_dev = -1; /* current device */
|
||||
|
||||
printf("Starting USB Test\n"
|
||||
"Please insert USB Memmory Stick\n\n"
|
||||
"Please press any key to start\n\n");
|
||||
getc();
|
||||
|
||||
usb_stop();
|
||||
printf("(Re)start USB...\n");
|
||||
i = usb_init();
|
||||
#ifdef CONFIG_USB_STORAGE
|
||||
/* try to recognize storage devices immediately */
|
||||
if (i >= 0)
|
||||
usb_stor_curr_dev = usb_stor_scan(1);
|
||||
#endif /* CONFIG_USB_STORAGE */
|
||||
if (usb_stor_curr_dev >= 0)
|
||||
printf("Found USB Storage Dev continue with Test...\n");
|
||||
else {
|
||||
printf("No USB Storage Device detected.. Stop Test\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
usb_stor_info();
|
||||
|
||||
printf("stopping USB..\n");
|
||||
usb_stop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int do_led(char *argv[])
|
||||
{
|
||||
int i = 0;
|
||||
struct mpc5xxx_gpt_0_7 *gpt = (struct mpc5xxx_gpt_0_7 *)MPC5XXX_GPT;
|
||||
|
||||
printf("Starting LED Test\n"
|
||||
"Please set Switch S500 all off\n\n"
|
||||
"Please press any key to start\n\n");
|
||||
getc();
|
||||
|
||||
/* configure timer 2-3 for simple GPIO output High */
|
||||
gpt->gpt2.emsr |= 0x00000034;
|
||||
gpt->gpt3.emsr |= 0x00000034;
|
||||
|
||||
(*(vu_long *)MPC5XXX_WU_GPIO_ENABLE) |= 0x80000000;
|
||||
(*(vu_long *)MPC5XXX_WU_GPIO_DIR) |= 0x80000000;
|
||||
printf("Please press any key to stop\n\n");
|
||||
while (!tstc()) {
|
||||
if (i == 1) {
|
||||
(*(vu_long *)MPC5XXX_WU_GPIO_DATA_O) |= 0x80000000;
|
||||
gpt->gpt2.emsr &= ~0x00000010;
|
||||
gpt->gpt3.emsr &= ~0x00000010;
|
||||
} else if (i == 2) {
|
||||
(*(vu_long *)MPC5XXX_WU_GPIO_DATA_O) &= ~0x80000000;
|
||||
gpt->gpt2.emsr &= ~0x00000010;
|
||||
gpt->gpt3.emsr |= 0x00000010;
|
||||
} else if (i >= 3) {
|
||||
(*(vu_long *)MPC5XXX_WU_GPIO_DATA_O) &= ~0x80000000;
|
||||
gpt->gpt3.emsr &= ~0x00000010;
|
||||
gpt->gpt2.emsr |= 0x00000010;
|
||||
i = 0;
|
||||
}
|
||||
i++;
|
||||
udelay(200000);
|
||||
}
|
||||
getc();
|
||||
|
||||
(*(vu_long *)MPC5XXX_WU_GPIO_DATA_O) |= 0x80000000;
|
||||
gpt->gpt2.emsr |= 0x00000010;
|
||||
gpt->gpt3.emsr |= 0x00000010;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int do_rs232(char *argv[])
|
||||
{
|
||||
int error_status = 0;
|
||||
struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO;
|
||||
struct mpc5xxx_psc *psc1 = (struct mpc5xxx_psc *)MPC5XXX_PSC1;
|
||||
|
||||
/* Configure PSC 2-3-6 as GPIO */
|
||||
gpio->port_config &= 0xFF0FF80F;
|
||||
|
||||
switch (simple_strtoul(argv[2], NULL, 10)) {
|
||||
case 1:
|
||||
/* check RTS <-> CTS loop */
|
||||
/* set rts to 0 */
|
||||
printf("Uart 1 test: RX TX tested by using U-Boot\n"
|
||||
"Please connect RTS with CTS on Uart1 plug\n\n"
|
||||
"Press any key to start\n\n");
|
||||
getc();
|
||||
|
||||
psc1->op1 |= 0x01;
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
/* check status at cts */
|
||||
if ((psc1->ip & 0x01) != 0) {
|
||||
error_status = 3;
|
||||
printf("%s: failure at rs232_1, cts status is %d "
|
||||
"(should be 0)\n",
|
||||
__FUNCTION__, (psc1->ip & 0x01));
|
||||
}
|
||||
|
||||
/* set rts to 1 */
|
||||
psc1->op0 |= 0x01;
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
/* check status at cts */
|
||||
if ((psc1->ip & 0x01) != 1) {
|
||||
error_status = 3;
|
||||
printf("%s: failure at rs232_1, cts status is %d "
|
||||
"(should be 1)\n",
|
||||
__FUNCTION__, (psc1->ip & 0x01));
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
/* set PSC2_0, PSC2_2 as output and PSC2_1, PSC2_3 as input */
|
||||
printf("Uart 2 test: Please use RS232 Loopback plug on UART2\n"
|
||||
"\nPress any key to start\n\n");
|
||||
getc();
|
||||
|
||||
gpio->simple_gpioe &= ~(0x000000F0);
|
||||
gpio->simple_gpioe |= 0x000000F0;
|
||||
gpio->simple_ddr &= ~(0x000000F0);
|
||||
gpio->simple_ddr |= 0x00000050;
|
||||
|
||||
/* check TXD <-> RXD loop */
|
||||
/* set TXD to 1 */
|
||||
gpio->simple_dvo |= (1 << 4);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if ((gpio->simple_ival & 0x00000020) != 0x00000020) {
|
||||
error_status = 2;
|
||||
printf("%s: failure at rs232_2, rxd status is %d "
|
||||
"(should be 1)\n", __FUNCTION__,
|
||||
(gpio->simple_ival & 0x00000020) >> 5);
|
||||
}
|
||||
|
||||
/* set TXD to 0 */
|
||||
gpio->simple_dvo &= ~(1 << 4);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if ((gpio->simple_ival & 0x00000020) != 0x00000000) {
|
||||
error_status = 2;
|
||||
printf("%s: failure at rs232_2, rxd status is %d "
|
||||
"(should be 0)\n", __FUNCTION__,
|
||||
(gpio->simple_ival & 0x00000020) >> 5);
|
||||
}
|
||||
|
||||
/* check RTS <-> CTS loop */
|
||||
/* set RTS to 1 */
|
||||
gpio->simple_dvo |= (1 << 6);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if ((gpio->simple_ival & 0x00000080) != 0x00000080) {
|
||||
error_status = 3;
|
||||
printf("%s: failure at rs232_2, cts status is %d "
|
||||
"(should be 1)\n", __FUNCTION__,
|
||||
(gpio->simple_ival & 0x00000080) >> 7);
|
||||
}
|
||||
|
||||
/* set RTS to 0 */
|
||||
gpio->simple_dvo &= ~(1 << 6);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if ((gpio->simple_ival & 0x00000080) != 0x00000000) {
|
||||
error_status = 3;
|
||||
printf("%s: failure at rs232_2, cts status is %d "
|
||||
"(should be 0)\n", __FUNCTION__,
|
||||
(gpio->simple_ival & 0x00000080) >> 7);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
/* set PSC3_0, PSC3_2 as output and PSC3_1, PSC3_3 as input */
|
||||
printf("Uart 3 test: Please use RS232 Loopback plug on UART2\n"
|
||||
"\nPress any key to start\n\n");
|
||||
getc();
|
||||
|
||||
gpio->simple_gpioe &= ~(0x00000F00);
|
||||
gpio->simple_gpioe |= 0x00000F00;
|
||||
|
||||
gpio->simple_ddr &= ~(0x00000F00);
|
||||
gpio->simple_ddr |= 0x00000500;
|
||||
|
||||
/* check TXD <-> RXD loop */
|
||||
/* set TXD to 1 */
|
||||
gpio->simple_dvo |= (1 << 8);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if ((gpio->simple_ival & 0x00000200) != 0x00000200) {
|
||||
error_status = 2;
|
||||
printf("%s: failure at rs232_3, rxd status is %d "
|
||||
"(should be 1)\n", __FUNCTION__,
|
||||
(gpio->simple_ival & 0x00000200) >> 9);
|
||||
}
|
||||
|
||||
/* set TXD to 0 */
|
||||
gpio->simple_dvo &= ~(1 << 8);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if ((gpio->simple_ival & 0x00000200) != 0x00000000) {
|
||||
error_status = 2;
|
||||
printf("%s: failure at rs232_3, rxd status is %d "
|
||||
"(should be 0)\n", __FUNCTION__,
|
||||
(gpio->simple_ival & 0x00000200) >> 9);
|
||||
}
|
||||
|
||||
/* check RTS <-> CTS loop */
|
||||
/* set RTS to 1 */
|
||||
gpio->simple_dvo |= (1 << 10);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if ((gpio->simple_ival & 0x00000800) != 0x00000800) {
|
||||
error_status = 3;
|
||||
printf("%s: failure at rs232_3, cts status is %d "
|
||||
"(should be 1)\n", __FUNCTION__,
|
||||
(gpio->simple_ival & 0x00000800) >> 11);
|
||||
}
|
||||
|
||||
/* set RTS to 0 */
|
||||
gpio->simple_dvo &= ~(1 << 10);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if ((gpio->simple_ival & 0x00000800) != 0x00000000) {
|
||||
error_status = 3;
|
||||
printf("%s: failure at rs232_3, cts status is %d "
|
||||
"(should be 0)\n", __FUNCTION__,
|
||||
(gpio->simple_ival & 0x00000800) >> 11);
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
/* set PSC6_2, PSC6_3 as output and PSC6_0, PSC6_1 as input */
|
||||
printf("Uart 4 test: Please use RS232 Loopback plug on UART2\n"
|
||||
"\nPress any key to start\n\n");
|
||||
getc();
|
||||
|
||||
gpio->simple_gpioe &= ~(0xF0000000);
|
||||
gpio->simple_gpioe |= 0x30000000;
|
||||
|
||||
gpio->simple_ddr &= ~(0xf0000000);
|
||||
gpio->simple_ddr |= 0x30000000;
|
||||
|
||||
(*(vu_long *)MPC5XXX_WU_GPIO_ENABLE) |= 0x30000000;
|
||||
(*(vu_long *)MPC5XXX_WU_GPIO_DIR) &= ~(0x30000000);
|
||||
|
||||
/* check TXD <-> RXD loop */
|
||||
/* set TXD to 1 */
|
||||
gpio->simple_dvo |= (1 << 28);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x10000000) !=
|
||||
0x10000000) {
|
||||
error_status = 2;
|
||||
printf("%s: failure at rs232_4, rxd status is %d "
|
||||
"(should be 1)\n", __FUNCTION__,
|
||||
((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
|
||||
0x10000000) >> 28);
|
||||
}
|
||||
|
||||
/* set TXD to 0 */
|
||||
gpio->simple_dvo &= ~(1 << 28);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x10000000) !=
|
||||
0x00000000) {
|
||||
error_status = 2;
|
||||
printf("%s: failure at rs232_4, rxd status is %d "
|
||||
"(should be 0)\n", __FUNCTION__,
|
||||
((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
|
||||
0x10000000) >> 28);
|
||||
}
|
||||
|
||||
/* check RTS <-> CTS loop */
|
||||
/* set RTS to 1 */
|
||||
gpio->simple_dvo |= (1 << 29);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x20000000) !=
|
||||
0x20000000) {
|
||||
error_status = 3;
|
||||
printf("%s: failure at rs232_4, cts status is %d "
|
||||
"(should be 1)\n", __FUNCTION__,
|
||||
((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
|
||||
0x20000000) >> 29);
|
||||
}
|
||||
|
||||
/* set RTS to 0 */
|
||||
gpio->simple_dvo &= ~(1 << 29);
|
||||
|
||||
/* wait some time before requesting status */
|
||||
udelay(10);
|
||||
|
||||
if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x20000000) !=
|
||||
0x00000000) {
|
||||
error_status = 3;
|
||||
printf("%s: failure at rs232_4, cts status is %d "
|
||||
"(should be 0)\n", __FUNCTION__,
|
||||
((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
|
||||
0x20000000) >> 29);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
printf("%s: invalid rs232 number %s\n", __FUNCTION__, argv[2]);
|
||||
error_status = 1;
|
||||
break;
|
||||
}
|
||||
gpio->port_config |= (CFG_GPS_PORT_CONFIG & 0xFF0FF80F);
|
||||
|
||||
return error_status;
|
||||
}
|
||||
|
||||
int cmd_fkt(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
int rcode = -1;
|
||||
|
||||
switch (argc) {
|
||||
case 2:
|
||||
if (strncmp(argv[1], "i2c", 3) == 0)
|
||||
rcode = do_i2c(argv);
|
||||
else if (strncmp(argv[1], "led", 3) == 0)
|
||||
rcode = do_led(argv);
|
||||
else if (strncmp(argv[1], "usb", 3) == 0)
|
||||
rcode = do_usbtest(argv);
|
||||
break;
|
||||
case 3:
|
||||
if (strncmp(argv[1], "rs232", 3) == 0)
|
||||
rcode = do_rs232(argv);
|
||||
break;
|
||||
}
|
||||
|
||||
switch (rcode) {
|
||||
case -1:
|
||||
printf("Usage:\n"
|
||||
"fkt { i2c | led | usb }\n"
|
||||
"fkt rs232 number\n");
|
||||
rcode = 1;
|
||||
break;
|
||||
case 0:
|
||||
printf("Test passed\n");
|
||||
break;
|
||||
default:
|
||||
printf("Test failed with code: %d\n", rcode);
|
||||
}
|
||||
|
||||
return rcode;
|
||||
}
|
||||
|
||||
U_BOOT_CMD(
|
||||
fkt, 4, 1, cmd_fkt,
|
||||
"fkt - Function test routines\n",
|
||||
"i2c\n"
|
||||
" - Test I2C communication\n"
|
||||
"fkt led\n"
|
||||
" - Test LEDs\n"
|
||||
"fkt rs232 number\n"
|
||||
" - Test RS232 (loopback plug(s) for RS232 required)\n"
|
||||
"fkt usb\n"
|
||||
" - Test USB communication\n"
|
||||
);
|
||||
#endif /* CFG_CMD_BSP */
|
|
@ -0,0 +1,26 @@
|
|||
#
|
||||
# (C) Copyright 2007
|
||||
# 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
|
||||
#
|
||||
|
||||
TEXT_BASE = 0xfc000000
|
||||
|
||||
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
|
|
@ -0,0 +1,187 @@
|
|||
/*
|
||||
* (C) Copyright 2007 Schindler Lift Inc.
|
||||
* (C) Copyright 2007 Semihalf
|
||||
*
|
||||
* Author: Michel Marti <mma@objectxp.com>
|
||||
* Adapted for U-Boot 1.2 by Piotr Kruszynski <ppk@semihalf.com>:
|
||||
* - code clean-up
|
||||
* - bugfix for overwriting bootargs by user
|
||||
*
|
||||
* 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 <command.h>
|
||||
#include <malloc.h>
|
||||
#include <image.h>
|
||||
#include <usb.h>
|
||||
#include <fat.h>
|
||||
|
||||
#include "fwupdate.h"
|
||||
|
||||
extern int do_bootm(cmd_tbl_t *, int, int, char *[]);
|
||||
extern long do_fat_read(const char *, void *, unsigned long, int);
|
||||
extern int do_fat_fsload(cmd_tbl_t *, int, int, char *[]);
|
||||
|
||||
static int load_rescue_image(ulong);
|
||||
|
||||
void cm1_fwupdate(void)
|
||||
{
|
||||
cmd_tbl_t *bcmd;
|
||||
char *rsargs;
|
||||
char *tmp = NULL;
|
||||
char ka[16];
|
||||
char *argv[3] = { "bootm", ka, NULL };
|
||||
|
||||
/* Check if rescue system is disabled... */
|
||||
if (getenv("norescue")) {
|
||||
printf(LOG_PREFIX "Rescue System disabled.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Check if we have a USB storage device and load image */
|
||||
if (load_rescue_image(LOAD_ADDR))
|
||||
return;
|
||||
|
||||
bcmd = find_cmd("bootm");
|
||||
if (!bcmd)
|
||||
return;
|
||||
|
||||
sprintf(ka, "%lx", LOAD_ADDR);
|
||||
|
||||
/* prepare our bootargs */
|
||||
rsargs = getenv("rs-args");
|
||||
if (!rsargs)
|
||||
rsargs = RS_BOOTARGS;
|
||||
else {
|
||||
tmp = malloc(strlen(rsargs+1));
|
||||
if (!tmp) {
|
||||
printf(LOG_PREFIX "Memory allocation failed\n");
|
||||
return;
|
||||
}
|
||||
strcpy(tmp, rsargs);
|
||||
rsargs = tmp;
|
||||
}
|
||||
|
||||
setenv("bootargs", rsargs);
|
||||
|
||||
if (rsargs == tmp)
|
||||
free(rsargs);
|
||||
|
||||
printf(LOG_PREFIX "Starting update system (bootargs=%s)...\n", rsargs);
|
||||
do_bootm(bcmd, 0, 2, argv);
|
||||
}
|
||||
|
||||
static int load_rescue_image(ulong addr)
|
||||
{
|
||||
disk_partition_t info;
|
||||
int devno;
|
||||
int partno;
|
||||
int i;
|
||||
char fwdir[64];
|
||||
char nxri[128];
|
||||
char *tmp;
|
||||
char dev[7];
|
||||
char addr_str[16];
|
||||
char *argv[6] = { "fatload", "usb", dev, addr_str, nxri, NULL };
|
||||
block_dev_desc_t *stor_dev = NULL;
|
||||
cmd_tbl_t *bcmd;
|
||||
|
||||
/* Get name of firmware directory */
|
||||
tmp = getenv("fw-dir");
|
||||
|
||||
/* Copy it into fwdir */
|
||||
strncpy(fwdir, tmp ? tmp : FW_DIR, sizeof(fwdir));
|
||||
fwdir[sizeof(fwdir) - 1] = 0; /* Terminate string */
|
||||
|
||||
printf(LOG_PREFIX "Checking for firmware image directory '%s' on USB"
|
||||
" storage...\n", fwdir);
|
||||
usb_stop();
|
||||
if (usb_init() != 0)
|
||||
return 1;
|
||||
|
||||
/* Check for storage device */
|
||||
if (usb_stor_scan(1) != 0) {
|
||||
usb_stop();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Detect storage device */
|
||||
for (devno = 0; devno < USB_MAX_STOR_DEV; devno++) {
|
||||
stor_dev = usb_stor_get_dev(devno);
|
||||
if (stor_dev->type != DEV_TYPE_UNKNOWN)
|
||||
break;
|
||||
}
|
||||
if (!stor_dev || stor_dev->type == DEV_TYPE_UNKNOWN) {
|
||||
printf(LOG_PREFIX "No valid storage device found...\n");
|
||||
usb_stop();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Detect partition */
|
||||
for (partno = -1, i = 0; i < 6; i++) {
|
||||
if (get_partition_info(stor_dev, i, &info) == 0) {
|
||||
if (fat_register_device(stor_dev, i) == 0) {
|
||||
/* Check if rescue image is present */
|
||||
FW_DEBUG("Looking for firmware directory '%s'"
|
||||
" on partition %d\n", fwdir, i);
|
||||
if (do_fat_read(fwdir, NULL, 0, LS_NO) == -1) {
|
||||
FW_DEBUG("No NX rescue image on "
|
||||
"partition %d.\n", i);
|
||||
} else {
|
||||
partno = i;
|
||||
FW_DEBUG("Partition %d contains "
|
||||
"firmware directory\n", partno);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (partno == -1) {
|
||||
printf(LOG_PREFIX "Error: No valid (FAT) partition detected\n");
|
||||
usb_stop();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Load the rescue image */
|
||||
bcmd = find_cmd("fatload");
|
||||
if (!bcmd) {
|
||||
printf(LOG_PREFIX "Error - 'fatload' command not present.\n");
|
||||
usb_stop();
|
||||
return 1;
|
||||
}
|
||||
|
||||
tmp = getenv("nx-rescue-image");
|
||||
sprintf(nxri, "%s/%s", fwdir, tmp ? tmp : RESCUE_IMAGE);
|
||||
sprintf(dev, "%d:%d", devno, partno);
|
||||
sprintf(addr_str, "%lx", addr);
|
||||
|
||||
FW_DEBUG("fat_fsload device='%s', addr='%s', file: %s\n",
|
||||
dev, addr_str, nxri);
|
||||
|
||||
if (do_fat_fsload(bcmd, 0, 5, argv) != 0) {
|
||||
usb_stop();
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Stop USB */
|
||||
usb_stop();
|
||||
return 0;
|
||||
}
|
|
@ -0,0 +1,47 @@
|
|||
/*
|
||||
* (C) Copyright 2007 Schindler Lift Inc.
|
||||
*
|
||||
* Author: Michel Marti <mma@objectxp.com>
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef __FW_UPDATE_H
|
||||
#define __FW_UPDATE_H
|
||||
|
||||
/* Default prefix for output messages */
|
||||
#define LOG_PREFIX "CM1: "
|
||||
|
||||
/* Extra debug macro */
|
||||
#ifdef CONFIG_FWUPDATE_DEBUG
|
||||
#define FW_DEBUG(fmt...) printf(LOG_PREFIX fmt)
|
||||
#else
|
||||
#define FW_DEBUG(fmt...)
|
||||
#endif
|
||||
|
||||
/* Name of the directory holding firmware images */
|
||||
#define FW_DIR "nx-fw"
|
||||
#define RESCUE_IMAGE "nxrs.img"
|
||||
#define LOAD_ADDR 0x400000
|
||||
#define RS_BOOTARGS "ramdisk=8192K"
|
||||
|
||||
/* Main function for fwupdate */
|
||||
void cm1_fwupdate(void);
|
||||
|
||||
#endif /* __FW_UPDATE_H */
|
|
@ -0,0 +1,123 @@
|
|||
/*
|
||||
* (C) Copyright 2003-2007
|
||||
* 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
|
||||
*/
|
||||
|
||||
OUTPUT_ARCH(powerpc)
|
||||
SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
|
||||
SECTIONS
|
||||
{
|
||||
/* Read-only sections, merged into text segment: */
|
||||
. = + SIZEOF_HEADERS;
|
||||
.interp : { *(.interp) }
|
||||
.hash : { *(.hash) }
|
||||
.dynsym : { *(.dynsym) }
|
||||
.dynstr : { *(.dynstr) }
|
||||
.rel.text : { *(.rel.text) }
|
||||
.rela.text : { *(.rela.text) }
|
||||
.rel.data : { *(.rel.data) }
|
||||
.rela.data : { *(.rela.data) }
|
||||
.rel.rodata : { *(.rel.rodata) }
|
||||
.rela.rodata : { *(.rela.rodata) }
|
||||
.rel.got : { *(.rel.got) }
|
||||
.rela.got : { *(.rela.got) }
|
||||
.rel.ctors : { *(.rel.ctors) }
|
||||
.rela.ctors : { *(.rela.ctors) }
|
||||
.rel.dtors : { *(.rel.dtors) }
|
||||
.rela.dtors : { *(.rela.dtors) }
|
||||
.rel.bss : { *(.rel.bss) }
|
||||
.rela.bss : { *(.rela.bss) }
|
||||
.rel.plt : { *(.rel.plt) }
|
||||
.rela.plt : { *(.rela.plt) }
|
||||
.init : { *(.init) }
|
||||
.plt : { *(.plt) }
|
||||
.text :
|
||||
{
|
||||
cpu/mpc5xxx/start.o (.text)
|
||||
*(.text)
|
||||
*(.fixup)
|
||||
*(.got1)
|
||||
. = ALIGN(16);
|
||||
*(.rodata)
|
||||
*(.rodata1)
|
||||
*(.rodata.str1.4)
|
||||
*(.eh_frame)
|
||||
}
|
||||
.fini : { *(.fini) } =0
|
||||
.ctors : { *(.ctors) }
|
||||
.dtors : { *(.dtors) }
|
||||
|
||||
/* Read-write section, merged into data segment: */
|
||||
. = (. + 0x0FFF) & 0xFFFFF000;
|
||||
_erotext = .;
|
||||
PROVIDE (erotext = .);
|
||||
.reloc :
|
||||
{
|
||||
*(.got)
|
||||
_GOT2_TABLE_ = .;
|
||||
*(.got2)
|
||||
_FIXUP_TABLE_ = .;
|
||||
*(.fixup)
|
||||
}
|
||||
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2;
|
||||
__fixup_entries = (. - _FIXUP_TABLE_) >> 2;
|
||||
|
||||
.data :
|
||||
{
|
||||
*(.data)
|
||||
*(.data1)
|
||||
*(.sdata)
|
||||
*(.sdata2)
|
||||
*(.dynamic)
|
||||
CONSTRUCTORS
|
||||
}
|
||||
_edata = .;
|
||||
PROVIDE (edata = .);
|
||||
|
||||
. = .;
|
||||
__u_boot_cmd_start = .;
|
||||
.u_boot_cmd : { *(.u_boot_cmd) }
|
||||
__u_boot_cmd_end = .;
|
||||
|
||||
|
||||
. = .;
|
||||
__start___ex_table = .;
|
||||
__ex_table : { *(__ex_table) }
|
||||
__stop___ex_table = .;
|
||||
|
||||
. = ALIGN(4096);
|
||||
__init_begin = .;
|
||||
.text.init : { *(.text.init) }
|
||||
.data.init : { *(.data.init) }
|
||||
. = ALIGN(4096);
|
||||
__init_end = .;
|
||||
|
||||
__bss_start = .;
|
||||
.bss :
|
||||
{
|
||||
*(.sbss) *(.scommon)
|
||||
*(.dynbss)
|
||||
*(.bss)
|
||||
*(COMMON)
|
||||
}
|
||||
_end = . ;
|
||||
PROVIDE (end = .);
|
||||
}
|
|
@ -82,6 +82,7 @@ void flash_print_info(flash_info_t *info)
|
|||
case FLASH_MAN_AMD: printf ("AMD "); break;
|
||||
case FLASH_MAN_FUJ: printf ("FUJITSU "); break;
|
||||
case FLASH_MAN_SST: printf ("SST "); break;
|
||||
case FLASH_MAN_STM: printf ("ST Micro"); break;
|
||||
case FLASH_MAN_EXCEL: printf ("Excel Semiconductor "); break;
|
||||
case FLASH_MAN_MX: printf ("MXIC "); break;
|
||||
default: printf ("Unknown Vendor "); break;
|
||||
|
@ -118,6 +119,8 @@ void flash_print_info(flash_info_t *info)
|
|||
break;
|
||||
case FLASH_SST040: printf ("SST39LF/VF040 (4 Mbit, uniform sector size)\n");
|
||||
break;
|
||||
case STM_ID_M29W040B: printf ("ST Micro M29W040B (4 Mbit, uniform sector size)\n");
|
||||
break;
|
||||
default: printf ("Unknown Chip Type\n");
|
||||
break;
|
||||
}
|
||||
|
@ -193,6 +196,9 @@ static ulong flash_get_size(vu_long *addr, flash_info_t *info)
|
|||
case (CFG_FLASH_WORD_SIZE)SST_MANUFACT:
|
||||
info->flash_id = FLASH_MAN_SST;
|
||||
break;
|
||||
case (CFG_FLASH_WORD_SIZE)STM_MANUFACT:
|
||||
info->flash_id = FLASH_MAN_STM;
|
||||
break;
|
||||
case (CFG_FLASH_WORD_SIZE)EXCEL_MANUFACT:
|
||||
info->flash_id = FLASH_MAN_EXCEL;
|
||||
break;
|
||||
|
@ -226,6 +232,11 @@ static ulong flash_get_size(vu_long *addr, flash_info_t *info)
|
|||
info->sector_count = 8;
|
||||
info->size = 0x0080000; /* => 0.5 MB */
|
||||
break;
|
||||
case (CFG_FLASH_WORD_SIZE)STM_ID_M29W040B:
|
||||
info->flash_id += FLASH_AM040;
|
||||
info->sector_count = 8;
|
||||
info->size = 0x0080000; /* => 0,5 MB */
|
||||
break;
|
||||
|
||||
case (CFG_FLASH_WORD_SIZE)AMD_ID_LV800T:
|
||||
info->flash_id += FLASH_AM800T;
|
||||
|
|
|
@ -85,8 +85,9 @@ static void status_led_blink (void)
|
|||
|
||||
/* set all LED which are on, to state BLINKING */
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (val & 0x08) status_led_set (i, STATUS_LED_BLINKING);
|
||||
val = val << 1;
|
||||
if (val & 0x01) status_led_set (3 - i, STATUS_LED_BLINKING);
|
||||
else status_led_set (3 - i, STATUS_LED_OFF);
|
||||
val = val >> 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -113,12 +114,14 @@ void show_boot_progress (int val)
|
|||
status_led_set (1, STATUS_LED_ON);
|
||||
status_led_set (2, STATUS_LED_ON);
|
||||
break;
|
||||
#if 0
|
||||
case 64:
|
||||
/* starting Ethernet configuration */
|
||||
status_led_set (0, STATUS_LED_OFF);
|
||||
status_led_set (1, STATUS_LED_OFF);
|
||||
status_led_set (2, STATUS_LED_ON);
|
||||
break;
|
||||
#endif
|
||||
case 80:
|
||||
/* loading Image */
|
||||
status_led_set (0, STATUS_LED_ON);
|
||||
|
@ -235,7 +238,13 @@ void load_sernum_ethaddr (void)
|
|||
}
|
||||
/* Env doesnt exist -> hang */
|
||||
status_led_blink ();
|
||||
hang ();
|
||||
/* here we do this "handy" because we have no interrupts
|
||||
at this time */
|
||||
puts ("### EEPROM ERROR ### Please RESET the board ###\n");
|
||||
for (;;) {
|
||||
__led_toggle (12);
|
||||
udelay (100000);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -404,13 +413,22 @@ static void pcs440ep_checksha1 (void)
|
|||
int ret;
|
||||
char *cs_test;
|
||||
|
||||
status_led_set (0, STATUS_LED_OFF);
|
||||
status_led_set (1, STATUS_LED_OFF);
|
||||
status_led_set (2, STATUS_LED_ON);
|
||||
ret = pcs440ep_sha1 (1);
|
||||
if (ret == 0) return;
|
||||
|
||||
if ((cs_test = getenv ("cs_test")) == NULL) {
|
||||
/* Env doesnt exist -> hang */
|
||||
status_led_blink ();
|
||||
hang ();
|
||||
/* here we do this "handy" because we have no interrupts
|
||||
at this time */
|
||||
puts ("### SHA1 ERROR ### Please RESET the board ###\n");
|
||||
for (;;) {
|
||||
__led_toggle (2);
|
||||
udelay (100000);
|
||||
}
|
||||
}
|
||||
|
||||
if (strncmp (cs_test, "off", 3) == 0) {
|
||||
|
@ -511,7 +529,7 @@ void spd_ddr_init_hang (void)
|
|||
status_led_set (1, STATUS_LED_ON);
|
||||
/* we cannot use hang() because we are still running from
|
||||
Flash, and so the status_led driver is not initialized */
|
||||
puts ("### ERROR ### Please RESET the board ###\n");
|
||||
puts ("### SDRAM ERROR ### Please RESET the board ###\n");
|
||||
for (;;) {
|
||||
__led_toggle (4);
|
||||
udelay (100000);
|
||||
|
@ -751,28 +769,41 @@ void hw_watchdog_reset(void)
|
|||
************************************************************************/
|
||||
int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
int rcode = 0;
|
||||
int rcode = 0, i;
|
||||
ulong pattern = 0;
|
||||
|
||||
pattern = simple_strtoul (argv[1], NULL, 10);
|
||||
if (pattern > 200) {
|
||||
pattern = simple_strtoul (argv[1], NULL, 16);
|
||||
if (pattern > 0x400) {
|
||||
int val = GET_LEDS;
|
||||
printf ("led: %x\n", val);
|
||||
return rcode;
|
||||
}
|
||||
if (pattern > 0x200) {
|
||||
status_led_blink ();
|
||||
hang ();
|
||||
return rcode;
|
||||
}
|
||||
if (pattern > 100) {
|
||||
if (pattern > 0x100) {
|
||||
status_led_blink ();
|
||||
return rcode;
|
||||
}
|
||||
pattern &= 0x0f;
|
||||
set_leds (pattern);
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (pattern & 0x01) status_led_set (i, STATUS_LED_ON);
|
||||
else status_led_set (i, STATUS_LED_OFF);
|
||||
pattern = pattern >> 1;
|
||||
}
|
||||
return rcode;
|
||||
}
|
||||
|
||||
U_BOOT_CMD(
|
||||
led, 2, 1, do_led,
|
||||
"led - set the led\n",
|
||||
NULL
|
||||
"led [bitmask] - set the DIAG-LED\n",
|
||||
"[bitmask] 0x01 = DIAG 1 on\n"
|
||||
" 0x02 = DIAG 2 on\n"
|
||||
" 0x04 = DIAG 3 on\n"
|
||||
" 0x08 = DIAG 4 on\n"
|
||||
" > 0x100 set the LED, who are on, to state blinking\n"
|
||||
);
|
||||
|
||||
#if defined(CONFIG_SHA1_CHECK_UB_IMG)
|
||||
|
|
|
@ -56,13 +56,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
#include <hush.h>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
#ifdef CFG_INIT_RAM_LOCK
|
||||
#include <asm/cache.h>
|
||||
#endif
|
||||
|
@ -176,7 +169,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
addr = simple_strtoul(argv[1], NULL, 16);
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (1);
|
||||
show_boot_progress (1);
|
||||
printf ("## Booting image at %08lx ...\n", addr);
|
||||
|
||||
/* Copy header so we can blank CRC field for re-calculation */
|
||||
|
@ -200,11 +193,11 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
#endif /* __I386__ */
|
||||
{
|
||||
puts ("Bad Magic Number\n");
|
||||
SHOW_BOOT_PROGRESS (-1);
|
||||
show_boot_progress (-1);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (2);
|
||||
show_boot_progress (2);
|
||||
|
||||
data = (ulong)&header;
|
||||
len = sizeof(image_header_t);
|
||||
|
@ -214,10 +207,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
|
||||
if (crc32 (0, (uchar *)data, len) != checksum) {
|
||||
puts ("Bad Header Checksum\n");
|
||||
SHOW_BOOT_PROGRESS (-2);
|
||||
show_boot_progress (-2);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (3);
|
||||
show_boot_progress (3);
|
||||
|
||||
#ifdef CONFIG_HAS_DATAFLASH
|
||||
if (addr_dataflash(addr)){
|
||||
|
@ -238,12 +231,12 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
puts (" Verifying Checksum ... ");
|
||||
if (crc32 (0, (uchar *)data, len) != ntohl(hdr->ih_dcrc)) {
|
||||
printf ("Bad Data CRC\n");
|
||||
SHOW_BOOT_PROGRESS (-3);
|
||||
show_boot_progress (-3);
|
||||
return 1;
|
||||
}
|
||||
puts ("OK\n");
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (4);
|
||||
show_boot_progress (4);
|
||||
|
||||
len_ptr = (ulong *)data;
|
||||
|
||||
|
@ -272,10 +265,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
#endif
|
||||
{
|
||||
printf ("Unsupported Architecture 0x%x\n", hdr->ih_arch);
|
||||
SHOW_BOOT_PROGRESS (-4);
|
||||
show_boot_progress (-4);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (5);
|
||||
show_boot_progress (5);
|
||||
|
||||
switch (hdr->ih_type) {
|
||||
case IH_TYPE_STANDALONE:
|
||||
|
@ -297,10 +290,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
data += 4;
|
||||
break;
|
||||
default: printf ("Wrong Image Type for %s command\n", cmdtp->name);
|
||||
SHOW_BOOT_PROGRESS (-5);
|
||||
show_boot_progress (-5);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (6);
|
||||
show_boot_progress (6);
|
||||
|
||||
/*
|
||||
* We have reached the point of no return: we are going to
|
||||
|
@ -351,7 +344,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
if (gunzip ((void *)ntohl(hdr->ih_load), unc_len,
|
||||
(uchar *)data, &len) != 0) {
|
||||
puts ("GUNZIP ERROR - must RESET board to recover\n");
|
||||
SHOW_BOOT_PROGRESS (-6);
|
||||
show_boot_progress (-6);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
break;
|
||||
|
@ -368,7 +361,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
CFG_MALLOC_LEN < (4096 * 1024), 0);
|
||||
if (i != BZ_OK) {
|
||||
printf ("BUNZIP2 ERROR %d - must RESET board to recover\n", i);
|
||||
SHOW_BOOT_PROGRESS (-6);
|
||||
show_boot_progress (-6);
|
||||
udelay(100000);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
@ -378,11 +371,11 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
if (iflag)
|
||||
enable_interrupts();
|
||||
printf ("Unimplemented compression type %d\n", hdr->ih_comp);
|
||||
SHOW_BOOT_PROGRESS (-7);
|
||||
show_boot_progress (-7);
|
||||
return 1;
|
||||
}
|
||||
puts ("OK\n");
|
||||
SHOW_BOOT_PROGRESS (7);
|
||||
show_boot_progress (7);
|
||||
|
||||
switch (hdr->ih_type) {
|
||||
case IH_TYPE_STANDALONE:
|
||||
|
@ -409,10 +402,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
if (iflag)
|
||||
enable_interrupts();
|
||||
printf ("Can't boot image type %d\n", hdr->ih_type);
|
||||
SHOW_BOOT_PROGRESS (-8);
|
||||
show_boot_progress (-8);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (8);
|
||||
show_boot_progress (8);
|
||||
|
||||
switch (hdr->ih_os) {
|
||||
default: /* handled by (original) Linux case */
|
||||
|
@ -458,7 +451,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
#endif
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (-9);
|
||||
show_boot_progress (-9);
|
||||
#ifdef DEBUG
|
||||
puts ("\n## Control returned to monitor - resetting...\n");
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
|
@ -637,7 +630,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
#endif
|
||||
if (argc >= 3) {
|
||||
debug ("Not skipping initrd\n");
|
||||
SHOW_BOOT_PROGRESS (9);
|
||||
show_boot_progress (9);
|
||||
|
||||
addr = simple_strtoul(argv[2], NULL, 16);
|
||||
|
||||
|
@ -648,7 +641,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
|
||||
if (ntohl(hdr->ih_magic) != IH_MAGIC) {
|
||||
puts ("Bad Magic Number\n");
|
||||
SHOW_BOOT_PROGRESS (-10);
|
||||
show_boot_progress (-10);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -660,11 +653,11 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
|
||||
if (crc32 (0, (uchar *)data, len) != checksum) {
|
||||
puts ("Bad Header Checksum\n");
|
||||
SHOW_BOOT_PROGRESS (-11);
|
||||
show_boot_progress (-11);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (10);
|
||||
show_boot_progress (10);
|
||||
|
||||
print_image_hdr (hdr);
|
||||
|
||||
|
@ -697,19 +690,19 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
|
||||
if (csum != ntohl(hdr->ih_dcrc)) {
|
||||
puts ("Bad Data CRC\n");
|
||||
SHOW_BOOT_PROGRESS (-12);
|
||||
show_boot_progress (-12);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
puts ("OK\n");
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (11);
|
||||
show_boot_progress (11);
|
||||
|
||||
if ((hdr->ih_os != IH_OS_LINUX) ||
|
||||
(hdr->ih_arch != IH_CPU_PPC) ||
|
||||
(hdr->ih_type != IH_TYPE_RAMDISK) ) {
|
||||
puts ("No Linux PPC Ramdisk Image\n");
|
||||
SHOW_BOOT_PROGRESS (-13);
|
||||
show_boot_progress (-13);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -720,7 +713,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
u_long tail = ntohl(len_ptr[0]) % 4;
|
||||
int i;
|
||||
|
||||
SHOW_BOOT_PROGRESS (13);
|
||||
show_boot_progress (13);
|
||||
|
||||
/* skip kernel length and terminator */
|
||||
data = (ulong)(&len_ptr[2]);
|
||||
|
@ -739,7 +732,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
/*
|
||||
* no initrd image
|
||||
*/
|
||||
SHOW_BOOT_PROGRESS (14);
|
||||
show_boot_progress (14);
|
||||
|
||||
len = data = 0;
|
||||
}
|
||||
|
@ -890,7 +883,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
initrd_start = nsp;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (12);
|
||||
show_boot_progress (12);
|
||||
|
||||
debug ("## initrd at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n",
|
||||
data, data + len - 1, len, len);
|
||||
|
@ -926,7 +919,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
debug ("## Transferring control to Linux (at address %08lx) ...\n",
|
||||
(ulong)kernel);
|
||||
|
||||
SHOW_BOOT_PROGRESS (15);
|
||||
show_boot_progress (15);
|
||||
|
||||
#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
|
||||
unlock_ram_in_cache();
|
||||
|
@ -1115,7 +1108,7 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
|
|||
printf ("## Transferring control to NetBSD stage-2 loader (at address %08lx) ...\n",
|
||||
(ulong)loader);
|
||||
|
||||
SHOW_BOOT_PROGRESS (15);
|
||||
show_boot_progress (15);
|
||||
|
||||
/*
|
||||
* NetBSD Stage-2 Loader Parameters:
|
||||
|
@ -1578,7 +1571,7 @@ do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
printf ("## Transferring control to RTEMS (at address %08lx) ...\n",
|
||||
(ulong)entry_point);
|
||||
|
||||
SHOW_BOOT_PROGRESS (15);
|
||||
show_boot_progress (15);
|
||||
|
||||
/*
|
||||
* RTEMS Parameters:
|
||||
|
|
|
@ -12,13 +12,6 @@
|
|||
#include <malloc.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
|
||||
|
||||
#include <linux/mtd/nftl.h>
|
||||
|
@ -216,7 +209,7 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
image_header_t *hdr;
|
||||
int rcode = 0;
|
||||
|
||||
SHOW_BOOT_PROGRESS (34);
|
||||
show_boot_progress (34);
|
||||
switch (argc) {
|
||||
case 1:
|
||||
addr = CFG_LOAD_ADDR;
|
||||
|
@ -237,27 +230,27 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
break;
|
||||
default:
|
||||
printf ("Usage:\n%s\n", cmdtp->usage);
|
||||
SHOW_BOOT_PROGRESS (-35);
|
||||
show_boot_progress (-35);
|
||||
return 1;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (35);
|
||||
show_boot_progress (35);
|
||||
if (!boot_device) {
|
||||
puts ("\n** No boot device **\n");
|
||||
SHOW_BOOT_PROGRESS (-36);
|
||||
show_boot_progress (-36);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (36);
|
||||
show_boot_progress (36);
|
||||
|
||||
dev = simple_strtoul(boot_device, &ep, 16);
|
||||
|
||||
if ((dev >= CFG_MAX_DOC_DEVICE) ||
|
||||
(doc_dev_desc[dev].ChipID == DOC_ChipID_UNKNOWN)) {
|
||||
printf ("\n** Device %d not available\n", dev);
|
||||
SHOW_BOOT_PROGRESS (-37);
|
||||
show_boot_progress (-37);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (37);
|
||||
show_boot_progress (37);
|
||||
|
||||
printf ("\nLoading from device %d: %s at 0x%lX (offset 0x%lX)\n",
|
||||
dev, doc_dev_desc[dev].name, doc_dev_desc[dev].physadr,
|
||||
|
@ -266,10 +259,10 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
if (doc_rw (doc_dev_desc + dev, 1, offset,
|
||||
SECTORSIZE, NULL, (u_char *)addr)) {
|
||||
printf ("** Read error on %d\n", dev);
|
||||
SHOW_BOOT_PROGRESS (-38);
|
||||
show_boot_progress (-38);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (38);
|
||||
show_boot_progress (38);
|
||||
|
||||
hdr = (image_header_t *)addr;
|
||||
|
||||
|
@ -281,18 +274,18 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
cnt -= SECTORSIZE;
|
||||
} else {
|
||||
puts ("\n** Bad Magic Number **\n");
|
||||
SHOW_BOOT_PROGRESS (-39);
|
||||
show_boot_progress (-39);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (39);
|
||||
show_boot_progress (39);
|
||||
|
||||
if (doc_rw (doc_dev_desc + dev, 1, offset + SECTORSIZE, cnt,
|
||||
NULL, (u_char *)(addr+SECTORSIZE))) {
|
||||
printf ("** Read error on %d\n", dev);
|
||||
SHOW_BOOT_PROGRESS (-40);
|
||||
show_boot_progress (-40);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (40);
|
||||
show_boot_progress (40);
|
||||
|
||||
/* Loading ok, update default load address */
|
||||
|
||||
|
|
|
@ -59,13 +59,6 @@ unsigned long mips_io_port_base = 0;
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_IDE_8xx_DIRECT
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
#endif
|
||||
|
@ -385,7 +378,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
image_header_t *hdr;
|
||||
int rcode = 0;
|
||||
|
||||
SHOW_BOOT_PROGRESS (41);
|
||||
show_boot_progress (41);
|
||||
switch (argc) {
|
||||
case 1:
|
||||
addr = CFG_LOAD_ADDR;
|
||||
|
@ -401,50 +394,50 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
break;
|
||||
default:
|
||||
printf ("Usage:\n%s\n", cmdtp->usage);
|
||||
SHOW_BOOT_PROGRESS (-42);
|
||||
show_boot_progress (-42);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (42);
|
||||
show_boot_progress (42);
|
||||
|
||||
if (!boot_device) {
|
||||
puts ("\n** No boot device **\n");
|
||||
SHOW_BOOT_PROGRESS (-43);
|
||||
show_boot_progress (-43);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (43);
|
||||
show_boot_progress (43);
|
||||
|
||||
dev = simple_strtoul(boot_device, &ep, 16);
|
||||
|
||||
if (ide_dev_desc[dev].type==DEV_TYPE_UNKNOWN) {
|
||||
printf ("\n** Device %d not available\n", dev);
|
||||
SHOW_BOOT_PROGRESS (-44);
|
||||
show_boot_progress (-44);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (44);
|
||||
show_boot_progress (44);
|
||||
|
||||
if (*ep) {
|
||||
if (*ep != ':') {
|
||||
puts ("\n** Invalid boot device, use `dev[:part]' **\n");
|
||||
SHOW_BOOT_PROGRESS (-45);
|
||||
show_boot_progress (-45);
|
||||
return 1;
|
||||
}
|
||||
part = simple_strtoul(++ep, NULL, 16);
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (45);
|
||||
show_boot_progress (45);
|
||||
if (get_partition_info (&ide_dev_desc[dev], part, &info)) {
|
||||
SHOW_BOOT_PROGRESS (-46);
|
||||
show_boot_progress (-46);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (46);
|
||||
show_boot_progress (46);
|
||||
if ((strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) &&
|
||||
(strncmp((char *)info.type, BOOT_PART_COMP, sizeof(info.type)) != 0)) {
|
||||
printf ("\n** Invalid partition type \"%.32s\""
|
||||
" (expect \"" BOOT_PART_TYPE "\")\n",
|
||||
info.type);
|
||||
SHOW_BOOT_PROGRESS (-47);
|
||||
show_boot_progress (-47);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (47);
|
||||
show_boot_progress (47);
|
||||
|
||||
printf ("\nLoading from IDE device %d, partition %d: "
|
||||
"Name: %.32s Type: %.32s\n",
|
||||
|
@ -455,29 +448,29 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
|
||||
if (ide_dev_desc[dev].block_read (dev, info.start, 1, (ulong *)addr) != 1) {
|
||||
printf ("** Read error on %d:%d\n", dev, part);
|
||||
SHOW_BOOT_PROGRESS (-48);
|
||||
show_boot_progress (-48);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (48);
|
||||
show_boot_progress (48);
|
||||
|
||||
hdr = (image_header_t *)addr;
|
||||
|
||||
if (ntohl(hdr->ih_magic) != IH_MAGIC) {
|
||||
printf("\n** Bad Magic Number **\n");
|
||||
SHOW_BOOT_PROGRESS (-49);
|
||||
show_boot_progress (-49);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (49);
|
||||
show_boot_progress (49);
|
||||
|
||||
checksum = ntohl(hdr->ih_hcrc);
|
||||
hdr->ih_hcrc = 0;
|
||||
|
||||
if (crc32 (0, (uchar *)hdr, sizeof(image_header_t)) != checksum) {
|
||||
puts ("\n** Bad Header Checksum **\n");
|
||||
SHOW_BOOT_PROGRESS (-50);
|
||||
show_boot_progress (-50);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (50);
|
||||
show_boot_progress (50);
|
||||
hdr->ih_hcrc = htonl(checksum); /* restore checksum for later use */
|
||||
|
||||
print_image_hdr (hdr);
|
||||
|
@ -490,10 +483,10 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
if (ide_dev_desc[dev].block_read (dev, info.start+1, cnt,
|
||||
(ulong *)(addr+info.blksz)) != cnt) {
|
||||
printf ("** Read error on %d:%d\n", dev, part);
|
||||
SHOW_BOOT_PROGRESS (-51);
|
||||
show_boot_progress (-51);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS (51);
|
||||
show_boot_progress (51);
|
||||
|
||||
|
||||
/* Loading ok, update default load address */
|
||||
|
|
|
@ -25,14 +25,6 @@
|
|||
#include <watchdog.h>
|
||||
#include <malloc.h>
|
||||
#include <asm/byteorder.h>
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
#include <jffs2/jffs2.h>
|
||||
#include <nand.h>
|
||||
|
||||
|
@ -486,19 +478,19 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
|
|||
r = nand_read(nand, offset, &cnt, (u_char *) addr);
|
||||
if (r) {
|
||||
puts("** Read error\n");
|
||||
SHOW_BOOT_PROGRESS(-56);
|
||||
show_boot_progress (-56);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(56);
|
||||
show_boot_progress (56);
|
||||
|
||||
hdr = (image_header_t *) addr;
|
||||
|
||||
if (ntohl(hdr->ih_magic) != IH_MAGIC) {
|
||||
printf("\n** Bad Magic Number 0x%x **\n", hdr->ih_magic);
|
||||
SHOW_BOOT_PROGRESS(-57);
|
||||
show_boot_progress (-57);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(57);
|
||||
show_boot_progress (57);
|
||||
|
||||
print_image_hdr(hdr);
|
||||
|
||||
|
@ -507,10 +499,10 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
|
|||
r = nand_read(nand, offset, &cnt, (u_char *) addr);
|
||||
if (r) {
|
||||
puts("** Read error\n");
|
||||
SHOW_BOOT_PROGRESS(-58);
|
||||
show_boot_progress (-58);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(58);
|
||||
show_boot_progress (58);
|
||||
|
||||
/* Loading ok, update default load address */
|
||||
|
||||
|
@ -562,7 +554,7 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
|||
}
|
||||
#endif
|
||||
|
||||
SHOW_BOOT_PROGRESS(52);
|
||||
show_boot_progress(52);
|
||||
switch (argc) {
|
||||
case 1:
|
||||
addr = CFG_LOAD_ADDR;
|
||||
|
@ -586,26 +578,26 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
|||
usage:
|
||||
#endif
|
||||
printf("Usage:\n%s\n", cmdtp->usage);
|
||||
SHOW_BOOT_PROGRESS(-53);
|
||||
show_boot_progress(-53);
|
||||
return 1;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS(53);
|
||||
show_boot_progress(53);
|
||||
if (!boot_device) {
|
||||
puts("\n** No boot device **\n");
|
||||
SHOW_BOOT_PROGRESS(-54);
|
||||
show_boot_progress(-54);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(54);
|
||||
show_boot_progress(54);
|
||||
|
||||
idx = simple_strtoul(boot_device, NULL, 16);
|
||||
|
||||
if (idx < 0 || idx >= CFG_MAX_NAND_DEVICE || !nand_info[idx].name) {
|
||||
printf("\n** Device %d not available\n", idx);
|
||||
SHOW_BOOT_PROGRESS(-55);
|
||||
show_boot_progress(-55);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(55);
|
||||
show_boot_progress(55);
|
||||
|
||||
return nand_load_image(cmdtp, &nand_info[idx], offset, addr, argv[0]);
|
||||
}
|
||||
|
@ -627,11 +619,11 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot,
|
|||
#include <asm/io.h>
|
||||
#include <watchdog.h>
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
#ifdef CONFIG_show_boot_progress
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
# define show_boot_progress(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
# define show_boot_progress(arg)
|
||||
#endif
|
||||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
|
||||
|
@ -894,7 +886,7 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
ulong offset = 0;
|
||||
image_header_t *hdr;
|
||||
int rcode = 0;
|
||||
SHOW_BOOT_PROGRESS(52);
|
||||
show_boot_progress (52);
|
||||
switch (argc) {
|
||||
case 1:
|
||||
addr = CFG_LOAD_ADDR;
|
||||
|
@ -915,27 +907,27 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
break;
|
||||
default:
|
||||
printf ("Usage:\n%s\n", cmdtp->usage);
|
||||
SHOW_BOOT_PROGRESS (-53);
|
||||
show_boot_progress (-53);
|
||||
return 1;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS(53);
|
||||
show_boot_progress (53);
|
||||
if (!boot_device) {
|
||||
puts ("\n** No boot device **\n");
|
||||
SHOW_BOOT_PROGRESS (-54);
|
||||
show_boot_progress (-54);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(54);
|
||||
show_boot_progress (54);
|
||||
|
||||
dev = simple_strtoul(boot_device, &ep, 16);
|
||||
|
||||
if ((dev >= CFG_MAX_NAND_DEVICE) ||
|
||||
(nand_dev_desc[dev].ChipID == NAND_ChipID_UNKNOWN)) {
|
||||
printf ("\n** Device %d not available\n", dev);
|
||||
SHOW_BOOT_PROGRESS (-55);
|
||||
show_boot_progress (-55);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(55);
|
||||
show_boot_progress (55);
|
||||
|
||||
printf ("\nLoading from device %d: %s at 0x%lx (offset 0x%lx)\n",
|
||||
dev, nand_dev_desc[dev].name, nand_dev_desc[dev].IO_ADDR,
|
||||
|
@ -944,10 +936,10 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
if (nand_legacy_rw (nand_dev_desc + dev, NANDRW_READ, offset,
|
||||
SECTORSIZE, NULL, (u_char *)addr)) {
|
||||
printf ("** Read error on %d\n", dev);
|
||||
SHOW_BOOT_PROGRESS (-56);
|
||||
show_boot_progress (-56);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(56);
|
||||
show_boot_progress (56);
|
||||
|
||||
hdr = (image_header_t *)addr;
|
||||
|
||||
|
@ -959,19 +951,19 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
cnt -= SECTORSIZE;
|
||||
} else {
|
||||
printf ("\n** Bad Magic Number 0x%x **\n", ntohl(hdr->ih_magic));
|
||||
SHOW_BOOT_PROGRESS (-57);
|
||||
show_boot_progress (-57);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(57);
|
||||
show_boot_progress (57);
|
||||
|
||||
if (nand_legacy_rw (nand_dev_desc + dev, NANDRW_READ,
|
||||
offset + SECTORSIZE, cnt, NULL,
|
||||
(u_char *)(addr+SECTORSIZE))) {
|
||||
printf ("** Read error on %d\n", dev);
|
||||
SHOW_BOOT_PROGRESS (-58);
|
||||
show_boot_progress (-58);
|
||||
return 1;
|
||||
}
|
||||
SHOW_BOOT_PROGRESS(58);
|
||||
show_boot_progress (58);
|
||||
|
||||
/* Loading ok, update default load address */
|
||||
|
||||
|
|
|
@ -30,14 +30,6 @@
|
|||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_NET)
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
extern void show_boot_progress (int val);
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress (arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
|
||||
|
||||
static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);
|
||||
|
@ -191,23 +183,23 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
|
|||
break;
|
||||
|
||||
default: printf ("Usage:\n%s\n", cmdtp->usage);
|
||||
SHOW_BOOT_PROGRESS(-80);
|
||||
show_boot_progress (-80);
|
||||
return 1;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS(80);
|
||||
show_boot_progress (80);
|
||||
if ((size = NetLoop(proto)) < 0) {
|
||||
SHOW_BOOT_PROGRESS(-81);
|
||||
show_boot_progress (-81);
|
||||
return 1;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS(81);
|
||||
show_boot_progress (81);
|
||||
/* NetLoop ok, update environment */
|
||||
netboot_update_env();
|
||||
|
||||
/* done if no file was loaded (no errors though) */
|
||||
if (size == 0) {
|
||||
SHOW_BOOT_PROGRESS(-82);
|
||||
show_boot_progress (-82);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -222,23 +214,21 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
|
|||
|
||||
printf ("Automatic boot of image at addr 0x%08lX ...\n",
|
||||
load_addr);
|
||||
SHOW_BOOT_PROGRESS(82);
|
||||
show_boot_progress (82);
|
||||
rcode = do_bootm (cmdtp, 0, 1, local_args);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_AUTOSCRIPT
|
||||
if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
|
||||
printf("Running autoscript at addr 0x%08lX ...\n", load_addr);
|
||||
SHOW_BOOT_PROGRESS(83);
|
||||
show_boot_progress (83);
|
||||
rcode = autoscript (load_addr);
|
||||
}
|
||||
#endif
|
||||
#if defined(CONFIG_SHOW_BOOT_PROGRESS)
|
||||
if (rcode < 0)
|
||||
SHOW_BOOT_PROGRESS(-83);
|
||||
show_boot_progress (-83);
|
||||
else
|
||||
SHOW_BOOT_PROGRESS(84);
|
||||
#endif
|
||||
show_boot_progress (84);
|
||||
return rcode;
|
||||
}
|
||||
|
||||
|
|
|
@ -30,13 +30,6 @@
|
|||
#include <linux/stddef.h>
|
||||
#include <malloc.h>
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
#ifdef CONFIG_AMIGAONEG3SE
|
||||
|
@ -232,7 +225,7 @@ void env_relocate (void)
|
|||
puts ("Using default environment\n\n");
|
||||
#else
|
||||
puts ("*** Warning - bad CRC, using default environment\n\n");
|
||||
SHOW_BOOT_PROGRESS (-60);
|
||||
show_boot_progress (-60);
|
||||
#endif
|
||||
|
||||
if (sizeof(default_environment) > ENV_SIZE)
|
||||
|
|
|
@ -44,6 +44,12 @@
|
|||
DECLARE_GLOBAL_DATA_PTR;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Board-specific Platform code can reimplement show_boot_progress () if needed
|
||||
*/
|
||||
void inline __show_boot_progress (int val) {}
|
||||
void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
|
||||
|
||||
#if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
|
||||
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
|
||||
#endif
|
||||
|
|
|
@ -889,13 +889,20 @@ int mpc5xxx_fec_initialize(bd_t * bis)
|
|||
fec->eth = (ethernet_regs *)MPC5XXX_FEC;
|
||||
fec->tbdBase = (FEC_TBD *)FEC_BD_BASE;
|
||||
fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD));
|
||||
#if defined(CONFIG_CANMB) || defined(CONFIG_HMI1001) || \
|
||||
defined(CONFIG_ICECUBE) || defined(CONFIG_INKA4X0) || \
|
||||
defined(CONFIG_JUPITER) || defined(CONFIG_MCC200) || \
|
||||
defined(CONFIG_MOTIONPRO)|| defined(CONFIG_O2DNT) || \
|
||||
defined(CONFIG_PM520) || defined(CONFIG_TOP5200) || \
|
||||
defined(CONFIG_TQM5200) || defined(CONFIG_UC101) || \
|
||||
defined(CONFIG_V38B)
|
||||
#if defined(CONFIG_CANMB) || \
|
||||
defined(CONFIG_CM1_QP1) || \
|
||||
defined(CONFIG_HMI1001) || \
|
||||
defined(CONFIG_ICECUBE) || \
|
||||
defined(CONFIG_INKA4X0) || \
|
||||
defined(CONFIG_JUPITER) || \
|
||||
defined(CONFIG_MCC200) || \
|
||||
defined(CONFIG_MOTIONPRO) || \
|
||||
defined(CONFIG_O2DNT) || \
|
||||
defined(CONFIG_PM520) || \
|
||||
defined(CONFIG_TOP5200) || \
|
||||
defined(CONFIG_TQM5200) || \
|
||||
defined(CONFIG_UC101) || \
|
||||
defined(CONFIG_V38B)
|
||||
# ifndef CONFIG_FEC_10MBIT
|
||||
fec->xcv_type = MII100;
|
||||
# else
|
||||
|
|
|
@ -1016,7 +1016,7 @@ static int short_mem_test(void)
|
|||
*/
|
||||
for (i = 0; i < NUMMEMTESTS; i++) {
|
||||
for (j = 0; j < NUMMEMWORDS; j++) {
|
||||
//printf("bank enabled base:%x\n", &membase[j]);
|
||||
/* printf("bank enabled base:%x\n", &membase[j]); */
|
||||
membase[j] = test[i][j];
|
||||
ppcDcbf((unsigned long)&(membase[j]));
|
||||
}
|
||||
|
|
|
@ -0,0 +1,57 @@
|
|||
SHA1 usage:
|
||||
-----------
|
||||
|
||||
In the U-Boot Image for the pcs440ep board is a SHA1 checksum integrated.
|
||||
This SHA1 sum is used, to check, if the U-Boot Image in Flash is not
|
||||
corrupted.
|
||||
|
||||
The following command is available:
|
||||
|
||||
=> help sha1
|
||||
sha1 address len [addr] calculate the SHA1 sum [save at addr]
|
||||
-p calculate the SHA1 sum from the U-Boot image in flash and print
|
||||
-c check the U-Boot image in flash
|
||||
|
||||
"sha1 -p"
|
||||
calculates and prints the SHA1 sum, from the Image stored in Flash
|
||||
|
||||
"sha1 -c"
|
||||
check, if the SHA1 sum from the Image stored in Flash is correct
|
||||
|
||||
|
||||
It is possible to calculate a SHA1 checksum from a memoryrange with:
|
||||
|
||||
"sha1 address len"
|
||||
|
||||
If you want to store a new Image in Flash for the pcs440ep board,
|
||||
which has no SHA1 sum, you can do the following:
|
||||
|
||||
a) cp the new Image on a position in RAM (here 0x300000)
|
||||
(for this example we use the Image from Flash, stored at 0xfffa0000 and
|
||||
0x60000 Bytes long)
|
||||
|
||||
"cp.b fffa0000 300000 60000"
|
||||
|
||||
b) Initialize the SHA1 sum in the Image with 0x00
|
||||
The SHA1 sum is stored in Flash at:
|
||||
CFG_MONITOR_BASE + CFG_MONITOR_LEN + SHA1_SUM_POS
|
||||
for the pcs440ep Flash: 0xfffa0000 + 0x60000 + -0x20
|
||||
= 0xffffffe0
|
||||
for the example in RAM: 0x300000 + 0x60000 + -0x20
|
||||
= 0x35ffe0
|
||||
|
||||
note: a SHA1 checksum is 20 bytes long.
|
||||
|
||||
"mw.b 35ffe0 0 14"
|
||||
|
||||
c) now calculate the SHA1 sum from the memoryrange and write
|
||||
the calculated checksum at the right place:
|
||||
|
||||
"sha1 300000 60000 35ffe0"
|
||||
|
||||
Now you have a U-Boot-Image for the pcs440ep board with the correct SHA1 sum.
|
||||
|
||||
If you do a "./MAKEALL pcs440ep" or a "make all" to get the U-Boot image,
|
||||
the correct SHA1 sum will be automagically included in the U-Boot image.
|
||||
|
||||
Heiko Schocher, 11 Jul 2007
|
|
@ -15,13 +15,6 @@
|
|||
#include <asm/io.h>
|
||||
#include <watchdog.h>
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY)
|
||||
|
||||
#include <linux/mtd/nand_legacy.h>
|
||||
|
|
|
@ -626,9 +626,13 @@ int fgetc(int file);
|
|||
|
||||
int pcmcia_init (void);
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
void show_boot_progress (int status);
|
||||
#ifdef CONFIG_STATUS_LED
|
||||
# include <status_led.h>
|
||||
#endif
|
||||
/*
|
||||
* Board-specific Platform code can reimplement show_boot_progress () if needed
|
||||
*/
|
||||
void inline show_boot_progress (int val);
|
||||
|
||||
#ifdef CONFIG_INIT_CRITICAL
|
||||
#error CONFIG_INIT_CRITICAL is deprecated!
|
||||
|
|
|
@ -0,0 +1,358 @@
|
|||
/*
|
||||
* (C) Copyright 2003-2007
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef __CONFIG_H
|
||||
#define __CONFIG_H
|
||||
|
||||
/*
|
||||
* High Level Configuration Options
|
||||
*/
|
||||
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
|
||||
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
|
||||
#define CONFIG_CM1_QP1 1 /* ... on CM1.QP1 module */
|
||||
|
||||
|
||||
/*
|
||||
* Supported commands
|
||||
*/
|
||||
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
|
||||
CFG_CMD_ASKENV | \
|
||||
CFG_CMD_DATE | \
|
||||
CFG_CMD_DHCP | \
|
||||
CFG_CMD_ECHO | \
|
||||
CFG_CMD_I2C | \
|
||||
CFG_CMD_FLASH | \
|
||||
CFG_CMD_MII | \
|
||||
CFG_CMD_NFS | \
|
||||
CFG_CMD_PING | \
|
||||
CFG_CMD_DIAG | \
|
||||
CFG_CMD_REGINFO | \
|
||||
CFG_CMD_SNTP | \
|
||||
CFG_CMD_BSP | \
|
||||
CFG_CMD_USB | \
|
||||
CFG_CMD_FAT | \
|
||||
CFG_CMD_JFFS2)
|
||||
|
||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
||||
#include <cmd_confdefs.h>
|
||||
|
||||
|
||||
/*
|
||||
* Serial console configuration
|
||||
*/
|
||||
#define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */
|
||||
#define CONFIG_BAUDRATE 57600 /* ... at 57600 bps */
|
||||
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
|
||||
|
||||
|
||||
/*
|
||||
* Ethernet configuration
|
||||
*/
|
||||
#define CONFIG_MPC5xxx_FEC 1
|
||||
#define CONFIG_PHY_ADDR 0x00
|
||||
#define CONFIG_ENV_OVERWRITE 1 /* allow overwriting of ethaddr */
|
||||
/* use misc_init_r() to read ethaddr from I2C EEPROM (see CFG_I2C_EEPROM) */
|
||||
#define CONFIG_MISC_INIT_R 1
|
||||
#define CONFIG_MAC_OFFSET 0x35 /* MAC address offset in I2C EEPROM */
|
||||
|
||||
|
||||
/*
|
||||
* POST support
|
||||
*/
|
||||
#define CONFIG_POST (CFG_POST_MEMORY | CFG_POST_CPU | CFG_POST_I2C)
|
||||
#define MPC5XXX_SRAM_POST_SIZE (MPC5XXX_SRAM_SIZE - 4)
|
||||
/* List of I2C addresses to be verified by POST */
|
||||
#define I2C_ADDR_LIST { CFG_I2C_SLAVE, CFG_I2C_IO, CFG_I2C_EEPROM }
|
||||
|
||||
|
||||
/* display image timestamps */
|
||||
#define CONFIG_TIMESTAMP 1
|
||||
|
||||
|
||||
/*
|
||||
* Autobooting
|
||||
*/
|
||||
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
||||
#define CONFIG_PREBOOT "echo;" \
|
||||
"echo Type \"run net_nfs_fdt\" to mount root filesystem over NFS;" \
|
||||
"echo"
|
||||
#undef CONFIG_BOOTARGS
|
||||
|
||||
/*
|
||||
* Default environment settings
|
||||
*/
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"netdev=eth0\0" \
|
||||
"hostname=cm1_qp1\0" \
|
||||
"netmask=255.255.0.0\0" \
|
||||
"ipaddr=192.168.160.33\0" \
|
||||
"serverip=192.168.1.1\0" \
|
||||
"gatewayip=192.168.1.1\0" \
|
||||
"console=ttyPSC0\0" \
|
||||
"u-boot_addr=100000\0" \
|
||||
"kernel_addr=200000\0" \
|
||||
"kernel_addr_flash=fc0c0000\0" \
|
||||
"fdt_addr=400000\0" \
|
||||
"fdt_addr_flash=fc0a0000\0" \
|
||||
"ramdisk_addr=500000\0" \
|
||||
"rootpath=/opt/eldk-4.1/ppc_6xx\0" \
|
||||
"u-boot=/tftpboot/cm1_qp1/u-boot.bin\0" \
|
||||
"bootfile=/tftpboot/cm1_qp1/uImage\0" \
|
||||
"fdt_file=/tftpboot/cm1_qp1/cm1_qp1.dtb\0" \
|
||||
"load=tftp ${u-boot_addr} ${u-boot}\0" \
|
||||
"update=prot off fc000000 fc05ffff; era fc000000 fc05ffff; " \
|
||||
"cp.b ${u-boot_addr} fc000000 ${filesize}; " \
|
||||
"prot on fc000000 fc05ffff\0" \
|
||||
"nfsargs=setenv bootargs root=/dev/nfs rw " \
|
||||
"nfsroot=${serverip}:${rootpath}\0" \
|
||||
"flashargs=setenv bootargs root=/dev/mtdblock5 rw\0" \
|
||||
"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
|
||||
"addinit=setenv bootargs ${bootargs} init=/linuxrc\0" \
|
||||
"addcons=setenv bootargs ${bootargs} " \
|
||||
"console=${console},${baudrate}\0" \
|
||||
"addip=setenv bootargs ${bootargs} " \
|
||||
"ip=${ipaddr}:${serverip}:${gatewayip}:" \
|
||||
"${netmask}:${hostname}:${netdev}:off panic=1\0" \
|
||||
"flash_flash=run flashargs addinit addip addcons;" \
|
||||
"bootm ${kernel_addr_flash} - ${fdt_addr_flash}\0" \
|
||||
"net_nfs_fdt=tftp ${kernel_addr} ${bootfile_fdt}; " \
|
||||
"tftp ${fdt_addr} ${fdt_file}; run nfsargs addip " \
|
||||
"addcons; bootm ${kernel_addr} - ${fdt_addr}\0" \
|
||||
""
|
||||
#define CONFIG_BOOTCOMMAND "run flash_flash"
|
||||
|
||||
|
||||
/*
|
||||
* Low level configuration
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* Clock configuration
|
||||
*/
|
||||
#define CFG_MPC5XXX_CLKIN 33000000 /* SYS_XTAL_IN = 33MHz */
|
||||
#define CFG_IPBCLK_EQUALS_XLBCLK 1 /* IPB = 133MHz */
|
||||
|
||||
|
||||
/*
|
||||
* Memory map
|
||||
*/
|
||||
#define CFG_MBAR 0xF0000000
|
||||
#define CFG_SDRAM_BASE 0x00000000
|
||||
#define CFG_DEFAULT_MBAR 0x80000000
|
||||
|
||||
#define CFG_LOWBOOT 1
|
||||
|
||||
/* Use ON-Chip SRAM until RAM will be available */
|
||||
#define CFG_INIT_RAM_ADDR MPC5XXX_SRAM
|
||||
#ifdef CONFIG_POST
|
||||
/* preserve space for the post_word at end of on-chip SRAM */
|
||||
#define CFG_INIT_RAM_END MPC5XXX_SRAM_POST_SIZE
|
||||
#else
|
||||
#define CFG_INIT_RAM_END MPC5XXX_SRAM_SIZE
|
||||
#endif
|
||||
|
||||
#define CFG_GBL_DATA_SIZE 128 /* size in bytes for initial data */
|
||||
#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
|
||||
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
|
||||
|
||||
#define CFG_MONITOR_BASE TEXT_BASE
|
||||
#define CFG_MONITOR_LEN (384 << 10) /* 384 kB for Monitor */
|
||||
#define CFG_MALLOC_LEN (256 << 10) /* 256 kB for malloc() */
|
||||
#define CFG_BOOTMAPSZ (8 << 20) /* initial mem map for Linux */
|
||||
|
||||
#if (CFG_MONITOR_BASE < CFG_FLASH_BASE)
|
||||
#define CFG_RAMBOOT 1
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Chip selects configuration
|
||||
*/
|
||||
/* Boot Chipselect */
|
||||
#define CFG_BOOTCS_START CFG_FLASH_BASE
|
||||
#define CFG_BOOTCS_SIZE CFG_FLASH_SIZE
|
||||
#define CFG_BOOTCS_CFG 0x00087D31 /* for pci_clk = 33 MHz */
|
||||
/* use board_early_init_r to enable flash write in CS_BOOT */
|
||||
#define CONFIG_BOARD_EARLY_INIT_R
|
||||
|
||||
/* Flash memory addressing */
|
||||
#define CFG_CS0_START CFG_FLASH_BASE
|
||||
#define CFG_CS0_SIZE CFG_FLASH_SIZE
|
||||
|
||||
/* No burst, dead cycle = 1 for CS0 (Flash) */
|
||||
#define CFG_CS_BURST 0x00000000
|
||||
#define CFG_CS_DEADCYCLE 0x00000001
|
||||
|
||||
|
||||
/*
|
||||
* SDRAM configuration
|
||||
* settings for k4s561632E-xx75, assuming XLB = 132 MHz
|
||||
*/
|
||||
#define SDRAM_MODE 0x00CD0000 /* CASL 3, burst length 8 */
|
||||
#define SDRAM_CONTROL 0x514F0000
|
||||
#define SDRAM_CONFIG1 0xE2333900
|
||||
#define SDRAM_CONFIG2 0x8EE70000
|
||||
|
||||
|
||||
/*
|
||||
* Flash configuration
|
||||
*/
|
||||
#define CFG_FLASH_CFI 1
|
||||
#define CFG_FLASH_CFI_DRIVER 1
|
||||
#define CFG_FLASH_BASE TEXT_BASE
|
||||
/* we need these despite using CFI */
|
||||
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks */
|
||||
#define CFG_MAX_FLASH_SECT 256 /* max num of sectors on one chip */
|
||||
#define CFG_FLASH_SIZE 0x02000000 /* 32 MiB */
|
||||
|
||||
|
||||
/*
|
||||
* MTD configuration
|
||||
*/
|
||||
#define CONFIG_JFFS2_CMDLINE 1
|
||||
#define MTDIDS_DEFAULT "nor0=cm1qp1-0"
|
||||
#define MTDPARTS_DEFAULT "mtdparts=cm1qp1-0:" \
|
||||
"384k(uboot),128k(env)," \
|
||||
"128k(redund_env),128k(dtb)," \
|
||||
"2m(kernel),27904k(rootfs)," \
|
||||
"-(config)"
|
||||
|
||||
|
||||
/*
|
||||
* I2C configuration
|
||||
*/
|
||||
#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
|
||||
#define CFG_I2C_MODULE 2 /* Select I2C module #2 */
|
||||
#define CFG_I2C_SPEED 40000 /* 40 kHz */
|
||||
#define CFG_I2C_SLAVE 0x0
|
||||
#define CFG_I2C_IO 0x38 /* PCA9554AD I2C I/O port address */
|
||||
#define CFG_I2C_EEPROM 0x53 /* I2C EEPROM device address */
|
||||
|
||||
|
||||
/*
|
||||
* RTC configuration
|
||||
*/
|
||||
#define CONFIG_RTC_MPC5200 1 /* use internal MPC5200 RTC */
|
||||
|
||||
|
||||
/*
|
||||
* USB configuration
|
||||
*/
|
||||
#define CONFIG_USB_OHCI 1
|
||||
#define CONFIG_USB_STORAGE 1
|
||||
#define CONFIG_USB_CLOCK 0x0001BBBB
|
||||
#define CONFIG_USB_CONFIG 0x00001000
|
||||
/* Partitions (for USB) */
|
||||
#define CONFIG_MAC_PARTITION 1
|
||||
#define CONFIG_DOS_PARTITION 1
|
||||
#define CONFIG_ISO_PARTITION 1
|
||||
|
||||
/*
|
||||
* Invoke our last_stage_init function - needed by fwupdate
|
||||
*/
|
||||
#define CONFIG_LAST_STAGE_INIT 1
|
||||
|
||||
/*
|
||||
* Environment settings
|
||||
*/
|
||||
#define CFG_ENV_IS_IN_FLASH 1
|
||||
#define CFG_ENV_SIZE 0x10000
|
||||
#define CFG_ENV_SECT_SIZE 0x20000
|
||||
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN)
|
||||
/* Configuration of redundant environment */
|
||||
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
|
||||
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
|
||||
|
||||
|
||||
/*
|
||||
* Pin multiplexing configuration
|
||||
*/
|
||||
|
||||
/*
|
||||
* CS1/GPIO_WKUP_6: GPIO (default)
|
||||
* ALTs: CAN1 on I2C1, CAN2 on TIMER0/1
|
||||
* IRDA/PSC6: UART
|
||||
* Ether: Ethernet 100Mbit with MD
|
||||
* PCI_DIS: PCI controller disabled
|
||||
* USB: USB
|
||||
* PSC3: SPI with UART3
|
||||
* PSC2: UART
|
||||
* PSC1: UART
|
||||
*/
|
||||
#define CFG_GPS_PORT_CONFIG 0x10559C44
|
||||
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
*/
|
||||
#define CFG_LONGHELP 1 /* undef to save memory */
|
||||
#define CFG_PROMPT "=> " /* Monitor Command Prompt */
|
||||
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
|
||||
#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
|
||||
#define CFG_MAXARGS 16 /* max number of command args */
|
||||
#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */
|
||||
|
||||
#define CFG_ALT_MEMTEST 1
|
||||
#define CFG_MEMTEST_START 0x00100000 /* memtest works on */
|
||||
#define CFG_MEMTEST_END 0x03f00000 /* 1 .. 63 MiB in SDRAM */
|
||||
|
||||
#define CONFIG_LOOPW 1
|
||||
|
||||
#define CFG_LOAD_ADDR 0x100000 /* default load address */
|
||||
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
|
||||
|
||||
|
||||
/*
|
||||
* Various low-level settings
|
||||
*/
|
||||
#define CFG_HID0_INIT HID0_ICE | HID0_ICFI
|
||||
#define CFG_HID0_FINAL HID0_ICE
|
||||
|
||||
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
|
||||
#define BOOTFLAG_WARM 0x02 /* Software reboot */
|
||||
|
||||
#define CFG_XLB_PIPELINING 1 /* enable transaction pipeling */
|
||||
|
||||
|
||||
/*
|
||||
* Cache Configuration
|
||||
*/
|
||||
#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
|
||||
#define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Flat Device Tree support
|
||||
*/
|
||||
#define CONFIG_OF_FLAT_TREE 1
|
||||
#define CONFIG_OF_BOARD_SETUP 1
|
||||
#define OF_FLAT_TREE_MAX_SIZE 8192 /* max size of the flat tree (8K) */
|
||||
#define OF_CPU "PowerPC,5200@0"
|
||||
#define OF_SOC "soc5200@f0000000"
|
||||
#define OF_TBCLK (bd->bi_busfreq / 4)
|
||||
#define OF_STDOUT_PATH "/soc5200@f0000000/serial@2000"
|
||||
|
||||
#endif /* __CONFIG_H */
|
|
@ -197,16 +197,16 @@
|
|||
#define CONFIG_STATUS_LED 1 /* Status LED enabled */
|
||||
#define CONFIG_BOARD_SPECIFIC_LED 1
|
||||
|
||||
#define STATUS_LED_BIT 0x08 /* LED 1 is on GPIO_PPC_1 */
|
||||
#define STATUS_LED_BIT 0x08 /* DIAG1 is on GPIO_PPC_1 */
|
||||
#define STATUS_LED_PERIOD ((CFG_HZ / 2) / 5) /* blink at 5 Hz */
|
||||
#define STATUS_LED_STATE STATUS_LED_OFF
|
||||
#define STATUS_LED_BIT1 0x04 /* LED 2 is on GPIO_PPC_2 */
|
||||
#define STATUS_LED_BIT1 0x04 /* DIAG2 is on GPIO_PPC_2 */
|
||||
#define STATUS_LED_PERIOD1 ((CFG_HZ / 2) / 5) /* blink at 5 Hz */
|
||||
#define STATUS_LED_STATE1 STATUS_LED_ON
|
||||
#define STATUS_LED_BIT2 0x02 /* LED 3 is on GPIO_PPC_3 */
|
||||
#define STATUS_LED_BIT2 0x02 /* DIAG3 is on GPIO_PPC_3 */
|
||||
#define STATUS_LED_PERIOD2 ((CFG_HZ / 2) / 5) /* blink at 5 Hz */
|
||||
#define STATUS_LED_STATE2 STATUS_LED_OFF
|
||||
#define STATUS_LED_BIT3 0x01 /* LED 4 is on GPIO_PPC_4 */
|
||||
#define STATUS_LED_BIT3 0x01 /* DIAG4 is on GPIO_PPC_4 */
|
||||
#define STATUS_LED_PERIOD3 ((CFG_HZ / 2) / 5) /* blink at 5 Hz */
|
||||
#define STATUS_LED_STATE3 STATUS_LED_OFF
|
||||
|
||||
|
|
|
@ -66,13 +66,6 @@ static void setup_videolfb_tag (gd_t *gd);
|
|||
static struct tag *params;
|
||||
#endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
extern image_header_t header; /* from cmd_bootm.c */
|
||||
|
||||
|
||||
|
@ -96,7 +89,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
* Check if there is an initrd image
|
||||
*/
|
||||
if (argc >= 3) {
|
||||
SHOW_BOOT_PROGRESS (9);
|
||||
show_boot_progress (9);
|
||||
|
||||
addr = simple_strtoul (argv[2], NULL, 16);
|
||||
|
||||
|
@ -114,7 +107,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (ntohl (hdr->ih_magic) != IH_MAGIC) {
|
||||
printf ("Bad Magic Number\n");
|
||||
SHOW_BOOT_PROGRESS (-10);
|
||||
show_boot_progress (-10);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -126,11 +119,11 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (crc32 (0, (unsigned char *) data, len) != checksum) {
|
||||
printf ("Bad Header Checksum\n");
|
||||
SHOW_BOOT_PROGRESS (-11);
|
||||
show_boot_progress (-11);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (10);
|
||||
show_boot_progress (10);
|
||||
|
||||
print_image_hdr (hdr);
|
||||
|
||||
|
@ -151,19 +144,19 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
csum = crc32 (0, (unsigned char *) data, len);
|
||||
if (csum != ntohl (hdr->ih_dcrc)) {
|
||||
printf ("Bad Data CRC\n");
|
||||
SHOW_BOOT_PROGRESS (-12);
|
||||
show_boot_progress (-12);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
printf ("OK\n");
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (11);
|
||||
show_boot_progress (11);
|
||||
|
||||
if ((hdr->ih_os != IH_OS_LINUX) ||
|
||||
(hdr->ih_arch != IH_CPU_ARM) ||
|
||||
(hdr->ih_type != IH_TYPE_RAMDISK)) {
|
||||
printf ("No Linux ARM Ramdisk Image\n");
|
||||
SHOW_BOOT_PROGRESS (-13);
|
||||
show_boot_progress (-13);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -182,7 +175,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
ulong tail = ntohl (len_ptr[0]) % 4;
|
||||
int i;
|
||||
|
||||
SHOW_BOOT_PROGRESS (13);
|
||||
show_boot_progress (13);
|
||||
|
||||
/* skip kernel length and terminator */
|
||||
data = (ulong) (&len_ptr[2]);
|
||||
|
@ -201,7 +194,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
/*
|
||||
* no initrd image
|
||||
*/
|
||||
SHOW_BOOT_PROGRESS (14);
|
||||
show_boot_progress (14);
|
||||
|
||||
len = data = 0;
|
||||
}
|
||||
|
@ -220,7 +213,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
initrd_end = 0;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (15);
|
||||
show_boot_progress (15);
|
||||
|
||||
debug ("## Transferring control to Linux (at address %08lx) ...\n",
|
||||
(ulong) theKernel);
|
||||
|
|
|
@ -36,13 +36,6 @@ extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
|||
/* CPU-specific hook to allow flushing of caches, etc. */
|
||||
extern void prepare_to_boot(void);
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
extern image_header_t header; /* from cmd_bootm.c */
|
||||
|
||||
static struct tag *setup_start_tag(struct tag *params)
|
||||
|
@ -204,7 +197,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
* Check if there is an initrd image
|
||||
*/
|
||||
if (argc >= 3) {
|
||||
SHOW_BOOT_PROGRESS(9);
|
||||
show_boot_progress (9);
|
||||
|
||||
addr = simple_strtoul(argv[2], NULL, 16);
|
||||
|
||||
|
@ -215,7 +208,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (ntohl(hdr->ih_magic) != IH_MAGIC) {
|
||||
puts("Bad Magic Number\n");
|
||||
SHOW_BOOT_PROGRESS(-10);
|
||||
show_boot_progress (-10);
|
||||
do_reset(cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -226,11 +219,11 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (crc32(0, (unsigned char *)data, len) != checksum) {
|
||||
puts("Bad Header Checksum\n");
|
||||
SHOW_BOOT_PROGRESS(-11);
|
||||
show_boot_progress (-11);
|
||||
do_reset(cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS(10);
|
||||
show_boot_progress (10);
|
||||
|
||||
print_image_hdr(hdr);
|
||||
|
||||
|
@ -244,26 +237,26 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
csum = crc32(0, (unsigned char *)data, len);
|
||||
if (csum != ntohl(hdr->ih_dcrc)) {
|
||||
puts("Bad Data CRC\n");
|
||||
SHOW_BOOT_PROGRESS(-12);
|
||||
show_boot_progress (-12);
|
||||
do_reset(cmdtp, flag, argc, argv);
|
||||
}
|
||||
puts("OK\n");
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS(11);
|
||||
show_boot_progress (11);
|
||||
|
||||
if ((hdr->ih_os != IH_OS_LINUX) ||
|
||||
(hdr->ih_arch != IH_CPU_AVR32) ||
|
||||
(hdr->ih_type != IH_TYPE_RAMDISK)) {
|
||||
puts("Not a Linux/AVR32 RAMDISK image\n");
|
||||
SHOW_BOOT_PROGRESS(-13);
|
||||
show_boot_progress (-13);
|
||||
do_reset(cmdtp, flag, argc, argv);
|
||||
}
|
||||
} else if ((hdr->ih_type == IH_TYPE_MULTI) && (len_ptr[1])) {
|
||||
ulong tail = ntohl (len_ptr[0]) % 4;
|
||||
int i;
|
||||
|
||||
SHOW_BOOT_PROGRESS (13);
|
||||
show_boot_progress (13);
|
||||
|
||||
/* skip kernel length and terminator */
|
||||
data = (ulong) (&len_ptr[2]);
|
||||
|
@ -279,7 +272,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
len = ntohl (len_ptr[1]);
|
||||
} else {
|
||||
/* no initrd image */
|
||||
SHOW_BOOT_PROGRESS(14);
|
||||
show_boot_progress (14);
|
||||
len = data = 0;
|
||||
}
|
||||
|
||||
|
@ -291,7 +284,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|||
initrd_end = 0;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS(15);
|
||||
show_boot_progress (15);
|
||||
|
||||
params = params_start = (struct tag *)gd->bd->bi_boot_params;
|
||||
params = setup_start_tag(params);
|
||||
|
|
|
@ -36,13 +36,6 @@
|
|||
#define LINUX_MAX_ENVS 256
|
||||
#define LINUX_MAX_ARGS 256
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
#include <status_led.h>
|
||||
#define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
#define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
#define CMD_LINE_ADDR 0xFF900000 /* L1 scratchpad */
|
||||
|
||||
#ifdef SHARED_RESOURCES
|
||||
|
|
|
@ -132,9 +132,7 @@ void post_output_backlog(void)
|
|||
post_log("PASSED\n");
|
||||
else {
|
||||
post_log("FAILED\n");
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
show_boot_progress(-31);
|
||||
#endif
|
||||
show_boot_progress (-31);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -245,9 +243,7 @@ static int post_run_single(struct post_test *test,
|
|||
} else {
|
||||
if ((*test->test) (flags) != 0) {
|
||||
post_log("FAILED\n");
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
show_boot_progress(-32);
|
||||
#endif
|
||||
show_boot_progress (-32);
|
||||
} else
|
||||
post_log("PASSED\n");
|
||||
}
|
||||
|
|
|
@ -34,13 +34,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
#define LINUX_MAX_ENVS 256
|
||||
#define LINUX_MAX_ARGS 256
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
extern image_header_t header; /* from cmd_bootm.c */
|
||||
|
||||
extern int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);
|
||||
|
@ -73,7 +66,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
* Check if there is an initrd image
|
||||
*/
|
||||
if (argc >= 3) {
|
||||
SHOW_BOOT_PROGRESS (9);
|
||||
show_boot_progress (9);
|
||||
|
||||
addr = simple_strtoul (argv[2], NULL, 16);
|
||||
|
||||
|
@ -84,7 +77,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (ntohl (hdr->ih_magic) != IH_MAGIC) {
|
||||
printf ("Bad Magic Number\n");
|
||||
SHOW_BOOT_PROGRESS (-10);
|
||||
show_boot_progress (-10);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -96,11 +89,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (crc32 (0, (char *) data, len) != checksum) {
|
||||
printf ("Bad Header Checksum\n");
|
||||
SHOW_BOOT_PROGRESS (-11);
|
||||
show_boot_progress (-11);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (10);
|
||||
show_boot_progress (10);
|
||||
|
||||
print_image_hdr (hdr);
|
||||
|
||||
|
@ -114,19 +107,19 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
csum = crc32 (0, (char *) data, len);
|
||||
if (csum != ntohl (hdr->ih_dcrc)) {
|
||||
printf ("Bad Data CRC\n");
|
||||
SHOW_BOOT_PROGRESS (-12);
|
||||
show_boot_progress (-12);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
printf ("OK\n");
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (11);
|
||||
show_boot_progress (11);
|
||||
|
||||
if ((hdr->ih_os != IH_OS_LINUX) ||
|
||||
(hdr->ih_arch != IH_CPU_M68K) ||
|
||||
(hdr->ih_type != IH_TYPE_RAMDISK)) {
|
||||
printf ("No Linux M68K Ramdisk Image\n");
|
||||
SHOW_BOOT_PROGRESS (-13);
|
||||
show_boot_progress (-13);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -137,7 +130,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
ulong tail = ntohl (len_ptr[0]) % 4;
|
||||
int i;
|
||||
|
||||
SHOW_BOOT_PROGRESS (13);
|
||||
show_boot_progress (13);
|
||||
|
||||
/* skip kernel length and terminator */
|
||||
data = (ulong) (&len_ptr[2]);
|
||||
|
@ -156,7 +149,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
/*
|
||||
* no initrd image
|
||||
*/
|
||||
SHOW_BOOT_PROGRESS (14);
|
||||
show_boot_progress (14);
|
||||
|
||||
data = 0;
|
||||
}
|
||||
|
@ -175,7 +168,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
initrd_end = 0;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (15);
|
||||
show_boot_progress (15);
|
||||
|
||||
#ifdef DEBUG
|
||||
printf ("## Transferring control to Linux (at address %08lx) ...\n",
|
||||
|
|
|
@ -32,13 +32,6 @@
|
|||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
extern image_header_t header; /* from cmd_bootm.c */
|
||||
/*cmd_boot.c*/
|
||||
extern int do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);
|
||||
|
@ -59,7 +52,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
/* Check if there is an initrd image */
|
||||
if (argc >= 3) {
|
||||
SHOW_BOOT_PROGRESS (9);
|
||||
show_boot_progress (9);
|
||||
|
||||
addr = simple_strtoul (argv[2], NULL, 16);
|
||||
|
||||
|
@ -70,7 +63,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (ntohl (hdr->ih_magic) != IH_MAGIC) {
|
||||
printf ("Bad Magic Number\n");
|
||||
SHOW_BOOT_PROGRESS (-10);
|
||||
show_boot_progress (-10);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -82,11 +75,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (crc32 (0, (char *)data, len) != checksum) {
|
||||
printf ("Bad Header Checksum\n");
|
||||
SHOW_BOOT_PROGRESS (-11);
|
||||
show_boot_progress (-11);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (10);
|
||||
show_boot_progress (10);
|
||||
|
||||
print_image_hdr (hdr);
|
||||
|
||||
|
@ -100,19 +93,19 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
csum = crc32 (0, (char *)data, len);
|
||||
if (csum != ntohl (hdr->ih_dcrc)) {
|
||||
printf ("Bad Data CRC\n");
|
||||
SHOW_BOOT_PROGRESS (-12);
|
||||
show_boot_progress (-12);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
printf ("OK\n");
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (11);
|
||||
show_boot_progress (11);
|
||||
|
||||
if ((hdr->ih_os != IH_OS_LINUX) ||
|
||||
(hdr->ih_arch != IH_CPU_MICROBLAZE) ||
|
||||
(hdr->ih_type != IH_TYPE_RAMDISK)) {
|
||||
printf ("No Linux Microblaze Ramdisk Image\n");
|
||||
SHOW_BOOT_PROGRESS (-13);
|
||||
show_boot_progress (-13);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -122,7 +115,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
} else if ((hdr->ih_type == IH_TYPE_MULTI) && (len_ptr[1])) {
|
||||
ulong tail = ntohl (len_ptr[0]) % 4;
|
||||
|
||||
SHOW_BOOT_PROGRESS (13);
|
||||
show_boot_progress (13);
|
||||
|
||||
/* skip kernel length and terminator */
|
||||
data = (ulong) (&len_ptr[2]);
|
||||
|
@ -141,7 +134,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
/*
|
||||
* no initrd image
|
||||
*/
|
||||
SHOW_BOOT_PROGRESS (14);
|
||||
show_boot_progress (14);
|
||||
|
||||
data = 0;
|
||||
}
|
||||
|
@ -160,7 +153,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
initrd_end = 0;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (15);
|
||||
show_boot_progress (15);
|
||||
|
||||
#ifdef DEBUG
|
||||
printf ("## Transferring control to Linux (at address %08lx) ...\n",
|
||||
|
|
|
@ -33,13 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
#define LINUX_MAX_ENVS 256
|
||||
#define LINUX_MAX_ARGS 256
|
||||
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
# include <status_led.h>
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
extern image_header_t header; /* from cmd_bootm.c */
|
||||
|
||||
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||
|
@ -73,7 +66,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
* Check if there is an initrd image
|
||||
*/
|
||||
if (argc >= 3) {
|
||||
SHOW_BOOT_PROGRESS (9);
|
||||
show_boot_progress (9);
|
||||
|
||||
addr = simple_strtoul (argv[2], NULL, 16);
|
||||
|
||||
|
@ -84,7 +77,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (ntohl (hdr->ih_magic) != IH_MAGIC) {
|
||||
printf ("Bad Magic Number\n");
|
||||
SHOW_BOOT_PROGRESS (-10);
|
||||
show_boot_progress (-10);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -96,11 +89,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
|
||||
if (crc32 (0, (uchar *) data, len) != checksum) {
|
||||
printf ("Bad Header Checksum\n");
|
||||
SHOW_BOOT_PROGRESS (-11);
|
||||
show_boot_progress (-11);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (10);
|
||||
show_boot_progress (10);
|
||||
|
||||
print_image_hdr (hdr);
|
||||
|
||||
|
@ -114,19 +107,19 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
csum = crc32 (0, (uchar *) data, len);
|
||||
if (csum != ntohl (hdr->ih_dcrc)) {
|
||||
printf ("Bad Data CRC\n");
|
||||
SHOW_BOOT_PROGRESS (-12);
|
||||
show_boot_progress (-12);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
printf ("OK\n");
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (11);
|
||||
show_boot_progress (11);
|
||||
|
||||
if ((hdr->ih_os != IH_OS_LINUX) ||
|
||||
(hdr->ih_arch != IH_CPU_MIPS) ||
|
||||
(hdr->ih_type != IH_TYPE_RAMDISK)) {
|
||||
printf ("No Linux MIPS Ramdisk Image\n");
|
||||
SHOW_BOOT_PROGRESS (-13);
|
||||
show_boot_progress (-13);
|
||||
do_reset (cmdtp, flag, argc, argv);
|
||||
}
|
||||
|
||||
|
@ -137,7 +130,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
ulong tail = ntohl (len_ptr[0]) % 4;
|
||||
int i;
|
||||
|
||||
SHOW_BOOT_PROGRESS (13);
|
||||
show_boot_progress (13);
|
||||
|
||||
/* skip kernel length and terminator */
|
||||
data = (ulong) (&len_ptr[2]);
|
||||
|
@ -156,7 +149,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
/*
|
||||
* no initrd image
|
||||
*/
|
||||
SHOW_BOOT_PROGRESS (14);
|
||||
show_boot_progress (14);
|
||||
|
||||
data = 0;
|
||||
}
|
||||
|
@ -175,7 +168,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
|||
initrd_end = 0;
|
||||
}
|
||||
|
||||
SHOW_BOOT_PROGRESS (15);
|
||||
show_boot_progress (15);
|
||||
|
||||
#ifdef DEBUG
|
||||
printf ("## Transferring control to Linux (at address %08lx) ...\n",
|
||||
|
|
|
@ -1117,9 +1117,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
|||
void hang (void)
|
||||
{
|
||||
puts ("### ERROR ### Please RESET the board ###\n");
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
show_boot_progress(-30);
|
||||
#endif
|
||||
for (;;);
|
||||
}
|
||||
|
||||
|
|
14
net/eth.c
14
net/eth.c
|
@ -28,14 +28,6 @@
|
|||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
|
||||
|
||||
#if defined(CONFIG_SHOW_BOOT_PROGRESS)
|
||||
# include <status_led.h>
|
||||
extern void show_ethcfg_progress (int arg);
|
||||
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress (arg)
|
||||
#else
|
||||
# define SHOW_BOOT_PROGRESS(arg)
|
||||
#endif
|
||||
|
||||
#ifdef CFG_GT_6426x
|
||||
extern int gt6426x_eth_initialize(bd_t *bis);
|
||||
#endif
|
||||
|
@ -150,7 +142,7 @@ int eth_initialize(bd_t *bis)
|
|||
eth_devices = NULL;
|
||||
eth_current = NULL;
|
||||
|
||||
SHOW_BOOT_PROGRESS(64);
|
||||
show_boot_progress (64);
|
||||
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
|
||||
miiphy_init();
|
||||
#endif
|
||||
|
@ -256,12 +248,12 @@ int eth_initialize(bd_t *bis)
|
|||
|
||||
if (!eth_devices) {
|
||||
puts ("No ethernet found.\n");
|
||||
SHOW_BOOT_PROGRESS(-64);
|
||||
show_boot_progress (-64);
|
||||
} else {
|
||||
struct eth_device *dev = eth_devices;
|
||||
char *ethprime = getenv ("ethprime");
|
||||
|
||||
SHOW_BOOT_PROGRESS(65);
|
||||
show_boot_progress (65);
|
||||
do {
|
||||
if (eth_number)
|
||||
puts (", ");
|
||||
|
|
|
@ -129,9 +129,7 @@ void post_output_backlog ( void )
|
|||
post_log ("PASSED\n");
|
||||
else {
|
||||
post_log ("FAILED\n");
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
show_boot_progress(-31);
|
||||
#endif
|
||||
show_boot_progress (-31);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -241,9 +239,7 @@ static int post_run_single (struct post_test *test,
|
|||
} else {
|
||||
if ((*test->test) (flags) != 0) {
|
||||
post_log ("FAILED\n");
|
||||
#ifdef CONFIG_SHOW_BOOT_PROGRESS
|
||||
show_boot_progress(-32);
|
||||
#endif
|
||||
show_boot_progress (-32);
|
||||
}
|
||||
else
|
||||
post_log ("PASSED\n");
|
||||
|
|
Loading…
Reference in New Issue