2 files changed, 47 insertions, 1 deletions

diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
index fc76234..46146b7 100644
--- a/classes/image-hdd.bbclass
+++ b/classes/image-hdd.bbclass
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 # need to define the dependency and the ROOTFS for directdisk
 do_bootdirectdisk[depends] += "${PN}:do_rootfs"
 ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
@@ -7,10 +29,13 @@ SYSLINUX_PROMPT = "0"
 SYSLINUX_TIMEOUT = "1"
 SYSLINUX_LABELS = "boot"
 LABELS_append = " ${SYSLINUX_LABELS} "
+SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200"
 
 inherit image_types boot-directdisk
 
 create_hdd_image () {
+        cd ${DEPLOY_DIR_IMAGE}
+        rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
         ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
 }
 
@@ -19,4 +44,3 @@ python do_hddimg() {
 }
 
 addtask hddimg after do_bootdirectdisk before do_build
-do_hddimg[nostamp] = "1"
diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass
index 7b11482..e562530 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/classes/image_types_sdcard.bbclass
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 inherit image_types_fsl
 
 IMAGE_ROOTFS_EXTRA_SPACE = "300000"