Skip to contentSkip to conversation

ARM: Kota2 mach-type update fix

PATCH New Magnus Damm 5 participants 7 messages Nov 22, 2011 – Dec 1, 2011

Subsystems (2)
Arm (32-bit) SuperH
lore
Share & tools
lore

Magnus Damm

author
#0 lore raw

PATCH 1/1 ARM: Kota2 mach-type update fix

From: Magnus Damm <[email protected]>

This patch adds kota2 to the in-kernel ARM mach-type file.

Basic board support is included in 3.2-rc and the mach-type has been registered in the ARM machine repository as

3616 Renesas SH-Mobile kota2.x Board kota2 Yusuke Goda mainlined

The file arch/arm/tools/mach-types is however missing Kota2 which makes build of sh73a0 based boards fail with:

arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count':
arch/arm/mach-shmobile/platsmp.c:28:2: error: implicit declaration of function 'machine_is_kota2' make[1]: *** [arch/arm/mach-shmobile/platsmp.o] Error 1

arch/arm/mach-shmobile/board-kota2.c:448:136: error: 'MACH_TYPE_KOTA2' undeclared here (not in a function) make[1]: *** [arch/arm/mach-shmobile/board-kota2.o] Error 1
make: *** [arch/arm/mach-shmobile] Error 2

Signed-off-by Magnus Damm <[email protected]>

---

I propose that Paul Mundt merges this patch together with other SH-Mobile ARM related fixes.

 arch/arm/tools/mach-types |    1 +
 1 file changed, 1 insertion(+)
arch/arm/tools/mach-types +1 -0
@@ -1123,5 +1123,6 @@ blissc			MACH_BLISSC		BLISSC			3491
 thales_adc		MACH_THALES_ADC		THALES_ADC		3492
 ubisys_p9d_evp		MACH_UBISYS_P9D_EVP	UBISYS_P9D_EVP		3493
 atdgp318		MACH_ATDGP318		ATDGP318		3494
+kota2			MACH_KOTA2		KOTA2			3616
 smdk4212		MACH_SMDK4212		SMDK4212		3638
 smdk4412		MACH_SMDK4412		SMDK4412		3765
#1 lore raw

PATCH 1/1 ARM: Kota2 mach-type update fix

Quoted 20 lines · Magnus Damm

From: Magnus Damm <[email protected]>

This patch adds kota2 to the in-kernel ARM mach-type file.

Basic board support is included in 3.2-rc and the mach-type has been registered in the ARM machine repository as

3616 Renesas SH-Mobile kota2.x Board kota2 Yusuke Goda mainlined

The file arch/arm/tools/mach-types is however missing Kota2 which makes build of sh73a0 based boards fail with:

arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count':
arch/arm/mach-shmobile/platsmp.c:28:2: error: implicit declaration of function 'machine_is_kota2' make[1]: *** [arch/arm/mach-shmobile/platsmp.o] Error 1

arch/arm/mach-shmobile/board-kota2.c:448:136: error: 'MACH_TYPE_KOTA2' undeclared here (not in a function) make[1]: *** [arch/arm/mach-shmobile/board-kota2.o] Error 1
make: *** [arch/arm/mach-shmobile] Error 2

Quoted 6 lines
Signed-off-by Magnus Damm <[email protected]>

---

I propose that Paul Mundt merges this patch together with other SH-Mobile ARM related fixes.

Err, no. I'm not patching machine-generated files which precisely say not to patch them at the top of the file. If there is a missing definition for an upstream board then the file needs to be regenerated with the new definitions, plain and simple.

author
#2 lore raw

PATCH 1/1 ARM: Kota2 mach-type update fix

Quoted 24 lines · Paul Mundt
Quoted 23 lines · Magnus Damm

From: Magnus Damm <[email protected]>

This patch adds kota2 to the in-kernel ARM mach-type file.

Basic board support is included in 3.2-rc and the mach-type has been registered in the ARM machine repository as

3616 Renesas SH-Mobile kota2.x Board kota2 Yusuke Goda mainlined

The file arch/arm/tools/mach-types is however missing Kota2 which makes build of sh73a0 based boards fail with:

arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count':
arch/arm/mach-shmobile/platsmp.c:28:2: error: implicit declaration of function 'machine_is_kota2' make[1]: *** [arch/arm/mach-shmobile/platsmp.o] Error 1

arch/arm/mach-shmobile/board-kota2.c:448:136: error: 'MACH_TYPE_KOTA2' undeclared here (not in a function) make[1]: *** [arch/arm/mach-shmobile/board-kota2.o] Error 1
make: *** [arch/arm/mach-shmobile] Error 2

Signed-off-by Magnus Damm <[email protected]>

---

Quoted 7 lines
Quoted 3 lines

?I propose that Paul Mundt merges this patch together with other ?SH-Mobile ARM related fixes.

Err, no. I'm not patching machine-generated files which precisely say not to patch them at the top of the file. If there is a missing definition for an upstream board then the file needs to be regenerated with the new definitions, plain and simple.

Following the comment sure sounds like a good idea, but according to the git logs people seem to update the file:

1d08fd9 Update Nook Color machine 3284 to common Encore name

Russell, do you mind if we update the mach-type file to include Kota2? It's already registered via the web interface.

Cheers,

/ magnus

#3 lore raw

PATCH 1/1 ARM: Kota2 mach-type update fix

Quoted 33 lines · Magnus Damm
Quoted 24 lines · Paul Mundt
Quoted 23 lines · Magnus Damm

From: Magnus Damm <[email protected]>

This patch adds kota2 to the in-kernel ARM mach-type file.

Basic board support is included in 3.2-rc and the mach-type has been registered in the ARM machine repository as

3616 Renesas SH-Mobile kota2.x Board kota2 Yusuke Goda mainlined

The file arch/arm/tools/mach-types is however missing Kota2 which makes build of sh73a0 based boards fail with:

arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count':
arch/arm/mach-shmobile/platsmp.c:28:2: error: implicit declaration of function 'machine_is_kota2' make[1]: *** [arch/arm/mach-shmobile/platsmp.o] Error 1

arch/arm/mach-shmobile/board-kota2.c:448:136: error: 'MACH_TYPE_KOTA2' undeclared here (not in a function) make[1]: *** [arch/arm/mach-shmobile/board-kota2.o] Error 1
make: *** [arch/arm/mach-shmobile] Error 2

Signed-off-by Magnus Damm <[email protected]>

---

Quoted 7 lines
Quoted 3 lines

?I propose that Paul Mundt merges this patch together with other ?SH-Mobile ARM related fixes.

Err, no. I'm not patching machine-generated files which precisely say not to patch them at the top of the file. If there is a missing definition for an upstream board then the file needs to be regenerated with the new definitions, plain and simple.

Quoted 8 lines

Following the comment sure sounds like a good idea, but according to the git logs people seem to update the file:

1d08fd9 Update Nook Color machine 3284 to common Encore name

Russell, do you mind if we update the mach-type file to include Kota2? It's already registered via the web interface.

I'll add it with Russell's Acked-by, otherwise we'll simply have to wait for the next batch of mach-types updates.

#4 lore raw

PATCH 1/1 ARM: Kota2 mach-type update fix

Hi Paul

Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines

From: Magnus Damm <[email protected]>

This patch adds kota2 to the in-kernel ARM mach-type file.

Basic board support is included in 3.2-rc and the mach-type has been registered in the ARM machine repository as

3616 Renesas SH-Mobile kota2.x Board kota2 Yusuke Goda mainlined

The file arch/arm/tools/mach-types is however missing Kota2 which makes build of sh73a0 based boards fail with:

arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count':
arch/arm/mach-shmobile/platsmp.c:28:2: error: implicit declaration of function 'machine_is_kota2' make[1]: *** [arch/arm/mach-shmobile/platsmp.o] Error 1

arch/arm/mach-shmobile/board-kota2.c:448:136: error: 'MACH_TYPE_KOTA2' undeclared here (not in a function) make[1]: *** [arch/arm/mach-shmobile/board-kota2.o] Error 1
make: *** [arch/arm/mach-shmobile] Error 2

Signed-off-by Magnus Damm <[email protected]>

---

(snip)

Quoted 5 lines
Quoted 3 lines

