Dear Peter Tyser,
In message 1224624769-10425-1-git-send-email-ptyser@xes-inc.com you wrote:
Use the GNU 'date' command to auto-generate a new U-Boot timestamp on every compile.
Signed-off-by: Peter Tyser ptyser@xes-inc.com
Sorry, this patch has whitespace issues and other problems:
Applying Update U-Boot's build timestamp on every compile .dotest/patch:85: trailing whitespace. .PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE) .dotest/patch:123: trailing whitespace. depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) error: patch failed: common/lcd.c:788 error: common/lcd.c: patch does not apply Using index info to reconstruct a base tree... <stdin>:85: trailing whitespace. .PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE) <stdin>:123: trailing whitespace. depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) warning: 2 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merged Makefile Auto-merged common/lcd.c CONFLICT (content): Merge conflict in common/lcd.c Auto-merged cpu/mpc85xx/start.S Auto-merged cpu/mpc86xx/start.S Auto-merged cpu/ppc4xx/start.S Failed to merge in the changes. Patch failed at 0001.
Please rebase against current TOT and resubmit. Thanks.
Best regards,
Wolfgang Denk