Skip to contentSkip to conversation

powerpc/mpc85xx: support application without resetvec segment in the linker script

PATCH Superseded ying.zhang at freescale.com 5 participants 28 messages May 20, 2013 – Jun 21, 2013

Subsystems (3)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 powerpc/mpc85xx: support application without resetvec segment in the linker script

From: Ying Zhang <[email protected]>

For SD/SPI 2-stage bootloader, the On-Chip Rom code loads the SPL into L2 SRAM, then jump to it to begin execution. After that, the SPL loads the final uboot image into DDR, then jump to it to begin execution. The segment .resetvec in the SPL and in final U-boot is useless.

So, add new symbols CONFIG_SYS_MPC85XX_NO_RESETVEC for this application. If CONFIG_SYS_MPC85XX_NO_RESETVEC is set, the segment .resetvec is excluded and the segment .bootpg is placed in the previous 4K of the segment .text.

---
 README                                  |    5 +++++
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds |   14 ++++++++++++++
 arch/powerpc/cpu/mpc85xx/u-boot.lds     |    8 ++++++++
 3 files changed, 27 insertions(+), 0 deletions(-)
README +5 -0
index 3d81092..ef95e4e 100644
@@ -3978,6 +3978,11 @@ Low Level (hardware related) configuration options:
 		that is executed before the actual U-Boot. E.g. when
 		compiling a NAND SPL.
 
+- CONFIG_SYS_MPC85XX_NO_RESETVEC
+		Only for 85xx systems. If this variable is specified, the section
+		.resetvec is not kept and the section .bootpg is placed in the
+		previous 4k of the .text section.
+
 - CONFIG_ARCH_MAP_SYSMEM
 		Generally U-Boot (and in particular the md command) uses
 		effective address. It is therefore not necessary to regard
arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +14 -0
index f2b7bff..d595b89 100644
@@ -26,6 +26,13 @@
 #include "config.h"	/* CONFIG_BOARDDIR */
 
 OUTPUT_ARCH(powerpc)
