Message ID | 1340955478-22251-2-git-send-email-monstr@monstr.eu |
---|---|
State | Accepted |
Commit | 2e65b44c0fcac0db608493b86e30b02e8ebafb61 |
Headers | show |
2012/6/29 Michal Simek <monstr@monstr.eu>: > Unification for all microblaze boards. > > Signed-off-by: Michal Simek <monstr@monstr.eu> > --- > arch/microblaze/config.mk | 2 + > arch/microblaze/cpu/u-boot.lds | 71 ++++++++++++++++++++++++++++ > board/xilinx/microblaze-generic/u-boot.lds | 71 ---------------------------- > 3 files changed, 73 insertions(+), 71 deletions(-) > create mode 100644 arch/microblaze/cpu/u-boot.lds > delete mode 100644 board/xilinx/microblaze-generic/u-boot.lds > > diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk > index abea70b..aca79e2 100644 > --- a/arch/microblaze/config.mk > +++ b/arch/microblaze/config.mk > @@ -29,3 +29,5 @@ CROSS_COMPILE ?= mb- > CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000 > > PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__ > + > +LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds > diff --git a/arch/microblaze/cpu/u-boot.lds b/arch/microblaze/cpu/u-boot.lds > new file mode 100644 > index 0000000..ee41145 > --- /dev/null > +++ b/arch/microblaze/cpu/u-boot.lds > @@ -0,0 +1,71 @@ > +/* > + * (C) Copyright 2004 Atmark Techno, Inc. > + * > + * Yasushi SHOJI <yashi@atmark-techno.com> > + * > + * 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_ARCH(microblaze) > +ENTRY(_start) > + > +SECTIONS > +{ > + .text ALIGN(0x4): > + { > + __text_start = .; > + arch/microblaze/cpu/start.o (.text) > + *(.text) > + __text_end = .; > + } > + > + .rodata ALIGN(0x4): > + { > + __rodata_start = .; > + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) > + __rodata_end = .; > + } > + > + .data ALIGN(0x4): > + { > + __data_start = .; > + *(.data) > + __data_end = .; > + } > + > + .u_boot_cmd ALIGN(0x4): > + { > + . = .; > + __u_boot_cmd_start = .; > + *(.u_boot_cmd) > + __u_boot_cmd_end = .; > + } > + > + .bss ALIGN(0x4): > + { > + __bss_start = .; > + *(.sbss) > + *(.scommon) > + *(.bss) > + *(COMMON) > + . = ALIGN(4); > + __bss_end = .; > + } > + __end = . ; > +} > diff --git a/board/xilinx/microblaze-generic/u-boot.lds b/board/xilinx/microblaze-generic/u-boot.lds > deleted file mode 100644 > index ee41145..0000000 > --- a/board/xilinx/microblaze-generic/u-boot.lds > +++ /dev/null > @@ -1,71 +0,0 @@ > -/* > - * (C) Copyright 2004 Atmark Techno, Inc. > - * > - * Yasushi SHOJI <yashi@atmark-techno.com> > - * > - * 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_ARCH(microblaze) > -ENTRY(_start) > - > -SECTIONS > -{ > - .text ALIGN(0x4): > - { > - __text_start = .; > - arch/microblaze/cpu/start.o (.text) > - *(.text) > - __text_end = .; > - } > - > - .rodata ALIGN(0x4): > - { > - __rodata_start = .; > - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) > - __rodata_end = .; > - } > - > - .data ALIGN(0x4): > - { > - __data_start = .; > - *(.data) > - __data_end = .; > - } > - > - .u_boot_cmd ALIGN(0x4): > - { > - . = .; > - __u_boot_cmd_start = .; > - *(.u_boot_cmd) > - __u_boot_cmd_end = .; > - } > - > - .bss ALIGN(0x4): > - { > - __bss_start = .; > - *(.sbss) > - *(.scommon) > - *(.bss) > - *(COMMON) > - . = ALIGN(4); > - __bss_end = .; > - } > - __end = . ; > -} > -- > 1.7.0.4 > Applied to microblaze custodian branch. Michal
diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk index abea70b..aca79e2 100644 --- a/arch/microblaze/config.mk +++ b/arch/microblaze/config.mk @@ -29,3 +29,5 @@ CROSS_COMPILE ?= mb- CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000 PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__ + +LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds diff --git a/arch/microblaze/cpu/u-boot.lds b/arch/microblaze/cpu/u-boot.lds new file mode 100644 index 0000000..ee41145 --- /dev/null +++ b/arch/microblaze/cpu/u-boot.lds @@ -0,0 +1,71 @@ +/* + * (C) Copyright 2004 Atmark Techno, Inc. + * + * Yasushi SHOJI <yashi@atmark-techno.com> + * + * 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_ARCH(microblaze) +ENTRY(_start) + +SECTIONS +{ + .text ALIGN(0x4): + { + __text_start = .; + arch/microblaze/cpu/start.o (.text) + *(.text) + __text_end = .; + } + + .rodata ALIGN(0x4): + { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + __rodata_end = .; + } + + .data ALIGN(0x4): + { + __data_start = .; + *(.data) + __data_end = .; + } + + .u_boot_cmd ALIGN(0x4): + { + . = .; + __u_boot_cmd_start = .; + *(.u_boot_cmd) + __u_boot_cmd_end = .; + } + + .bss ALIGN(0x4): + { + __bss_start = .; + *(.sbss) + *(.scommon) + *(.bss) + *(COMMON) + . = ALIGN(4); + __bss_end = .; + } + __end = . ; +} diff --git a/board/xilinx/microblaze-generic/u-boot.lds b/board/xilinx/microblaze-generic/u-boot.lds deleted file mode 100644 index ee41145..0000000 --- a/board/xilinx/microblaze-generic/u-boot.lds +++ /dev/null @@ -1,71 +0,0 @@ -/* - * (C) Copyright 2004 Atmark Techno, Inc. - * - * Yasushi SHOJI <yashi@atmark-techno.com> - * - * 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_ARCH(microblaze) -ENTRY(_start) - -SECTIONS -{ - .text ALIGN(0x4): - { - __text_start = .; - arch/microblaze/cpu/start.o (.text) - *(.text) - __text_end = .; - } - - .rodata ALIGN(0x4): - { - __rodata_start = .; - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - __rodata_end = .; - } - - .data ALIGN(0x4): - { - __data_start = .; - *(.data) - __data_end = .; - } - - .u_boot_cmd ALIGN(0x4): - { - . = .; - __u_boot_cmd_start = .; - *(.u_boot_cmd) - __u_boot_cmd_end = .; - } - - .bss ALIGN(0x4): - { - __bss_start = .; - *(.sbss) - *(.scommon) - *(.bss) - *(COMMON) - . = ALIGN(4); - __bss_end = .; - } - __end = . ; -}
Unification for all microblaze boards. Signed-off-by: Michal Simek <monstr@monstr.eu> --- arch/microblaze/config.mk | 2 + arch/microblaze/cpu/u-boot.lds | 71 ++++++++++++++++++++++++++++ board/xilinx/microblaze-generic/u-boot.lds | 71 ---------------------------- 3 files changed, 73 insertions(+), 71 deletions(-) create mode 100644 arch/microblaze/cpu/u-boot.lds delete mode 100644 board/xilinx/microblaze-generic/u-boot.lds