powerpc/85xx: add CONFIG_SYS_TEXT_BASE_SPL for 85xx nand spl build
Introduce a SPL specific CONFIG_SYS_TEXT_BASE_SPL define to be used by the linker. This has similiar semantics to CONFIG_SYS_TEXT_BASE however since SPL is a unqiue image we introduce a new variable to control its text base address. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
0635b09cc0
commit
96196a1f75
|
@ -36,7 +36,12 @@
|
||||||
#ifdef CONFIG_NAND
|
#ifdef CONFIG_NAND
|
||||||
#define CONFIG_NAND_U_BOOT 1
|
#define CONFIG_NAND_U_BOOT 1
|
||||||
#define CONFIG_RAMBOOT_NAND 1
|
#define CONFIG_RAMBOOT_NAND 1
|
||||||
|
#ifdef CONFIG_NAND_SPL
|
||||||
|
#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
|
||||||
|
#else
|
||||||
#define CONFIG_SYS_TEXT_BASE 0xf8f82000
|
#define CONFIG_SYS_TEXT_BASE 0xf8f82000
|
||||||
|
#endif /* CONFIG_NAND_SPL */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SDCARD
|
#ifdef CONFIG_SDCARD
|
||||||
|
@ -53,6 +58,10 @@
|
||||||
#define CONFIG_SYS_TEXT_BASE 0xeff80000
|
#define CONFIG_SYS_TEXT_BASE 0xeff80000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SYS_MONITOR_BASE
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
||||||
|
#endif
|
||||||
|
|
||||||
/* High Level Configuration Options */
|
/* High Level Configuration Options */
|
||||||
#define CONFIG_BOOKE 1 /* BOOKE */
|
#define CONFIG_BOOKE 1 /* BOOKE */
|
||||||
#define CONFIG_E500 1 /* BOOKE e500 family */
|
#define CONFIG_E500 1 /* BOOKE e500 family */
|
||||||
|
@ -233,8 +242,6 @@
|
||||||
#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */
|
#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */
|
||||||
#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */
|
#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
|
||||||
|
|
||||||
#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \
|
#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \
|
||||||
|| defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
|
|| defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
|
||||||
#define CONFIG_SYS_RAMBOOT
|
#define CONFIG_SYS_RAMBOOT
|
||||||
|
|
|
@ -65,13 +65,22 @@ extern unsigned long get_clock_freq(void);
|
||||||
#ifdef CONFIG_NAND
|
#ifdef CONFIG_NAND
|
||||||
#define CONFIG_NAND_U_BOOT 1
|
#define CONFIG_NAND_U_BOOT 1
|
||||||
#define CONFIG_RAMBOOT_NAND 1
|
#define CONFIG_RAMBOOT_NAND 1
|
||||||
|
#ifdef CONFIG_NAND_SPL
|
||||||
|
#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
|
||||||
|
#else
|
||||||
#define CONFIG_SYS_TEXT_BASE 0xf8f82000
|
#define CONFIG_SYS_TEXT_BASE 0xf8f82000
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef CONFIG_SYS_TEXT_BASE
|
#ifndef CONFIG_SYS_TEXT_BASE
|
||||||
#define CONFIG_SYS_TEXT_BASE 0xfff80000
|
#define CONFIG_SYS_TEXT_BASE 0xfff80000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SYS_MONITOR_BASE
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Only possible on E500 Version 2 or newer cores.
|
* Only possible on E500 Version 2 or newer cores.
|
||||||
*/
|
*/
|
||||||
|
@ -194,8 +203,6 @@ extern unsigned long get_clock_freq(void);
|
||||||
#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */
|
#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */
|
||||||
#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */
|
#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
|
||||||
|
|
||||||
#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND)
|
#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND)
|
||||||
#define CONFIG_SYS_RAMBOOT
|
#define CONFIG_SYS_RAMBOOT
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 Freescale Semiconductor, Inc.
|
* Copyright 2009-2010 Freescale Semiconductor, Inc.
|
||||||
*
|
*
|
||||||
* See file CREDITS for list of people who contributed to this
|
* See file CREDITS for list of people who contributed to this
|
||||||
* project.
|
* project.
|
||||||
|
@ -46,7 +46,12 @@
|
||||||
#ifdef CONFIG_NAND
|
#ifdef CONFIG_NAND
|
||||||
#define CONFIG_NAND_U_BOOT 1
|
#define CONFIG_NAND_U_BOOT 1
|
||||||
#define CONFIG_RAMBOOT_NAND 1
|
#define CONFIG_RAMBOOT_NAND 1
|
||||||
|
#ifdef CONFIG_NAND_SPL
|
||||||
|
#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
|
||||||
|
#else
|
||||||
#define CONFIG_SYS_TEXT_BASE 0xf8f82000
|
#define CONFIG_SYS_TEXT_BASE 0xf8f82000
|
||||||
|
#endif /* CONFIG_NAND_SPL */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SDCARD
|
#ifdef CONFIG_SDCARD
|
||||||
|
@ -63,6 +68,10 @@
|
||||||
#define CONFIG_SYS_TEXT_BASE 0xeff80000
|
#define CONFIG_SYS_TEXT_BASE 0xeff80000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SYS_MONITOR_BASE
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
||||||
|
#endif
|
||||||
|
|
||||||
/* High Level Configuration Options */
|
/* High Level Configuration Options */
|
||||||
#define CONFIG_BOOKE 1 /* BOOKE */
|
#define CONFIG_BOOKE 1 /* BOOKE */
|
||||||
#define CONFIG_E500 1 /* BOOKE e500 family */
|
#define CONFIG_E500 1 /* BOOKE e500 family */
|
||||||
|
@ -192,8 +201,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
||||||
#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */
|
#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */
|
||||||
#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */
|
#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
|
||||||
|
|
||||||
#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \
|
#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \
|
||||||
|| defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
|
|| defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
|
||||||
#define CONFIG_SYS_RAMBOOT
|
#define CONFIG_SYS_RAMBOOT
|
||||||
|
|
|
@ -24,13 +24,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
NAND_SPL := y
|
NAND_SPL := y
|
||||||
CONFIG_SYS_TEXT_BASE := 0xfff00000
|
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
|
||||||
PAD_TO := 0xfff01000
|
PAD_TO := 0xfff01000
|
||||||
|
|
||||||
include $(TOPDIR)/config.mk
|
include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
|
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
|
||||||
LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) $(PLATFORM_LDFLAGS)
|
||||||
AFLAGS += -DCONFIG_NAND_SPL
|
AFLAGS += -DCONFIG_NAND_SPL
|
||||||
CFLAGS += -DCONFIG_NAND_SPL
|
CFLAGS += -DCONFIG_NAND_SPL
|
||||||
|
|
||||||
|
|
|
@ -24,13 +24,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
NAND_SPL := y
|
NAND_SPL := y
|
||||||
CONFIG_SYS_TEXT_BASE := 0xfff00000
|
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
|
||||||
PAD_TO := 0xfff01000
|
PAD_TO := 0xfff01000
|
||||||
|
|
||||||
include $(TOPDIR)/config.mk
|
include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
|
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
|
||||||
LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) $(PLATFORM_LDFLAGS)
|
||||||
AFLAGS += -DCONFIG_NAND_SPL
|
AFLAGS += -DCONFIG_NAND_SPL
|
||||||
CFLAGS += -DCONFIG_NAND_SPL
|
CFLAGS += -DCONFIG_NAND_SPL
|
||||||
|
|
||||||
|
|
|
@ -24,13 +24,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
NAND_SPL := y
|
NAND_SPL := y
|
||||||
CONFIG_SYS_TEXT_BASE := 0xfff00000
|
CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
|
||||||
PAD_TO := 0xfff01000
|
PAD_TO := 0xfff01000
|
||||||
|
|
||||||
include $(TOPDIR)/config.mk
|
include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
|
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
|
||||||
LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) $(PLATFORM_LDFLAGS)
|
||||||
AFLAGS += -DCONFIG_NAND_SPL
|
AFLAGS += -DCONFIG_NAND_SPL
|
||||||
CFLAGS += -DCONFIG_NAND_SPL
|
CFLAGS += -DCONFIG_NAND_SPL
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue