* [PATCH] arm: Do not overwrite __machine_arch_type
@ 2014-08-19 3:21 Peng Fan
2014-08-19 7:43 ` Russell King - ARM Linux
0 siblings, 1 reply; 3+ messages in thread
From: Peng Fan @ 2014-08-19 3:21 UTC (permalink / raw)
To: linux-arm-kernel
If using DT_MACHINE_START when enabled CONFIG_OF, the nr of mdesc is ~0.
The value of __machine_arch_type is passsed from bootloader using reigster
r1, and assigned in head-common.S. Remove this line to avoid overwrite it.
Signed-off-by: Peng Fan <van.freenix@gmail.com>
---
arch/arm/kernel/devtree.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 11c54de..3a04486 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -243,8 +243,5 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
early_init_dt_scan_nodes();
- /* Change machine number to match the mdesc we're using */
- __machine_arch_type = mdesc->nr;
-
return mdesc;
}
--
1.8.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] arm: Do not overwrite __machine_arch_type
2014-08-19 3:21 [PATCH] arm: Do not overwrite __machine_arch_type Peng Fan
@ 2014-08-19 7:43 ` Russell King - ARM Linux
2014-08-19 8:12 ` Peng Fan
0 siblings, 1 reply; 3+ messages in thread
From: Russell King - ARM Linux @ 2014-08-19 7:43 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 19, 2014 at 11:21:31AM +0800, Peng Fan wrote:
> If using DT_MACHINE_START when enabled CONFIG_OF, the nr of mdesc is ~0.
> The value of __machine_arch_type is passsed from bootloader using reigster
> r1, and assigned in head-common.S. Remove this line to avoid overwrite it.
No. The idea here is that the machine_is_xxx() methods are not used when
using DT, so this disables them.
--
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] arm: Do not overwrite __machine_arch_type
2014-08-19 7:43 ` Russell King - ARM Linux
@ 2014-08-19 8:12 ` Peng Fan
0 siblings, 0 replies; 3+ messages in thread
From: Peng Fan @ 2014-08-19 8:12 UTC (permalink / raw)
To: linux-arm-kernel
On 08/19/2014 03:43 PM, Russell King - ARM Linux wrote:
> On Tue, Aug 19, 2014 at 11:21:31AM +0800, Peng Fan wrote:
>> If using DT_MACHINE_START when enabled CONFIG_OF, the nr of mdesc is ~0.
>> The value of __machine_arch_type is passsed from bootloader using reigster
>> r1, and assigned in head-common.S. Remove this line to avoid overwrite it.
>
> No. The idea here is that the machine_is_xxx() methods are not used when
> using DT, so this disables them.
>
Got it. Thanks.
Regards,
Peng.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-08-19 8:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-19 3:21 [PATCH] arm: Do not overwrite __machine_arch_type Peng Fan
2014-08-19 7:43 ` Russell King - ARM Linux
2014-08-19 8:12 ` Peng Fan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).