nhk8815: remove platform.S, which was unused at link time
PATCH 1/3 nhk8815: remove platform.S, which was unused at link time
From: Alessandro Rubini <[email protected]>
This source file, which I got by the vendor in their own port, was not actually executing because lib-based compilation didn't call lowlevel_init (we have CONFIG_SKIP_LOWLEVEL_INIT). With the change to object-based linking, an undefined symbol in this file started hitting in the final link.
--- board/st/nhk8815/Makefile | 2 +- board/st/nhk8815/platform.S | 340 ------------------------------------------- 2 files changed, 1 insertions(+), 341 deletions(-) delete mode 100644 board/st/nhk8815/platform.S
board/st/nhk8815/Makefile +1 -1
@@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o COBJS := nhk8815.o -SOBJS := platform.o +SOBJS := SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
board/st/nhk8815/platform.S deleted +0 -340
340 lines not on this page · raw message
Signature · 1 line
1.5.6.5
PATCH 2/3 nhk8815: add support for relocation
From: Alessandro Rubini <[email protected]>
This patch defines all the needed symbols in the header file and removes the now-unused config.mk in board directory. Changes to board C file as requested.
--- board/st/nhk8815/config.mk | 26 -------------------------- board/st/nhk8815/nhk8815.c | 9 +++++++-- include/configs/nhk8815.h | 5 +++++ 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 board/st/nhk8815/config.mk
board/st/nhk8815/config.mk deleted +0 -26
@@ -1,26 +0,0 @@ -# (C) Copyright 2007 -# STMicroelectronics, <www.st.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 -# -# -# image should be loaded at 0x01000000 -# - -CONFIG_SYS_TEXT_BASE = 0x03F80000
board/st/nhk8815/nhk8815.c +7 -2
@@ -82,13 +82,18 @@ int board_late_init(void)int dram_init (void ) { -/* set dram bank start addr and size */ + gd->ram_size =get_ram_size (CONFIG_SYS_SDRAM_BASE , +CONFIG_SYS_SDRAM_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 ; gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ; -return 0 ; }#ifdef CONFIG_CMD_NET
include/configs/nhk8815.h +5 -0
@@ -80,6 +80,11 @@#define PHYS_SDRAM_1_SIZE 0x04000000/* 64 MB */ #define PHYS_SDRAM_2 0x08000000/* SDR-SDRAM BANK #2*/ #define PHYS_SDRAM_2_SIZE 0x04000000/* 64 MB */ +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_SDRAM_SIZE (PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE) +/* The IPL loads us at 0, tell so to u-boot. Put stack pointer 1M into RAM */ +#define CONFIG_SYS_TEXT_BASE 0x00000000 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 1<<20)#define CONFIG_STACKSIZE (128 * 1024)/* regular stack */ #ifdef CONFIG_USE_IRQ
Signature · 1 line
1.5.6.5
PATCH v2 2/3 nhk8815: add support for relocation
From: Alessandro Rubini <[email protected]>
This patch defines all the needed symbols in the header file and removes the now-unused config.mk in board directory. Changes to board C file as requested.
---
Sorry, just noted that a parenthesis was missing in CONFIG_SYS_INIT_SP_ADDR. It was a latent bug spitting a warning. This only changes that line over V1 I sent earlier.
board/st/nhk8815/config.mk | 26 -------------------------- board/st/nhk8815/nhk8815.c | 9 +++++++-- include/configs/nhk8815.h | 5 +++++ 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 board/st/nhk8815/config.mk
board/st/nhk8815/config.mk deleted +0 -26
@@ -1,26 +0,0 @@ -# (C) Copyright 2007 -# STMicroelectronics, <www.st.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 -# -# -# image should be loaded at 0x01000000 -# - -CONFIG_SYS_TEXT_BASE = 0x03F80000
board/st/nhk8815/nhk8815.c +7 -2
@@ -82,13 +82,18 @@ int board_late_init(void)int dram_init (void ) { -/* set dram bank start addr and size */ + gd->ram_size =get_ram_size (CONFIG_SYS_SDRAM_BASE , +CONFIG_SYS_SDRAM_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 ; gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ; -return 0 ; }#ifdef CONFIG_CMD_NET
include/configs/nhk8815.h +5 -0
@@ -80,6 +80,11 @@#define PHYS_SDRAM_1_SIZE 0x04000000/* 64 MB */ #define PHYS_SDRAM_2 0x08000000/* SDR-SDRAM BANK #2*/ #define PHYS_SDRAM_2_SIZE 0x04000000/* 64 MB */ +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_SDRAM_SIZE (PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE) +/* The IPL loads us at 0, tell so to u-boot. Put stack pointer 1M into RAM */ +#define CONFIG_SYS_TEXT_BASE 0x00000000 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + (1<<20))#define CONFIG_STACKSIZE (128 * 1024)/* regular stack */ #ifdef CONFIG_USE_IRQ
Signature · 1 line
1.5.6.5
PATCH v2 2/3 nhk8815: add support for relocation
Hi Alessandro,
Le 17/04/2011 01:00, Alessandro Rubini a ?crit :
Quoted 15 lines
From: Alessandro Rubini<[email protected]>
This patch defines all the needed symbols in the header file and removes the now-unused config.mk in board directory. Changes to board C file as requested.
Signed-off-by Alessandro Rubini<[email protected]>Signed-off-by Alessandro Rubini<[email protected]>Acked-by Andrea Gallo<[email protected]>---
Sorry, just noted that a parenthesis was missing in
CONFIG_SYS_INIT_SP_ADDR. It was a latent bug spitting a warning. This only changes that line over V1 I sent earlier.
Quoted 5 lines
board/st/nhk8815/config.mk | 26 -------------------------- board/st/nhk8815/nhk8815.c | 9 +++++++-- include/configs/nhk8815.h | 5 +++++ 3 files changed, 12 insertions(+), 28 deletions(-)delete mode 100644
board/st/nhk8815/config.mk
Applied to u-boot-arm/master, thanks.
Amicalement,
Signature · 1 line
Albert.
PATCH 3/3 nhk8815: move config targets from Makefile to boards.cfg
In reply to Alessandro RubiniFrom: Alessandro Rubini <[email protected]>
---
BTW: please note that file is not sorted and has some white-space
error: "dkb" is aligned with tabs while all other use spaces and there is a spurious tab after "Target" (both begin and end)
Makefile | 9 --------- boards.cfg | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-)
Makefile +0 -9
@@ -933,15 +933,6 @@ cp922_XA10_config \ cp1026_config: unconfig @board/armltd/integrator/split_by_variant.sh cp $@ -nhk8815_config \ -nhk8815_onenand_config: unconfig - @mkdir -p $(obj)include - @ > $(obj)include/config.h - @if [ "$(findstring _onenand, $@)" ] ; then \ - echo "#define CONFIG_BOOT_ONENAND" >> $(obj)include/config.h; \ - fi - @$(MKCONFIG) -n $@ -a nhk8815 arm arm926ejs nhk8815 st nomadik - xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1)))) omap1610inn_config \
boards.cfg +2 -0
@@ -103,6 +103,8 @@ dockstar arm arm926ejs - Seagate jadecpu arm arm926ejs jadecpu syteco mb86r0x imx27lite arm arm926ejs imx27lite logicpd mx27 magnesium arm arm926ejs imx27lite logicpd mx27 +nhk8815 arm arm926ejs nhk8815 st nomadik +nhk8815_onenand arm arm926ejs nhk8815 st nomadik nhk8815:BOOT_ONENAND omap5912osk arm arm926ejs - ti omap edminiv2 arm arm926ejs - LaCie orion5x dkb arm arm926ejs - Marvell pantheon
Signature · 1 line
1.5.6.5
PATCH 3/3 nhk8815: move config targets from Makefile to boards.cfg
Hi Alessandro,
Le 16/04/2011 19:50, Alessandro Rubini a ?crit :
Quoted 9 lines
From: Alessandro Rubini<[email protected]>
Signed-off-by Alessandro Rubini<[email protected]>Acked-by Andrea Gallo<[email protected]>---
BTW: please note that file is not sorted and has some white-space
error: "dkb" is aligned with tabs while all other use spaces and there is a spurious tab after "Target" (both begin and end)
Applied to u-boot-arm/master, thanks.
Amicalement,
Signature · 1 line
Albert.
PATCH 1/3 nhk8815: remove platform.S, which was unused at link time
In reply to Alessandro RubiniHi Alessandro,
Le 16/04/2011 19:49, Alessandro Rubini a ?crit :
Quoted 8 lines
From: Alessandro Rubini<[email protected]>
This source file, which I got by the vendor in their own port, was not actually executing because lib-based compilation didn't call
lowlevel_init(we haveCONFIG_SKIP_LOWLEVEL_INIT). With the change to object-based linking, an undefined symbol in this file started hitting in the final link.
Quoted 7 lines
Signed-off-by Alessandro Rubini<[email protected]>Acked-by Andrea Gallo<[email protected]>--- board/st/nhk8815/Makefile | 2 +- board/st/nhk8815/platform.S | 340 ------------------------------------------- 2 files changed, 1 insertions(+), 341 deletions(-)delete mode 100644
board/st/nhk8815/platform.S
Applied to u-boot-arm/master, thanks.
Amicalement,
Signature · 1 line
Albert.