diff options
| author | Ryan Grimm <grimm@linux.vnet.ibm.com> | 2014-12-08 20:47:34 -0500 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2014-12-10 15:01:13 +1100 |
| commit | 1839a3f153cadfabbd6ec8b3c49ebaae566ec519 (patch) | |
| tree | 4feeb959f23429b0008b13b85ab184c997871298 /core | |
| parent | 632b5270d78e6fe08210afa9d3ba518c807a899a (diff) | |
| download | skiboot-1839a3f153cadfabbd6ec8b3c49ebaae566ec519.zip skiboot-1839a3f153cadfabbd6ec8b3c49ebaae566ec519.tar.gz skiboot-1839a3f153cadfabbd6ec8b3c49ebaae566ec519.tar.bz2 | |
Don't add dummy console property if already in dt.
generic_platform_init() adds this propery by default in commit
9594a715b50c338f1261e88c12c120cf8e5b8bba . If a platform adds it to the dt,
Sapphire detects multiple dt props and dies. So don't add it if already
exists in the dt.
Signed-off-by: Ryan Grimm <grimm@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/console.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/console.c b/core/console.c index d24a4b4..bc8eed8 100644 --- a/core/console.c +++ b/core/console.c @@ -56,7 +56,9 @@ bool dummy_console_enabled(void) void force_dummy_console(void) { - dt_add_property(dt_chosen, "sapphire,enable-dummy-console", NULL, 0); + if (!dummy_console_enabled()) + dt_add_property(dt_chosen, "sapphire,enable-dummy-console", + NULL, 0); } |