summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-08-26 10:47:29 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-08-26 11:04:45 +0200
commit8a6bd111d9d67d0a0c803f28498d02c730bba900 (patch)
tree300a5a5f7754756cb7b792c42c33683a265bf7ed
parent6d5996d88db91b7167289ee7a01a574670eba51e (diff)
downloadbarebox-8a6bd111d9d67d0a0c803f28498d02c730bba900.tar.gz
barebox-8a6bd111d9d67d0a0c803f28498d02c730bba900.tar.xz
ARM: socfpga: Configure console from device tree
Add the missing stdout-path properties for the socfpga boards and enable CONFIG_CONSOLE_ACTIVATE_NONE. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/configs/socfpga_defconfig1
-rw-r--r--arch/arm/dts/socfpga_cyclone5_sockit.dts4
-rw-r--r--arch/arm/dts/socfpga_cyclone5_socrates.dts4
3 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index ec369ae42e..414aa23a54 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -14,6 +14,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_LONGHELP=y
CONFIG_CMD_IOMEM=y
diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts b/arch/arm/dts/socfpga_cyclone5_sockit.dts
index 8b37574e5d..8df5ed4775 100644
--- a/arch/arm/dts/socfpga_cyclone5_sockit.dts
+++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts
@@ -22,6 +22,10 @@
model = "Terasic SoCkit";
compatible = "terasic,sockit", "altr,socfpga";
+ chosen {
+ stdout-path = &uart0;
+ };
+
leds: gpio-leds {
};
diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts
index 29b41f1043..95cdf5d3d5 100644
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -22,6 +22,10 @@
model = "EBV SoCrates";
compatible = "ebv,socrates", "altr,socfpga";
+ chosen {
+ stdout-path = &uart0;
+ };
+
leds: gpio-leds {
};
};