+#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
+PHDRS
+{
+	text PT_LOAD;
+	bss PT_LOAD;
+}
+#endif
 SECTIONS
 {
 	. = CONFIG_SPL_TEXT_BASE;
@@ -68,9 +75,16 @@ SECTIONS
 #else
 #error unknown NAND controller
 #endif
+#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
+	.bootpg ADDR(.text) - 0x1000 :
+	{
+		KEEP(*(.bootpg))
+	} :text = 0xffff
+#else
 	.resetvec ADDR(.text) + RESET_VECTOR_OFFSET : {
 		KEEP(*(.resetvec))
 	} = 0xffff
+#endif
 
 	/*
 	 * Make sure that the bss segment isn't linked at 0x0, otherwise its
arch/powerpc/cpu/mpc85xx/u-boot.lds +8 -0
index 0503dce..2643563 100644
@@ -95,6 +95,13 @@ SECTIONS
   . = ALIGN(256);
   __init_end = .;
 
+#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC
+  .bootpg ADDR(.text) - 0x1000 :
+  {
+    KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))
+  } :text = 0xffff
+  . = ADDR(.text) + 0x80000;
+#else
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
     arch/powerpc/cpu/mpc85xx/start.o	(.bootpg)
@@ -117,6 +124,7 @@ SECTIONS
 #if (RESET_VECTOR_ADDRESS == 0xfffffffc)
   . |= 0x10;
 #endif
+#endif
 
   __bss_start = .;
   .bss (NOLOAD)       :
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/6 powerpc/mpc85xx: modify the functionality clear_bss and the end address of the BSS

From: Ying Zhang <[email protected]>

There will clear the BSS in the function clear_bss(), the reset address of the BSS started from the __bss_start, and increased by four-byte increments, finally stoped depending on the address is equal to the _bss_end. If the end address __bss_end is not alignment to 4byte, it will be an infinite loop.

1. The reset action stoped depending on the reset address is greater than or equal the end address of the BSS.
2. The end address of the BSS should be 4byte aligned. Because the reset unit is 4 Bytes.

This patch is on top of the patch "powerpc/mpc85xx: support application without resetvec segment in the linker script".

---
 arch/powerpc/cpu/mpc85xx/start.S        |    2 +-
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)
arch/powerpc/cpu/mpc85xx/start.S +1 -1
index 5542d0a..fb07938 100644
@@ -1794,7 +1794,7 @@ clear_bss:
 	stw	r0,0(r3)
 	addi	r3,r3,4
 	cmplw	0,r3,r4
-	bne	5b
+	blt	5b
 6:
 
 	mr	r3,r9		/* Init Data pointer		*/
arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +2 -4
index d595b89..55ff5e8 100644
@@ -1,8 +1,5 @@
 /*
- * (C) Copyright 2006
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de
- *
- * Copyright 2009 Freescale Semiconductor, Inc.
+ * Copyright 2013 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -97,5 +94,6 @@ SECTIONS
 		*(.sbss*)
 		*(.bss*)
 	}
+	. = ALIGN(4);
 	__bss_end = .;
 }
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/6 powerpc/mpc85xx: modify the functionality clear_bss and the end address of the BSS

Quoted 11 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There will clear the BSS in the function clear_bss(), the reset address of
the BSS started from the __bss_start, and increased by four-byte increments,
finally stoped depending on the address is equal to the _bss_end. If the end
address __bss_end is not alignment to 4byte, it will be an infinite loop.

Quoted 5 lines

1. The reset action stoped depending on the reset address is greater than or equal the end address of the BSS.
2. The end address of the BSS should be 4byte aligned. Because the reset unit
is 4 Bytes.

Should we add explicit alignment of the BSS start as well?

-Scott

#3 lore raw

PATCH 2/6 powerpc/mpc85xx: modify the functionality clear_bss and the end address of the BSS

-----Original Message-----
From: Wood Scott-B07421
Sent: Wednesday, May 22, 2013 3:38 AM
To: Zhang Ying-B40530
Cc: u-boot at lists.denx.de; afleming at gmail.com; Xie Xiaobo-R63061; Zhang Ying-B40530
Subject: Re: [PATCH 2/6] powerpc/mpc85xx: modify the functionality clear_bss and the end address of the BSS

Quoted 11 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There will clear the BSS in the function clear_bss(), the reset address of
the BSS started from the __bss_start, and increased by four-byte increments,
finally stoped depending on the address is equal to the _bss_end. If the end
address __bss_end is not alignment to 4byte, it will be an infinite loop.

Quoted 5 lines

1. The reset action stoped depending on the reset address is greater than or equal the end address of the BSS.
2. The end address of the BSS should be 4byte aligned. Because the reset unit
is 4 Bytes.

Should we add explicit alignment of the BSS start as well? [Zhang Ying]
That is better. I can add.

#4 lore raw

PATCH 3/6 common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL

In reply to ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There will need the environment in SPL for reasons other than network support (in particular, hwconfig contains info for how to set up DDR).

Add a new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT for environment in common/Makefile.

---
 README                       |    8 ++++++++
 common/Makefile              |   27 +++++++++++++++++----------
 include/configs/a3m071.h     |    1 +
 include/configs/am335x_evm.h |    1 +
 include/configs/pcm051.h     |    1 +
 5 files changed, 28 insertions(+), 10 deletions(-)
README +8 -0
index ef95e4e..d66e5b0 100644
@@ -2984,6 +2984,14 @@ FIT uImage format:
 		CONFIG_SPL_LIBGENERIC_SUPPORT
 		Support for lib/libgeneric.o in SPL binary
 
+		CONFIG_SPL_ENV_SUPPORT
+		Support for the environment operating in SPL binary
+
+		CONFIG_SPL_NET_SUPPORT
+		Support for the net/libnet.o in SPL binary.
+		It conflicts with SPL env from storage medium specified by
+		CONFIG_ENV_IS_xxx but CONFIG_ENV_IS_NOWHERE
+
 		CONFIG_SPL_PAD_TO
 		Image offset to which the SPL should be padded before appending
 		the SPL payload. By default, this is defined as
common/Makefile +17 -10
index f50bf2e..26b8495 100644
@@ -44,13 +44,11 @@ COBJS-$(CONFIG_SYS_GENERIC_BOARD) += board_r.o
 COBJS-y += cmd_boot.o
 COBJS-$(CONFIG_CMD_BOOTM) += cmd_bootm.o
 COBJS-y += cmd_help.o
-COBJS-y += cmd_nvedit.o
 COBJS-y += cmd_version.o
 
 # environment
 COBJS-y += env_attr.o
 COBJS-y += env_callback.o
-COBJS-y += env_common.o
 COBJS-y += env_flags.o
 COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
@@ -215,18 +213,27 @@ COBJS-$(CONFIG_CMD_GPT) += cmd_gpt.o
 endif
 
 ifdef CONFIG_SPL_BUILD
-COBJS-y += cmd_nvedit.o
-COBJS-y += env_common.o
 COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
 COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += cmd_nvedit.o
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_attr.o
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_callback.o
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_common.o
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_flags.o
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += env_nowhere.o
 COBJS-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
+# environment
+COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o
+COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
+COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
+ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
+COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
+COBJS-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
+COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
+COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
+COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
+else
+COBJS-y += env_nowhere.o
+endif
 endif
+# core command
+COBJS-y += cmd_nvedit.o
+#environment
+COBJS-y += env_common.o
 COBJS-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o
 COBJS-y += console.o
 COBJS-y += dlmalloc.o
include/configs/a3m071.h +1 -0
index e9af825..8f29229 100644
@@ -426,6 +426,7 @@
 #define CONFIG_SPL_BSS_MAX_SIZE		(64 << 10)
 
 #define CONFIG_SPL_OS_BOOT
+#define CONFIG_SPL_ENV_SUPPORT
 /* Place patched DT blob (fdt)@this address */
 #define CONFIG_SYS_SPL_ARGS_ADDR	0x01800000
 
include/configs/am335x_evm.h +1 -0
index ef00306..f47d3d1 100644
@@ -325,6 +325,7 @@
 #define CONFIG_SPL_GPIO_SUPPORT
 #define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_NET_SUPPORT
+#define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_NET_VCI_STRING	"AM335x U-Boot SPL"
 #define CONFIG_SPL_ETH_SUPPORT
 #define CONFIG_SPL_SPI_SUPPORT
include/configs/pcm051.h +1 -0
index d0ea74e..926842f 100644
@@ -224,6 +224,7 @@
 #define CONFIG_SPL_GPIO_SUPPORT
 #define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_NET_SUPPORT
+#define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_NET_VCI_STRING	"pcm051 U-Boot SPL"
 #define CONFIG_SPL_ETH_SUPPORT
 #define CONFIG_SPL_SPI_SUPPORT
Signature · 1 line
1.7.0.4
#5 lore raw

PATCH 3/6 common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL

Quoted 9 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There will need the environment in SPL for reasons other than network support (in particular, hwconfig contains info for how to set up DDR).

Add a new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT for environment in common/Makefile.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130523/43e3d14e/attachment.pgp>
Applied
#6 lore raw

PATCH 3/6 common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL

In reply to ying.zhang at freescale.com
Quoted 10 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There will need the environment in SPL for reasons other than network support (in particular, hwconfig contains info for how to set up DDR).

Add a new symbol CONFIG_SPL_ENV_SUPPORT to replace CONFIG_SPL_NET_SUPPORT for environment in common/Makefile.

Applied, thanks!

Andy

#7 lore raw

PATCH 4/6 Makefile: move the common makefile line to public area

In reply to ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

Move the common makefile line shared by the SPL and non-SPL to the public area, so that we can avoid excessive SPL symbols. Some of them will be used by the SPL later.

This patch is on top of the patch "common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL".

---
 common/Makefile |   17 +++++++++--------
 lib/Makefile    |   14 ++++----------
 2 files changed, 13 insertions(+), 18 deletions(-)
common/Makefile +9 -8
index 26b8495..0d72da5 100644
@@ -188,14 +188,6 @@ COBJS-$(CONFIG_CMD_ZIP) += cmd_zip.o
 COBJS-$(CONFIG_CMD_ZFS) += cmd_zfs.o
 
 # others
-ifdef CONFIG_DDR_SPD
-SPD := y
-endif
-ifdef CONFIG_SPD_EEPROM
-SPD := y
-endif
-COBJS-$(SPD) += ddr_spd.o
-COBJS-$(CONFIG_HWCONFIG) += hwconfig.o
 COBJS-$(CONFIG_BOOTSTAGE) += bootstage.o
 COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o
 COBJS-y += flash.o
@@ -234,6 +226,15 @@ endif
 COBJS-y += cmd_nvedit.o
 #environment
 COBJS-y += env_common.o
+#others
+ifdef CONFIG_DDR_SPD
+SPD := y
+endif
+ifdef CONFIG_SPD_EEPROM
+SPD := y
+endif
+COBJS-$(SPD) += ddr_spd.o
+COBJS-$(CONFIG_HWCONFIG) += hwconfig.o
 COBJS-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o
 COBJS-y += console.o
 COBJS-y += dlmalloc.o
lib/Makefile +4 -10
index 8f81862..dad057f 100644
@@ -26,7 +26,6 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)libgeneric.o
 
 ifndef CONFIG_SPL_BUILD
-COBJS-$(CONFIG_ADDR_MAP) += addr_map.o
 COBJS-$(CONFIG_AES) += aes.o
 COBJS-$(CONFIG_BZIP2) += bzlib.o
 COBJS-$(CONFIG_BZIP2) += bzlib_crctable.o
@@ -36,13 +35,10 @@ COBJS-$(CONFIG_BZIP2) += bzlib_huffman.o
 COBJS-$(CONFIG_USB_TTY) += circbuf.o
 COBJS-y += crc7.o
 COBJS-y += crc16.o
-COBJS-y += display_options.o
-COBJS-y += errno.o
 COBJS-$(CONFIG_OF_CONTROL) += fdtdec.o
 COBJS-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o
 COBJS-$(CONFIG_GZIP) += gunzip.o
 COBJS-$(CONFIG_GZIP_COMPRESSED) += gzip.o
-COBJS-y += hashtable.o
 COBJS-y += initcall.o
 COBJS-$(CONFIG_LMB) += lmb.o
 COBJS-y += ldiv.o
@@ -59,14 +55,12 @@ endif
 
 ifdef CONFIG_SPL_BUILD
 COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += crc32.o
