diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-13 21:53:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-13 21:53:09 +0200 |
| commit | 107b56bdd8e82b07458df11f8df4a01067512281 (patch) | |
| tree | 5408cb88b9aaf65e8b8e96ea812ae09e506bea22 /board | |
| parent | 2c51983b810d73946f653a4385c65a8b7babbbe1 (diff) | |
| parent | 880c80d004acdc7370ab892df51c37c0cf0ff86d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'board')
| -rw-r--r-- | board/eNET/config.mk | 24 | ||||
| -rw-r--r-- | board/eNET/eNET.c | 2 | ||||
| -rw-r--r-- | board/eNET/eNET_pci.c | 7 |
3 files changed, 6 insertions, 27 deletions
diff --git a/board/eNET/config.mk b/board/eNET/config.mk deleted file mode 100644 index 9d2dfa535b..0000000000 --- a/board/eNET/config.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# (C) Copyright 2002 -# Daniel Engström, Omicron Ceti AB, daniel@omicron.se. -# -# 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 -# - -LDPPFLAGS += -DFLASH_SIZE=0x40000 diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c index dd0ce54516..2a5636c073 100644 --- a/board/eNET/eNET.c +++ b/board/eNET/eNET.c @@ -35,6 +35,8 @@ DECLARE_GLOBAL_DATA_PTR; +unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN; + static void enet_timer_isr(void); static void enet_toggle_run_led(void); static void enet_setup_pars(void); diff --git a/board/eNET/eNET_pci.c b/board/eNET/eNET_pci.c index fefb1a4fbe..a03090e540 100644 --- a/board/eNET/eNET_pci.c +++ b/board/eNET/eNET_pci.c @@ -1,9 +1,9 @@ /* - * (C) Copyright 2008 - * Graeme Russ, graeme.russ@gmail.com. + * (C) Copyright 2008,2009 + * Graeme Russ, <graeme.russ@gmail.com> * * (C) Copyright 2002 - * Daniel Engström, Omicron Ceti AB <daniel@omicron.se>. + * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> * * See file CREDITS for list of people who contributed to this * project. @@ -23,6 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ + #include <common.h> #include <pci.h> #include <asm/pci.h> |