From 6dd652fa4d8591a32e2707a91f4582ed13011b17 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Thu, 19 Jun 2003 23:40:20 +0000
Subject: Patches by Murray Jensen, 17 Jun 2003: - Hymod board database mods:
 add "who" field and new xilinx chip types - provide new "init_cmd_timeout()"
 function so code external to   "common/main.c" can use the
 "reset_cmd_timeout()" function before   entering the main loop - add DTT
 support for adm1021 (new file dtt/adm1021.c; config   slightly different. see
 include/configs/hymod.h for an example   (requires CONFIG_DTT_ADM1021,
 CONFIG_DTT_SENSORS, and   CFG_DTT_ADM1021 defined) - add new "eeprom_probe()"
 function which has similar args and   behaves in a similar way to
 "eeprom_read()" etc. - add 8260 FCC ethernet loopback code (new
 "eth_loopback_test()"   function which is enabled by defining
 CONFIG_ETHER_LOOPBACK_TEST) - gdbtools copyright update - ensure that
 set_msr() executes the "sync" and "isync" instructions   after the "mtmsr"
 instruction in cpu/mpc8260/interrupts.c - 8260 I/O ports fix: Open Drain
 should be set last when configuring - add SIU IRQ defines for 8260 - allow
 LDSCRIPT override and OBJCFLAGS initialization: change to   config.mk to
 allow board configurations to override the GNU   linker script, selected via
 the LDSCRIPT, make variable, and to   give an initial value to the OBJCFLAGS
 make variable - 8260 i2c enhancement:   o correctly extends the timeout
 depending on the size of all     queued messages for both transmit and
 receive   o will not continue with receive if transmit times out   o ensures
 that the error callback is done for all queued tx     and rx messages   o
 correctly detects both tx and rx timeouts, only delivers one to     the
 callback, and does not overwrite an earlier error   o logic in i2c_probe now
 correct - add "vprintf()" function so that "panic()" function can be  
 technically correct - many Hymod board changes

---
 config.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config.mk')

diff --git a/config.mk b/config.mk
index 92844b1f5d..95b7256c54 100644
--- a/config.mk
+++ b/config.mk
@@ -96,9 +96,11 @@ RANLIB	= $(CROSS_COMPILE)RANLIB
 RELFLAGS= $(PLATFORM_RELFLAGS)
 DBGFLAGS= -g #-DDEBUG
 OPTFLAGS= -Os #-fomit-frame-pointer
+ifndef LDSCRIPT
 #LDSCRIPT := board/$(BOARDDIR)/u-boot.lds.debug
 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
-OBJCFLAGS := --gap-fill=0xff
+endif
+OBJCFLAGS += --gap-fill=0xff
 
 CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS)		\
 	-D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE)		\
-- 
cgit v1.2.1