Rename TEXT_BASE: fix merge conflicts
PATCH 1/1 Rename TEXT_BASE: fix merge conflicts
Commit 14d0a02a "Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE" missed a few places, especially for boards that were added inbetween. Fix the remaining issues.
Signed-off-by Wolfgang Denk <[email protected]>
--- board/a4m072/config.mk | 39 --------------------------------------- board/eNET/u-boot.lds | 8 ++++---- doc/README.arm-relocation | 10 +++++----- include/configs/a4m072.h | 6 ++++-- nand_spl/nand_boot.c | 3 ++- nand_spl/nand_boot_fsl_nfc.c | 3 ++- 6 files changed, 17 insertions(+), 52 deletions(-) delete mode 100644 board/a4m072/config.mk
board/a4m072/config.mk deleted +0 -39
@@ -1,39 +0,0 @@ -# -# (C) Copyright 2003 -# Wolfgang Denk, DENX Software Engineering, wd at 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 -# - -# -# a4m072 board: -# -# Valid values for TEXT_BASE is: -# -# 0xFE000000 boot low -# - -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifndef TEXT_BASE -## Standard: boot low -TEXT_BASE = 0xFE000000 -endif - -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
board/eNET/u-boot.lds +4 -4
@@ -27,7 +27,7 @@ ENTRY(_start) SECTIONS { - . = TEXT_BASE; /* Location of bootcode in flash */ + . = CONFIG_SYS_TEXT_BASE; /* Location of bootcode in flash */ __text_start = .; .text : { *(.text*); }
@@ -94,11 +94,11 @@ SECTIONS * The fff0 offset of resetvec is important, however. */ . = 0xfffffe00; - .start32 : AT (TEXT_BASE + 0x3fe00) { KEEP(*(.start32)); } + .start32 : AT (CONFIG_SYS_TEXT_BASE + 0x3fe00) { KEEP(*(.start32)); } . = 0xf800; - .start16 : AT (TEXT_BASE + 0x3f800) { KEEP(*(.start16)); } + .start16 : AT (CONFIG_SYS_TEXT_BASE + 0x3f800) { KEEP(*(.start16)); } . = 0xfff0; - .resetvec : AT (TEXT_BASE + 0x3fff0) { KEEP(*(.resetvec)); } + .resetvec : AT (CONFIG_SYS_TEXT_BASE + 0x3fff0) { KEEP(*(.resetvec)); } }
doc/README.arm-relocation +5 -5
@@ -92,11 +92,11 @@ Relocation with NAND_SPL (example for the tx25): the "real" u-boot to CONFIG_SYS_NAND_U_BOOT_DST and starts execution @CONFIG_SYS_NAND_U_BOOT_START -- This u-boot does no ram int, nor cpu register setup. Just looks - where it have to relocate and relocate itself to this address. - If relocate address = CONFIG_SYS_TEXT_BASE(not the same, as the TEXT_BASE - from the nand_spl code), no need to copy, just go on with bss clear - and jump to board_init_r. +- This u-boot does no RAM init, nor CPU register setup. Just look + where it has to copy and relocate itself to this address. If + relocate address = CONFIG_SYS_TEXT_BASE (not the same, as the + CONFIG_SYS_TEXT_BASE from the nand_spl code), then there is no need + to copy, just go on with bss clear and jump to board_init_r. -------------------------------------------------------------------------------------
include/configs/a4m072.h +4 -2
@@ -37,6 +37,8 @@#define CONFIG_A4M072 1/* ... on A4M072 board */ #define CONFIG_MPC5200_DDR 1/* ... use DDR RAM */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 +#define CONFIG_MISC_INIT_R #define CONFIG_SYS_MPC5XXX_CLKIN 33000000/* ... running at 33.000000MHz */
@@ -125,7 +127,7 @@#define CONFIG_CMD_PCI #endif -#if (TEXT_BASE ==0xFE000000 )/* Boot low with 32 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE ==0xFE000000 )/* Boot low with 32 MB Flash */ #define CONFIG_SYS_LOWBOOT 1#define CONFIG_SYS_LOWBOOT32 1#endif
@@ -238,7 +240,7 @@#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#if (CONFIG_SYS_MONITOR_BASE <CONFIG_SYS_FLASH_BASE )# define CONFIG_SYS_RAMBOOT 1#endif
nand_spl/nand_boot.c +2 -1
@@ -224,7 +224,8 @@ static int nand_load(struct mtd_info *mtd, unsigned int offs,#if defined(CONFIG_ARM ) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC )void board_init_f (ulong bootflag) { -relocate_code (CONFIG_SYS_TEXT_BASE -TOTAL_MALLOC_LEN ,NULL ,TEXT_BASE ); +relocate_code (CONFIG_SYS_TEXT_BASE -TOTAL_MALLOC_LEN ,NULL , +CONFIG_SYS_TEXT_BASE ); }#endif
nand_spl/nand_boot_fsl_nfc.c +2 -1
@@ -266,7 +266,8 @@ static int nand_load(unsigned int from, unsigned int size, unsigned char *buf)#if defined(CONFIG_ARM ) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC )void board_init_f (ulong bootflag) { -relocate_code (CONFIG_SYS_TEXT_BASE -TOTAL_MALLOC_LEN ,NULL ,TEXT_BASE ); +relocate_code (CONFIG_SYS_TEXT_BASE -TOTAL_MALLOC_LEN ,NULL , +CONFIG_SYS_TEXT_BASE ); }#endif
Signature · 1 line
1.7.2.3