From 06e4b5af34bc296e546fb02b8f5ef2ecdb3802eb Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Thu, 21 Jan 2016 13:58:57 +0000 Subject: fvp: use earlycon earlyprintk has been replaced by earlycon as of 3.15-rc3. Signed-off-by: Ryan Harkin --- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc index adfa1ad8fe..cc5f06cd5a 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -180,20 +180,20 @@ !ifdef ARM_FVP_BOOT_FROM_SEMIHOSTING gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linaro Image and fdt.dtb from semihosting" gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/Image" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"dtb=fdt.dtb console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9 androidboot.hardware=fvpbase systemd.log_target=null rootwait root=/dev/vda2" + gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"dtb=fdt.dtb console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9 androidboot.hardware=fvpbase systemd.log_target=null rootwait root=/dev/vda2" gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0 !else !ifdef ARM_FVP_BOOT_ANDROID_FROM_SEMIHOSTING gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linaro Android kernel, fdt.dtb and ramdisk.img from semihosting" gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)/kernel" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"dtb=fdt.dtb initrd=ramdisk.img console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9 androidboot.hardware=fvpbase" + gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"dtb=fdt.dtb initrd=ramdisk.img console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9 androidboot.hardware=fvpbase" gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0 !else # This is the default config if you don't specify any options gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux from DRAM" gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(30F57E4A-69CE-4FB7-B7A1-4C7CE49D57A6)/MemoryMapped(0x0,0x80080000,0x81000000)" gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths|L"VenHw(30F57E4A-69CE-4FB7-B7A1-4C7CE49D57A6)/MemoryMapped(0x0,0x83000000,0x83200000)" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9 androidboot.hardware=fvpbase systemd.log_target=null rootwait root=/dev/vda2" + gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|L"console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9 androidboot.hardware=fvpbase systemd.log_target=null rootwait root=/dev/vda2" gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2 !endif !endif -- cgit v1.2.3