ARM: OMAP: Use the correct CONFIG_ARCH_OMAP24XX

PATCH In review Kyungmin Park 4 participants 4 messages Dec 6, 2007 – Dec 17, 2007

Subsystems (2)

Arm (32-bit) Arm sub-architectures

lore

Share & tools

lore

Kyungmin Park

author

2007-12-06 01:46 UTC #0 lore raw

PATCH 1/1 ARM: OMAP: Use the correct CONFIG_ARCH_OMAP24XX

Use the correct CONFIG_ARCH_OMAP24XX.
It boots on locked SRAM board.

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

---

arch/arm/plat-omap/sram.c +1 -1

index afe8181..6305dc9 100644
@@ -91,7 +91,7 @@ static int is_sram_locked(void)
 {
 	int type = 0;
 
-#if defined(CONFIG_ARCH_OMAP242X)
+#if defined(CONFIG_ARCH_OMAP24XX)
 	if (cpu_is_omap242x())
 		type = (ctrl_read_reg(OMAP24XX_CONTROL_STATUS) &
 			OMAP2_DEVICETYPE_MASK);

Paul Walmsley

Acked-by on v1 1/1

2007-12-06 02:12 UTC #1 lore raw

Quoted 2 lines · Kyungmin Park

Use the correct CONFIG_ARCH_OMAP24XX.
It boots on locked SRAM board.

Acked-by Paul Walmsley <[email protected]>

since CONFIG_ARCH_OMAP242X does not exist.

- Paul

Kevin Hilman

2007-12-06 18:49 UTC #2 lore raw

In reply to Kyungmin Park

Quoted 10 lines · Kyungmin Park

Use the correct CONFIG_ARCH_OMAP24XX.
It boots on locked SRAM board.
Signed-off-by Kyungmin Park <[email protected]>
---
arch/arm/plat-omap/sram.c +0 -0
index afe8181..6305dc9 100644

arch/arm/plat-omap/sram.c static int is_sram_locked(void) · line 97

Quoted 8 lines

arch/arm/plat-omap/sram.c +1 -1

@@ -91,7 +91,7 @@ static int is_sram_locked(void)
 {
 	int type = 0;
 
-#if defined(CONFIG_ARCH_OMAP242X)
+#if defined(CONFIG_ARCH_OMAP24XX)
 	if (cpu_is_omap242x())
 		type = (ctrl_read_reg(OMAP24XX_CONTROL_STATUS) &
 			OMAP2_DEVICETYPE_MASK);

Shouldn't the cpu_is_omap242x be changed to cpu_is_omap24xx also so this works on 2430?

Kevin

Tony Lindgren

2007-12-17 00:59 UTC #3 lore raw

Quoted 15 lines · Kevin Hilman

Quoted 13 lines · Kyungmin Park
Use the correct CONFIG_ARCH_OMAP24XX.
It boots on locked SRAM board.
Signed-off-by Kyungmin Park <[email protected]>
---
arch/arm/plat-omap/sram.c +0 -0
index afe8181..6305dc9 100644
@@ -91,7 +91,7 @@ static int is_sram_locked(void)
 {
 	int type = 0;
 

Quoted 8 lines

arch/arm/plat-omap/sram.c static int is_sram_locked(void) · line 97
Quoted 5 lines
arch/arm/plat-omap/sram.c +1 -1
-#if defined(CONFIG_ARCH_OMAP242X)
+#if defined(CONFIG_ARCH_OMAP24XX)
 	if (cpu_is_omap242x())
 		type = (ctrl_read_reg(OMAP24XX_CONTROL_STATUS) &
 			OMAP2_DEVICETYPE_MASK);
Shouldn't the cpu_is_omap242x be changed to cpu_is_omap24xx also so this works on 2430?

Additionally the #if defined(CONFIG_ARCH_OMAP242X) should not be needed here. If not selected, the cpu_is_omapxxxx() functions are if (0) {} functions and get optimized out.

Tony