-ifneq ($(CONFIG_SPL_SPI_FLASH_SUPPORT)$(CONFIG_SPL_NET_SUPPORT),)
-COBJS-y += display_options.o
-endif
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += errno.o
-COBJS-$(CONFIG_SPL_NET_SUPPORT) += hashtable.o
 COBJS-$(CONFIG_SPL_NET_SUPPORT) += net_utils.o
 endif
+COBJS-$(CONFIG_ADDR_MAP) += addr_map.o
+COBJS-y += hashtable.o
+COBJS-y += errno.o
+COBJS-y += display_options.o
 COBJS-$(CONFIG_BCH) += bch.o
 COBJS-y += crc32.o
 COBJS-y += ctype.o
Signature · 1 line
1.7.0.4
#8 lore raw

PATCH 4/6 Makefile: move the common makefile line to public area

Quoted 10 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

Move the common makefile line shared by the SPL and non-SPL to the public area, so that we can avoid excessive SPL symbols. Some of them will be used by the SPL later.

This patch is on top of the patch "common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL".

Provided that you've at least build-tested MAKEALL -a arm:

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130524/43eff0b9/attachment.pgp>
#9 lore raw

PATCH 4/6 Makefile: move the common makefile line to public area

Hi, Tom,
this patch has not merged to upstream?

-----Original Message-----
From: Tom Rini [mailto:tom.rini at gmail.com] On Behalf Of Tom Rini
Sent: Saturday, May 25, 2013 12:05 AM
To: Zhang Ying-B40530
Cc: u-boot at lists.denx.de; Wood Scott-B07421; afleming at gmail.com; Xie Xiaobo-R63061; Zhang Ying-B40530
Subject: Re: [U-Boot] [PATCH 4/6] Makefile: move the common makefile line to public area

Quoted 10 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

Move the common makefile line shared by the SPL and non-SPL to the public area, so that we can avoid excessive SPL symbols. Some of them will be used by the SPL later.

This patch is on top of the patch "common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL".

Provided that you've at least build-tested MAKEALL -a arm:

--
Tom

#10 lore raw

PATCH 4/6 Makefile: move the common makefile line to public area

Quoted 2 lines · On Thu, Jun 06, 2013 at 08:51:34AM +0000, Zhang Ying-B40530 wrote:

Hi, Tom,
this patch has not merged to upstream?

I assume that, so long as ARM has been build tested, it will come via one of the powerpc trees along with the rest of the series.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130606/ab8f9b10/attachment.pgp>
Applied
#11 lore raw

PATCH 4/6 Makefile: move the common makefile line to public area

In reply to ying.zhang at freescale.com
Quoted 6 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

Move the common makefile line shared by the SPL and non-SPL to the public area, so that we can avoid excessive SPL symbols. Some of them will be used by the SPL later.

Quoted 6 lines

This patch is on top of the patch "common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL".

Applied, thanks!

Andy

#12 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

In reply to ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There was some functionality will be used in the SPL. They had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it into the SPL.

---
 arch/powerpc/cpu/mpc85xx/tlb.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/law.c |    4 ++--
 common/env_common.c            |    2 --
 include/configs/MPC8313ERDB.h  |    2 ++
 include/configs/P1022DS.h      |    2 ++
 include/configs/p1_p2_rdb_pc.h |    2 ++
 6 files changed, 9 insertions(+), 5 deletions(-)
arch/powerpc/cpu/mpc85xx/tlb.c +1 -1
index 0dff37f..a44a89c 100644
@@ -55,7 +55,7 @@ void init_tlbs(void)
 	return ;
 }
 
-#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD)
+#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_NAND_MINIMAL)
 void read_tlbcam_entry(int idx, u32 *valid, u32 *tsize, unsigned long *epn,
 		       phys_addr_t *rpn)
 {
arch/powerpc/cpu/mpc8xxx/law.c +2 -2
index 6f9d568..0df62b6 100644
@@ -92,7 +92,7 @@ void disable_law(u8 idx)
 	return;
 }
 
-#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD)
+#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_NAND_MINIMAL)
 static int get_law_entry(u8 i, struct law_entry *e)
 {
 	u32 lawar;
@@ -122,7 +122,7 @@ int set_next_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
 	return idx;
 }
 
-#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD)
+#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_NAND_MINIMAL)
 int set_last_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
 {
 	u32 idx;
common/env_common.c +0 -2
index 906b41f..8cb81e9 100644
@@ -156,7 +156,6 @@ int set_default_vars(int nvars, char * const vars[])
 				H_NOCLEAR | H_INTERACTIVE, nvars, vars);
 }
 
