From: Angelo Dureghello <angelo@sysam.it>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk
Date: Sun, 13 Dec 2015 20:55:36 +0100 [thread overview]
Message-ID: <566DCD38.2060101@sysam.it> (raw)
In-Reply-To: <1449804151-12707-3-git-send-email-yamada.masahiro@socionext.com>
On 11/12/2015 04:22, Masahiro Yamada wrote:
> The board/freescale/m54418twr/config.mk defined TEXT_BASE, which has
> the same value as CONFIG_SYS_TEXT_BASE. The TEXT_BASE is referenced
> by two files:
> - arch/m68k/cpu/mcf5445x/start.S and include/
> - include/configs/M54418TWR.h
>
> Replace the references with CONFIG_SYS_TEXT_BASE and delete
> board/freescale/m54418twr/config.mk.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> arch/m68k/cpu/mcf5445x/start.S | 8 ++++----
> board/freescale/m54418twr/config.mk | 7 -------
> include/configs/M54418TWR.h | 2 +-
> 3 files changed, 5 insertions(+), 12 deletions(-)
> delete mode 100644 board/freescale/m54418twr/config.mk
>
> diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S
> index 979eb5a..ae261b1 100644
> --- a/arch/m68k/cpu/mcf5445x/start.S
> +++ b/arch/m68k/cpu/mcf5445x/start.S
> @@ -34,7 +34,7 @@
>
> #if defined(CONFIG_SERIAL_BOOT)
> #define ASM_DRAMINIT (asm_dram_init - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR)
> -#define ASM_DRAMINIT_N (asm_dram_init - TEXT_BASE)
> +#define ASM_DRAMINIT_N (asm_dram_init - CONFIG_SYS_TEXT_BASE)
> #define ASM_SBF_IMG_HDR (asm_sbf_img_hdr - CONFIG_SYS_TEXT_BASE + CONFIG_SYS_INIT_RAM_ADDR)
> #endif
>
> @@ -490,7 +490,7 @@ asm_dspi_rd_status:
> /* copy 4 boot pages to dram as soon as possible */
> /* each page is 996 bytes (1056 total with 60 ECC bytes */
> move.l #0x00000000, %a1 /* src */
> - move.l #TEXT_BASE, %a2 /* dst */
> + move.l #CONFIG_SYS_TEXT_BASE, %a2 /* dst */
> move.l #0x3E0, %d0 /* sz in long */
>
> asm_boot_nand_copy:
> @@ -571,7 +571,7 @@ asm_nand_init:
> move.l #4, %d2 /* start at 4 */
> move.l #0xFC0FFF04, %a0 /* cmd2 */
> move.l #0xFC0FFF0C, %a1 /* rar */
> - move.l #(TEXT_BASE + 0xF80), %a2 /* dst */
> + move.l #(CONFIG_SYS_TEXT_BASE + 0xF80), %a2 /* dst */
>
> asm_nand_read:
> move.l #0x11000000, %d0 /* rar */
> @@ -609,7 +609,7 @@ asm_nand_copy:
> bgt asm_nand_read
>
> /* jump to memory and execute */
> - move.l #(TEXT_BASE + 0x400), %a0
> + move.l #(CONFIG_SYS_TEXT_BASE + 0x400), %a0
> jmp (%a0)
>
> #endif /* CONFIG_SYS_NAND_BOOT */
> diff --git a/board/freescale/m54418twr/config.mk b/board/freescale/m54418twr/config.mk
> deleted file mode 100644
> index 07f52e0..0000000
> --- a/board/freescale/m54418twr/config.mk
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -# Copyright 2010-2012 Freescale Semiconductor, Inc.
> -# TsiChung Liew (Tsi-Chung.Liew at freescale.com)
> -#
> -# SPDX-License-Identifier: GPL-2.0+
> -#
> -
> -PLATFORM_CPPFLAGS += -DTEXT_BASE=$(CONFIG_SYS_TEXT_BASE)
> diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
> index 05ba13b..826de5b 100644
> --- a/include/configs/M54418TWR.h
> +++ b/include/configs/M54418TWR.h
> @@ -267,7 +267,7 @@
> #endif
>
> #if defined(CONFIG_SERIAL_BOOT)
> -#define CONFIG_SYS_MONITOR_BASE (TEXT_BASE + 0x400)
> +#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400)
> #else
> #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400)
> #endif
>
Acked-by: Angelo Dureghello <angelo@sysam.it>
next prev parent reply other threads:[~2015-12-13 19:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-11 3:22 [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Masahiro Yamada
2015-12-11 3:22 ` [U-Boot] [PATCH 1/8] m68k: move CONFIG_SYS_TEXT_BASE to defconfig files Masahiro Yamada
2015-12-13 19:55 ` Angelo Dureghello
2016-01-06 0:24 ` Simon Glass
2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini
2015-12-11 3:22 ` [U-Boot] [PATCH 2/8] m68k: M54418TWR: drop board/freescale/m54418twr/config.mk Masahiro Yamada
2015-12-13 19:55 ` Angelo Dureghello [this message]
2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini
2015-12-11 3:22 ` [U-Boot] [PATCH 3/8] microblaze: move CONFIG_SYS_TEXT_BASE to defconfig Masahiro Yamada
2015-12-11 7:32 ` Michal Simek
2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini
2015-12-11 3:22 ` [U-Boot] [PATCH 4/8] mips: vct: move CONFIG_SYS_TEXT_BASE away from config.mk Masahiro Yamada
2015-12-11 13:45 ` Daniel Schwierzeck
2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini
2015-12-11 3:22 ` [U-Boot] [PATCH 5/8] mips: dbau1x00: " Masahiro Yamada
2015-12-11 13:46 ` Daniel Schwierzeck
2016-01-20 21:00 ` [U-Boot] [U-Boot, " Tom Rini
2015-12-11 3:22 ` [U-Boot] [PATCH 6/8] mips: pb1x00: " Masahiro Yamada
2015-12-11 13:46 ` Daniel Schwierzeck
2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini
2015-12-11 3:22 ` [U-Boot] [PATCH 7/8] powerpc: yucca: drop redundant CONFIG_SYS_TEXT_BASE " Masahiro Yamada
2015-12-11 4:04 ` Stefan Roese
2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini
2015-12-11 3:22 ` [U-Boot] [PATCH 8/8] kbuild: drop workaround for old style CONFIG_SYS_TEXT_BASE defines Masahiro Yamada
2015-12-11 4:05 ` Stefan Roese
2016-01-20 21:01 ` [U-Boot] [U-Boot, " Tom Rini
2015-12-13 19:54 ` [U-Boot] [PATCH 0/8] m68k, mips, powerpc, kbuild: move CONFIG_SYS_TEXT_BASE Angelo Dureghello
2015-12-14 9:52 ` Angelo Dureghello
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=566DCD38.2060101@sysam.it \
--to=angelo@sysam.it \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.