From 8ca9a0269ef0ab64a6b79bcdeb3a8eaa4bcbb1b6 Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Tue, 23 Feb 2010 18:14:32 -0500 Subject: [PATCH] better variable defs. touch objdir to fix problem where board.h would try to get created after it's already been created. --- Makefile.include | 6 +++--- board/Makefile.board | 7 ++++--- tests/Makefile | 6 +++--- tests/blink-blue.c | 28 ++++++++++++---------------- tests/blink-green.c | 28 ++++++++++++---------------- tests/blink-white.c | 28 ++++++++++++---------------- 6 files changed, 46 insertions(+), 57 deletions(-) diff --git a/Makefile.include b/Makefile.include index d39710c13..f88a09fa7 100644 --- a/Makefile.include +++ b/Makefile.include @@ -1,7 +1,7 @@ -LINKERSCRIPT = $(MC1322X)/mc1322x.lds -LIBMC1322X = $(MC1322X)/libmc1322x +LINKERSCRIPT := $(MC1322X)/mc1322x.lds +LIBMC1322X := $(MC1322X)/libmc1322x -.DEFAULT_GOAL = all +.DEFAULT_GOAL := all include $(MC1322X)/config.mk diff --git a/board/Makefile.board b/board/Makefile.board index 90e519e5e..dd4deaa42 100644 --- a/board/Makefile.board +++ b/board/Makefile.board @@ -1,6 +1,6 @@ -BOARDS = redbee-dev redbee-module redbee-r1 redbee-usb redbee-econotag +BOARDS := redbee-dev redbee-module redbee-r1 redbee-usb redbee-econotag -OBJDIR = ./obj_$(BOARD)_board +OBJDIR := obj_$(BOARD)_board CFLAGS += -I$(OBJDIR) $(OBJDIR): @@ -11,7 +11,8 @@ ifndef BOARD ${error you must define BOARD} endif @echo "setup object directory for dev board" - mkdir -p $(OBJDIR) + mkdir $(OBJDIR) $(OBJDIR)/board.h: $(OBJDIR) ln -s ../$(MC1322X)/board/$(BOARD).h $(OBJDIR)/board.h + touch $(OBJDIR)/board.h \ No newline at end of file diff --git a/tests/Makefile b/tests/Makefile index 6bb611712..237e8073b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,8 +1,8 @@ -MC1322X = .. +MC1322X := .. include $(MC1322X)/Makefile.include -TARGETS = blink-red_$(BOARD).bin +TARGETS := blink-red_$(BOARD).bin -all: $(OBJDIR) $(OBJDIR)/board.h $(TARGETS) $(TARGETS:.bin=.dis) +all: $(OBJDIR)/board.h $(TARGETS) $(TARGETS:.bin=.dis) diff --git a/tests/blink-blue.c b/tests/blink-blue.c index 06699279d..8529243b7 100644 --- a/tests/blink-blue.c +++ b/tests/blink-blue.c @@ -1,31 +1,27 @@ -#define MBAR_GPIO 0x80000000 -#define GPIO_PAD_DIR0 0x80000000 -#define GPIO_DATA0 0x80000008 -#define UART1_DATA 0x80005008 +#include +#include + #define DELAY 400000 -#include "embedded_types.h" -#include "isr.h" -#include "led.h" - -#define LED_BITS LED_BLUE - -__attribute__ ((section ("startup"))) -void main(void) { - - *(volatile uint32_t *)GPIO_PAD_DIR0 = LED_BITS; +#define LED_BITS LED_RED +__attribute__ ((section ("startup"))) +void main(void) { volatile uint32_t i; + + *GPIO_PAD_DIR0 = LED_BITS; while(1) { - *(volatile uint32_t *)GPIO_DATA0 = LED_BITS; + *GPIO_DATA0 = LED_BITS; for(i=0; i +#include + #define DELAY 400000 -#include "embedded_types.h" -#include "isr.h" -#include "led.h" - -#define LED_BITS LED_GREEN - -__attribute__ ((section ("startup"))) -void main(void) { - - *(volatile uint32_t *)GPIO_PAD_DIR0 = LED_BITS; +#define LED_BITS LED_RED +__attribute__ ((section ("startup"))) +void main(void) { volatile uint32_t i; + + *GPIO_PAD_DIR0 = LED_BITS; while(1) { - *(volatile uint32_t *)GPIO_DATA0 = LED_BITS; + *GPIO_DATA0 = LED_BITS; for(i=0; i +#include + #define DELAY 400000 -#include "embedded_types.h" -#include "isr.h" -#include "led.h" - -#define LED_BITS LED_WHITE - -__attribute__ ((section ("startup"))) -void main(void) { - - *(volatile uint32_t *)GPIO_PAD_DIR0 = LED_BITS; +#define LED_BITS LED_RED +__attribute__ ((section ("startup"))) +void main(void) { volatile uint32_t i; + + *GPIO_PAD_DIR0 = LED_BITS; while(1) { - *(volatile uint32_t *)GPIO_DATA0 = LED_BITS; + *GPIO_DATA0 = LED_BITS; for(i=0; i