-#ifndef CONFIG_SPL_BUILD
 /*
  * Check if CRC is valid and (if yes) import the environment.
  * Note that "buf" may or may not be aligned.
@@ -188,7 +187,6 @@ int env_import(const char *buf, int check)
 
 	return 0;
 }
-#endif
 
 void env_relocate(void)
 {
include/configs/MPC8313ERDB.h +2 -0
index c28dfe0..a2bdcff 100644
@@ -40,7 +40,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
include/configs/P1022DS.h +2 -0
index 8b13b10..5bdd44a 100644
@@ -41,7 +41,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 
include/configs/p1_p2_rdb_pc.h +2 -0
index 7ed634b..bc48d62 100644
@@ -159,7 +159,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 
Signature · 1 line
1.7.0.4
#13 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

Please change the title and the rest of the changelog to describe what functionality you're adding and why.

Quoted 14 lines · ying.zhang at freescale.com
common/env_common.c +0 -1
index 906b41f..8cb81e9 100644
@@ -156,7 +156,6 @@ int set_default_vars(int nvars, char * const  
 vars[])
 				H_NOCLEAR | H_INTERACTIVE, nvars, vars);
 }
 
-#ifndef CONFIG_SPL_BUILD
 /*
  * Check if CRC is valid and (if yes) import the environment.

* Note that "buf" may or may not be aligned.

common/env_common.c int env_import(const char *buf, int check) · line 191

Quoted 4 lines
common/env_common.c +0 -1
@@ -188,7 +187,6 @@ int env_import(const char *buf, int check)
 
 	return 0;
 }
-#endif

This ifndef was introduced by Ilya Yanok in commit 7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56.

Ilya, what are the consequences of removing this? Is there some other symbol we can use here?

Quoted 35 lines
include/configs/MPC8313ERDB.h +2 -0
index c28dfe0..a2bdcff 100644
@@ -40,7 +40,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
include/configs/P1022DS.h +2 -0
index 8b13b10..5bdd44a 100644
@@ -41,7 +41,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 
include/configs/p1_p2_rdb_pc.h +0 -0
index 7ed634b..bc48d62 100644

include/configs/p1_p2_rdb_pc.h line 166

Quoted 8 lines
include/configs/p1_p2_rdb_pc.h +2 -0
@@ -159,7 +159,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"

Are you sure this belongs in this patch?

-Scott

#14 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 35 lines
include/configs/MPC8313ERDB.h +2 -0
index c28dfe0..a2bdcff 100644
@@ -40,7 +40,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
include/configs/P1022DS.h +2 -0
index 8b13b10..5bdd44a 100644
@@ -41,7 +41,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 
include/configs/p1_p2_rdb_pc.h +0 -0
index 7ed634b..bc48d62 100644

include/configs/p1_p2_rdb_pc.h line 166

Quoted 8 lines
include/configs/p1_p2_rdb_pc.h +2 -0
@@ -159,7 +159,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"

Are you sure this belongs in this patch?
[Zhang Ying]
Yes, it is necessary. Because CONFIG_SPL_NAND_MINIMAL has been used in the file law.c and tlb.c in this patch.

#15 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 40 lines · On 05/21/2013 09:15:08 PM, Zhang Ying-B40530 wrote:
Quoted 40 lines
include/configs/MPC8313ERDB.h +2 -0
index c28dfe0..a2bdcff 100644
@@ -40,7 +40,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
include/configs/P1022DS.h +2 -0
index 8b13b10..5bdd44a 100644
@@ -41,7 +41,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 
include/configs/p1_p2_rdb_pc.h +1 -0
index 7ed634b..bc48d62 100644
@@ -159,7 +159,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
Quoted 8 lines

include/configs/p1_p2_rdb_pc.h line 166

Quoted 3 lines
include/configs/p1_p2_rdb_pc.h +1 -0
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"

Are you sure this belongs in this patch?
[Zhang Ying]
Yes, it is necessary. Because CONFIG_SPL_NAND_MINIMAL has been used in the file law.c and tlb.c in this patch.

What I mean is that it should probably have been done earlier, when you introduced CONFIG_SPL_NAND_MINIMAL.

-Scott

#16 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

-----Original Message-----
From: Wood Scott-B07421
Sent: Wednesday, May 22, 2013 11:46 PM
To: Zhang Ying-B40530
Cc: Wood Scott-B07421; u-boot at lists.denx.de; afleming at gmail.com; Xie Xiaobo-R63061; Ilya Yanok
Subject: Re: [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 40 lines · On 05/21/2013 09:15:08 PM, Zhang Ying-B40530 wrote:
Quoted 40 lines
include/configs/MPC8313ERDB.h +2 -0
index c28dfe0..a2bdcff 100644
@@ -40,7 +40,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
include/configs/P1022DS.h +2 -0
index 8b13b10..5bdd44a 100644
@@ -41,7 +41,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 
include/configs/p1_p2_rdb_pc.h +1 -0
index 7ed634b..bc48d62 100644
@@ -159,7 +159,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
Quoted 8 lines

include/configs/p1_p2_rdb_pc.h line 166

Quoted 3 lines
include/configs/p1_p2_rdb_pc.h +1 -0
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"

Are you sure this belongs in this patch?
[Zhang Ying]
Yes, it is necessary. Because CONFIG_SPL_NAND_MINIMAL has been used in the file law.c and tlb.c in this patch.

What I mean is that it should probably have been done earlier, when you
introduced CONFIG_SPL_NAND_MINIMAL.
[Zhang Ying]
I can understand you mean. Because the symbol "CONFIG_SPL_NAND_MINIMAL" has been useless, I think no need to split out a separate patch.

#17 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 61 lines · On 05/22/2013 08:26:31 PM, Zhang Ying-B40530 wrote:

-----Original Message-----
From: Wood Scott-B07421
Sent: Wednesday, May 22, 2013 11:46 PM
To: Zhang Ying-B40530
Cc: Wood Scott-B07421; u-boot at lists.denx.de; afleming at gmail.com; Xie Xiaobo-R63061; Ilya Yanok
Subject: Re: [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 40 lines · On 05/21/2013 09:15:08 PM, Zhang Ying-B40530 wrote:
Quoted 40 lines
include/configs/MPC8313ERDB.h +2 -0
index c28dfe0..a2bdcff 100644
@@ -40,7 +40,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
include/configs/P1022DS.h +2 -0
index 8b13b10..5bdd44a 100644
@@ -41,7 +41,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 
include/configs/p1_p2_rdb_pc.h +1 -0
index 7ed634b..bc48d62 100644
@@ -159,7 +159,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
Quoted 8 lines

include/configs/p1_p2_rdb_pc.h line 166

Quoted 3 lines
include/configs/p1_p2_rdb_pc.h +1 -0
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"

Are you sure this belongs in this patch?
[Zhang Ying]
Yes, it is necessary. Because CONFIG_SPL_NAND_MINIMAL has been used in the file law.c and tlb.c in this patch.

Quoted 7 lines

What I mean is that it should probably have been done earlier, when you
introduced CONFIG_SPL_NAND_MINIMAL.
[Zhang Ying]
I can understand you mean. Because the symbol "CONFIG_SPL_NAND_MINIMAL" has been useless, I think no need to split out a separate patch.

OK, it looks like CONFIG_SPL_NAND_MINIMAL was there before your patchset. I think that was an accidental left-over and should have been removed (it was replaced with CONFIG_SPL_NAND_DRIVERS, _BASE, and _ECC).

Could you describe what specifically you're using it to mean here?

-Scott

#18 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

-----Original Message-----
From: Wood Scott-B07421
Sent: Wednesday, May 29, 2013 6:34 AM
To: Zhang Ying-B40530
Cc: Wood Scott-B07421; u-boot at lists.denx.de; afleming at gmail.com; Xie Xiaobo-R63061; Ilya Yanok
Subject: Re: [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 61 lines · On 05/22/2013 08:26:31 PM, Zhang Ying-B40530 wrote:

-----Original Message-----
From: Wood Scott-B07421
Sent: Wednesday, May 22, 2013 11:46 PM
To: Zhang Ying-B40530
Cc: Wood Scott-B07421; u-boot at lists.denx.de; afleming at gmail.com; Xie Xiaobo-R63061; Ilya Yanok
Subject: Re: [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 40 lines · On 05/21/2013 09:15:08 PM, Zhang Ying-B40530 wrote:
Quoted 40 lines
include/configs/MPC8313ERDB.h +2 -0
index c28dfe0..a2bdcff 100644
@@ -40,7 +40,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
include/configs/P1022DS.h +2 -0
index 8b13b10..5bdd44a 100644
@@ -41,7 +41,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 
include/configs/p1_p2_rdb_pc.h +1 -0
index 7ed634b..bc48d62 100644
@@ -159,7 +159,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
Quoted 8 lines

include/configs/p1_p2_rdb_pc.h line 166

Quoted 3 lines
include/configs/p1_p2_rdb_pc.h +1 -0
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"

Are you sure this belongs in this patch?
[Zhang Ying]
Yes, it is necessary. Because CONFIG_SPL_NAND_MINIMAL has been used in the file law.c and tlb.c in this patch.

Quoted 7 lines

What I mean is that it should probably have been done earlier, when you
introduced CONFIG_SPL_NAND_MINIMAL.
[Zhang Ying]
I can understand you mean. Because the symbol "CONFIG_SPL_NAND_MINIMAL" has been useless, I think no need to split out a separate patch.

OK, it looks like CONFIG_SPL_NAND_MINIMAL was there before your patchset. I think that was an accidental left-over and should have been removed (it was replaced with CONFIG_SPL_NAND_DRIVERS, _BASE, and _ECC).

Could you describe what specifically you're using it to mean here?
[Zhang Ying]
CONFIG_SPL_NAND_MINIMAL is effective only for mpc85xx NAND SPL. If it is set, said the SPL as small as possible and the size is not more than 4K.

#19 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 83 lines · On 05/28/2013 09:11:17 PM, Zhang Ying-B40530 wrote:

-----Original Message-----
From: Wood Scott-B07421
Sent: Wednesday, May 29, 2013 6:34 AM
To: Zhang Ying-B40530
Cc: Wood Scott-B07421; u-boot at lists.denx.de; afleming at gmail.com; Xie Xiaobo-R63061; Ilya Yanok
Subject: Re: [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 12 lines · On 05/22/2013 08:26:31 PM, Zhang Ying-B40530 wrote:

-----Original Message-----
From: Wood Scott-B07421
Sent: Wednesday, May 22, 2013 11:46 PM
To: Zhang Ying-B40530
Cc: Wood Scott-B07421; u-boot at lists.denx.de; afleming at gmail.com; Xie Xiaobo-R63061; Ilya Yanok
Subject: Re: [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality

On 05/21/2013 09:15:08 PM, Zhang Ying-B40530 wrote:

Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
include/configs/MPC8313ERDB.h +0 -0
index c28dfe0..a2bdcff 100644
@@ -40,7 +40,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
Quoted 8 lines

Review

Quoted 8 lines
include/configs/MPC8313ERDB.h +2 -0
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
(quoted diff) +0 -0

b/include/configs/P1022DS.h

Quoted 23 lines
Quoted 23 lines
Quoted 23 lines

index 8b13b10..5bdd44a 100644

include/configs/P1022DS.h +2 -0
@@ -41,7 +41,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 
include/configs/p1_p2_rdb_pc.h +1 -0
index 7ed634b..bc48d62 100644
@@ -159,7 +159,9 @@
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
+#ifdef CONFIG_SPL_BUILD
Quoted 8 lines
Quoted 8 lines

include/configs/p1_p2_rdb_pc.h line 166

Quoted 4 lines
include/configs/p1_p2_rdb_pc.h +1 -0
 #define CONFIG_SPL_NAND_MINIMAL
+#endif
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"

Are you sure this belongs in this patch?
[Zhang Ying]
Yes, it is necessary. Because CONFIG_SPL_NAND_MINIMAL has been

used

Quoted 9 lines
Quoted 1 line

in the file law.c and tlb.c in this patch.

What I mean is that it should probably have been done earlier, when you
introduced CONFIG_SPL_NAND_MINIMAL.
[Zhang Ying]
I can understand you mean. Because the symbol "CONFIG_SPL_NAND_MINIMAL" has been useless, I think no need to split out a separate patch.

Quoted 8 lines

OK, it looks like CONFIG_SPL_NAND_MINIMAL was there before your patchset. I think that was an accidental left-over and should have been removed (it was replaced with CONFIG_SPL_NAND_DRIVERS, _BASE, and _ECC).

Could you describe what specifically you're using it to mean here? [Zhang Ying]
CONFIG_SPL_NAND_MINIMAL is effective only for mpc85xx NAND SPL.

No, it's just a mistake that should be removed. It doesn't mean anything. There are other SPL targets that use minimal NAND drivers (e.g. mxc_nand_spl.c) that don't define this.

-Scott

#20 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

In reply to Scott Wood
Quoted 26 lines · Scott Wood

Please change the title and the rest of the changelog to describe what functionality you're adding and why.

Quoted 14 lines · ying.zhang at freescale.com
common/env_common.c +0 -1
index 906b41f..8cb81e9 100644
@@ -156,7 +156,6 @@ int set_default_vars(int nvars, char * const
 vars[])
 				H_NOCLEAR | H_INTERACTIVE, nvars, vars);
 }
 
-#ifndef CONFIG_SPL_BUILD
 /*
 * Check if CRC is valid and (if yes) import the environment.

* Note that "buf" may or may not be aligned.

common/env_common.c int env_import(const char *buf, int check) · line 191

Quoted 4 lines
common/env_common.c +0 -1
@@ -188,7 +187,6 @@ int env_import(const char *buf, int check)
 
 	return 0;
 }
-#endif

This ifndef was introduced by Ilya Yanok in commit 7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56.

Quoted 2 lines

Ilya, what are the consequences of removing this? Is there some other symbol we can use here?

This was likely done so that we could fit the combination of USB RNDIS networking in SPL into the size constraint we have and the need for more than just unused section discarding to get rid of codepaths we know won't be taken (but couldn't compile-time determine).

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130524/abff7bf6/attachment.pgp>
#21 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

In reply to ying.zhang at freescale.com
Quoted 10 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There was some functionality will be used in the SPL. They had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it into the SPL.

---
 arch/powerpc/cpu/mpc85xx/tlb.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/law.c |    4 ++--

In these cases can we not just always build them, aside from when CONFIG_NAND_SPL is set and rely on link-time discard here? Otherwise:

Review

Quoted 2 lines
(quoted diff) +1 -1
-#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD)
+#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_NAND_MINIMAL)

Should become, I believe (and this isn't whitespaced properly):
#if !defined(CONFIG_NAND_SPL) && !(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NAND_MINIMAL))

So that:

Quoted 1 line
include/configs/MPC8313ERDB.h +0 -0

[snip]

Quoted 1 line
include/configs/P1022DS.h +0 -0

[snip]

include/configs/p1_p2_rdb_pc.h

Quoted 1 line
include/configs/p1_p2_rdb_pc.h +0 -0

Can then all be dropped.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130524/54129188/attachment.pgp>
#22 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 30 lines · Tom Rini
Quoted 10 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There was some functionality will be used in the SPL. They had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it into the SPL.

---
 arch/powerpc/cpu/mpc85xx/tlb.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/law.c |    4 ++--

In these cases can we not just always build them, aside from when CONFIG_NAND_SPL is set and rely on link-time discard here? Otherwise:

Review

Quoted 2 lines
(quoted diff) +1 -1
-#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD)
+#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_NAND_MINIMAL)

Should become, I believe (and this isn't whitespaced properly):
#if !defined(CONFIG_NAND_SPL) && !(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NAND_MINIMAL))

So that:

Review

Quoted 1 line
(quoted diff) +0 -0

b/include/configs/MPC8313ERDB.h
[snip]

Quoted 6 lines
Quoted 1 line
include/configs/P1022DS.h +0 -0

[snip]

Review

Quoted 1 line
(quoted diff) +0 -0

b/include/configs/p1_p2_rdb_pc.h

Can then all be dropped.

Possibly, but it would be nice to limit SPL symbols to only be defined for the SPL part of the build, so we don't have to add checks for CONFIG_SPL_BUILD all over the place. Currently this won't work for symbols that makefiles look at, though there was a patch to fix that, which I referred to elsewhere in the these threads.

-Scott

#23 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 36 lines · Scott Wood
Quoted 35 lines · Tom Rini
Quoted 10 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There was some functionality will be used in the SPL. They had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it into the SPL.

---
 arch/powerpc/cpu/mpc85xx/tlb.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/law.c |    4 ++--

In these cases can we not just always build them, aside from when CONFIG_NAND_SPL is set and rely on link-time discard here? Otherwise:

Review

Quoted 2 lines
(quoted diff) +1 -1
-#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD)
+#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_NAND_MINIMAL)

Should become, I believe (and this isn't whitespaced properly):
#if !defined(CONFIG_NAND_SPL) && !(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NAND_MINIMAL))

So that:

Review

Quoted 1 line
(quoted diff) +0 -0

b/include/configs/MPC8313ERDB.h
[snip]

Quoted 1 line
include/configs/P1022DS.h +0 -0

[snip]

Review

Quoted 1 line
(quoted diff) +0 -0

b/include/configs/p1_p2_rdb_pc.h

Quoted 8 lines
Quoted 1 line

Can then all be dropped.

Possibly, but it would be nice to limit SPL symbols to only be defined for the SPL part of the build, so we don't have to add checks for CONFIG_SPL_BUILD all over the place. Currently this won't work for symbols that makefiles look at, though there was a patch to fix that, which I referred to elsewhere in the these threads.

At the high level, yes, I agree it would be good to clean up everyones configs around CONFIG_SPL/CONFIG_SPL_BUILD.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130524/f06641db/attachment.pgp>
#24 lore raw

PATCH 5/6 spl: Make CONFIG_SPL_BUILD contain more functionality

So, about this patch, what need I do?

-----Original Message-----
From: Tom Rini [mailto:tom.rini at gmail.com] On Behalf Of Tom Rini
Sent: Saturday, May 25, 2013 3:18 AM
To: Wood Scott-B07421
Cc: u-boot at lists.denx.de; Zhang Ying-B40530; afleming at gmail.com; Xie Xiaobo-R63061; Zhang Ying-B40530
Subject: Re: [U-Boot] [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality

Quoted 36 lines · Scott Wood
Quoted 35 lines · Tom Rini
Quoted 10 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

There was some functionality will be used in the SPL. They had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it into the SPL.

---
 arch/powerpc/cpu/mpc85xx/tlb.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/law.c |    4 ++--

In these cases can we not just always build them, aside from when CONFIG_NAND_SPL is set and rely on link-time discard here? Otherwise:

Review

Quoted 2 lines
(quoted diff) +1 -1
-#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD)
+#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_NAND_MINIMAL)

Should become, I believe (and this isn't whitespaced properly):
#if !defined(CONFIG_NAND_SPL) && !(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NAND_MINIMAL))

So that:

Review

Quoted 1 line
(quoted diff) +0 -0

b/include/configs/MPC8313ERDB.h
[snip]

Quoted 1 line
include/configs/P1022DS.h +0 -0

[snip]

Review

Quoted 1 line
(quoted diff) +0 -0

b/include/configs/p1_p2_rdb_pc.h

Quoted 8 lines
Quoted 1 line

Can then all be dropped.

Possibly, but it would be nice to limit SPL symbols to only be defined for the SPL part of the build, so we don't have to add checks for CONFIG_SPL_BUILD all over the place. Currently this won't work for symbols that makefiles look at, though there was a patch to fix that, which I referred to elsewhere in the these threads.

At the high level, yes, I agree it would be good to clean up everyones configs around CONFIG_SPL/CONFIG_SPL_BUILD.

Signature · 1 line
Tom
#25 lore raw

PATCH 6/6 powerpc/p1022ds: boot from SD Card with SPL

In reply to ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

This patch introduces SPL to enable a loader stub that runs in the L2 SRAM, after being loaded by the code from the internal on-chip ROM. It loads the final uboot image into DDR, then jump to it to begin execution.

The SPL's size is sizeable, the maximum size must not exceed the size of L2 SRAM. It initializes the DDR through SPD code, and copys final uboot image to DDR. So there are two stage uboot images:
* spl_boot, 96KB size. The env variables are copied to L2 SRAM, so that ddr spd code can get the interleaving mode setting in env. It loads final uboot image from offset 96KB.
* final uboot image, size is variable depends on the functions enabled.

This patch is on top of the following patch:
1. common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL.
2. Makefile: move the common makefile line to public area
3. powerpc/mpc85xx: support application without resetvec segment in the linker script.
4. powerpc/mpc85xx: modify the function clear_bss and the end address of the BSS
5. spl: Make CONFIG_SPL_BUILD contain more functionality

---
 README                                             |    8 ++
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds            |    5 +
 .../cpu/mpc8xxx/ddr/lc_common_dimm_params.c        |    4 +
 board/freescale/common/Makefile                    |    2 -
 board/freescale/p1022ds/Makefile                   |    3 +
 board/freescale/p1022ds/spl.c                      |  112 +++++++++++++++++
 board/freescale/p1022ds/tlb.c                      |    9 ++-
 doc/README.mpc85xx-sd-spi-boot                     |   82 ++++++++++++
 drivers/mmc/Makefile                               |    3 +
 drivers/mmc/fsl_esdhc_spl.c                        |  132 ++++++++++++++++++++
 drivers/mmc/mmc.c                                  |    4 +-
 include/configs/P1022DS.h                          |   54 +++++++-
 include/fsl_esdhc.h                                |    1 +
 spl/Makefile                                       |    3 +
 14 files changed, 410 insertions(+), 12 deletions(-)
 create mode 100644 board/freescale/p1022ds/spl.c
 create mode 100644 doc/README.mpc85xx-sd-spi-boot
 create mode 100644 drivers/mmc/fsl_esdhc_spl.c
README +8 -0
index d66e5b0..0ab7b4c 100644
@@ -2941,6 +2941,14 @@ FIT uImage format:
 		Support for NAND boot using simple NAND drivers that
 		expose the cmd_ctrl() interface.
 
+		CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
+		Set for the SPL on PPC mpc8xxx targets, support for
+		arch/powerpc/cpu/mpc8xxx/ddr/libddr.o in SPL binary.
+
+		CONFIG_SPL_COMMON_INIT_DDR
+		Set for common ddr init with serial presence detect in
+		SPL binary.
+
 		CONFIG_SYS_NAND_5_ADDR_CYCLE, CONFIG_SYS_NAND_PAGE_COUNT,
 		CONFIG_SYS_NAND_PAGE_SIZE, CONFIG_SYS_NAND_OOBSIZE,
 		CONFIG_SYS_NAND_BLOCK_SIZE, CONFIG_SYS_NAND_BAD_BLOCK_POS,
arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +5 -0
index 55ff5e8..751feaa 100644
@@ -57,6 +57,11 @@ SECTIONS
 	}
 	_edata  =  .;
 
+	. = .;
+	__start___ex_table = .;
+	__ex_table : { *(__ex_table) }
+	__stop___ex_table = .;
+
 	. = ALIGN(8);
 	__init_begin = .;
 	__init_end = .;
arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c +4 -0
index 9adde31..aa32454 100644
@@ -220,12 +220,16 @@ compute_lowest_common_dimm_parameters(const dimm_params_t *dimm_params,
 		if (dimm_params[i].n_ranks) {
 			if (dimm_params[i].registered_dimm) {
 				temp1 = 1;
+#ifndef CONFIG_SPL_BUILD
 				printf("Detected RDIMM %s\n",
 					dimm_params[i].mpart);
+#endif
 			} else {
 				temp2 = 1;
+#ifndef CONFIG_SPL_BUILD
 				printf("Detected UDIMM %s\n",
 					dimm_params[i].mpart);
+#endif
 			}
 		}
 	}
board/freescale/common/Makefile +0 -2
index 72bb56c..c334797 100644
@@ -52,9 +52,7 @@ COBJS-$(CONFIG_MPC8555CDS)	+= cds_pci_ft.o
 
 COBJS-$(CONFIG_MPC8536DS)	+= ics307_clk.o
 COBJS-$(CONFIG_MPC8572DS)	+= ics307_clk.o
-ifndef CONFIG_SPL_BUILD
 COBJS-$(CONFIG_P1022DS)		+= ics307_clk.o
-endif
 COBJS-$(CONFIG_P2020DS)		+= ics307_clk.o
 COBJS-$(CONFIG_P3041DS)		+= ics307_clk.o
 COBJS-$(CONFIG_P4080DS)		+= ics307_clk.o
board/freescale/p1022ds/Makefile +3 -0
index 0eeef05..9746063 100644
@@ -24,6 +24,9 @@ ifdef MINIMAL
 COBJS-y        += spl_minimal.o tlb.o law.o
 
 else
+ifdef CONFIG_SPL_BUILD
+COBJS-y += spl.o
+endif
 COBJS-y	+= $(BOARD).o
 COBJS-y	+= ddr.o
 COBJS-y	+= law.o
board/freescale/p1022ds/spl.c new file +112 -0

112 lines not on this page · raw message

board/freescale/p1022ds/tlb.c +8 -1
index 3acc449..9b14c37 100644
@@ -74,7 +74,8 @@ struct fsl_e_tlb_entry tlb_table[] = {
 		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
 		      0, 7, BOOKE_PAGESZ_4K, 1),
 
-#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_SPL)
+#if defined(CONFIG_SYS_RAMBOOT) || \
+	(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
 	/* **** - eSDHC/eSPI/NAND boot */
 	SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
 			MAS3_SX|MAS3_SW|MAS3_SR, 0,
