M28: Document that units has to be set to sectors on SD bootcard

PATCH RESEND New Marek Vasut 3 participants 9 messages Dec 2, 2011 – Dec 4, 2011 Arm (32-bit)

lore

Share & tools

lore

Marek Vasut

author

2011-12-02 13:47 UTC #0 lore raw

PATCH RESEND 1/3 M28: Document that units has to be set to sectors on SD bootcard

Signed-off-by Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Wolfgang Denk <[email protected]>

---
 doc/README.m28 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

doc/README.m28 +2 -1

index b749ce0..548982f 100644
@@ -113,7 +113,8 @@ must have the following parameters:
 	* Partition size ........ at least 1024 kb
 	* Partition type ........ 0x53 (sometimes "OnTrack DM6 Aux3")
 
-For example in Linux fdisk, the sequence for a clear card is the following:
+For example in Linux fdisk, the sequence for a clear card follows. Be sure to
+run fdisk with the option "-u=sectors" to set units to sectors:
 
 	* o ..................... create a clear partition table
 	* n ..................... create new partition

Signature · 1 line

1.7.7.1

Marek Vasut

author

2011-12-02 13:47 UTC #1 lore raw

PATCH 2/3 M28: Fix typo

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Detlev Zundel <[email protected]>

Cc Stefano Babic <[email protected]>

---
 board/denx/m28evk/m28evk.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

board/denx/m28evk/m28evk.c +1 -1

index 8cf3dc9..fcee046 100644
@@ -104,7 +104,7 @@ static int m28_mmc_wp(int id)
 
 int board_mmc_init(bd_t *bis)
 {
-	/* Configure WP as output */
+	/* Configure WP as input. */
 	gpio_direction_input(MX28_PAD_AUART2_CTS__GPIO_3_10);
 
 	return mxsmmc_initialize(bis, 0, m28_mmc_wp);

Signature · 1 line

1.7.7.1

Stefano Babic

2011-12-04 15:10 UTC #2 lore raw

PATCH 2/3 M28: Fix typo

Quoted 5 lines · Marek Vasut

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Detlev Zundel <[email protected]>
Cc Stefano Babic <[email protected]>
---

Applied to u-boot-imx, next branch.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
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
=====================================================================

Marek Vasut

author

2011-12-02 13:47 UTC #3 lore raw

PATCH 3/3 i.MX28: Move SPL to arch/arm/cpu/arm926ejs/mx28

In reply to Marek Vasut

This moves SPL to common location so it can be reused by multiple boards. Also, this commit adjusts M28 SoM to avoid breakage due to the move.

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Detlev Zundel <[email protected]>

Cc Stefano Babic <[email protected]>

---
 arch/arm/cpu/arm926ejs/mx28/Makefile               |    9 ++
 .../arm/cpu/arm926ejs/mx28/mx28_init.h             |    0
 arch/arm/cpu/arm926ejs/mx28/spl_boot.c             |   87 ++++++++++++++++++++
 .../arm/cpu/arm926ejs/mx28/spl_mem_init.c          |    2 +-
 .../arm/cpu/arm926ejs/mx28/spl_power_init.c        |    2 +-
 .../m28evk => arch/arm/cpu/arm926ejs/mx28}/start.S |    0
 .../arm/cpu/arm926ejs/mx28}/u-boot-spl.lds         |    2 +-
 arch/arm/include/asm/arch-mx28/sys_proto.h         |    6 ++
 board/denx/m28evk/Makefile                         |   11 +--
 board/denx/m28evk/{mmc_boot.c => spl_boot.c}       |   61 +-------------
 include/configs/m28evk.h                           |    4 +-
 11 files changed, 113 insertions(+), 71 deletions(-)
 rename board/denx/m28evk/m28_init.h => arch/arm/cpu/arm926ejs/mx28/mx28_init.h (100%)
 create mode 100644 arch/arm/cpu/arm926ejs/mx28/spl_boot.c
 rename board/denx/m28evk/mem_init.c => arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c (99%)
 rename board/denx/m28evk/power_init.c => arch/arm/cpu/arm926ejs/mx28/spl_power_init.c (99%)
 rename {board/denx/m28evk => arch/arm/cpu/arm926ejs/mx28}/start.S (100%)
 rename {board/denx/m28evk => arch/arm/cpu/arm926ejs/mx28}/u-boot-spl.lds (97%)
 rename board/denx/m28evk/{mmc_boot.c => spl_boot.c} (87%)

