diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-26 11:39:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-10 14:35:34 +0100 |
| commit | dd2d7e1a82de475bb9c949275b8cce9aec228115 (patch) | |
| tree | 1c09b8f66a0aa603a7fdf128621f04fe7dff5036 /arch | |
| parent | 4e6cd5b6edf9bc6efa0d97abe4024ad867b0d8ab (diff) | |
| download | barebox-dd2d7e1a82de475bb9c949275b8cce9aec228115.tar.gz barebox-dd2d7e1a82de475bb9c949275b8cce9aec228115.tar.xz | |
ARM: beaglebone: configure console from devicetree
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -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>; |