Move machine specific code to board at s3c64xx (v2)

PATCH New Kyungmin Park 2 participants 5 messages Nov 26, 2008 – Apr 2, 2009

Subsystems (2)

Arm Samsung Exynos Arm/actions semi architecture

lore

Share & tools

lore

Kyungmin Park

author

2008-11-26 01:18 UTC #0 lore raw

PATCH 1/1 Move machine specific code to board at s3c64xx (v2)

Move machine specific code to smdk6400.
Some board use OneNAND instead of NAND.

Some register MP0_CS_CFG[5:0] are controled by both h/w and s/w. So it's better to use macro instead of hard-coded value.

Signed-off-by Kyungmin Park <[email protected]>

---

board/samsung/smdk6400/lowlevel_init.S +7 -0

index e0119a7..47f72f6 100644
@@ -104,6 +104,13 @@ lowlevel_init:
 	bl nand_asm_init
 #endif
 
+	/* Memory subsystem address 0x7e00f120 */
+	ldr	r0, =ELFIN_MEM_SYS_CFG
+
+	/* Xm0CSn2 = NFCON CS0, Xm0CSn3 = NFCON CS1 */
+	mov	r1, #S3C64XX_MEM_SYS_CFG_NAND
+	str	r1, [r0]
+
 	bl	mem_ctrl_asm_init
 
 /* Wakeup support. Don't know if it's going to be used, untested. */

cpu/arm1176/s3c64xx/cpu_init.S +0 -7

index 08bda99..32bb467 100644
@@ -28,13 +28,6 @@
 
 	.globl mem_ctrl_asm_init
 mem_ctrl_asm_init:
-	/* Memory subsystem address 0x7e00f120 */
-	ldr	r0, =ELFIN_MEM_SYS_CFG
-
-	/* Xm0CSn2 = NFCON CS0, Xm0CSn3 = NFCON CS1 */
-	mov	r1, #0xd
-	str	r1, [r0]
-
 	/* DMC1 base address 0x7e001000 */
 	ldr	r0, =ELFIN_DMC1_BASE

include/s3c6400.h +5 -0

index fd3e99b..d3f136d 100644
@@ -380,6 +380,11 @@
  */
 #define ELFIN_MEM_SYS_CFG	0x7e00f120
 
+#define S3C64XX_MEM_SYS_CFG_16BIT	(1 << 12)
+
+#define S3C64XX_MEM_SYS_CFG_NAND	0x0008
+#define S3C64XX_MEM_SYS_CFG_ONENAND	S3C64XX_MEM_SYS_CFG_16BIT
+
 #define GPACON		(ELFIN_GPIO_BASE + GPACON_OFFSET)
 #define GPADAT		(ELFIN_GPIO_BASE + GPADAT_OFFSET)
 #define GPAPUD		(ELFIN_GPIO_BASE + GPAPUD_OFFSET)

Kyungmin Park

author

2009-04-02 04:43 UTC #1 lore raw

PATCH 1/1 Move machine specific code to board at s3c64xx (v2)

Hi,

If there's no objection, could you apply this patch to ARM git tree?

Thank you,
Kyungmin Park

Quoted 65 lines · Kyungmin Park

Move machine specific code to smdk6400.
Some board use OneNAND instead of NAND.
Some register MP0_CS_CFG[5:0] are controled by both h/w and s/w. So it's better to use macro instead of hard-coded value.
Signed-off-by Kyungmin Park <[email protected]>
---
board/samsung/smdk6400/lowlevel_init.S +0 -0
index e0119a7..47f72f6 100644
@@ -104,6 +104,13 @@ lowlevel_init:
? ? ? ?bl nand_asm_init
?#endif
+ ? ? ? /* Memory subsystem address 0x7e00f120 */
+ ? ? ? ldr ? ? r0, =ELFIN_MEM_SYS_CFG
board/samsung/smdk6400/lowlevel_init.S +5 -0
+
+ ? ? ? /* Xm0CSn2 = NFCON CS0, Xm0CSn3 = NFCON CS1 */
+ ? ? ? mov ? ? r1, #S3C64XX_MEM_SYS_CFG_NAND
+ ? ? ? str ? ? r1, [r0]
+
? ? ? ?bl ? ? ?mem_ctrl_asm_init
?/* Wakeup support. Don't know if it's going to be used, untested. */
cpu/arm1176/s3c64xx/cpu_init.S +0 -0
index 08bda99..32bb467 100644
@@ -28,13 +28,6 @@
 
? ? ? ?.globl mem_ctrl_asm_init
?mem_ctrl_asm_init:
- ? ? ? /* Memory subsystem address 0x7e00f120 */
- ? ? ? ldr ? ? r0, =ELFIN_MEM_SYS_CFG
cpu/arm1176/s3c64xx/cpu_init.S +0 -5
-
- ? ? ? /* Xm0CSn2 = NFCON CS0, Xm0CSn3 = NFCON CS1 */
- ? ? ? mov ? ? r1, #0xd
- ? ? ? str ? ? r1, [r0]
-
? ? ? ?/* DMC1 base address 0x7e001000 */
? ? ? ?ldr ? ? r0, =ELFIN_DMC1_BASE
include/s3c6400.h +0 -0
index fd3e99b..d3f136d 100644
@@ -380,6 +380,11 @@
?*/
?#define ELFIN_MEM_SYS_CFG ? ? ?0x7e00f120
include/s3c6400.h +5 -0
+#define S3C64XX_MEM_SYS_CFG_16BIT ? ? ?(1 << 12)
+
+#define S3C64XX_MEM_SYS_CFG_NAND ? ? ? 0x0008
+#define S3C64XX_MEM_SYS_CFG_ONENAND ? ?S3C64XX_MEM_SYS_CFG_16BIT
+
?#define GPACON ? ? ? ? (ELFIN_GPIO_BASE + GPACON_OFFSET) ?#define GPADAT ? ? ? ? (ELFIN_GPIO_BASE + GPADAT_OFFSET) ?#define GPAPUD ? ? ? ? (ELFIN_GPIO_BASE + GPAPUD_OFFSET)
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Jean-Christophe PLAGNIOL-VILLARD

2009-04-02 05:18 UTC #2 lore raw

PATCH 1/1 Move machine specific code to board at s3c64xx (v2)

Quoted 3 lines · Kyungmin Park

Hi,
If there's no objection, could you apply this patch to ARM git tree?

Just one question
is the OneNand always 16bits?

Best Regards,
J.

Kyungmin Park

author

2009-04-02 07:02 UTC #3 lore raw

PATCH 1/1 Move machine specific code to board at s3c64xx (v2)

Quoted 7 lines · Jean-Christophe PLAGNIOL-VILLARD

Quoted 3 lines · Kyungmin Park
Hi,
If there's no objection, could you apply this patch to ARM git tree?
Just one question
is the OneNand always 16bits?

Sure as I know, there's no exception.

Thank you,
Kyungmin Park

Jean-Christophe PLAGNIOL-VILLARD

Applied

2009-04-02 10:40 UTC #4 lore raw

PATCH 1/1 Move machine specific code to board at s3c64xx (v2)

In reply to Kyungmin Park

Quoted 8 lines · Kyungmin Park

Move machine specific code to smdk6400.
Some board use OneNAND instead of NAND.
Some register MP0_CS_CFG[5:0] are controled by both h/w and s/w. So it's better to use macro instead of hard-coded value.
Signed-off-by Kyungmin Park <[email protected]>
---

Applied
Best Regards,
J.