| .. | .. |
|---|
| 32 | 32 | #include <linux/of.h> |
|---|
| 33 | 33 | #include <linux/of_fdt.h> |
|---|
| 34 | 34 | #include <linux/uaccess.h> |
|---|
| 35 | +#include <uapi/linux/mount.h> |
|---|
| 35 | 36 | #include <asm/io.h> |
|---|
| 36 | 37 | #include <asm/page.h> |
|---|
| 37 | 38 | #include <asm/elf.h> |
|---|
| .. | .. |
|---|
| 43 | 44 | #include <asm/mmu_context.h> |
|---|
| 44 | 45 | #include <asm/mmzone.h> |
|---|
| 45 | 46 | #include <asm/sparsemem.h> |
|---|
| 47 | +#include <asm/platform_early.h> |
|---|
| 46 | 48 | |
|---|
| 47 | 49 | /* |
|---|
| 48 | 50 | * Initialize loops_per_jiffy as 10000000 (1000MIPS). |
|---|
| .. | .. |
|---|
| 288 | 290 | |
|---|
| 289 | 291 | #ifdef CONFIG_BLK_DEV_RAM |
|---|
| 290 | 292 | rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; |
|---|
| 291 | | - rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0); |
|---|
| 292 | | - rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0); |
|---|
| 293 | 293 | #endif |
|---|
| 294 | 294 | |
|---|
| 295 | 295 | if (!MOUNT_ROOT_RDONLY) |
|---|
| .. | .. |
|---|
| 327 | 327 | sh_mv_setup(); |
|---|
| 328 | 328 | |
|---|
| 329 | 329 | /* Let earlyprintk output early console messages */ |
|---|
| 330 | | - early_platform_driver_probe("earlyprintk", 1, 1); |
|---|
| 330 | + sh_early_platform_driver_probe("earlyprintk", 1, 1); |
|---|
| 331 | 331 | |
|---|
| 332 | 332 | #ifdef CONFIG_OF_FLATTREE |
|---|
| 333 | 333 | #ifdef CONFIG_USE_BUILTIN_DTB |
|---|
| .. | .. |
|---|
| 339 | 339 | |
|---|
| 340 | 340 | paging_init(); |
|---|
| 341 | 341 | |
|---|
| 342 | | -#ifdef CONFIG_DUMMY_CONSOLE |
|---|
| 343 | | - conswitchp = &dummy_con; |
|---|
| 344 | | -#endif |
|---|
| 345 | | - |
|---|
| 346 | 342 | /* Perform the machine specific initialisation */ |
|---|
| 347 | 343 | if (likely(sh_mv.mv_setup)) |
|---|
| 348 | 344 | sh_mv.mv_setup(cmdline_p); |
|---|
| .. | .. |
|---|
| 353 | 349 | /* processor boot mode configuration */ |
|---|
| 354 | 350 | int generic_mode_pins(void) |
|---|
| 355 | 351 | { |
|---|
| 356 | | - pr_warning("generic_mode_pins(): missing mode pin configuration\n"); |
|---|
| 352 | + pr_warn("generic_mode_pins(): missing mode pin configuration\n"); |
|---|
| 357 | 353 | return 0; |
|---|
| 358 | 354 | } |
|---|
| 359 | 355 | |
|---|