Deleted Added
sdiff udiff text old ( 161370 ) new ( 163597 )
full compact
main.c (161370) main.c (163597)
1/*-
2 * Copyright (c) 2006 M. Warner Losh. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 17 unchanged lines hidden (view full) ---

26 *
27 * No warranty, expressed or implied, is included with this software. It is
28 * provided "AS IS" and no warranty of any kind including statutory or aspects
29 * relating to merchantability or fitness for any purpose is provided. All
30 * intellectual property rights of others is maintained with the respective
31 * owners. This software is not copyrighted and is intended for reference
32 * only.
33 *
1/*-
2 * Copyright (c) 2006 M. Warner Losh. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 17 unchanged lines hidden (view full) ---

26 *
27 * No warranty, expressed or implied, is included with this software. It is
28 * provided "AS IS" and no warranty of any kind including statutory or aspects
29 * relating to merchantability or fitness for any purpose is provided. All
30 * intellectual property rights of others is maintained with the respective
31 * owners. This software is not copyrighted and is intended for reference
32 * only.
33 *
34 * $FreeBSD: head/sys/boot/arm/at91/bootspi/main.c 161370 2006-08-16 23:39:58Z imp $
34 * $FreeBSD: head/sys/boot/arm/at91/bootspi/main.c 163597 2006-10-21 22:44:26Z imp $
35 */
36
37#include "env_vars.h"
38#include "at91rm9200.h"
39#include "at91rm9200_lowlevel.h"
40#include "loader_prompt.h"
41#include "emac.h"
42#include "lib.h"
43#include "spi_flash.h"
35 */
36
37#include "env_vars.h"
38#include "at91rm9200.h"
39#include "at91rm9200_lowlevel.h"
40#include "loader_prompt.h"
41#include "emac.h"
42#include "lib.h"
43#include "spi_flash.h"
44#include "ee.h"
44
45int
46main(void)
47{
45
46int
47main(void)
48{
48 printf("\r\nBoot\r\n");
49 printf("\nBoot\n");
50 EEInit();
49 SPI_InitFlash();
51 SPI_InitFlash();
52#ifdef TSC_FPGA
53 fpga_load();
54#endif
50 EMAC_Init();
51 LoadBootCommands();
52 if (getc(1) == -1) {
53 start_wdog(30);
54 ExecuteEnvironmentFunctions();
55 }
56 Bootloader(getc);
57 return (1);
58}
55 EMAC_Init();
56 LoadBootCommands();
57 if (getc(1) == -1) {
58 start_wdog(30);
59 ExecuteEnvironmentFunctions();
60 }
61 Bootloader(getc);
62 return (1);
63}