aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/goldfish-qemu/Makefile1
-rw-r--r--package/goldfish-qemu/skins/HVGA/arrow_down.pngbin0 -> 3438 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/arrow_left.pngbin0 -> 4122 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/arrow_right.pngbin0 -> 4147 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/arrow_up.pngbin0 -> 3493 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/back.pngbin0 -> 3564 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/device.pngbin0 -> 45511 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/end.pngbin0 -> 3562 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/home.pngbin0 -> 3578 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/key.pngbin0 -> 2857 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/keyboard.pngbin0 -> 11032 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/layout380
-rw-r--r--package/goldfish-qemu/skins/HVGA/menu.pngbin0 -> 3079 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/power.pngbin0 -> 3782 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/select.pngbin0 -> 3374 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/send.pngbin0 -> 3561 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/spacebar.pngbin0 -> 2916 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/volume_down.pngbin0 -> 3586 bytes
-rw-r--r--package/goldfish-qemu/skins/HVGA/volume_up.pngbin0 -> 3856 bytes
-rw-r--r--target/linux/goldfish/image/run-emulator.sh2
20 files changed, 382 insertions, 1 deletions
diff --git a/package/goldfish-qemu/Makefile b/package/goldfish-qemu/Makefile
index 41d2db19b5..da3c64e4ff 100644
--- a/package/goldfish-qemu/Makefile
+++ b/package/goldfish-qemu/Makefile
@@ -63,6 +63,7 @@ endef
define Package/goldfish-qemu/install
$(INSTALL_DIR) $(1)
$(CP) $(PKG_BUILD_DIR)/objs/emulator $(1)/
+ $(CP) ./skins $(1)/
endef
$(eval $(call BuildPackage,goldfish-qemu))
diff --git a/package/goldfish-qemu/skins/HVGA/arrow_down.png b/package/goldfish-qemu/skins/HVGA/arrow_down.png
new file mode 100644
index 0000000000..19b3764e83
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/arrow_down.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/arrow_left.png b/package/goldfish-qemu/skins/HVGA/arrow_left.png
new file mode 100644
index 0000000000..113e58427a
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/arrow_left.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/arrow_right.png b/package/goldfish-qemu/skins/HVGA/arrow_right.png
new file mode 100644
index 0000000000..ffe3356c0f
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/arrow_right.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/arrow_up.png b/package/goldfish-qemu/skins/HVGA/arrow_up.png
new file mode 100644
index 0000000000..81c54df51e
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/arrow_up.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/back.png b/package/goldfish-qemu/skins/HVGA/back.png
new file mode 100644
index 0000000000..41034d9105
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/back.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/device.png b/package/goldfish-qemu/skins/HVGA/device.png
new file mode 100644
index 0000000000..465eb029d6
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/device.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/end.png b/package/goldfish-qemu/skins/HVGA/end.png
new file mode 100644
index 0000000000..6830a603be
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/end.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/home.png b/package/goldfish-qemu/skins/HVGA/home.png
new file mode 100644
index 0000000000..7d021369b8
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/home.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/key.png b/package/goldfish-qemu/skins/HVGA/key.png
new file mode 100644
index 0000000000..7a3f563bde
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/key.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/keyboard.png b/package/goldfish-qemu/skins/HVGA/keyboard.png
new file mode 100644
index 0000000000..bb076d315a
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/keyboard.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/layout b/package/goldfish-qemu/skins/HVGA/layout
new file mode 100644
index 0000000000..4c3d76420f
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/layout
@@ -0,0 +1,380 @@
+parts {
+ device {
+ background {
+ image device.png
+ }
+ display {
+ width 320
+ height 480
+ x 31
+ y 72
+ }
+
+ buttons {
+ soft-left {
+ image menu.png
+ x 147
+ y 555
+ }
+ home {
+ image home.png
+ x 48
+ y 590
+ }
+ back {
+ image back.png
+ x 286
+ y 590
+ }
+ dpad-up {
+ image arrow_up.png
+ x 140
+ y 595
+ }
+ dpad-down {
+ image arrow_down.png
+ x 140
+ y 656
+ }
+ dpad-left {
+ image arrow_left.png
+ x 111
+ y 598
+ }
+ dpad-right {
+ image arrow_right.png
+ x 222
+ y 598
+ }
+ dpad-center {
+ image select.png
+ x 142
+ y 626
+ }
+ phone-dial {
+ image send.png
+ x 48
+ y 646
+ }
+ phone-hangup {
+ image end.png
+ x 286
+ y 646
+ }
+
+ power {
+ image power.png
+ x -38
+ y 52
+ }
+
+ volume-up {
+ image volume_up.png
+ x 362
+ y 260
+ }
+
+ volume-down {
+ image volume_down.png
+ x 362
+ y 310
+ }
+ }
+ }
+
+ keyboard {
+ background {
+ image keyboard.png
+ }
+ buttons {
+ 1 {
+ image key.png
+ x 0
+ y 0
+ }
+ 2 {
+ image key.png
+ x 37
+ y 0
+ }
+ 3 {
+ image key.png
+ x 74
+ y 0
+ }
+ 4 {
+ image key.png
+ x 111
+ y 0
+ }
+ 5 {
+ image key.png
+ x 148
+ y 0
+ }
+ 6 {
+ image key.png
+ x 185
+ y 0
+ }
+ 7 {
+ image key.png
+ x 222
+ y 0
+ }
+ 8 {
+ image key.png
+ x 259
+ y 0
+ }
+ 9 {
+ image key.png
+ x 296
+ y 0
+ }
+ 0 {
+ image key.png
+ x 333
+ y 0
+ }
+
+ q {
+ image key.png
+ x 0
+ y 36
+ }
+ w {
+ image key.png
+ x 37
+ y 36
+ }
+ e {
+ image key.png
+ x 74
+ y 36
+ }
+ r {
+ image key.png
+ x 111
+ y 36
+ }
+ t {
+ image key.png
+ x 148
+ y 36
+ }
+ y {
+ image key.png
+ x 185
+ y 36
+ }
+ u {
+ image key.png
+ x 222
+ y 36
+ }
+ i {
+ image key.png
+ x 259
+ y 36
+ }
+ o {
+ image key.png
+ x 296
+ y 36
+ }
+ p {
+ image key.png
+ x 333
+ y 36
+ }
+
+ a {
+ image key.png
+ x 0
+ y 72
+ }
+ s {
+ image key.png
+ x 37
+ y 72
+ }
+ d {
+ image key.png
+ x 74
+ y 72
+ }
+ f {
+ image key.png
+ x 111
+ y 72
+ }
+ g {
+ image key.png
+ x 148
+ y 72
+ }
+ h {
+ image key.png
+ x 185
+ y 72
+ }
+ j {
+ image key.png
+ x 222
+ y 72
+ }
+ k {
+ image key.png
+ x 259
+ y 72
+ }
+ l {
+ image key.png
+ x 296
+ y 72
+ }
+ DEL {
+ image key.png
+ x 333
+ y 72
+ }
+
+ CAP {
+ image key.png
+ x 0
+ y 108
+ }
+ z {
+ image key.png
+ x 37
+ y 108
+ }
+ x {
+ image key.png
+ x 74
+ y 108
+ }
+ c {
+ image key.png
+ x 111
+ y 108
+ }
+ v {
+ image key.png
+ x 148
+ y 108
+ }
+ b {
+ image key.png
+ x 185
+ y 108
+ }
+ n {
+ image key.png
+ x 222
+ y 108
+ }
+ m {
+ image key.png
+ x 259
+ y 108
+ }
+ PERIOD {
+ image key.png
+ x 296
+ y 108
+ }
+ ENTER {
+ image key.png
+ x 333
+ y 108
+ }
+
+ ALT {
+ image key.png
+ x 0
+ y 144
+ }
+ SYM {
+ image key.png
+ x 37
+ y 144
+ }
+ AT {
+ image key.png
+ x 74
+ y 144
+ }
+ SPACE {
+ image spacebar.png
+ x 111
+ y 144
+ }
+ SLASH {
+ image key.png
+ x 259
+ y 144
+ }
+ COMMA {
+ image key.png
+ x 296
+ y 144
+ }
+ ALT2 {
+ image key.png
+ x 333
+ y 144
+ }
+
+ }
+ }
+}
+
+layouts {
+ portrait {
+ width 900
+ height 730
+ color 0xe0e0e0
+ event EV_SW:0:1
+
+ part1 {
+ name device
+ x 40
+ y -18
+ }
+ part2 {
+ name keyboard
+ x 480
+ y 200
+ }
+ }
+
+ landscape {
+ width 900
+ height 670
+ color 0xe0e0e0
+ event EV_SW:0:0
+
+ part1 {
+ name device
+ x 50
+ y 440
+ rotation 3
+ }
+ part2 {
+ name keyboard
+ x 250
+ y 470
+ }
+ }
+}
+
+keyboard {
+ charmap qwerty2
+}
+
+network {
+ speed full
+ delay none
+}
diff --git a/package/goldfish-qemu/skins/HVGA/menu.png b/package/goldfish-qemu/skins/HVGA/menu.png
new file mode 100644
index 0000000000..e81d8abcff
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/menu.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/power.png b/package/goldfish-qemu/skins/HVGA/power.png
new file mode 100644
index 0000000000..5894288f03
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/power.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/select.png b/package/goldfish-qemu/skins/HVGA/select.png
new file mode 100644
index 0000000000..803d493159
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/select.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/send.png b/package/goldfish-qemu/skins/HVGA/send.png
new file mode 100644
index 0000000000..f547c8817d
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/send.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/spacebar.png b/package/goldfish-qemu/skins/HVGA/spacebar.png
new file mode 100644
index 0000000000..19fe604765
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/spacebar.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/volume_down.png b/package/goldfish-qemu/skins/HVGA/volume_down.png
new file mode 100644
index 0000000000..f8a88dec81
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/volume_down.png
Binary files differ
diff --git a/package/goldfish-qemu/skins/HVGA/volume_up.png b/package/goldfish-qemu/skins/HVGA/volume_up.png
new file mode 100644
index 0000000000..940457f707
--- /dev/null
+++ b/package/goldfish-qemu/skins/HVGA/volume_up.png
Binary files differ
diff --git a/target/linux/goldfish/image/run-emulator.sh b/target/linux/goldfish/image/run-emulator.sh
index 652ec5ed78..c815a2313a 100644
--- a/target/linux/goldfish/image/run-emulator.sh
+++ b/target/linux/goldfish/image/run-emulator.sh
@@ -1,3 +1,3 @@
PREFIX=openwrt-goldfish-
touch ${PREFIX}data.bin
-./goldfish-qemu/emulator -sysdir . -ramdisk ${PREFIX}ramdisk.bin -kernel ${PREFIX}kernel.bin -system ${PREFIX}system.bin -data ${PREFIX}data.bin -show-kernel -partition-size 100 -qemu -append "console=ttyS0 ubi.mtd=0 root=/dev/mtdblock3 rootfstype=jffs2 bootdelay=1 init=/etc/preinit" -net nic,vlan=0,model=smc91c111 -net user,vlan=0,hostname=OpenWrt
+./goldfish-qemu/emulator -skindir ./goldfish-qemu/skins -skin HVGA -sysdir . -ramdisk ${PREFIX}ramdisk.bin -kernel ${PREFIX}kernel.bin -system ${PREFIX}system.bin -data ${PREFIX}data.bin -show-kernel -partition-size 100 -qemu -append "console=ttyS0 ubi.mtd=0 root=/dev/mtdblock3 rootfstype=jffs2 bootdelay=1 init=/etc/preinit" -net nic,vlan=0,model=smc91c111 -net user,vlan=0,hostname=OpenWrt