diff mbox

[U-Boot,V4,4/4] MIPS: add mips64 standalone support

Message ID 1346071750-6634-10-git-send-email-etou.zh@gmail.com
State Superseded
Delegated to: Daniel Schwierzeck
Headers show

Commit Message

Zhi-zhou Zhang Aug. 27, 2012, 12:49 p.m. UTC
Move CONFIG_SYS_TEXT_BASE to the board specified header file. So
change qemu-mips.h also. board/qemu-mips/config.mk is not used, then
remove it.

Signed-off-by: Zhizhou Zhang <etou.zh@gmail.com>
---
 board/qemu-mips/config.mk      |   10 -------
 examples/standalone/mips64.lds |   59 ++++++++++++++++++++++++++++++++++++++++
 include/configs/qemu-mips.h    |    1 +
 3 files changed, 60 insertions(+), 10 deletions(-)
 delete mode 100644 board/qemu-mips/config.mk
 create mode 100644 examples/standalone/mips64.lds

Comments

Wolfgang Denk Sept. 1, 2012, 12:48 p.m. UTC | #1
Dear Zhizhou Zhang,

In message <1346071750-6634-10-git-send-email-etou.zh@gmail.com> you wrote:
> Move CONFIG_SYS_TEXT_BASE to the board specified header file. So
> change qemu-mips.h also. board/qemu-mips/config.mk is not used, then
> remove it.
> 
> Signed-off-by: Zhizhou Zhang <etou.zh@gmail.com>
> ---
>  board/qemu-mips/config.mk      |   10 -------
>  examples/standalone/mips64.lds |   59 ++++++++++++++++++++++++++++++++++++++++
>  include/configs/qemu-mips.h    |    1 +
>  3 files changed, 60 insertions(+), 10 deletions(-)
>  delete mode 100644 board/qemu-mips/config.mk
>  create mode 100644 examples/standalone/mips64.lds

This patch appears to be too late in this patch series  Either
re-order and/or squash with other parts to ensure bisectability.


Best regards,

Wolfgang Denk
Zhi-zhou Zhang Sept. 2, 2012, 1:45 p.m. UTC | #2
Dear Wolfgang Denk,

On Sat, Sep 1, 2012 at 8:48 PM, Wolfgang Denk <wd@denx.de> wrote:

> Dear Zhizhou Zhang,
>
> In message <1346071750-6634-10-git-send-email-etou.zh@gmail.com> you
> wrote:
> > Move CONFIG_SYS_TEXT_BASE to the board specified header file. So
> > change qemu-mips.h also. board/qemu-mips/config.mk is not used, then
> > remove it.
> >
> > Signed-off-by: Zhizhou Zhang <etou.zh@gmail.com>
> > ---
> >  board/qemu-mips/config.mk      |   10 -------
> >  examples/standalone/mips64.lds |   59
> ++++++++++++++++++++++++++++++++++++++++
> >  include/configs/qemu-mips.h    |    1 +
> >  3 files changed, 60 insertions(+), 10 deletions(-)
> >  delete mode 100644 board/qemu-mips/config.mk
> >  create mode 100644 examples/standalone/mips64.lds
>
> This patch appears to be too late in this patch series  Either
> re-order and/or squash with other parts to ensure bisectability.
>
>
> I'm sorry, I can't catch you.  So what should I do now? Do you mean I
should
resend these patch again?

> Best regards,
>
> Wolfgang Denk
>
> --
> DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
> If I ever needed a brain transplant, I'd choose a teenager's  because
> I'd want a brain that had never been used.
>
Wolfgang Denk Sept. 2, 2012, 2:11 p.m. UTC | #3
Dear Zhi-zhou Zhang,

In message <CACFOYQ=x-8G27oznZMeY66y6Nrr54-tZFUSr8cwFvea05EdU-Q@mail.gmail.com> you wrote:
>
> > > Signed-off-by: Zhizhou Zhang <etou.zh@gmail.com>
> > > ---
> > >  board/qemu-mips/config.mk      |   10 -------
> > >  examples/standalone/mips64.lds |   59
> > ++++++++++++++++++++++++++++++++++++++++
> > >  include/configs/qemu-mips.h    |    1 +
> > >  3 files changed, 60 insertions(+), 10 deletions(-)
> > >  delete mode 100644 board/qemu-mips/config.mk
> > >  create mode 100644 examples/standalone/mips64.lds
> >
> > This patch appears to be too late in this patch series  Either
> > re-order and/or squash with other parts to ensure bisectability.
> >
> >
> > I'm sorry, I can't catch you.  So what should I do now? Do you mean I should
> resend these patch again?

No.  I already wrote what to do: please either re-order the patches so
thatfiles get added before they are referenced, or squash with other
parts so that they get added with the code that references them first.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/board/qemu-mips/config.mk b/board/qemu-mips/config.mk
deleted file mode 100644
index 27cd34a..0000000
--- a/board/qemu-mips/config.mk
+++ /dev/null
@@ -1,10 +0,0 @@ 
-#
-# Qemu -M mips system emulator
-# See http://fabrice.bellard.free.fr/qemu
-#
-
-# ROM version
-CONFIG_SYS_TEXT_BASE = 0xbfc00000
-
-# RAM version
-#CONFIG_SYS_TEXT_BASE = 0x80001000
diff --git a/examples/standalone/mips64.lds b/examples/standalone/mips64.lds
new file mode 100644
index 0000000..9b27ef4
--- /dev/null
+++ b/examples/standalone/mips64.lds
@@ -0,0 +1,59 @@ 
+/*
+ * (C) Copyright 2003
+ * Wolfgang Denk Engineering, <wd@denx.de>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program 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 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/*
+OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-bigmips")
+*/
+OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradbigmips", "elf64-tradlittlemips")
+OUTPUT_ARCH(mips)
+SECTIONS
+{
+	.text       :
+	{
+	  *(.text*)
+	}
+
+	. = ALIGN(4);
+	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+
+	. = ALIGN(4);
+	.data  : { *(.data*) }
+
+	. = .;
+	_gp = ALIGN(16) + 0x7ff0;
+
+	.got : {
+	  __got_start = .;
+	  *(.got)
+	  __got_end = .;
+	}
+
+	.sdata  : { *(.sdata*) }
+
+	. = ALIGN(4);
+	__bss_start = .;
+	.sbss (NOLOAD) : { *(.sbss*) }
+	.bss (NOLOAD)  : { *(.bss*) . = ALIGN(4); }
+
+	_end = .;
+}
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index b8b9705..bab3fb1 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -137,6 +137,7 @@ 
  */
 
 /* The following #defines are needed to get flash environment right */
+#define CONFIG_SYS_TEXT_BASE	0xbfc00000 /* Rom version */
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN		(192 << 10)