--- zzzz-none-000/linux-4.4.60/arch/mips/kernel/setup.c 2017-04-08 07:53:53.000000000 +0000 +++ scorpion-7490-727/linux-4.4.60/arch/mips/kernel/setup.c 2021-02-04 17:41:59.000000000 +0000 @@ -9,6 +9,7 @@ * Copyright (C) 1996 Stoned Elipot * Copyright (C) 1999 Silicon Graphics, Inc. * Copyright (C) 2000, 2001, 2002, 2007 Maciej W. Rozycki + * Copyright (C) 2013 AVM GmbH */ #include #include @@ -38,6 +39,12 @@ #include #include #include +#if defined(CONFIG_AVM_ENHANCED) +#include +#endif/*--- #if defined(CONFIG_AVM_ENHANCED) ---*/ + +#include +#include #ifdef CONFIG_MIPS_ELF_APPENDED_DTB const char __section(.appended_dtb) __appended_dtb[0x100000]; @@ -172,6 +179,9 @@ case BOOT_MEM_ROM_DATA: printk(KERN_CONT "(ROM data)\n"); break; + case BOOT_MEM_BOOTLOADER: + printk(KERN_CONT "(bootloader)\n"); + break; case BOOT_MEM_RESERVED: printk(KERN_CONT "(reserved)\n"); break; @@ -741,6 +751,9 @@ case BOOT_MEM_ROM_DATA: res->name = "System RAM"; break; + case BOOT_MEM_BOOTLOADER: + res->name = "bootloader"; + break; case BOOT_MEM_RESERVED: default: res->name = "reserved"; @@ -784,11 +797,20 @@ void __init setup_arch(char **cmdline_p) { + extern void plat_device_tree_setup(void); + +#if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_ATH79) + /* ATH79 earlyprintk can run without dt and prom */ + setup_early_printk(); +#endif + cpu_probe(); prom_init(); + plat_device_tree_setup(); + setup_early_fdc_console(); -#ifdef CONFIG_EARLY_PRINTK +#if defined(CONFIG_EARLY_PRINTK) && !defined(CONFIG_ATH79) setup_early_printk(); #endif cpu_report(); @@ -808,6 +830,9 @@ plat_smp_setup(); prefill_possible_map(); + avm_fw_info_init(); + avm_module_mem_init(); + cpu_cache_init(); }