@@ -93,6 +94,12 @@ struct fsl_e_tlb_entry tlb_table[] = {
 			0, 10, BOOKE_PAGESZ_16K, 1),
 #endif
 
+#ifdef CONFIG_SYS_INIT_L2_ADDR
+	/* *I*G - L2SRAM */
+	SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR, CONFIG_SYS_INIT_L2_ADDR_PHYS,
+			MAS3_SX|MAS3_SW|MAS3_SR, MAS2_G,
+			0, 11, BOOKE_PAGESZ_256K, 1)
+#endif
 };
 
 int num_tlb_entries = ARRAY_SIZE(tlb_table);
doc/README.mpc85xx-sd-spi-boot new file +82 -0

82 lines not on this page · raw message

drivers/mmc/Makefile +3 -0
index 2b58178..4bfaea5 100644
@@ -47,6 +47,9 @@ COBJS-$(CONFIG_SPEAR_SDHCI) += spear_sdhci.o
 COBJS-$(CONFIG_TEGRA_MMC) += tegra_mmc.o
 COBJS-$(CONFIG_DWMMC) += dw_mmc.o
 COBJS-$(CONFIG_EXYNOS_DWMMC) += exynos_dw_mmc.o
+ifdef CONFIG_SPL_BUILD
+COBJS-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o
+endif
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
drivers/mmc/fsl_esdhc_spl.c new file +132 -0

