sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

svn_rev_463 

make ppc compile again
This commit is contained in:
Sascha Hauer 2007-07-05 18:01:56 +02:00 committed by Sascha Hauer
parent d5a108ece3
commit 17f9b2c9ac
8 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ppc/Kconfig
View File

@ -25,4 +25,4 @@ endchoice
source common/Kconfig
source net/Kconfig
source drivers/Kconfig
source fs/Kconfig

9
arch/ppc/lib/ppclinux.c
View File

@ -1,18 +1,24 @@
#include <common.h>
#include <command.h>
#include <watchdog.h>
#include <image.h>
#include <environment.h>
#include <asm/global_data.h>
#include <asm/bitops.h>
#ifdef CONFIG_OF_FLAT_TREE
#include <ft_build.h>
#endif
static void __attribute__((noinline))
void __attribute__((noinline))
do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
int argc, char *argv[],
ulong addr,
ulong *len_ptr,
int verify)
{
#if 0
ulong sp;
ulong len, checksum;
ulong initrd_start, initrd_end;
@ -458,5 +464,6 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
(*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
#endif
#endif
}

11
board/phycore_mpc5200b_tiny/phycore_mpc5200b_tiny.c
View File

@ -84,17 +84,6 @@ static int devices_init (void)
device_initcall(devices_init);
/* Do not collide with the env from our first stage loader for now */
static char *env_spec = "nor0:0+128k";
static int init_env(void)
{
add_env_spec(env_spec);
return 0;
}
late_initcall(init_env);
#define CFG_RAMBOOT
#include "mt46v32m16-75.h"

4
common/cmd_bootm.c
View File

@ -813,13 +813,13 @@ U_BOOT_CMD(
void
print_image_hdr (image_header_t *hdr)
{
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
#ifdef CONFIG_CMD_DATE || defined(CONFIG_TIMESTAMP)
time_t timestamp = (time_t)ntohl(hdr->ih_time);
struct rtc_time tm;
#endif
printf (" Image Name: %.*s\n", IH_NMLEN, hdr->ih_name);
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
#ifdef CONFIG_CMD_DATE || defined(CONFIG_TIMESTAMP)
to_tm (timestamp, &tm);
printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
tm.tm_year, tm.tm_mon, tm.tm_mday,

1
cpu/mpc5xxx/Makefile
View File

@ -12,4 +12,3 @@ obj-y += serial.o
obj-y += speed.o
extra-y += start.o
obj-y += traps.o
obj-y += usb_ohci.o

2
cpu/mpc5xxx/interrupts.c
View File

@ -41,6 +41,8 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <command.h>
#include <asm/arch/sdma.h>
#include <asm/bitops.h>
struct irq_action {
interrupt_handler_t *handler;

6
include/configs/phycore_mpc5200b_tiny.h
View File

@ -54,9 +54,6 @@ Serial console configuration
#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
#define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */
#if (TEXT_BASE == 0xFF000000) /* Boot low */
@ -68,9 +65,6 @@ Serial console configuration
Autobooting
------------------------------------------------------------------------------------------------------------------------------------------------------*/
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_ZERO_BOOTDELAY_CHECK /* allow stopping of boot process even with bootdelay=0 */
#undef CONFIG_BOOTARGS
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run net_nfs\" to load Kernel over TFTP and to mount root filesystem over NFS;" \

1
include/image.h
View File

@ -158,5 +158,6 @@ typedef struct image_header {
/* common/cmd_bootm.c */
void print_image_hdr (image_header_t *hdr);
extern image_header_t header;
#endif /* __IMAGE_H__ */