From 9a892622a59d11dbbca91d4f09b89b36a5907eaf Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 25 Aug 2005 07:01:00 +0000
Subject: [PATCH] Config updated to actual version of rules, tolpc is now
 compiled natively by omk.

darcs-hash:20050825070100-f2ef6-185e1f7c41cc438b3cb77930cca8db3ea779e80d.gz
---
 arch/arm/mach-lpc2106/tools/tolpc/Makefile         | 42 ++++++++--------------
 arch/arm/mach-lpc2106/tools/tolpc/Makefile.omk     |  6 ++++
 .../tools/tolpc/{Makefile => Makefile.std}         |  0
 board/miniarm/config.armtest                       |  8 ++---
 4 files changed, 22 insertions(+), 34 deletions(-)
 rewrite arch/arm/mach-lpc2106/tools/tolpc/Makefile (98%)
 create mode 100644 arch/arm/mach-lpc2106/tools/tolpc/Makefile.omk
 copy arch/arm/mach-lpc2106/tools/tolpc/{Makefile => Makefile.std} (100%)

diff --git a/arch/arm/mach-lpc2106/tools/tolpc/Makefile b/arch/arm/mach-lpc2106/tools/tolpc/Makefile
dissimilarity index 98%
index 00454f6..f595272 100644
--- a/arch/arm/mach-lpc2106/tools/tolpc/Makefile
+++ b/arch/arm/mach-lpc2106/tools/tolpc/Makefile
@@ -1,28 +1,14 @@
-.PHONY: all
-
-ifeq ($(SOURCES_DIR),)
-all: tolpc #rs232_lt
-else
-# if called from OMK
-all:
-	$(MAKE) -C $(SOURCES_DIR) SOURCES_DIR='' all
-endif
-
-# if called from OMK
-binary-pass: all
-check-dir include-pass library-pass utils-pass default-config-pass:
-
-#all: tolpc lpcerm
- 
-CFLAGS=-O0 -Wall -g
-LDFLAGS=-g -lbfd
-
-tolpc: tolpc.o tolpc_fn.o uuencode.o load_bfd.o
-
-hiterm: hiterm.o tolpc_fn.o
-
-rs232_lt: rs232_lt.o tolpc_fn.o
-	$(CC) $(LDFLAGS) $(CFLAGS) -lncurses -o $@ $^
- 
-clean:
-	rm -f *.o
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+	@echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else	
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+
diff --git a/arch/arm/mach-lpc2106/tools/tolpc/Makefile.omk b/arch/arm/mach-lpc2106/tools/tolpc/Makefile.omk
new file mode 100644
index 0000000..bd27767
--- /dev/null
+++ b/arch/arm/mach-lpc2106/tools/tolpc/Makefile.omk
@@ -0,0 +1,6 @@
+# -*- makefile -*-
+
+utils_PROGRAMS = tolpc
+
+tolpc_SOURCES = tolpc.c tolpc_fn.c uuencode.c load_bfd.c
+tolpc_LIBS = bfd
diff --git a/arch/arm/mach-lpc2106/tools/tolpc/Makefile b/arch/arm/mach-lpc2106/tools/tolpc/Makefile.std
similarity index 100%
copy from arch/arm/mach-lpc2106/tools/tolpc/Makefile
copy to arch/arm/mach-lpc2106/tools/tolpc/Makefile.std
diff --git a/board/miniarm/config.armtest b/board/miniarm/config.armtest
index 375b345..172a973 100644
--- a/board/miniarm/config.armtest
+++ b/board/miniarm/config.armtest
@@ -4,11 +4,7 @@ ARCH=arm
 MACH=lpc2106
 BOARD=miniarm
 
-CC = arm-elf-gcc
-LINK = arm-elf-ld
-AR = arm-elf-ar
-OBJCOPY = arm-elf-objcopy
-
+CROSS_COMPILE = arm-elf-
 TARGET_ARCH = -mcpu=arm7tdmi 
 
 # Set default C flags. If theese are set elsewhere (e.g. on a command
@@ -17,7 +13,7 @@ DEBUG ?= -g
 OPTIMIZE ?= -O2
 
 LPC_BAUD = 38400
-TOLPC = $(MAKERULES_DIR)/arch/arm/mach-lpc2106/tools/tolpc/tolpc --baud $(LPC_BAUD) --sdev /dev/ttyS0
+TOLPC = $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/bin-utils/tolpc --baud $(LPC_BAUD) --sdev /dev/ttyS0
 LOAD_CMD-ramisp = $(TOLPC)  -v -q 7372 -L -f 
 
 # This selects linker script
-- 
2.11.4.GIT