Commit 0f94a3e8 authored Jun 12, 2014 by Stepan Moskovchenko Committed by Matt Wagantall May 30, 2015

arm64: Print device tree model string during boot



The change to refactor kernel/setup.c to use the common
of_flat_dt_get_machine_name() API has apparently removed
the line which prints the device tree model string during
boot. Having the model string in the kernel log is helpful,
so add it back in.

Change-Id: I7dccc3ab00f5b67753cdd256846a522596c5058f
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
[abhimany: resolve trivial merge conflicts]
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>

parent ebc4e05c

arch/arm64/kernel/setup.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ unsigned int compat_elf_hwcap2 __read_mostly;
		#endif

		static const char *cpu_name;
		static const char *machine_name;
		phys_addr_t __fdt_pointer __initdata;

		/*
		@@ -316,6 +317,9 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
		}

		dump_stack_set_arch_desc("%s (DT)", of_flat_dt_get_machine_name());
		machine_name = of_flat_dt_get_machine_name();
		if (machine_name)
		pr_info("Machine: %s\n", machine_name);
		}

		/*