aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/Makefile3
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/Makefile.thumb3
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/ch.ld2
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/main.c6
-rw-r--r--demos/ARM7-LPC214x-GCC/Makefile2
-rw-r--r--demos/ARM7-LPC214x-GCC/Makefile.thumb2
-rw-r--r--demos/ARM7-LPC214x-GCC/main.c2
-rw-r--r--demos/ARMCM3-STM32F103-GCC/main.c2
-rw-r--r--readme.txt4
9 files changed, 16 insertions, 10 deletions
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index 6c6d8f783..8ac2a69af 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -64,6 +64,7 @@ UADEFS =
# List ARM-mode C source files here
ASRC = ../../ports/ARM7-AT91SAM7X/chcore.c \
../../ports/ARM7-AT91SAM7X/sam7x_serial.c \
+ ../../ports/ARM7-AT91SAM7X/sam7x_emac.c \
../../src/chinit.c ../../src/chdebug.c ../../src/chlists.c ../../src/chdelta.c \
../../src/chschd.c ../../src/chthreads.c ../../src/chsem.c ../../src/chmtx.c \
../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c ../../src/chqueues.c \
@@ -81,7 +82,7 @@ TSRC =
ASMSRC = ../../ports/ARM7-AT91SAM7X/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib \
+UINCDIR = ../../src/include ../../src/lib ../../test \
../../ports/ARM7 ../../ports/ARM7-AT91SAM7X
# List the user directory to look for the libraries here
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
index 212886957..e3fb4a6ce 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
@@ -69,6 +69,7 @@ ASRC =
# enabled for all modules and that lowers performance.
TSRC = ../../ports/ARM7-AT91SAM7X/chcore.c \
../../ports/ARM7-AT91SAM7X/sam7x_serial.c \
+ ../../ports/ARM7-AT91SAM7X/sam7x_emac.c \
../../src/chinit.c ../../src/chdebug.c ../../src/chlists.c ../../src/chdelta.c \
../../src/chschd.c ../../src/chthreads.c ../../src/chsem.c ../../src/chmtx.c \
../../src/chevents.c ../../src/chmsg.c ../../src/chsleep.c ../../src/chqueues.c \
@@ -81,7 +82,7 @@ TSRC = ../../ports/ARM7-AT91SAM7X/chcore.c \
ASMSRC = ../../ports/ARM7-AT91SAM7X/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib \
+UINCDIR = ../../src/include ../../src/lib ../../test \
../../ports/ARM7 ../../ports/ARM7-AT91SAM7X
# List the user directory to look for the libraries here
diff --git a/demos/ARM7-AT91SAM7X-GCC/ch.ld b/demos/ARM7-AT91SAM7X-GCC/ch.ld
index 541c73b5b..847340cb4 100644
--- a/demos/ARM7-AT91SAM7X-GCC/ch.ld
+++ b/demos/ARM7-AT91SAM7X-GCC/ch.ld
@@ -30,7 +30,7 @@ __stacks_total_size__ = __und_stack_size__ + __abt_stack_size__ + __fiq_stack_si
MEMORY
{
- flash : org = 0x100000, len = 256k
+ flash : org = 0x000000, len = 256k
ram : org = 0x200020, len = 64k - 0x20
}
diff --git a/demos/ARM7-AT91SAM7X-GCC/main.c b/demos/ARM7-AT91SAM7X-GCC/main.c
index a255c9939..27fc20a3d 100644
--- a/demos/ARM7-AT91SAM7X-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-GCC/main.c
@@ -18,6 +18,7 @@
*/
#include <ch.h>
+#include <test.h>
#include "board.h"
#include "sam7x_serial.h"
@@ -27,9 +28,9 @@ static msg_t Thread1(void *arg) {
while (TRUE) {
AT91C_BASE_PIOB->PIO_SODR = PIOB_LCD_BL; // LCD on.
- chThdSleep(500);
+ chThdSleep(100);
AT91C_BASE_PIOB->PIO_CODR = PIOB_LCD_BL; // LCD off.
- chThdSleep(500);
+ chThdSleep(900);
}
return 0;
}
@@ -38,7 +39,6 @@ static msg_t Thread1(void *arg) {
* Entry point, the interrupts are disabled on entry.
*/
int main(int argc, char **argv) {
- msg_t TestThread(void *p);
/*
* The main() function becomes a thread here then the interrupts are
diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index 88d64b911..5d0450021 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@@ -82,7 +82,7 @@ TSRC =
ASMSRC = ../../ports/ARM7-LPC214x/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib \
+UINCDIR = ../../src/include ../../src/lib ../../test \
../../ports/ARM7 ../../ports/ARM7-LPC214x
# List the user directory to look for the libraries here
diff --git a/demos/ARM7-LPC214x-GCC/Makefile.thumb b/demos/ARM7-LPC214x-GCC/Makefile.thumb
index 3c8ba1947..83e19ebff 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile.thumb
+++ b/demos/ARM7-LPC214x-GCC/Makefile.thumb
@@ -82,7 +82,7 @@ TSRC = ../../ports/ARM7-LPC214x/chcore.c \
ASMSRC = ../../ports/ARM7-LPC214x/crt0.s ../../ports/ARM7/chsys.s
# List all user directories here
-UINCDIR = ../../src/include ../../src/lib \
+UINCDIR = ../../src/include ../../src/lib ../../test \
../../ports/ARM7 ../../ports/ARM7-LPC214x
# List the user directory to look for the libraries here
diff --git a/demos/ARM7-LPC214x-GCC/main.c b/demos/ARM7-LPC214x-GCC/main.c
index ad2ab2700..10cae19da 100644
--- a/demos/ARM7-LPC214x-GCC/main.c
+++ b/demos/ARM7-LPC214x-GCC/main.c
@@ -18,6 +18,7 @@
*/
#include <ch.h>
+#include <test.h>
#include "lpc214x.h"
#include "lpc214x_serial.h"
@@ -63,7 +64,6 @@ static msg_t Thread2(void *arg) {
* Executed as event handler at 500mS intervals.
*/
static void TimerHandler(eventid_t id) {
- msg_t TestThread(void *p);
if (!(IO0PIN & 0x00018000)) { // Both buttons
TestThread(&COM1);
diff --git a/demos/ARMCM3-STM32F103-GCC/main.c b/demos/ARMCM3-STM32F103-GCC/main.c
index 270786695..6a2037393 100644
--- a/demos/ARMCM3-STM32F103-GCC/main.c
+++ b/demos/ARMCM3-STM32F103-GCC/main.c
@@ -56,7 +56,7 @@ int main(int argc, char **argv) {
/*
* Normal main() thread activity, in this demo it does nothing except
- * sleeping in a loop.
+ * sleeping in a loop and check the button state.
*/
while (TRUE) {
if (GPIOA->IDR & GPIOA_BUTTON)
diff --git a/readme.txt b/readme.txt
index 5c87d03c7..9a4b9a4c8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -65,6 +65,10 @@ Win32-MinGW - ChibiOS/RT simulator and demo into a WIN32 process,
*** Releases ***
*****************************************************************************
+*** 0.6.5 ***
+- Modified the AT91SAM7X256 demo load script in order to make code segments
+ to start at address 0 instead of 0x100000.
+
*** 0.6.4 ***
- NEW: MSP430 port, the port code compiles correctly but it is not tested yet.
The port requires the MSPGCC toolchain.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 08:31:32 +0000