[U-Boot] [PATCH] ppc4xx: Update TEXT_BASE for CPCI405 boards

[Stefan Roese <sr@denx.de>]

Hi Matthias,

On Wednesday 10 December 2008, Matthias Fuchs wrote:
> This patch fixes building U-Boot for CPCI405 boards.

I have a small improvement suggestion below:

> Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
> ---
>  Makefile                    |    5 +----
>  board/esd/cpci405/config.mk |    6 +-----
>  include/configs/CPCI405.h   |    4 ++--
>  3 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index f8fe29c..2f07657 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1261,14 +1261,11 @@ CMS700_config:	unconfig
>  CPCI2DP_config:	unconfig
>  	@$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd
>
> -CPCI405_config:		unconfig
> -	@$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
> -
> +CPCI405_config		\
>  CPCI4052_config		\
>  CPCI405DT_config	\
>  CPCI405AB_config:	unconfig
>  	@mkdir -p $(obj)board/esd/cpci405
> -	@echo "TEXT_BASE = 0xFFFC0000" > $(obj)board/esd/cpci405/config.tmp
>  	@$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
>
>  CPCIISER4_config:	unconfig
> diff --git a/board/esd/cpci405/config.mk b/board/esd/cpci405/config.mk
> index 6cfb891..1bdf5e4 100644
> --- a/board/esd/cpci405/config.mk
> +++ b/board/esd/cpci405/config.mk
> @@ -21,8 +21,4 @@
>  # MA 02111-1307 USA
>  #
>
> -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
> -
> -ifndef TEXT_BASE
> -TEXT_BASE = 0xFFFD0000
> -endif
> +TEXT_BASE = 0xFFFC0000
> diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
> index 1a2bc1c..eb90620 100644
> --- a/include/configs/CPCI405.h
> +++ b/include/configs/CPCI405.h
> @@ -196,9 +196,9 @@
>   * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
>   */
>  #define CONFIG_SYS_SDRAM_BASE		0x00000000
> -#define CONFIG_SYS_FLASH_BASE		0xFFFD0000
> +#define CONFIG_SYS_FLASH_BASE		0xFFFC0000
>  #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_FLASH_BASE
> -#define CONFIG_SYS_MONITOR_LEN		(192 * 1024)	/* Reserve 196 kB for Monitor	*/
> +#define CONFIG_SYS_MONITOR_LEN		(256 * 1024)	/* Reserve 196 kB for Monitor	*/

How about this:

#define CONFIG_SYS_MONITOR_BASE		TEXT_BASE       /* Start of U-Boot      */
#define CONFIG_SYS_MONITOR_LEN          (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)

You only need to change TEXT_BASE this way.

Best regards,
Stefan

=====================================================================
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: office at denx.de
=====================================================================