132 lines not on this page · raw message

drivers/mmc/mmc.c +2 -2
index 0a2f535..9a0bfd2 100644
@@ -1441,9 +1441,9 @@ int mmc_initialize(bd_t *bis)
 
 	if (board_mmc_init(bis) < 0)
 		cpu_mmc_init(bis);
-
+#ifndef CONFIG_SPL_BUILD
 	print_mmc_devices(',');
-
+#endif
 	do_preinit();
 	return 0;
 }
include/configs/P1022DS.h +47 -7

79 lines not on this page · raw message

include/fsl_esdhc.h +1 -0
index 67d6057..b17c424 100644
@@ -198,5 +198,6 @@ void fdt_fixup_esdhc(void *blob, bd_t *bd);
 static inline int fsl_esdhc_mmc_init(bd_t *bis) { return -ENOSYS; }
 static inline void fdt_fixup_esdhc(void *blob, bd_t *bd) {}
 #endif /* CONFIG_FSL_ESDHC */
+void mmc_boot(void);
 
 #endif  /* __FSL_ESDHC_H__ */
spl/Makefile +3 -0
index b5a8de7..7187d68 100644
@@ -51,6 +51,9 @@ LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 endif
 ifeq ($(CPU),mpc85xx)
 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
+ifdef CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
+LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
+endif
 endif
 ifeq ($(CPU),mpc86xx)
 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
