[nuttx-bb][PATCH 2/3] Add compal_e88 for phones like the gta02 modem and the Motorola W220

The compal_e88 directory contains a fixed linking script to make it work romloader compatibles phones. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- .../calypsotest/Make.defs | 2 +- .../calypsotest/appconfig | 0 .../calypsotest/defconfig | 6 +++--- .../ostest => compal_e88/calypsotest}/setenv.sh | 0 .../{compal_e99 => compal_e88}/include/board.h | 0 nuttx/configs/{compal_e99 => compal_e88}/ld.script | 20 +++++++++++--------- .../{compal_e99 => compal_e88}/nsh/Make.defs | 0 .../{compal_e99 => compal_e88}/nsh/appconfig | 0 .../{compal_e99 => compal_e88}/nsh/defconfig | 4 ++-- .../{compal_e99 => compal_e88/nsh}/ld.script | 20 +++++++++++--------- .../configs/{c5471evm => compal_e88}/nsh/setenv.sh | 0 .../{compal_e99 => compal_e88}/ostest/Make.defs | 2 +- .../{c5471evm => compal_e88}/ostest/appconfig | 0 .../{compal_e99 => compal_e88}/ostest/defconfig | 6 +++--- .../{c5471evm => compal_e88}/ostest/setenv.sh | 0 nuttx/configs/compal_e88/src/Make.dep | 1 + .../{compal_e99 => compal_e88}/src/Makefile | 2 +- .../configs/{compal_e99 => compal_e88}/src/dummy.c | 0 18 files changed, 34 insertions(+), 29 deletions(-) copy nuttx/configs/{compal_e99 => compal_e88}/calypsotest/Make.defs (99%) copy nuttx/configs/{compal_e99 => compal_e88}/calypsotest/appconfig (100%) copy nuttx/configs/{compal_e99 => compal_e88}/calypsotest/defconfig (99%) copy nuttx/configs/{c5471evm/ostest => compal_e88/calypsotest}/setenv.sh (100%) copy nuttx/configs/{compal_e99 => compal_e88}/include/board.h (100%) copy nuttx/configs/{compal_e99 => compal_e88}/ld.script (91%) copy nuttx/configs/{compal_e99 => compal_e88}/nsh/Make.defs (100%) copy nuttx/configs/{compal_e99 => compal_e88}/nsh/appconfig (100%) copy nuttx/configs/{compal_e99 => compal_e88}/nsh/defconfig (99%) copy nuttx/configs/{compal_e99 => compal_e88/nsh}/ld.script (91%) copy nuttx/configs/{c5471evm => compal_e88}/nsh/setenv.sh (100%) copy nuttx/configs/{compal_e99 => compal_e88}/ostest/Make.defs (99%) copy nuttx/configs/{c5471evm => compal_e88}/ostest/appconfig (100%) copy nuttx/configs/{compal_e99 => compal_e88}/ostest/defconfig (99%) copy nuttx/configs/{c5471evm => compal_e88}/ostest/setenv.sh (100%) create mode 100644 nuttx/configs/compal_e88/src/.depend create mode 100644 nuttx/configs/compal_e88/src/Make.dep copy nuttx/configs/{compal_e99 => compal_e88}/src/Makefile (98%) copy nuttx/configs/{compal_e99 => compal_e88}/src/dummy.c (100%) diff --git a/nuttx/configs/compal_e99/calypsotest/Make.defs b/nuttx/configs/compal_e88/calypsotest/Make.defs similarity index 99% copy from nuttx/configs/compal_e99/calypsotest/Make.defs copy to nuttx/configs/compal_e88/calypsotest/Make.defs index 405dbd2..4099ccd 100644 --- a/nuttx/configs/compal_e99/calypsotest/Make.defs +++ b/nuttx/configs/compal_e88/calypsotest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/compal_e99/ostest/Make.defs +# configs/compal_e88/ostest/Make.defs # # Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey(a)racsa.co.cr> diff --git a/nuttx/configs/compal_e99/calypsotest/appconfig b/nuttx/configs/compal_e88/calypsotest/appconfig similarity index 100% copy from nuttx/configs/compal_e99/calypsotest/appconfig copy to nuttx/configs/compal_e88/calypsotest/appconfig diff --git a/nuttx/configs/compal_e99/calypsotest/defconfig b/nuttx/configs/compal_e88/calypsotest/defconfig similarity index 99% copy from nuttx/configs/compal_e99/calypsotest/defconfig copy to nuttx/configs/compal_e88/calypsotest/defconfig index e30ae36..8ac4bb6 100644 --- a/nuttx/configs/compal_e99/calypsotest/defconfig +++ b/nuttx/configs/compal_e88/calypsotest/defconfig @@ -1,5 +1,5 @@ ############################################################################ -# configs/compal_e99/ostest/defconfig +# configs/compal_e88/ostest/defconfig # # Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey(a)racsa.co.cr> @@ -64,8 +64,8 @@ CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y CONFIG_ARCH_CHIP=calypso CONFIG_ARCH_CHIP_CALYPSO=y -CONFIG_ARCH_BOARD=compal_e99 -CONFIG_ARCH_BOARD_COMPALE99=y +CONFIG_ARCH_BOARD=compal_e88 +CONFIG_ARCH_BOARD_COMPALE88=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n CONFIG_DRAM_END=0x00840000 diff --git a/nuttx/configs/c5471evm/ostest/setenv.sh b/nuttx/configs/compal_e88/calypsotest/setenv.sh similarity index 100% copy from nuttx/configs/c5471evm/ostest/setenv.sh copy to nuttx/configs/compal_e88/calypsotest/setenv.sh diff --git a/nuttx/configs/compal_e99/include/board.h b/nuttx/configs/compal_e88/include/board.h similarity index 100% copy from nuttx/configs/compal_e99/include/board.h copy to nuttx/configs/compal_e88/include/board.h diff --git a/nuttx/configs/compal_e99/ld.script b/nuttx/configs/compal_e88/ld.script similarity index 91% copy from nuttx/configs/compal_e99/ld.script copy to nuttx/configs/compal_e88/ld.script index 07f1ab0..838aad2 100644 --- a/nuttx/configs/compal_e99/ld.script +++ b/nuttx/configs/compal_e88/ld.script @@ -11,10 +11,12 @@ OUTPUT_ARCH(arm) ENTRY(__start) MEMORY { + /* 0x800000-0x83ffff */ /* compal-loaded binary: our text, initialized data */ - LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00010000 + LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00020000 + TRAM (rw) : ORIGIN = 0x00820000, LENGTH = 0x00010000 /* compal-loaded binary: our unitialized data, stacks, heap */ - IRAM (rw) : ORIGIN = 0x00810000, LENGTH = 0x00010000 + IRAM (rw) : ORIGIN = 0x00830000, LENGTH = 0x0000ffff } SECTIONS { @@ -32,7 +34,7 @@ SECTIONS PROVIDE(__start = .); KEEP(*(.text.start)) *(.text.start) - } > LRAM + } > TRAM /* exception vectors from 0x80001c to 0x800034 */ .text.exceptions 0x80001c : AT (LOADADDR(.text.start) + SIZEOF(.text.start)) { @@ -53,7 +55,7 @@ SECTIONS /* gcc voodoo */ *(.glue_7t) *(.glue_7) *(.vfp11_veneer) *(.v4_bx) . = ALIGN(4); - } > LRAM + } > TRAM PROVIDE(_text_start = LOADADDR(.text)); PROVIDE(_text_end = LOADADDR(.text) + SIZEOF(.text)); @@ -65,7 +67,7 @@ SECTIONS KEEP(*(SORT(.ctors))) /* end of list */ LONG(0) - } > LRAM + } > TRAM PROVIDE(_ctor_start = LOADADDR(.ctors)); PROVIDE(_ctor_end = LOADADDR(.ctors) + SIZEOF(.ctors)); @@ -77,7 +79,7 @@ SECTIONS KEEP(*(SORT(.dtors))) /* end of list */ LONG(0) - } > LRAM + } > TRAM PROVIDE(_dtor_start = LOADADDR(.dtors)); PROVIDE(_dtor_end = LOADADDR(.dtors) + SIZEOF(.dtors)); @@ -85,7 +87,7 @@ SECTIONS . = ALIGN(4); .rodata : { *(.rodata*) - } > LRAM + } > TRAM PROVIDE(_rodata_start = LOADADDR(.rodata)); PROVIDE(_rodata_end = LOADADDR(.rodata) + SIZEOF(.rodata)); @@ -93,7 +95,7 @@ SECTIONS . = ALIGN(4); .data : { *(.data) - } > LRAM + } > TRAM PROVIDE(_data_start = LOADADDR(.data)); PROVIDE(_data_end = LOADADDR(.data) + SIZEOF(.data)); @@ -102,7 +104,7 @@ SECTIONS .got : { *(.got) *(.got.plt) *(.igot.plt) *(.got) *(.igot) - } > LRAM + } > TRAM PROVIDE(_got_start = LOADADDR(.got)); PROVIDE(_got_end = LOADADDR(.got) + SIZEOF(.got)); diff --git a/nuttx/configs/compal_e99/nsh/Make.defs b/nuttx/configs/compal_e88/nsh/Make.defs similarity index 100% copy from nuttx/configs/compal_e99/nsh/Make.defs copy to nuttx/configs/compal_e88/nsh/Make.defs diff --git a/nuttx/configs/compal_e99/nsh/appconfig b/nuttx/configs/compal_e88/nsh/appconfig similarity index 100% copy from nuttx/configs/compal_e99/nsh/appconfig copy to nuttx/configs/compal_e88/nsh/appconfig diff --git a/nuttx/configs/compal_e99/nsh/defconfig b/nuttx/configs/compal_e88/nsh/defconfig similarity index 99% copy from nuttx/configs/compal_e99/nsh/defconfig copy to nuttx/configs/compal_e88/nsh/defconfig index 946c9cf..ebec6f0 100644 --- a/nuttx/configs/compal_e99/nsh/defconfig +++ b/nuttx/configs/compal_e88/nsh/defconfig @@ -64,8 +64,8 @@ CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y CONFIG_ARCH_CHIP=calypso CONFIG_ARCH_CHIP_CALYPSO=y -CONFIG_ARCH_BOARD=compal_e99 -CONFIG_ARCH_BOARD_COMPALE99=y +CONFIG_ARCH_BOARD=compal_e88 +CONFIG_ARCH_BOARD_COMPALE88=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n CONFIG_DRAM_END=0x00840000 diff --git a/nuttx/configs/compal_e99/ld.script b/nuttx/configs/compal_e88/nsh/ld.script similarity index 91% copy from nuttx/configs/compal_e99/ld.script copy to nuttx/configs/compal_e88/nsh/ld.script index 07f1ab0..838aad2 100644 --- a/nuttx/configs/compal_e99/ld.script +++ b/nuttx/configs/compal_e88/nsh/ld.script @@ -11,10 +11,12 @@ OUTPUT_ARCH(arm) ENTRY(__start) MEMORY { + /* 0x800000-0x83ffff */ /* compal-loaded binary: our text, initialized data */ - LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00010000 + LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00020000 + TRAM (rw) : ORIGIN = 0x00820000, LENGTH = 0x00010000 /* compal-loaded binary: our unitialized data, stacks, heap */ - IRAM (rw) : ORIGIN = 0x00810000, LENGTH = 0x00010000 + IRAM (rw) : ORIGIN = 0x00830000, LENGTH = 0x0000ffff } SECTIONS { @@ -32,7 +34,7 @@ SECTIONS PROVIDE(__start = .); KEEP(*(.text.start)) *(.text.start) - } > LRAM + } > TRAM /* exception vectors from 0x80001c to 0x800034 */ .text.exceptions 0x80001c : AT (LOADADDR(.text.start) + SIZEOF(.text.start)) { @@ -53,7 +55,7 @@ SECTIONS /* gcc voodoo */ *(.glue_7t) *(.glue_7) *(.vfp11_veneer) *(.v4_bx) . = ALIGN(4); - } > LRAM + } > TRAM PROVIDE(_text_start = LOADADDR(.text)); PROVIDE(_text_end = LOADADDR(.text) + SIZEOF(.text)); @@ -65,7 +67,7 @@ SECTIONS KEEP(*(SORT(.ctors))) /* end of list */ LONG(0) - } > LRAM + } > TRAM PROVIDE(_ctor_start = LOADADDR(.ctors)); PROVIDE(_ctor_end = LOADADDR(.ctors) + SIZEOF(.ctors)); @@ -77,7 +79,7 @@ SECTIONS KEEP(*(SORT(.dtors))) /* end of list */ LONG(0) - } > LRAM + } > TRAM PROVIDE(_dtor_start = LOADADDR(.dtors)); PROVIDE(_dtor_end = LOADADDR(.dtors) + SIZEOF(.dtors)); @@ -85,7 +87,7 @@ SECTIONS . = ALIGN(4); .rodata : { *(.rodata*) - } > LRAM + } > TRAM PROVIDE(_rodata_start = LOADADDR(.rodata)); PROVIDE(_rodata_end = LOADADDR(.rodata) + SIZEOF(.rodata)); @@ -93,7 +95,7 @@ SECTIONS . = ALIGN(4); .data : { *(.data) - } > LRAM + } > TRAM PROVIDE(_data_start = LOADADDR(.data)); PROVIDE(_data_end = LOADADDR(.data) + SIZEOF(.data)); @@ -102,7 +104,7 @@ SECTIONS .got : { *(.got) *(.got.plt) *(.igot.plt) *(.got) *(.igot) - } > LRAM + } > TRAM PROVIDE(_got_start = LOADADDR(.got)); PROVIDE(_got_end = LOADADDR(.got) + SIZEOF(.got)); diff --git a/nuttx/configs/c5471evm/nsh/setenv.sh b/nuttx/configs/compal_e88/nsh/setenv.sh similarity index 100% copy from nuttx/configs/c5471evm/nsh/setenv.sh copy to nuttx/configs/compal_e88/nsh/setenv.sh diff --git a/nuttx/configs/compal_e99/ostest/Make.defs b/nuttx/configs/compal_e88/ostest/Make.defs similarity index 99% copy from nuttx/configs/compal_e99/ostest/Make.defs copy to nuttx/configs/compal_e88/ostest/Make.defs index 06ef3d4..c887dd0 100644 --- a/nuttx/configs/compal_e99/ostest/Make.defs +++ b/nuttx/configs/compal_e88/ostest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/compal_e99/ostest/Make.defs +# configs/compal_e88/ostest/Make.defs # # Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey(a)racsa.co.cr> diff --git a/nuttx/configs/c5471evm/ostest/appconfig b/nuttx/configs/compal_e88/ostest/appconfig similarity index 100% copy from nuttx/configs/c5471evm/ostest/appconfig copy to nuttx/configs/compal_e88/ostest/appconfig diff --git a/nuttx/configs/compal_e99/ostest/defconfig b/nuttx/configs/compal_e88/ostest/defconfig similarity index 99% copy from nuttx/configs/compal_e99/ostest/defconfig copy to nuttx/configs/compal_e88/ostest/defconfig index 12c365e..1b5ded9 100644 --- a/nuttx/configs/compal_e99/ostest/defconfig +++ b/nuttx/configs/compal_e88/ostest/defconfig @@ -1,5 +1,5 @@ ############################################################################ -# configs/compal_e99/ostest/defconfig +# configs/compal_e88/ostest/defconfig # # Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey(a)racsa.co.cr> @@ -64,8 +64,8 @@ CONFIG_ARCH_ARM=y CONFIG_ARCH_ARM7TDMI=y CONFIG_ARCH_CHIP=calypso CONFIG_ARCH_CHIP_CALYPSO=y -CONFIG_ARCH_BOARD=compal_e99 -CONFIG_ARCH_BOARD_COMPALE99=y +CONFIG_ARCH_BOARD=compal_e88 +CONFIG_ARCH_BOARD_COMPALE88=y CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_ROM_VECTORS=n CONFIG_DRAM_END=0x00840000 diff --git a/nuttx/configs/c5471evm/ostest/setenv.sh b/nuttx/configs/compal_e88/ostest/setenv.sh similarity index 100% copy from nuttx/configs/c5471evm/ostest/setenv.sh copy to nuttx/configs/compal_e88/ostest/setenv.sh diff --git a/nuttx/configs/compal_e88/src/.depend b/nuttx/configs/compal_e88/src/.depend new file mode 100644 index 0000000..e69de29 diff --git a/nuttx/configs/compal_e88/src/Make.dep b/nuttx/configs/compal_e88/src/Make.dep new file mode 100644 index 0000000..b8378cf --- /dev/null +++ b/nuttx/configs/compal_e88/src/Make.dep @@ -0,0 +1 @@ +dummy.o: dummy.c diff --git a/nuttx/configs/compal_e99/src/Makefile b/nuttx/configs/compal_e88/src/Makefile similarity index 98% copy from nuttx/configs/compal_e99/src/Makefile copy to nuttx/configs/compal_e88/src/Makefile index 2160ea3..851a603 100644 --- a/nuttx/configs/compal_e99/src/Makefile +++ b/nuttx/configs/compal_e88/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# configs/compal_e99/src/Makefile +# configs/compal_e88/src/Makefile # # Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey(a)racsa.co.cr> diff --git a/nuttx/configs/compal_e99/src/dummy.c b/nuttx/configs/compal_e88/src/dummy.c similarity index 100% copy from nuttx/configs/compal_e99/src/dummy.c copy to nuttx/configs/compal_e88/src/dummy.c -- 1.7.4.1