summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/openmoko-panel-plugin.bbclass2
-rw-r--r--conf/machine/fic-gta01.conf4
-rw-r--r--conf/machine/fic-gta02.conf8
3 files changed, 7 insertions, 7 deletions
diff --git a/classes/openmoko-panel-plugin.bbclass b/classes/openmoko-panel-plugin.bbclass
index 0494b412c6..4ef42b5015 100644
--- a/classes/openmoko-panel-plugin.bbclass
+++ b/classes/openmoko-panel-plugin.bbclass
@@ -1,6 +1,6 @@
SECTION = "openmoko/panel-plugin"
DEPENDS += "matchbox-panel-2"
-inherit openmoko
+inherit openmoko2
FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 4e07379582..19bcb7607c 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -35,8 +35,8 @@ ROOT_FLASH_SIZE = "60"
# extra jffs2 tweaks
EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
-# build tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
# tune for S3C24x0
include conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 45483fd21e..a87222cc3e 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
#@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#@DESCRIPTION: Machine configuration for the FIC Neo1973.2 GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
@@ -32,10 +32,10 @@ SERIAL_CONSOLE = "115200 ttySAC2"
ROOT_FLASH_SIZE = "256"
# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
-# build tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
# tune for S3C24x0
include conf/machine/include/tune-arm920t.conf