Re: [U-Boot] [PATCH 2/3] mx31pdk: Use the new relocation scheme

2011-02-13 Thread Stefano Babic
On 02/09/2011 12:17 PM, Fabio Estevam wrote:
 Signed-off-by: Fabio Estevam fabio.este...@freescale.com
 ---
  board/freescale/mx31pdk/mx31pdk.c   |   10 -
  include/configs/mx31pdk.h   |6 +++
  nand_spl/board/freescale/mx31pdk/u-boot.lds |   59 +++---
  3 files changed, 66 insertions(+), 9 deletions(-)
 
 diff --git a/board/freescale/mx31pdk/mx31pdk.c 
 b/board/freescale/mx31pdk/mx31pdk.c
 index 9f47169..2756e5a 100644
 --- a/board/freescale/mx31pdk/mx31pdk.c
 +++ b/board/freescale/mx31pdk/mx31pdk.c
 @@ -33,10 +33,16 @@ DECLARE_GLOBAL_DATA_PTR;

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

-- 
=
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: off...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH 2/3] mx31pdk: Use the new relocation scheme

2011-02-09 Thread Fabio Estevam
Signed-off-by: Fabio Estevam fabio.este...@freescale.com
---
 board/freescale/mx31pdk/mx31pdk.c   |   10 -
 include/configs/mx31pdk.h   |6 +++
 nand_spl/board/freescale/mx31pdk/u-boot.lds |   59 +++---
 3 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/board/freescale/mx31pdk/mx31pdk.c 
b/board/freescale/mx31pdk/mx31pdk.c
index 9f47169..2756e5a 100644
--- a/board/freescale/mx31pdk/mx31pdk.c
+++ b/board/freescale/mx31pdk/mx31pdk.c
@@ -33,10 +33,16 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int dram_init(void)
 {
+   /* dram_init must store complete ramsize in gd-ram_size */
+   gd-ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+   PHYS_SDRAM_1_SIZE);
+   return 0;
+}
+
+void dram_init_banksize(void)
+{
gd-bd-bi_dram[0].start = PHYS_SDRAM_1;
gd-bd-bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
-   return 0;
 }
 
 int board_init(void)
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 3b90a01..d7286c0 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -155,6 +155,12 @@
 #define PHYS_SDRAM_1   CSD0_BASE
 #define PHYS_SDRAM_1_SIZE  (128 * 1024 * 1024)
 
+#define CONFIG_SYS_SDRAM_BASE  PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_RAM_ADDR   IRAM_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_SIZE   IRAM_SIZE
+#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - 
GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR(CONFIG_SYS_INIT_RAM_ADDR + 
CONFIG_SYS_GBL_DATA_OFFSET)
+
 /*---
  * FLASH and environment organization
  */
diff --git a/nand_spl/board/freescale/mx31pdk/u-boot.lds 
b/nand_spl/board/freescale/mx31pdk/u-boot.lds
index edd8430..ff289fb 100644
--- a/nand_spl/board/freescale/mx31pdk/u-boot.lds
+++ b/nand_spl/board/freescale/mx31pdk/u-boot.lds
@@ -1,3 +1,25 @@
+/*
+ * (C) Copyright 2009
+ * Wolfgang Denk, DENX Software Engineering, w...@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-littlearm, elf32-littlearm, elf32-littlearm)
 OUTPUT_ARCH(arm)
 ENTRY(_start)
@@ -19,18 +41,41 @@ SECTIONS
.rodata : { *(.rodata) }
 
. = ALIGN(4);
-   .data : { *(.data) }
+   .data : {
+   *(.data)
+   }
 
. = ALIGN(4);
-   .got : { *(.got) }
-
-   . = .;
__u_boot_cmd_start = .;
.u_boot_cmd : { *(.u_boot_cmd) }
__u_boot_cmd_end = .;
 
. = ALIGN(4);
-   __bss_start = .;
-   .bss : { *(.bss) }
-   _end = .;
+
+   .rel.dyn : {
+   __rel_dyn_start = .;
+   *(.rel*)
+   __rel_dyn_end = .;
+   }
+
+   .dynsym : {
+   __dynsym_start = .;
+   *(.dynsym)
+   }
+
+   .bss __rel_dyn_start (OVERLAY) : {
+   __bss_start = .;
+   *(.bss)
+. = ALIGN(4);
+   _end = .;
+   }
+
+   /DISCARD/ : { *(.bss*) }
+   /DISCARD/ : { *(.dynstr*) }
+   /DISCARD/ : { *(.dynsym*) }
+   /DISCARD/ : { *(.dynamic*) }
+   /DISCARD/ : { *(.hash*) }
+   /DISCARD/ : { *(.plt*) }
+   /DISCARD/ : { *(.interp*) }
+   /DISCARD/ : { *(.gnu*) }
 }
-- 
1.6.0.4


___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot