git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4649 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 17 insertions, 126 deletions

diff --git a/demos/PPC-SPC563-GCC/Makefile b/demos/PPC-SPC563-GCC/Makefile
index d771d2eb9..a91f3b69c 100644
--- a/demos/PPC-SPC563-GCC/Makefile
+++ b/demos/PPC-SPC563-GCC/Makefile
@@ -23,10 +23,14 @@ ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = no

 endif

 

-# Enable register caching optimization (read documentation).

-# Option not tested on MSP430, DO NOT USE.

-ifeq ($(USE_CURRP_CACHING),)

-  USE_CURRP_CACHING = no

+# If enabled, this option allows to compile the application in VLE mode.

+ifeq ($(USE_VLE),)

+  USE_VLE = yes

+endif

+

+# Enable this if you want to see the full log while compiling.

+ifeq ($(USE_VERBOSE_COMPILE),)

+  USE_VERBOSE_COMPILE = no

 endif

 

 #

@@ -40,18 +44,18 @@ endif
 # Define project name here

 PROJECT = ch

 

-# Define linker script file here

-LDSCRIPT = ./ch.ld

-

 # Imported source files

 CHIBIOS = ../..

 include $(CHIBIOS)/boards/GENERIC_SPC563/board.mk

 include $(CHIBIOS)/os/hal/platforms/SPC56x/platform.mk

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/ports/GCC/PPC/port.mk

+include $(CHIBIOS)/os/ports/GCC/PPC/SPC563Mxx/port.mk

 include $(CHIBIOS)/os/kernel/kernel.mk

 include $(CHIBIOS)/test/test.mk

 

+# Define linker script file here

+LDSCRIPT= $(PORTLD)/SPC563M64.ld

+

 # C sources here.

 CSRC = $(PORTSRC) \

        $(KERNSRC) \

@@ -68,9 +72,7 @@ CSRC = $(PORTSRC) \
 CPPSRC =

 

 # List ASM source files here

-ASMSRC = $(PORTASM) \

-         $(CHIBIOS)/os/ports/GCC/PPC/SPC56x/ivor.s \

-         $(CHIBIOS)/os/ports/GCC/PPC/SPC56x/vectors.s

+ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

@@ -84,9 +86,10 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
 # Compiler settings

 #

 

-MCU  = e500mc -meabi -msdata=none -mnew-mnemonics -mregnames

+MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

 

-TRGT = powerpc-eabi-

+#TRGT = powerpc-eabi-

+TRGT = ppc-vle-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

 # Enable loading with g++ only if you need C++ runtime support.

@@ -115,7 +118,7 @@ CPPWARN = -Wall -Wextra
 #

 

 # List all default C defines here, like -D_DEBUG=1

-DDEFS = -DPPC_VARIANT=PPC_VARIANT_e200z3

+DDEFS =

 

 # List all default ASM defines here, like -D_DEBUG=1

 DADEFS =

diff --git a/demos/PPC-SPC563-GCC/ch.ld b/demos/PPC-SPC563-GCC/ch.ld
deleted file mode 100644
index 72c7dddbe..000000000
--- a/demos/PPC-SPC563-GCC/ch.ld
+++ /dev/null
@@ -1,112 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/RT is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/*

- * SPC563M64 memory setup.

- */

-__irq_stack_size__      = 0x0400;

-__process_stack_size__  = 0x0800;

-__stacks_total_size__   = __irq_stack_size__ + __process_stack_size__;

-

-MEMORY

-{

-    flash : org = 0x00000000, len = 1536k

-    ram   : org = 0x40000000, len = 94k

-}

-

-/*

- * Derived constants.

- */

-__flash_size__          = LENGTH(flash);

-__flash_start__         = ORIGIN(flash);

-__flash_end__           = ORIGIN(flash) + LENGTH(flash);

-

-__ram_size__            = LENGTH(ram);

-__ram_start__           = ORIGIN(ram);

-__ram_end__             = ORIGIN(ram) + LENGTH(ram);

-

-SECTIONS

-{

-    . = ORIGIN(flash);

-

-    .text : ALIGN(16) SUBALIGN(16)

-    {

-        __ivpr_base__ = .;

-        KEEP(*(.bam))

-        KEEP(*(.handlers))

-        . = ALIGN(0x800);

-        KEEP(*(.vectors))

-        *(.text .stub .text.* .gnu.linkonce.t.*)

-        *(.glue_7t);

-        *(.glue_7);

-        *(.ctors);

-        *(.dtors);

-    } > flash

-

-    .rodata : ALIGN(16) SUBALIGN(16)

-    {

-        *(.rodata .rodata.* .gnu.linkonce.r.*)

-        *(.rodata1)

-    } > flash

-    

-    .sdata2 : ALIGN(16) SUBALIGN(16)

-    {

-        __sdata2_start__ = . + 0x8000;

-        *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)

-        *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)

-    } > flash

-    

-    .romdata : ALIGN(16) SUBALIGN(16)

-    {

-        __romdata_start__ = .;

-    } > flash

-

-    .data : AT(__romdata_start__)

-    {

-        . = ALIGN(4);

-        __data_start__ = .;

-        *(.data .data.* .gnu.linkonce.d.*)

-        __sdata_start__ = . + 0x8000;

-        *(.sdata .sdata.* .gnu.linkonce.s.*)

-        __data_end__ = .;

-    } > ram

-

-    .sbss :

-    {

-        __bss_start__ = .;

-        *(.sbss .sbss.* .gnu.linkonce.sb.*)

-        *(.scommon)

-    } > ram

-

-    .bss :

-    {

-        *(.bss .bss.* .gnu.linkonce.b.*)

-        *(COMMON)

-        __bss_end__ = .;

-    } > ram

-    

-    /DISCARD/ :

-    {

-        *(.eh_*)

-    }

-

-    __heap_base__   = __bss_end__;

-    __heap_end__    = __ram_end__ - __stacks_total_size__;

-}