Russell, do you mind if we update the mach-type file to include Kota2? It's already registered via the web interface.

I'll add it with Russell's Acked-by, otherwise we'll simply have to wait for the next batch of mach-types updates.

Can I add A1 bonito mach-type too?
I can not find it either

3623 Renesas R-Mobile A1 EVB bonito Kuninori Morimoto

Best regards
---
Kuninori Morimoto

#5 lore raw

PATCH 1/1 ARM: Kota2 mach-type update fix

Quoted 29 lines · Kuninori Morimoto

Hi Paul

Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines

From: Magnus Damm <[email protected]>

This patch adds kota2 to the in-kernel ARM mach-type file.

Basic board support is included in 3.2-rc and the mach-type has been registered in the ARM machine repository as

3616 Renesas SH-Mobile kota2.x Board kota2 Yusuke Goda mainlined

The file arch/arm/tools/mach-types is however missing Kota2 which makes build of sh73a0 based boards fail with:

arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count':
arch/arm/mach-shmobile/platsmp.c:28:2: error: implicit declaration of function 'machine_is_kota2' make[1]: *** [arch/arm/mach-shmobile/platsmp.o] Error 1

arch/arm/mach-shmobile/board-kota2.c:448:136: error: 'MACH_TYPE_KOTA2' undeclared here (not in a function) make[1]: *** [arch/arm/mach-shmobile/board-kota2.o] Error 1
make: *** [arch/arm/mach-shmobile] Error 2

Signed-off-by Magnus Damm <[email protected]>

---

(snip)

Quoted 3 lines
Quoted 3 lines

Russell, do you mind if we update the mach-type file to include Kota2? It's already registered via the web interface.

Quoted 8 lines
Quoted 2 lines

I'll add it with Russell's Acked-by, otherwise we'll simply have to wait for the next batch of mach-types updates.

Can I add A1 bonito mach-type too?
I can not find it either

3623 Renesas R-Mobile A1 EVB bonito Kuninori Morimoto

No, because it's not in the kernel source.

#6 lore raw

PATCH 1/1 ARM: Kota2 mach-type update fix

In reply to Magnus Damm
Quoted 16 lines · Magnus Damm

From: Magnus Damm <[email protected]>

This patch adds kota2 to the in-kernel ARM mach-type file.

Basic board support is included in 3.2-rc and the mach-type has been registered in the ARM machine repository as

3616 Renesas SH-Mobile kota2.x Board kota2 Yusuke Goda mainlined

The file arch/arm/tools/mach-types is however missing Kota2 which makes build of sh73a0 based boards fail with:

arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count':
arch/arm/mach-shmobile/platsmp.c:28:2: error: implicit declaration of function 'machine_is_kota2' make[1]: *** [arch/arm/mach-shmobile/platsmp.o] Error 1

Quoted 5 lines

arch/arm/mach-shmobile/board-kota2.c:448:136: error: 'MACH_TYPE_KOTA2' undeclared here (not in a function) make[1]: *** [arch/arm/mach-shmobile/board-kota2.o] Error 1
make: *** [arch/arm/mach-shmobile] Error 2

Signed-off-by Magnus Damm <[email protected]>

This patch is necessary to fix build of the Linus' tree for me with both CONFIG_ARCH_SH73A0 and CONFIG_SMP set.

Tested-by Rafael J. Wysocki <[email protected]>

Thanks,
Rafael

Quoted 23 lines

---

I propose that Paul Mundt merges this patch together with other SH-Mobile ARM related fixes.

 arch/arm/tools/mach-types |    1 +
 1 file changed, 1 insertion(+)
arch/arm/tools/mach-types +1 -1
@@ -1123,5 +1123,6 @@ blissc			MACH_BLISSC		BLISSC			3491
 thales_adc		MACH_THALES_ADC		THALES_ADC		3492
 ubisys_p9d_evp		MACH_UBISYS_P9D_EVP	UBISYS_P9D_EVP		3493
 atdgp318		MACH_ATDGP318		ATDGP318		3494
+kota2			MACH_KOTA2		KOTA2			3616
 smdk4212		MACH_SMDK4212		SMDK4212		3638
 smdk4412		MACH_SMDK4412		SMDK4412		3765
--

To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html