|
@@ -336,7 +336,7 @@ static void __init pmac_setup_arch(void)
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_ADB
|
|
#ifdef CONFIG_ADB
|
|
- if (strstr(cmd_line, "adb_sync")) {
|
|
|
|
|
|
+ if (strstr(boot_command_line, "adb_sync")) {
|
|
extern int __adb_probe_sync;
|
|
extern int __adb_probe_sync;
|
|
__adb_probe_sync = 1;
|
|
__adb_probe_sync = 1;
|
|
}
|
|
}
|
|
@@ -460,7 +460,7 @@ pmac_halt(void)
|
|
static void __init pmac_init_early(void)
|
|
static void __init pmac_init_early(void)
|
|
{
|
|
{
|
|
/* Enable early btext debug if requested */
|
|
/* Enable early btext debug if requested */
|
|
- if (strstr(cmd_line, "btextdbg")) {
|
|
|
|
|
|
+ if (strstr(boot_command_line, "btextdbg")) {
|
|
udbg_adb_init_early();
|
|
udbg_adb_init_early();
|
|
register_early_udbg_console();
|
|
register_early_udbg_console();
|
|
}
|
|
}
|
|
@@ -469,8 +469,8 @@ static void __init pmac_init_early(void)
|
|
pmac_feature_init();
|
|
pmac_feature_init();
|
|
|
|
|
|
/* Initialize debug stuff */
|
|
/* Initialize debug stuff */
|
|
- udbg_scc_init(!!strstr(cmd_line, "sccdbg"));
|
|
|
|
- udbg_adb_init(!!strstr(cmd_line, "btextdbg"));
|
|
|
|
|
|
+ udbg_scc_init(!!strstr(boot_command_line, "sccdbg"));
|
|
|
|
+ udbg_adb_init(!!strstr(boot_command_line, "btextdbg"));
|
|
|
|
|
|
#ifdef CONFIG_PPC64
|
|
#ifdef CONFIG_PPC64
|
|
iommu_init_early_dart();
|
|
iommu_init_early_dart();
|