Signature · 1 line
1.7.0.4
#26 lore raw

PATCH 6/6 powerpc/p1022ds: boot from SD Card with SPL

Hi, everybody.

Do you have any comments?

-----Original Message-----
From: Zhang Ying-B40530
Sent: Monday, May 20, 2013 2:07 PM
To: u-boot at lists.denx.de
Cc: Wood Scott-B07421; afleming at gmail.com; Xie Xiaobo-R63061; Zhang Ying-B40530
Subject: [PATCH 6/6] powerpc/p1022ds: boot from SD Card with SPL

From: Ying Zhang <[email protected]>

This patch introduces SPL to enable a loader stub that runs in the L2 SRAM, after being loaded by the code from the internal on-chip ROM. It loads the final uboot image into DDR, then jump to it to begin execution.

The SPL's size is sizeable, the maximum size must not exceed the size of L2 SRAM. It initializes the DDR through SPD code, and copys final uboot image to DDR. So there are two stage uboot images:
* spl_boot, 96KB size. The env variables are copied to L2 SRAM, so that ddr spd code can get the interleaving mode setting in env. It loads final uboot image from offset 96KB.
* final uboot image, size is variable depends on the functions enabled.

This patch is on top of the following patch:
1. common/Makefile: Add new symbol CONFIG_SPL_ENV_SUPPORT for environment in SPL.
2. Makefile: move the common makefile line to public area
3. powerpc/mpc85xx: support application without resetvec segment in the linker script.
4. powerpc/mpc85xx: modify the function clear_bss and the end address of the BSS
5. spl: Make CONFIG_SPL_BUILD contain more functionality

---
 README                                             |    8 ++
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds            |    5 +
 .../cpu/mpc8xxx/ddr/lc_common_dimm_params.c        |    4 +
 board/freescale/common/Makefile                    |    2 -
 board/freescale/p1022ds/Makefile                   |    3 +
 board/freescale/p1022ds/spl.c                      |  112 +++++++++++++++++
 board/freescale/p1022ds/tlb.c                      |    9 ++-
 doc/README.mpc85xx-sd-spi-boot                     |   82 ++++++++++++
 drivers/mmc/Makefile                               |    3 +
 drivers/mmc/fsl_esdhc_spl.c                        |  132 ++++++++++++++++++++
 drivers/mmc/mmc.c                                  |    4 +-
 include/configs/P1022DS.h                          |   54 +++++++-
 include/fsl_esdhc.h                                |    1 +
 spl/Makefile                                       |    3 +
 14 files changed, 410 insertions(+), 12 deletions(-)
 create mode 100644 board/freescale/p1022ds/spl.c
 create mode 100644 doc/README.mpc85xx-sd-spi-boot
 create mode 100644 drivers/mmc/fsl_esdhc_spl.c
README +8 -0
index d66e5b0..0ab7b4c 100644
@@ -2941,6 +2941,14 @@ FIT uImage format:
 		Support for NAND boot using simple NAND drivers that
 		expose the cmd_ctrl() interface.
 
