lpceurobot board builds without errors

Not checked with the hardware.

diff --git a/arch/arm/mach-lpc21xx/libs/Makefile.omk b/arch/arm/mach-lpc21xx/libs/Makefile.omk
index 95a8bff31b41984209a7d5b659816b17349682cd..bbdf176c9d1925cb27719cd574dce393e0aee399 100644 (file)
--- a/arch/arm/mach-lpc21xx/libs/Makefile.omk
+++ b/arch/arm/mach-lpc21xx/libs/Makefile.omk
@@ -1,4 +1,6 @@
 # -*- makefile -*-
 
-SUBDIRS = hal iap 
+ifneq ($(BOARD),lpceurobot)
+SUBDIRS = hal iap
+endif
 SUBDIRS += boot can lpcan lpcanvca pll pwm uart_zen uart-nozen ldscripts

diff --git a/arch/arm/mach-lpc21xx/test/armtest_leds/main.c b/arch/arm/mach-lpc21xx/test/armtest_leds/main.c
index ad925886bb8e66251fdaeaa8fe967ec7704cf6d5..18b251d0f703d576916a639796a8a2cdf2d1a3fe 100644 (file)
--- a/arch/arm/mach-lpc21xx/test/armtest_leds/main.c
+++ b/arch/arm/mach-lpc21xx/test/armtest_leds/main.c
@@ -44,9 +44,9 @@ static void lowInit(void) {
     PLLFEED = 0x55;                       // MUST occur in sequence.\r
 \r
     // setup the parallel port pin\r
-    IOCLR = PIO_ZERO_BITS;                // clear the ZEROs output\r
-    IOSET = PIO_ONE_BITS;                 // set the ONEs output\r
-    IODIR = PIO_OUTPUT_BITS;              // set the output bit direction\r
+    IO0CLR = PIO_ZERO_BITS;                // clear the ZEROs output\r
+    IO0SET = PIO_ONE_BITS;                 // set the ONEs output\r
+    IO0DIR = PIO_OUTPUT_BITS;              // set the output bit direction\r
 \r
     // wait for PLL lock\r
     while (!(PLLSTAT & PLLSTAT_LOCK))\r
@@ -119,8 +119,8 @@ static int All_leds = 0xF0000;
  */\r
 static void\r
 ledInit() {\r
-    IODIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/\r
-    IOSET = 0x000F0000;   /* all leds are switched on */\r
+    IO0DIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/\r
+    IO0SET = 0x000F0000;   /* all leds are switched on */\r
 }\r
 \r
 /**\r
@@ -129,7 +129,7 @@ ledInit() {
  */\r
 static void   /* Ioclr.i =1   =>   IOset.i cleared */\r
 ledOff(int led) {\r
-    IOCLR = led;\r
+    IO0CLR = led;\r
 }\r
 \r
 /**\r
@@ -138,7 +138,7 @@ ledOff(int led) {
  */\r
 static void    /*  Ioset.i = 1   =>  P0.i = 1    */\r
 ledOn(int led) {\r
-    IOSET = led;\r
+    IO0SET = led;\r
 }\r
 \r
 /**\r

diff --git a/arch/arm/mach-lpc21xx/test/interrupt_t0_test/interrupt_t0_test.c b/arch/arm/mach-lpc21xx/test/interrupt_t0_test/interrupt_t0_test.c
index 843647b98a3f995bd6cb9c12320bd2af41d86554..444c87497335a3a092cd95f340548cacf3efba76 100644 (file)
--- a/arch/arm/mach-lpc21xx/test/interrupt_t0_test/interrupt_t0_test.c
+++ b/arch/arm/mach-lpc21xx/test/interrupt_t0_test/interrupt_t0_test.c
@@ -50,9 +50,9 @@ static void lowInit(void)
     PLLFEED = 0x55;                       // MUST occur in sequence.
 
     // setup the parallel port pin
-    IOCLR = PIO_ZERO_BITS;                // clear the ZEROs output
-    IOSET = PIO_ONE_BITS;                 // set the ONEs output
-    IODIR = PIO_OUTPUT_BITS;              // set the output bit direction
+    IO0CLR = PIO_ZERO_BITS;                // clear the ZEROs output
+    IO0SET = PIO_ONE_BITS;                 // set the ONEs output
+    IO0DIR = PIO_OUTPUT_BITS;              // set the output bit direction
 
     // wait for PLL lock
     while (!(PLLSTAT & PLLSTAT_LOCK))
@@ -105,8 +105,8 @@ static void sysInit(void)
 */
 static void ledInit()
 {
-    IODIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/
-    IOSET = 0x00000000;   /* all leds are switched off */
+    IO0DIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/
+    IO0SET = 0x00000000;   /* all leds are switched off */
 }
 
 /**
@@ -115,7 +115,7 @@ static void ledInit()
 */
 static void ledOff(int led)  /* Ioclr.i =1   =>   IOset.i cleared */
 {
-    IOCLR = led;
+    IO0CLR = led;
 }
 
 /**
@@ -124,7 +124,7 @@ static void ledOff(int led)  /* Ioclr.i =1   =>   IOset.i cleared */
 */
 static void  ledOn(int led)  /*  Ioset.i = 1   =>  P0.i = 1    */
 {
-    IOSET = led;
+    IO0SET = led;
 }
 
 

diff --git a/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/test_ARMBoard_pwm.c b/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/test_ARMBoard_pwm.c
index f143602de2b7332413de974309df8d4def66978e..0ee0859ceb8d776284966c562bb2052f3a022620 100644 (file)
--- a/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/test_ARMBoard_pwm.c
+++ b/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/test_ARMBoard_pwm.c
@@ -45,9 +45,9 @@
     PLLFEED = 0x55;                       // MUST occur in sequence.\r
     \r
     // setup the parallel port pin\r
-    IOCLR = PIO_ZERO_BITS;                // clear the ZEROs output\r
-    IOSET = PIO_ONE_BITS;                 // set the ONEs output\r
-    IODIR = PIO_OUTPUT_BITS;              // set the output bit direction\r
+    IO0CLR = PIO_ZERO_BITS;                // clear the ZEROs output\r
+    IO0SET = PIO_ONE_BITS;                 // set the ONEs output\r
+    IO0DIR = PIO_OUTPUT_BITS;              // set the output bit direction\r
     \r
     // wait for PLL lock\r
     while (!(PLLSTAT & PLLSTAT_LOCK))\r

diff --git a/arch/arm/mach-lpc21xx/test/test_uart/uart_test.c b/arch/arm/mach-lpc21xx/test/test_uart/uart_test.c
index 8b3785a4cc3407d81312aa82ec85774e173a3e0b..b1d75ee7412f859a8ca0cb7166d667e067de9ad7 100644 (file)
--- a/arch/arm/mach-lpc21xx/test/test_uart/uart_test.c
+++ b/arch/arm/mach-lpc21xx/test/test_uart/uart_test.c
@@ -30,9 +30,9 @@ static void lowInit(void)
     PLLFEED = 0x55;                       // MUST occur in sequence.
 
     // setup the parallel port pin
-    IOCLR = PIO_ZERO_BITS;                // clear the ZEROs output
-    IOSET = PIO_ONE_BITS;                 // set the ONEs output
-    IODIR = PIO_OUTPUT_BITS;              // set the output bit direction
+    IO0CLR = PIO_ZERO_BITS;                // clear the ZEROs output
+    IO0SET = PIO_ONE_BITS;                 // set the ONEs output
+    IO0DIR = PIO_OUTPUT_BITS;              // set the output bit direction
 
     // wait for PLL lock
     while (!(PLLSTAT & PLLSTAT_LOCK))
@@ -105,8 +105,8 @@ static int leds[] = { 0x10000, 0x20000, 0x40000, 0x80000 };
  */
 static void ledInit()
 {
-    IODIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/
-    IOSET = 0x00000000;   /* all leds are switched off */
+    IO0DIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/
+    IO0SET = 0x00000000;   /* all leds are switched off */
 }
 
 /**
@@ -115,7 +115,7 @@ static void ledInit()
  */
 static void ledOff(int led)  /* Ioclr.i =1   =>   IOset.i cleared */
 {
-    IOCLR = led;
+    IO0CLR = led;
 }
 
 /**
@@ -124,7 +124,7 @@ static void ledOff(int led)  /* Ioclr.i =1   =>   IOset.i cleared */
  */
 static void  ledOn(int led)  /*  Ioset.i = 1   =>  P0.i = 1    */
 {
-    IOSET = led;
+    IO0SET = led;
 }
 
 

diff --git a/arch/generic/defines/Makefile.omk b/arch/generic/defines/Makefile.omk
index 637d63c359cc39bfec7c37d8fe61d5da5d8a2676..cac838395fa0bbb53ceed8605c7d15ebbede9c62 100644 (file)
--- a/arch/generic/defines/Makefile.omk
+++ b/arch/generic/defines/Makefile.omk
@@ -1,4 +1,5 @@
 # -*- makefile -*-
 
+include_HEADERS += deb_led.h
 include_HEADERS +=  byteswap.h endian.h lt_timer.h lt_timer_types.h keyval_id_his.h ads1x46.h irq_generic.h
 #include_HEADERS = $(notdir $(wildcard $(SOURCES_DIR)/*.h))