Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ae04acb authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

ARM: mach-shmobile: early console support using earlyprintk 



Add support for early console to the SH-Mobile boards.

Simply perform an early platform probe for "earlyprintk"
to trigger the early serial console code in sh-sci.c.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 62f60d6a

arch/arm/configs/ap4evb_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -322,7 +322,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC0,115200"

CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=sh-sci.0,115200"

# CONFIG_XIP_KERNEL is not set

# CONFIG_XIP_KERNEL is not set

CONFIG_KEXEC=y

CONFIG_KEXEC=y

CONFIG_ATAGS_PROC=y

CONFIG_ATAGS_PROC=y

arch/arm/configs/g3evm_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -317,7 +317,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC1,115200"

CONFIG_CMDLINE="console=ttySC1,115200 earlyprintk=sh-sci.1,115200"

# CONFIG_XIP_KERNEL is not set

# CONFIG_XIP_KERNEL is not set

CONFIG_KEXEC=y

CONFIG_KEXEC=y

CONFIG_ATAGS_PROC=y

CONFIG_ATAGS_PROC=y

arch/arm/configs/g4evm_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -322,7 +322,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC4,115200"

CONFIG_CMDLINE="console=ttySC4,115200 earlyprintk=sh-sci.4,115200"

# CONFIG_XIP_KERNEL is not set

# CONFIG_XIP_KERNEL is not set

CONFIG_KEXEC=y

CONFIG_KEXEC=y

CONFIG_ATAGS_PROC=y

CONFIG_ATAGS_PROC=y

arch/arm/mach-shmobile/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
#

#





# Common objects

# Common objects

obj-y				:= timer.o

obj-y				:= timer.o console.o





# CPU objects

# CPU objects

obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o

obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o

arch/arm/mach-shmobile/board-ap4evb.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -105,9 +105,10 @@ static void __init ap4evb_map_io(void) 
{

{

	iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc));

	iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc));





	/* setup early devices and clocks here as well */

	/* setup early devices, clocks and console here as well */

	sh7372_add_early_devices();

	sh7372_add_early_devices();

	sh7367_clock_init(); /* use g3 clocks for now */

	sh7367_clock_init(); /* use g3 clocks for now */

	shmobile_setup_console();

}

}





static void __init ap4evb_init(void)

static void __init ap4evb_init(void)