diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-26 11:39:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-27 10:43:17 +0100 |
| commit | 5a8b2ef2aa86c1571c01ffde31d411715b8df13c (patch) | |
| tree | 5a58e54b633e2a36f285eeccbfcdcfbbf292549a | |
| parent | 537cfc1145af0bbc2001b65bd665af3d5a9e97bd (diff) | |
| download | barebox-5a8b2ef2aa86c1571c01ffde31d411715b8df13c.tar.gz | |
ARM: beaglebone: configure console from devicetree
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/configs/am335x_beaglebone_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/dts/am335x-bone-common.dtsi | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/am335x_beaglebone_defconfig b/arch/arm/configs/am335x_beaglebone_defconfig index c80adc95e3..38e19efa8e 100644 --- a/arch/arm/configs/am335x_beaglebone_defconfig +++ b/arch/arm/configs/am335x_beaglebone_defconfig @@ -1,5 +1,4 @@ CONFIG_ARCH_OMAP=y -CONFIG_OMAP_MULTI_BOARDS=y CONFIG_MACH_BEAGLEBONE=y CONFIG_THUMB2_BAREBOX=y CONFIG_CMD_ARM_MMUINFO=y @@ -17,6 +16,7 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y # CONFIG_TIMESTAMP is not set +CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/beaglebone/env" CONFIG_CMD_EDIT=y diff --git a/arch/arm/dts/am335x-bone-common.dtsi b/arch/arm/dts/am335x-bone-common.dtsi index 1ecf0b3792..00271c4991 100644 --- a/arch/arm/dts/am335x-bone-common.dtsi +++ b/arch/arm/dts/am335x-bone-common.dtsi @@ -7,6 +7,10 @@ */ / { + chosen { + linux,stdout-path = &uart0; + }; + cpus { cpu@0 { cpu0-supply = <&dcdc2_reg>; |