arch/arm/cpu/arm926ejs/mx28/Makefile +9 -0

index 7845310..372de8a 100644
@@ -27,6 +27,10 @@ LIB	= $(obj)lib$(SOC).o
 
 COBJS	= clock.o mx28.o iomux.o timer.o
 
+ifdef	CONFIG_SPL_BUILD
+COBJS	+= memsize.o spl_boot.o spl_mem_init.o spl_power_init.o
+endif
+
 SRCS	:= $(START:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 START	:= $(addprefix $(obj),$(START))

@@ -36,6 +40,11 @@ all:	$(obj).depend $(LIB)
 $(LIB):	$(OBJS)
 	$(call cmd_link_o_target, $(OBJS))
 
+ifdef	CONFIG_SPL_BUILD
+memsize.c:
+	ln -sf $(TOPDIR)/common/memsize.c $@
+endif
+
 #########################################################################
 
 # defines $(obj).depend target

arch/arm/cpu/arm926ejs/mx28/mx28_init.h renamed from board/denx/m28evk/m28_init.h +0 -0

similarity index 100%
rename from board/denx/m28evk/m28_init.h
rename to arch/arm/cpu/arm926ejs/mx28/mx28_init.h

arch/arm/cpu/arm926ejs/mx28/spl_boot.c new file +87 -0

87 lines not on this page · raw message

arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c renamed from board/denx/m28evk/mem_init.c +1 -1

similarity index 99%
rename from board/denx/m28evk/mem_init.c
rename to arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c
index 17d1f9b..00493b8 100644
@@ -29,7 +29,7 @@
 #include <asm/arch/iomux-mx28.h>
 #include <asm/arch/imx-regs.h>
 
-#include "m28_init.h"
+#include "mx28_init.h"
 
 uint32_t dram_vals[] = {
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,

arch/arm/cpu/arm926ejs/mx28/spl_power_init.c renamed from board/denx/m28evk/power_init.c +1 -1

similarity index 99%
rename from board/denx/m28evk/power_init.c
rename to arch/arm/cpu/arm926ejs/mx28/spl_power_init.c
index 27322b4..a4dc2a3 100644
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 
-#include "m28_init.h"
+#include "mx28_init.h"
 
 void mx28_power_clock2xtal(void)
 {

arch/arm/cpu/arm926ejs/mx28/start.S renamed from board/denx/m28evk/start.S +0 -0

similarity index 100%
rename from board/denx/m28evk/start.S
rename to arch/arm/cpu/arm926ejs/mx28/start.S

arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds renamed from board/denx/m28evk/u-boot-spl.lds +1 -1

similarity index 97%
rename from board/denx/m28evk/u-boot-spl.lds
rename to arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds
index e296a92..893320f 100644
@@ -37,7 +37,7 @@ SECTIONS
 	. = ALIGN(4);
 	.text	:
 	{
-		board/denx/m28evk/start.o	(.text)
+		arch/arm/cpu/arm926ejs/mx28/start.o	(.text)
 		*(.text)
 	}

arch/arm/include/asm/arch-mx28/sys_proto.h +6 -0

index a226ea4..be1f7db 100644
@@ -29,4 +29,10 @@ int mx28_wait_mask_clr(struct mx28_register *reg, uint32_t mask, int timeout);
 
 int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int));
 
+#ifdef CONFIG_SPL_BUILD
+#include <asm/arch/iomux-mx28.h>
+void mx28_common_spl_init(const iomux_cfg_t *iomux_setup,
+			const unsigned int iomux_size);
+#endif
+
 #endif	/* __MX28_H__ */

board/denx/m28evk/Makefile +2 -9

index b6f002f..aa16c7d 100644
@@ -27,10 +27,8 @@ LIB	= $(obj)lib$(BOARD).o
 
 ifndef	CONFIG_SPL_BUILD
 COBJS	:= m28evk.o
-endif
-
-ifdef	CONFIG_SPL_BUILD
-COBJS	:= mem_init.o mmc_boot.o power_init.o memsize.o
+else
+COBJS	:= spl_boot.o
 endif
 
 SRCS	:= $(COBJS:.o=.c)

@@ -41,11 +39,6 @@ $(LIB):	$(obj).depend $(OBJS)
 
 all:	$(ALL)
 
-ifdef	CONFIG_SPL_BUILD
-memsize.c:
-	ln -sf $(TOPDIR)/common/memsize.c $@
-endif
-
 #########################################################################
 
 # defines $(obj).depend target

board/denx/m28evk/spl_boot.c renamed from board/denx/m28evk/mmc_boot.c +4 ~~-57~~

81 lines not on this page · raw message

include/configs/m28evk.h +2 -2

index d4bd207..cdf7636 100644
@@ -48,8 +48,8 @@
  */
 #define	CONFIG_SPL
 #define	CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define	CONFIG_SPL_START_S_PATH		"board/denx/m28evk"
-#define	CONFIG_SPL_LDSCRIPT		"board/denx/m28evk/u-boot-spl.lds"
+#define	CONFIG_SPL_START_S_PATH		"arch/arm/cpu/arm926ejs/mx28"
+#define	CONFIG_SPL_LDSCRIPT	"arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
 
 /*
  * U-Boot Commands

Signature · 1 line

1.7.7.1

Stefano Babic

2011-12-04 15:10 UTC #4 lore raw

PATCH 3/3 i.MX28: Move SPL to arch/arm/cpu/arm926ejs/mx28

Quoted 8 lines · Marek Vasut

This moves SPL to common location so it can be reused by multiple boards. Also, this commit adjusts M28 SoM to avoid breakage due to the move.
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Detlev Zundel <[email protected]>
Cc Stefano Babic <[email protected]>
---

Applied to u-boot-imx, next branch.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
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
=====================================================================

Fabio Estevam

2011-12-04 15:27 UTC #5 lore raw

PATCH 3/3 i.MX28: Move SPL to arch/arm/cpu/arm926ejs/mx28

In reply to Marek Vasut

Hi Marek,

Quoted 1 line · Marek Vasut

?rename board/denx/m28evk/mem_init.c => arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c (99%)

The RAM timings are specific to the board and RAM model (DDR2 or mDDR), memory clock, etc, so I don?t think we can use the same RAM settings for all MX28 based boards because not all of them will use the same RAM memory type.

The dram_vals array should be board specific.

Regards,

Fabio Estevam

Marek Vasut

author

2011-12-04 17:09 UTC #6 lore raw

PATCH 3/3 i.MX28: Move SPL to arch/arm/cpu/arm926ejs/mx28

Quoted 6 lines

Hi Marek,
Quoted 2 lines · Marek Vasut
 rename board/denx/m28evk/mem_init.c =>
arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c (99%)

Quoted 6 lines

The RAM timings are specific to the board and RAM model (DDR2 or mDDR), memory clock, etc, so I don?t think we can use the same RAM settings for all MX28 based boards because not all of them will use the same RAM memory type.
The dram_vals array should be board specific.

Patch is welcome :)

Stefano Babic

2011-12-04 15:10 UTC #7 lore raw

PATCH RESEND 1/3 M28: Document that units has to be set to sectors on SD bootcard

In reply to Marek Vasut

Quoted 4 lines · Marek Vasut

Signed-off-by Marek Vasut <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Wolfgang Denk <[email protected]>
---

Applied to u-boot-imx, next branch.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
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
=====================================================================

Marek Vasut

author

2011-12-04 15:18 UTC #8 lore raw

PATCH RESEND 1/3 M28: Document that units has to be set to sectors on SD bootcard

Quoted 10 lines · Marek Vasut

Quoted 4 lines
Signed-off-by Marek Vasut <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Wolfgang Denk <[email protected]>
---
Applied to u-boot-imx, next branch.
Best regards,
Stefano Babic

Thank you!