+		CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
+		Set for the SPL on PPC mpc8xxx targets, support for
+		arch/powerpc/cpu/mpc8xxx/ddr/libddr.o in SPL binary.
+
+		CONFIG_SPL_COMMON_INIT_DDR
+		Set for common ddr init with serial presence detect in
+		SPL binary.
+
 		CONFIG_SYS_NAND_5_ADDR_CYCLE, CONFIG_SYS_NAND_PAGE_COUNT,
 		CONFIG_SYS_NAND_PAGE_SIZE, CONFIG_SYS_NAND_OOBSIZE,
 		CONFIG_SYS_NAND_BLOCK_SIZE, CONFIG_SYS_NAND_BAD_BLOCK_POS,
arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +5 -0
index 55ff5e8..751feaa 100644
@@ -57,6 +57,11 @@ SECTIONS
 	}
 	_edata  =  .;
 
+	. = .;
+	__start___ex_table = .;
+	__ex_table : { *(__ex_table) }
+	__stop___ex_table = .;
+
 	. = ALIGN(8);
 	__init_begin = .;
 	__init_end = .;
arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c +4 -0
index 9adde31..aa32454 100644
@@ -220,12 +220,16 @@ compute_lowest_common_dimm_parameters(const dimm_params_t *dimm_params,
 		if (dimm_params[i].n_ranks) {
 			if (dimm_params[i].registered_dimm) {
 				temp1 = 1;
+#ifndef CONFIG_SPL_BUILD
 				printf("Detected RDIMM %s\n",
 					dimm_params[i].mpart);
+#endif
 			} else {
 				temp2 = 1;
+#ifndef CONFIG_SPL_BUILD
 				printf("Detected UDIMM %s\n",
 					dimm_params[i].mpart);
+#endif
 			}
 		}
 	}
board/freescale/common/Makefile +0 -2
index 72bb56c..c334797 100644
@@ -52,9 +52,7 @@ COBJS-$(CONFIG_MPC8555CDS)	+= cds_pci_ft.o
 
 COBJS-$(CONFIG_MPC8536DS)	+= ics307_clk.o
 COBJS-$(CONFIG_MPC8572DS)	+= ics307_clk.o
-ifndef CONFIG_SPL_BUILD
 COBJS-$(CONFIG_P1022DS)		+= ics307_clk.o
-endif
 COBJS-$(CONFIG_P2020DS)		+= ics307_clk.o
 COBJS-$(CONFIG_P3041DS)		+= ics307_clk.o
 COBJS-$(CONFIG_P4080DS)		+= ics307_clk.o
board/freescale/p1022ds/Makefile +3 -0
index 0eeef05..9746063 100644
@@ -24,6 +24,9 @@ ifdef MINIMAL
 COBJS-y        += spl_minimal.o tlb.o law.o
 
 else
+ifdef CONFIG_SPL_BUILD
+COBJS-y += spl.o
+endif
 COBJS-y	+= $(BOARD).o
 COBJS-y	+= ddr.o
 COBJS-y	+= law.o
board/freescale/p1022ds/spl.c new file +112 -0

112 lines not on this page · raw message

board/freescale/p1022ds/tlb.c +8 -1
index 3acc449..9b14c37 100644
@@ -74,7 +74,8 @@ struct fsl_e_tlb_entry tlb_table[] = {
 		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
 		      0, 7, BOOKE_PAGESZ_4K, 1),
 
-#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_SPL)
+#if defined(CONFIG_SYS_RAMBOOT) || \
+	(defined(CONFIG_SPL) && !defined(CONFIG_SPL_COMMON_INIT_DDR))
 	/* **** - eSDHC/eSPI/NAND boot */
 	SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE,
 			MAS3_SX|MAS3_SW|MAS3_SR, 0,
@@ -93,6 +94,12 @@ struct fsl_e_tlb_entry tlb_table[] = {
 			0, 10, BOOKE_PAGESZ_16K, 1),
 #endif
 
+#ifdef CONFIG_SYS_INIT_L2_ADDR
+	/* *I*G - L2SRAM */
+	SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR, CONFIG_SYS_INIT_L2_ADDR_PHYS,
+			MAS3_SX|MAS3_SW|MAS3_SR, MAS2_G,
+			0, 11, BOOKE_PAGESZ_256K, 1)
+#endif
 };
 
 int num_tlb_entries = ARRAY_SIZE(tlb_table);
doc/README.mpc85xx-sd-spi-boot new file +82 -0

82 lines not on this page · raw message

drivers/mmc/Makefile +3 -0
index 2b58178..4bfaea5 100644
@@ -47,6 +47,9 @@ COBJS-$(CONFIG_SPEAR_SDHCI) += spear_sdhci.o
 COBJS-$(CONFIG_TEGRA_MMC) += tegra_mmc.o
 COBJS-$(CONFIG_DWMMC) += dw_mmc.o
 COBJS-$(CONFIG_EXYNOS_DWMMC) += exynos_dw_mmc.o
+ifdef CONFIG_SPL_BUILD
+COBJS-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o
+endif
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
drivers/mmc/fsl_esdhc_spl.c new file +132 -0

132 lines not on this page · raw message

drivers/mmc/mmc.c +2 -2
index 0a2f535..9a0bfd2 100644
@@ -1441,9 +1441,9 @@ int mmc_initialize(bd_t *bis)
 
 	if (board_mmc_init(bis) < 0)
 		cpu_mmc_init(bis);
-
+#ifndef CONFIG_SPL_BUILD
 	print_mmc_devices(',');
-
+#endif
 	do_preinit();
 	return 0;
 }
include/configs/P1022DS.h +47 -7

79 lines not on this page · raw message

include/fsl_esdhc.h +1 -0
index 67d6057..b17c424 100644
@@ -198,5 +198,6 @@ void fdt_fixup_esdhc(void *blob, bd_t *bd);
 static inline int fsl_esdhc_mmc_init(bd_t *bis) { return -ENOSYS; }
 static inline void fdt_fixup_esdhc(void *blob, bd_t *bd) {}
 #endif /* CONFIG_FSL_ESDHC */
+void mmc_boot(void);
 
 #endif  /* __FSL_ESDHC_H__ */
spl/Makefile +3 -0
index b5a8de7..7187d68 100644
@@ -51,6 +51,9 @@ LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 endif
 ifeq ($(CPU),mpc85xx)
 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
+ifdef CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
+LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
+endif
 endif
 ifeq ($(CPU),mpc86xx)
 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
Signature · 1 line
1.7.0.4
Applied
#27 lore raw

PATCH 1/6 powerpc/mpc85xx: support application without resetvec segment in the linker script

In reply to ying.zhang at freescale.com
Quoted 7 lines · ying.zhang at freescale.com

From: Ying Zhang <[email protected]>

For SD/SPI 2-stage bootloader, the On-Chip Rom code loads the SPL into L2 SRAM, then jump to it to begin execution. After that, the SPL loads the final uboot image into DDR, then jump to it to begin execution. The segment .resetvec in the SPL and in final U-boot is useless.

Quoted 5 lines

So, add new symbols CONFIG_SYS_MPC85XX_NO_RESETVEC for this application. If CONFIG_SYS_MPC85XX_NO_RESETVEC is set, the segment .resetvec is excluded and the segment .bootpg is placed in the previous 4K of the segment .text.

Applied, thanks!

Andy