diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
| commit | 85fad497b3c2e99fa48d18351d2898cf8cdbe898 (patch) | |
| tree | 3c53a3ca56eaba5070a5fbcbbe4718d8ea4d082a /board/cogent | |
| parent | 706714d97a0d08d59eda4de2268c39f504688329 (diff) | |
| parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'board/cogent')
| -rw-r--r-- | board/cogent/config.mk | 2 | ||||
| -rw-r--r-- | board/cogent/serial.c | 2 | ||||
| -rw-r--r-- | board/cogent/u-boot.lds | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/board/cogent/config.mk b/board/cogent/config.mk index ee779394b..35a5ed3d0 100644 --- a/board/cogent/config.mk +++ b/board/cogent/config.mk @@ -29,3 +29,5 @@ TEXT_BASE = 0xfff00000 PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR) + +LDSCRIPT := $(SRCTREE)/board/cogent/u-boot.lds diff --git a/board/cogent/serial.c b/board/cogent/serial.c index 2b595a85a..d9c27beee 100644 --- a/board/cogent/serial.c +++ b/board/cogent/serial.c @@ -90,7 +90,7 @@ int serial_tstc (void) #endif /* CONS_NONE */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) && \ +#if defined(CONFIG_CMD_KGDB) && \ defined(CONFIG_KGDB_NONE) #if CONFIG_KGDB_INDEX == CONFIG_CONS_INDEX diff --git a/board/cogent/u-boot.lds b/board/cogent/u-boot.lds index 5ce2694cb..d87a39b24 100644 --- a/board/cogent/u-boot.lds +++ b/board/cogent/u-boot.lds @@ -55,7 +55,6 @@ SECTIONS { *(.text) common/environment.o(.text) - *(.fixup) *(.got1) } _etext = .; |