mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 07:01:57 +00:00
83xx: Fix NAND_SPL link address
Apply the same fix for 83xx as was done for 85xx in commit
96196a1f75
.
Without this, NAND SPLs are built with the text base intended for the main
image, resulting in a broken, very large u-boot-nand.bin.
The block of defines for NAND boot is moved closer to where
CONFIG_SYS_TEXT_BASE is defined. We can't directly use
CONFIG_SYS_NAND_U_BOOT_DST in the definition of CONFIG_SYS_TEXT_BASE because
autoconf.mk will include the literal text "CONFIG_SYS_NAND_U_BOOT_DST",
but at least keep them close and point out that they're supposed to be
the same.
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
parent
c56f84ca9c
commit
f1c574d400
6 changed files with 55 additions and 30 deletions
|
@ -35,10 +35,29 @@
|
||||||
#define CONFIG_MPC8313 1
|
#define CONFIG_MPC8313 1
|
||||||
#define CONFIG_MPC8313ERDB 1
|
#define CONFIG_MPC8313ERDB 1
|
||||||
|
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_START 0x00100100
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_OFFS 16384
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_RELOC 0x00010000
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_RELOC_SP (CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000)
|
||||||
|
|
||||||
|
#ifdef CONFIG_NAND_U_BOOT
|
||||||
|
#define CONFIG_SYS_TEXT_BASE 0x00100000 /* CONFIG_SYS_NAND_U_BOOT_DST */
|
||||||
|
#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
|
||||||
|
#ifdef CONFIG_NAND_SPL
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
|
||||||
|
#endif /* CONFIG_NAND_SPL */
|
||||||
|
#endif /* CONFIG_NAND_U_BOOT */
|
||||||
|
|
||||||
#ifndef CONFIG_SYS_TEXT_BASE
|
#ifndef CONFIG_SYS_TEXT_BASE
|
||||||
#define CONFIG_SYS_TEXT_BASE 0xFE000000
|
#define CONFIG_SYS_TEXT_BASE 0xFE000000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONFIG_SYS_MONITOR_BASE
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
||||||
|
#endif
|
||||||
|
|
||||||
#define CONFIG_PCI
|
#define CONFIG_PCI
|
||||||
#define CONFIG_FSL_ELBC 1
|
#define CONFIG_FSL_ELBC 1
|
||||||
|
|
||||||
|
@ -200,8 +219,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 (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) && !defined(CONFIG_NAND_SPL)
|
#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) && !defined(CONFIG_NAND_SPL)
|
||||||
#define CONFIG_SYS_RAMBOOT
|
#define CONFIG_SYS_RAMBOOT
|
||||||
#endif
|
#endif
|
||||||
|
@ -248,12 +265,6 @@
|
||||||
#define CONFIG_NAND_FSL_ELBC 1
|
#define CONFIG_NAND_FSL_ELBC 1
|
||||||
#define CONFIG_SYS_NAND_BLOCK_SIZE 16384
|
#define CONFIG_SYS_NAND_BLOCK_SIZE 16384
|
||||||
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_START 0x00100100
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_OFFS 16384
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_RELOC 0x00010000
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_RELOC_SP (CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000)
|
|
||||||
|
|
||||||
#define CONFIG_SYS_NAND_BR_PRELIM ( CONFIG_SYS_NAND_BASE \
|
#define CONFIG_SYS_NAND_BR_PRELIM ( CONFIG_SYS_NAND_BASE \
|
||||||
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
||||||
|
|
|
@ -25,15 +25,28 @@
|
||||||
#ifndef __CONFIG_H
|
#ifndef __CONFIG_H
|
||||||
#define __CONFIG_H
|
#define __CONFIG_H
|
||||||
|
|
||||||
#ifdef CONFIG_NAND
|
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
|
||||||
#define CONFIG_NAND_U_BOOT 1
|
#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
|
||||||
#define CONFIG_SYS_TEXT_BASE 0x00100000
|
#define CONFIG_SYS_NAND_U_BOOT_START 0x00100100
|
||||||
#endif
|
#define CONFIG_SYS_NAND_U_BOOT_OFFS 16384
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_RELOC 0x00010000
|
||||||
|
|
||||||
|
#ifdef CONFIG_NAND_U_BOOT
|
||||||
|
#define CONFIG_SYS_TEXT_BASE 0x00100000 /* CONFIG_SYS_NAND_U_BOOT_DST */
|
||||||
|
#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
|
||||||
|
#ifdef CONFIG_NAND_SPL
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
|
||||||
|
#endif /* CONFIG_NAND_SPL */
|
||||||
|
#endif /* CONFIG_NAND_U_BOOT */
|
||||||
|
|
||||||
#ifndef CONFIG_SYS_TEXT_BASE
|
#ifndef CONFIG_SYS_TEXT_BASE
|
||||||
#define CONFIG_SYS_TEXT_BASE 0xFE000000
|
#define CONFIG_SYS_TEXT_BASE 0xFE000000
|
||||||
#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
|
||||||
*/
|
*/
|
||||||
|
@ -181,8 +194,6 @@
|
||||||
/*
|
/*
|
||||||
* The reserved memory
|
* The reserved memory
|
||||||
*/
|
*/
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */
|
#define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */
|
||||||
#define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */
|
#define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */
|
||||||
|
|
||||||
|
|
|
@ -36,8 +36,19 @@
|
||||||
#define CONFIG_MPC831x 1
|
#define CONFIG_MPC831x 1
|
||||||
#define CONFIG_MPC8313 1
|
#define CONFIG_MPC8313 1
|
||||||
|
|
||||||
#ifndef CONFIG_SYS_TEXT_BASE
|
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
|
||||||
#define CONFIG_SYS_TEXT_BASE 0x00100000
|
#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_START 0x00100100
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_RELOC 0x00010000
|
||||||
|
#define CONFIG_SYS_NAND_U_BOOT_RELOC_SP (CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000)
|
||||||
|
|
||||||
|
#define CONFIG_SYS_TEXT_BASE 0x00100000 /* CONFIG_SYS_NAND_U_BOOT_DST */
|
||||||
|
#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
|
||||||
|
|
||||||
|
#ifdef CONFIG_NAND_SPL
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
|
||||||
|
#else
|
||||||
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_PCI
|
#define CONFIG_PCI
|
||||||
|
@ -95,8 +106,6 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_SYS_NO_FLASH
|
#define CONFIG_SYS_NO_FLASH
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
|
||||||
|
|
||||||
#if !defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_SPL)
|
||||||
#define CONFIG_SYS_RAMBOOT
|
#define CONFIG_SYS_RAMBOOT
|
||||||
#endif
|
#endif
|
||||||
|
@ -138,12 +147,6 @@
|
||||||
#define CONFIG_CMD_NAND 1
|
#define CONFIG_CMD_NAND 1
|
||||||
#define CONFIG_NAND_FSL_ELBC 1
|
#define CONFIG_NAND_FSL_ELBC 1
|
||||||
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_START 0x00100100
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_RELOC 0x00010000
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_RELOC_SP (CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000)
|
|
||||||
|
|
||||||
#define CONFIG_SYS_NAND_BR_PRELIM ( CONFIG_SYS_NAND_BASE \
|
#define CONFIG_SYS_NAND_BR_PRELIM ( CONFIG_SYS_NAND_BASE \
|
||||||
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
||||||
| BR_PS_8 /* Port Size = 8 bit */ \
|
| BR_PS_8 /* Port Size = 8 bit */ \
|
||||||
|
|
|
@ -23,13 +23,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
NAND_SPL := y
|
NAND_SPL := y
|
||||||
CONFIG_SYS_TEXT_BASE := 0xfff00000
|
|
||||||
PAD_TO := 0xfff04000
|
PAD_TO := 0xfff04000
|
||||||
|
|
||||||
include $(TOPDIR)/config.mk
|
include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
||||||
LDFLAGS = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
LDFLAGS = -Bstatic -T $(nandobj)u-boot.lds \
|
||||||
|
-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) $(PLATFORM_LDFLAGS)
|
||||||
AFLAGS += -DCONFIG_NAND_SPL
|
AFLAGS += -DCONFIG_NAND_SPL
|
||||||
CFLAGS += -DCONFIG_NAND_SPL
|
CFLAGS += -DCONFIG_NAND_SPL
|
||||||
|
|
||||||
|
|
|
@ -23,13 +23,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
NAND_SPL := y
|
NAND_SPL := y
|
||||||
CONFIG_SYS_TEXT_BASE := 0xfff00000
|
|
||||||
PAD_TO := 0xfff04000
|
PAD_TO := 0xfff04000
|
||||||
|
|
||||||
include $(TOPDIR)/config.mk
|
include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
||||||
LDFLAGS = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
LDFLAGS = -Bstatic -T $(nandobj)u-boot.lds \
|
||||||
|
-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,12 +24,12 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
NAND_SPL := y
|
NAND_SPL := y
|
||||||
CONFIG_SYS_TEXT_BASE := 0xfff00000
|
|
||||||
|
|
||||||
include $(TOPDIR)/config.mk
|
include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
||||||
LDFLAGS = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
LDFLAGS = -Bstatic -T $(nandobj)u-boot.lds \
|
||||||
|
-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 a new issue