From 820d1ab0841cbb96e0f80d090c2c7dd5876eef08 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Tue, 28 Apr 2009 06:34:00 +0000 Subject: 2009-04-28 Chris Johns * start/start.S: Update for boot_card command line change. --- c/src/lib/libbsp/m68k/av5282/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/av5282/start/start.S | 8 ++------ c/src/lib/libbsp/m68k/csb360/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/csb360/start/start.S | 4 +--- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/gen68302/start/start.S | 4 +--- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/gen68340/start/start.S | 4 +--- c/src/lib/libbsp/m68k/gen68360/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/gen68360/start/start.S | 11 ++--------- c/src/lib/libbsp/m68k/genmcf548x/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/genmcf548x/start/start.S | 6 +----- c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/mcf5206elite/start/start.S | 4 +--- c/src/lib/libbsp/m68k/mcf5235/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/mcf5235/start/start.S | 6 +----- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mrm332/start/start.S | 2 +- c/src/lib/libbsp/m68k/sim68000/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/sim68000/start/start.S | 7 +------ c/src/lib/libbsp/m68k/uC5282/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/uC5282/start/start.S | 6 +----- 22 files changed, 58 insertions(+), 49 deletions(-) (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog index 70a8bb557e..c30eac5128 100644 --- a/c/src/lib/libbsp/m68k/av5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * start/start.S: Update for boot_card command line change. + 2009-01-21 Frank Ueberschar PR 1354/bsps diff --git a/c/src/lib/libbsp/m68k/av5282/start/start.S b/c/src/lib/libbsp/m68k/av5282/start/start.S index 77553b8172..fa176b06fd 100644 --- a/c/src/lib/libbsp/m68k/av5282/start/start.S +++ b/c/src/lib/libbsp/m68k/av5282/start/start.S @@ -370,13 +370,9 @@ ZEROLOOPTEST: * Right : Now we're ready to boot RTEMS */ clrl d0 | Pass in null to all boot_card() params - movel d0,a7@- | environp - movel d0,a7@- | argv - movel d0,a7@- | argc + movel d0,a7@- | command line jsr SYM(boot_card) | Call C boot_card function to startup RTEMS - movel a7@+,d0 - movel a7@+,d0 - movel a7@+,d0 + movel a7@+,d0 MULTI_TASK_EXIT: nop nop diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog index 80f359f572..2c0398c31c 100644 --- a/c/src/lib/libbsp/m68k/csb360/ChangeLog +++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * start/start.S: Update for boot_card command line change. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/csb360/start/start.S b/c/src/lib/libbsp/m68k/csb360/start/start.S index e9fd75dd8a..d53ecc80cb 100644 --- a/c/src/lib/libbsp/m68k/csb360/start/start.S +++ b/c/src/lib/libbsp/m68k/csb360/start/start.S @@ -351,9 +351,7 @@ SYM(start_csb360): * Right : Now we're ready to boot RTEMS */ clrl d0 | Pass in null to all boot_card() params - movel d0,a7@- | environp - movel d0,a7@- | argv - movel d0,a7@- | argc + movel d0,a7@- | command line jsr SYM(boot_card) | Call C boot_card function to startup RTEMS diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 086231895c..bab2c86bdb 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * start/start.S: Update for boot_card command line change. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/gen68302/start/start.S b/c/src/lib/libbsp/m68k/gen68302/start/start.S index 8c2a6fe6bc..9df3198029 100644 --- a/c/src/lib/libbsp/m68k/gen68302/start/start.S +++ b/c/src/lib/libbsp/m68k/gen68302/start/start.S @@ -220,9 +220,7 @@ loop: movel d0,a1@+ | to zero out uninitialized movec a0,isp | set interrupt stack #endif - move.l #0,a7@- | environp - move.l #0,a7@- | argv - move.l #0,a7@- | argc + move.l #0,a7@- | command line jsr SYM (boot_card) nop diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 289c6033a7..e6b9e0bf4b 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * start/start.S: Update for boot_card command line change. + 2009-02-27 Joel Sherrill * Makefile.am: Remove unnecessary copy of cpu_asm.S diff --git a/c/src/lib/libbsp/m68k/gen68340/start/start.S b/c/src/lib/libbsp/m68k/gen68340/start/start.S index 16ab416a07..720553ef59 100644 --- a/c/src/lib/libbsp/m68k/gen68340/start/start.S +++ b/c/src/lib/libbsp/m68k/gen68340/start/start.S @@ -848,9 +848,7 @@ ZEROLOOPTEST: bcs.s ZEROLOOP | No, skip movel #_stack_init,a7 | set master stack pointer - movel d0,a7@- | environp - movel d0,a7@- | argv - movel d0,a7@- | argc + movel d0,a7@- | command line jsr SYM(boot_card) | Call C main PUBLIC (_mainDone) diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 8f5e740cca..7f54ab298b 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * start/start.S: Update for boot_card command line change. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/gen68360/start/start.S b/c/src/lib/libbsp/m68k/gen68360/start/start.S index c942b8a547..66f25d9284 100644 --- a/c/src/lib/libbsp/m68k/gen68360/start/start.S +++ b/c/src/lib/libbsp/m68k/gen68360/start/start.S @@ -393,9 +393,7 @@ ZEROLOOPTEST: bcs.s ZEROLOOP | No, skip movel #_stack_init,a7 | set master stack pointer - pea env | envp - pea arg | argv - movel d0,a7@- | argc + movel d0,a7@- | command line jsr boot_card | Call C main PUBLIC (_mainDone) @@ -413,15 +411,10 @@ BEGIN_DATA_DCL .align 2 PUBLIC (environ) environ: - .long env + .long 0 PUBLIC (_M68kSpuriousInterruptCount) _M68kSpuriousInterruptCount: .long 0 END_DATA_DCL -BEGIN_BSS -env: .long 0 -arg: .long 0 -END_BSS - END diff --git a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog index 0b6ece90e4..0db72c40ba 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog +++ b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * start/start.S: Update for boot_card command line change. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/genmcf548x/start/start.S b/c/src/lib/libbsp/m68k/genmcf548x/start/start.S index 6be143be8e..6b7e3b10cd 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/start/start.S +++ b/c/src/lib/libbsp/m68k/genmcf548x/start/start.S @@ -414,15 +414,11 @@ SYM(start_init): move.l #_SpInit,sp /* relocate sp */ clrl d0 /* clear d0 */ - movel d0,a7@- /* environp == NULL */ - movel d0,a7@- /* argv == NULL */ - movel d0,a7@- /* argc == 0 */ + movel d0,a7@- /* command line == 0 */ jsr boot_card /* boot rtems */ movel a7@+,d0 - movel a7@+,d0 - movel a7@+,d0 exit_multitasking: nop diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index 3f44b66f11..a21c76bbbc 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * startup/init52235.c: Update for boot_card command line change. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S b/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S index 065b3dff7f..528a6c4d46 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S +++ b/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S @@ -357,9 +357,7 @@ ZEROLOOPTEST: * Right : Now we're ready to boot RTEMS */ clrl d0 | Pass in null to all boot_card() params - movel d0,a7@- | environp - movel d0,a7@- | argv - movel d0,a7@- | argc + movel d0,a7@- | command line jsr SYM(boot_card) | Call C boot_card function to startup RTEMS # Wait forever diff --git a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog index f1d40cf597..b80854684e 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * start/start.S: Update for boot_card command line change. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/mcf5235/start/start.S b/c/src/lib/libbsp/m68k/mcf5235/start/start.S index f941b028f6..22f83dc43f 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/start/start.S +++ b/c/src/lib/libbsp/m68k/mcf5235/start/start.S @@ -368,13 +368,9 @@ ZEROLOOPTEST: * Right : Now we're ready to boot RTEMS */ clrl d0 | Pass in null to all boot_card() params - movel d0,a7@- | environp - movel d0,a7@- | argv - movel d0,a7@- | argc + movel d0,a7@- | command line jsr SYM(boot_card) | Call C boot_card function to startup RTEMS movel a7@+,d0 - movel a7@+,d0 - movel a7@+,d0 MULTI_TASK_EXIT: nop nop diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 6d867257be..4d06f2105f 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,8 @@ +2009-04-28 Chris Johns + + * start/start.S, startup/start_c.c: Update for boot_card command + line change. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/mrm332/start/start.S b/c/src/lib/libbsp/m68k/mrm332/start/start.S index 05bb23348d..5bdf88124b 100644 --- a/c/src/lib/libbsp/m68k/mrm332/start/start.S +++ b/c/src/lib/libbsp/m68k/mrm332/start/start.S @@ -142,7 +142,7 @@ END_CODE /* * Execute main with arguments argc and agrv. */ - boot_card(1,__argv); + boot_card((void*)0); reboot(); } diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index 3a72546d69..673b35ef76 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * start/start.S: Update for boot_card command line change. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/sim68000/start/start.S b/c/src/lib/libbsp/m68k/sim68000/start/start.S index 23e34ebab9..4085ee4144 100644 --- a/c/src/lib/libbsp/m68k/sim68000/start/start.S +++ b/c/src/lib/libbsp/m68k/sim68000/start/start.S @@ -381,8 +381,6 @@ zerobss_loop: movel %d0,%a7 | set master stack pointer movel %d0,%a6 | set base pointer - pea env | push environp - pea arg | push argv movel #0,%a7@- | push argc jsr boot_card | if this returns, what do we do??? @@ -403,11 +401,8 @@ bsp_exitted: .sect .bss -env: .long 0 -arg: .long 0 - .global environ .align 2 environ: - .long env + .long 0 diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 579552a7c9..119b0d7b18 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Chris Johns + + * start/start.S: Update for boot_card command line change. + 2009-03-02 Till Straumann PR 1375/bsps diff --git a/c/src/lib/libbsp/m68k/uC5282/start/start.S b/c/src/lib/libbsp/m68k/uC5282/start/start.S index 3e88059c86..03ec2731ba 100644 --- a/c/src/lib/libbsp/m68k/uC5282/start/start.S +++ b/c/src/lib/libbsp/m68k/uC5282/start/start.S @@ -382,13 +382,9 @@ ZEROLOOPTEST: * Right : Now we're ready to boot RTEMS */ clrl d0 | Pass in null to all boot_card() params - movel d0,a7@- | environp - movel d0,a7@- | argv - movel d0,a7@- | argc + movel d0,a7@- | command line jsr SYM(boot_card) | Call C boot_card function to startup RTEMS movel a7@+,d0 - movel a7@+,d0 - movel a7@+,d0 MULTI_TASK_EXIT: nop nop -- cgit v1.2.3