Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Move the keylayouts to their own dir for organization. Update to new …

…kernel and modules, include tun.ko. tweak the init.rc
  • Loading branch information...
commit 64aa7d8f176f1a76f02c1dccb2cd301fbfa95fe7 1 parent d2ccf9b
M. Adam Kendall LinuxBozo authored
16 BoardConfig.mk
@@ -48,7 +48,7 @@ TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := ./device/samsung/infuse4g/releaseto
48 48 TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := ./device/samsung/infuse4g/releasetools/infuse4g_img_from_target_files
49 49
50 50 # Camera
51   -USE_CAMERA_STUB := true
  51 +USE_CAMERA_STUB := false
52 52 ifeq ($(USE_CAMERA_STUB),false)
53 53 BOARD_CAMERA_LIBRARIES := libcamera
54 54 endif
@@ -63,9 +63,6 @@ BOARD_V4L2_DEVICE := /dev/video1
63 63 BOARD_CAMERA_DEVICE := /dev/video0
64 64 BOARD_SECOND_CAMERA_DEVICE := /dev/video2
65 65
66   -# FM Radio
67   -BOARD_HAVE_FM_RADIO := false
68   -
69 66 BOARD_NAND_PAGE_SIZE := 4096 -s 128
70 67 BOARD_KERNEL_BASE := 0x32000000
71 68 BOARD_KERNEL_PAGESIZE := 4096
@@ -82,10 +79,10 @@ WPA_SUPPLICANT_VERSION := VER_0_6_X
82 79 BOARD_WPA_SUPPLICANT_DRIVER := WEXT
83 80 BOARD_WLAN_DEVICE := dhd
84 81 WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/dhd.ko"
85   -WIFI_DRIVER_FW_STA_PATH := "/vendor/firmware/fw_bcm4329.bin"
86   -WIFI_DRIVER_FW_AP_PATH := "/vendor/firmware/fw_bcm4329_apsta.bin"
  82 +WIFI_DRIVER_FW_STA_PATH := "/vendor/firmware/bcm4330_sta.bin"
  83 +WIFI_DRIVER_FW_AP_PATH := "/vendor/firmware/bcm4330_aps.bin"
87 84 WIFI_DRIVER_MODULE_NAME := "dhd"
88   -WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt"
  85 +WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/firmware/bcm4330_sta.bin nvram_path=/vendor/firmware/nvram_net.txt"
89 86
90 87 # Vold
91 88 BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
@@ -94,6 +91,9 @@ BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
94 91 TARGET_USERIMAGES_USE_EXT4 := true
95 92 BOARD_HAS_NO_SELECT_BUTTON := true
96 93 BOARD_CUSTOM_BOOTIMG_MK := device/samsung/infuse4g/shbootimg.mk
97   -TARGET_RECOVERY_PRE_COMMAND="echo 1 > /cache/.startrecovery; sync;"
  94 +TARGET_RECOVERY_PRE_COMMAND := "echo 1 > /cache/.startrecovery; sync;"
  95 +
  96 +# Include aries specific stuff
  97 +-include device/samsung/aries-common/Android.mk
98 98
99 99 TARGET_OTA_ASSERT_DEVICE := infuse4g,SGH-I997
0  asound.conf 100644 → 100755
File mode changed
2  board-info.txt
... ... @@ -1,3 +1,3 @@
1   -require board=aries
  1 +require board=dempsey
2 2 require version-bootloader=I997
3 3 require version-baseband=I997
64 cypress-touchkey.kcm
... ... @@ -1,64 +0,0 @@
1   -[type=QWERTY]
2   -
3   -# keycode display number base caps fn caps_fn
4   -
5   -A 'A' '2' 'a' 'A' '#' 0x00
6   -B 'B' '2' 'b' 'B' '<' 0x00
7   -C 'C' '2' 'c' 'C' '9' 0x00E7
8   -D 'D' '3' 'd' 'D' '5' 0x00
9   -E 'E' '3' 'e' 'E' '2' 0x0301
10   -F 'F' '3' 'f' 'F' '6' 0x00A5
11   -G 'G' '4' 'g' 'G' '-' '_'
12   -H 'H' '4' 'h' 'H' '[' '{'
13   -I 'I' '4' 'i' 'I' '$' 0x0302
14   -J 'J' '5' 'j' 'J' ']' '}'
15   -K 'K' '5' 'k' 'K' '"' '~'
16   -L 'L' '5' 'l' 'L' ''' '`'
17   -M 'M' '6' 'm' 'M' '!' 0x00
18   -N 'N' '6' 'n' 'N' '>' 0x0303
19   -O 'O' '6' 'o' 'O' '(' 0x00
20   -P 'P' '7' 'p' 'P' ')' 0x00
21   -Q 'Q' '7' 'q' 'Q' '*' 0x0300
22   -R 'R' '7' 'r' 'R' '3' 0x20AC
23   -S 'S' '7' 's' 'S' '4' 0x00DF
24   -T 'T' '8' 't' 'T' '+' 0x00A3
25   -U 'U' '8' 'u' 'U' '&' 0x0308
26   -V 'V' '8' 'v' 'V' '=' '^'
27   -W 'W' '9' 'w' 'W' '1' 0x00
28   -X 'X' '9' 'x' 'X' '8' 0xEF00
29   -Y 'Y' '9' 'y' 'Y' '%' 0x00A1
30   -Z 'Z' '9' 'z' 'Z' '7' 0x00
31   -
32   -# on pc keyboards
33   -COMMA ',' ',' ',' ';' ';' '|'
34   -PERIOD '.' '.' '.' ':' ':' 0x2026
35   -AT '@' '0' '@' '0' '0' 0x2022
36   -SLASH '/' '/' '/' '?' '?' '\'
37   -
38   -SPACE 0x20 0x20 0x20 0x20 0xEF01 0xEF01
39   -ENTER 0xa 0xa 0xa 0xa 0xa 0xa
40   -
41   -TAB 0x9 0x9 0x9 0x9 0x9 0x9
42   -0 '0' '0' '0' ')' ')' ')'
43   -1 '1' '1' '1' '!' '!' '!'
44   -2 '2' '2' '2' '@' '@' '@'
45   -3 '3' '3' '3' '#' '#' '#'
46   -4 '4' '4' '4' '$' '$' '$'
47   -5 '5' '5' '5' '%' '%' '%'
48   -6 '6' '6' '6' '^' '^' '^'
49   -7 '7' '7' '7' '&' '&' '&'
50   -8 '8' '8' '8' '*' '*' '*'
51   -9 '9' '9' '9' '(' '(' '('
52   -
53   -GRAVE '`' '`' '`' '~' '`' '~'
54   -MINUS '-' '-' '-' '_' '-' '_'
55   -EQUALS '=' '=' '=' '+' '=' '+'
56   -LEFT_BRACKET '[' '[' '[' '{' '[' '{'
57   -RIGHT_BRACKET ']' ']' ']' '}' ']' '}'
58   -BACKSLASH '\' '\' '\' '|' '\' '|'
59   -SEMICOLON ';' ';' ';' ':' ';' ':'
60   -APOSTROPHE ''' ''' ''' '"' ''' '"'
61   -STAR '*' '*' '*' '*' '*' '*'
62   -POUND '#' '#' '#' '#' '#' '#'
63   -PLUS '+' '+' '+' '+' '+' '+'
64   -
4 cypress-touchkey.kl
... ... @@ -1,4 +0,0 @@
1   -key 139 MENU VIRTUAL
2   -key 102 HOME VIRTUAL
3   -key 158 BACK VIRTUAL
4   -key 217 SEARCH VIRTUAL
28 infuse4g.mk
@@ -38,7 +38,7 @@
38 38 # These is the hardware-specific overlay, which points to the location
39 39 # of hardware-specific resource overrides, typically the frameworks and
40 40 # application settings that are stored in resourced.
41   -DEVICE_PACKAGE_OVERLAYS := device/samsung/infuse4g/overlay
  41 +DEVICE_PACKAGE_OVERLAYS := device/samsung/aries-common/overlay
42 42
43 43 # These are the hardware-specific configuration files
44 44 PRODUCT_COPY_FILES := \
@@ -50,24 +50,27 @@ PRODUCT_COPY_FILES := \
50 50 PRODUCT_COPY_FILES += \
51 51 device/samsung/infuse4g/init.rc:root/init.rc \
52 52 device/samsung/infuse4g/init.dempsey.rc:root/init.dempsey.rc \
53   - device/samsung/infuse4g/ueventd.dempsey.rc:root/ueventd.dempsey.rc
  53 + device/samsung/infuse4g/ueventd.dempsey.rc:root/ueventd.dempsey.rc \
  54 + device/samsung/infuse4g/setupenv.sh:recovery/root/sbin/setupenv.sh
54 55
55 56
56 57 # Prebuilt kl keymaps
57 58 PRODUCT_COPY_FILES += \
58   - device/samsung/infuse4g/cypress-touchkey.kl:system/usr/keylayout/cypress-touchkey.kl \
59   - device/samsung/infuse4g/sec_jack.kl:system/usr/keylayout/sec_jack.kl \
60   - #device/samsung/infuse4g/aries-keypad.kl:system/usr/keylayout/aries-keypad.kl \
61   - device/samsung/infuse4g/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl
  59 + device/samsung/infuse4g/keylayout/sec_jack.kl:system/usr/keylayout/sec_jack.kl \
  60 + device/samsung/infuse4g/keylayout/melfas-touchkey.kl:system/usr/keylayout/melfas-touchkey.kl \
  61 + device/samsung/infuse4g/keylayout/qt602240_ts_input.kl:system/usr/keylayout/qt602240_ts_input.kl \
  62 + device/samsung/infuse4g/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \
  63 + device/samsung/infuse4g/keylayout/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl
62 64
63 65 # Generated kcm keymaps
64 66 PRODUCT_PACKAGES := \
65   - cypress-touchkey.kcm \
  67 + melfas-touchkey.kcm \
66 68 s3c-keypad.kcm
67 69
68 70 # Filesystem management tools
69 71 PRODUCT_PACKAGES += \
70   - make_ext4fs
  72 + make_ext4fs \
  73 + setup_fs
71 74
72 75 # These are the OpenMAX IL configuration files
73 76 PRODUCT_COPY_FILES += \
@@ -80,7 +83,7 @@ PRODUCT_PACKAGES += \
80 83
81 84 # apns config file
82 85 PRODUCT_COPY_FILES += \
83   - vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
  86 + vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
84 87
85 88 # These are the hardware-specific features
86 89 PRODUCT_COPY_FILES += \
@@ -88,7 +91,7 @@ PRODUCT_COPY_FILES += \
88 91 frameworks/base/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
89 92 frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
90 93 frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
91   - frameworks/base/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
  94 + frameworks/base/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
92 95 frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
93 96 frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
94 97 frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
@@ -144,7 +147,6 @@ PRODUCT_COPY_FILES += \
144 147 device/samsung/infuse4g/modules/param.ko:root/lib/modules/param.ko \
145 148 device/samsung/infuse4g/modules/rfs_fat.ko:root/lib/modules/rfs_fat.ko \
146 149 device/samsung/infuse4g/modules/rfs_glue.ko:root/lib/modules/rfs_glue.ko \
147   - device/samsung/infuse4g/modules/storage.ko:recovery/lib/modules/storage.ko
148 150
149 151
150 152 #recovery
@@ -155,7 +157,6 @@ PRODUCT_COPY_FILES += \
155 157 device/samsung/infuse4g/modules/param.ko:recovery/lib/modules/param.ko \
156 158 device/samsung/infuse4g/modules/rfs_fat.ko:recovery/root/lib/modules/rfs_fat.ko \
157 159 device/samsung/infuse4g/modules/rfs_glue.ko:recovery/root/lib/modules/rfs_glue.ko \
158   - device/samsung/infuse4g/modules/storage.ko:recovery/lib/modules/storage.ko
159 160
160 161 #system
161 162 PRODUCT_COPY_FILES += \
@@ -167,9 +168,12 @@ PRODUCT_COPY_FILES += \
167 168 device/samsung/infuse4g/modules/s3c_lcd.ko:system/lib/modules/s3c_lcd.ko \
168 169 device/samsung/infuse4g/modules/s3c_bc.ko:system/lib/modules/s3c_bc.ko \
169 170 device/samsung/infuse4g/modules/Si4709_driver.ko:system/lib/modules/Si4709_driver.ko \
  171 + device/samsung/infuse4g/modules/storage.ko:system/lib/modules/storage.ko \
  172 + device/samsung/infuse4g/modules/tun.ko:system/lib/modules/tun.ko \
170 173 device/samsung/infuse4g/modules/svnet.ko:system/lib/modules/svnet.ko \
171 174 device/samsung/infuse4g/modules/vibrator.ko:system/lib/modules/vibrator.ko
172 175
  176 +
173 177 ifeq ($(TARGET_PREBUILT_KERNEL),)
174 178 LOCAL_KERNEL := device/samsung/infuse4g/kernel
175 179 else
1  init.dempsey.rc
@@ -18,6 +18,7 @@ on boot
18 18 insmod /system/lib/modules/svnet.ko
19 19 insmod /system/lib/modules/modemctl.ko
20 20 insmod /system/lib/modules/bthid.ko
  21 + insmod /system/lib/modules/tun.ko
21 22
22 23 mount debugfs /sys/kernel/debug /sys/kernel/debug
23 24
7 init.rc
@@ -5,7 +5,7 @@ on init
5 5
6 6 sysclktz 0
7 7
8   -loglevel 9
  8 +loglevel 8
9 9
10 10 # setup the global environment
11 11 export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
@@ -27,6 +27,11 @@ loglevel 9
27 27 insmod /lib/modules/fsr_stl.ko
28 28 insmod /lib/modules/rfs_glue.ko
29 29 insmod /lib/modules/rfs_fat.ko
  30 +
  31 +# Param block
  32 + mkdir /mnt/.lfs 0755 root root
  33 + insmod /lib/modules/j4fs.ko
  34 + mount j4fs /dev/block/stl6 /mnt/.lfs
30 35 insmod /lib/modules/param.ko
31 36
32 37 # Backward compatibility
BIN  kernel
Binary file not shown
10 keylayout/AVRCP.kl
... ... @@ -0,0 +1,10 @@
  1 +key 200 MEDIA_PLAY_PAUSE WAKE
  2 +key 201 MEDIA_PLAY_PAUSE WAKE
  3 +key 166 MEDIA_STOP WAKE
  4 +key 163 MEDIA_NEXT WAKE
  5 +key 165 MEDIA_PREVIOUS WAKE
  6 +key 168 MEDIA_REWIND WAKE
  7 +key 208 MEDIA_FAST_FORWARD WAKE
  8 +key 164 MEDIA_PLAY_PAUSE WAKE
  9 +key 128 MEDIA_STOP WAKE
  10 +key 159 MEDIA_FAST_FORWARD WAKE
4 keylayout/melfas-touchkey.kl
... ... @@ -0,0 +1,4 @@
  1 +key 158 MENU WAKE_DROPPED
  2 +key 139 HOME WAKE_DROPPED
  3 +key 28 BACK WAKE_DROPPED
  4 +key 107 SEARCH WAKE_DROPPED
4 keylayout/qt602240_ts_input.kl
... ... @@ -0,0 +1,4 @@
  1 +key 158 MENU WAKE_DROPPED
  2 +key 139 HOME WAKE_DROPPED
  3 +key 28 BACK WAKE_DROPPED
  4 +key 107 SEARCH WAKE_DROPPED
4 qwerty.kl → keylayout/qwerty.kl
@@ -30,8 +30,8 @@ key 103 DPAD_UP WAKE_DROPPED
30 30 key 102 HOME WAKE
31 31 key 105 DPAD_LEFT WAKE_DROPPED
32 32 key 106 DPAD_RIGHT WAKE_DROPPED
33   -key 115 VOLUME_UP WAKE
34   -key 114 VOLUME_DOWN WAKE
  33 +key 115 VOLUME_UP
  34 +key 114 VOLUME_DOWN
35 35 key 116 POWER WAKE
36 36 key 212 CAMERA
37 37
8 s3c-keypad.kl → keylayout/s3c-keypad.kl
... ... @@ -1,11 +1,11 @@
1   -key 42 VOLUME_UP WAKE
2   -key 58 VOLUME_DOWN WAKE
  1 +key 42 VOLUME_UP WAKE
  2 +key 58 VOLUME_DOWN WAKE
3 3 key 50 HOME WAKE_DROPPED
4   -key 26 ENDCALL WAKE_DROPPED
  4 +key 26 POWER WAKE_DROPPED
5 5 key 34 BACK WAKE_DROPPED
6 6 key 57 DPAD_LEFT WAKE_DROPPED
7 7 key 49 DPAD_RIGHT WAKE_DROPPED
8 8 key 25 DPAD_UP WAKE_DROPPED
9 9 key 41 DPAD_DOWN WAKE_DROPPED
10 10 key 33 DPAD_CENTER WAKE_DROPPED
11   -key 10 POWER WAKE
  11 +key 10 UNKNOWN WAKE_DROPPED
2  keylayout/sec_jack.kl
... ... @@ -0,0 +1,2 @@
  1 +key 248 HEADSETHOOK
  2 +
BIN  modules/Si4709_driver.ko
Binary file not shown
BIN  modules/bthid.ko
Binary file not shown
BIN  modules/dhd.ko
Binary file not shown
BIN  modules/modemctl.ko
Binary file not shown
BIN  modules/onedram.ko
Binary file not shown
BIN  modules/scsi_wait_scan.ko
Binary file not shown
BIN  modules/svnet.ko
Binary file not shown
BIN  modules/tun.ko
Binary file not shown
BIN  modules/vibrator.ko
Binary file not shown
BIN  modules/xt_TCPMSS.ko
Binary file not shown
3  sec_jack.kl
... ... @@ -1,3 +0,0 @@
1   -key 163 MEDIA_NEXT WAKE
2   -key 165 MEDIA_PREVIOUS WAKE
3   -key 226 HEADSETHOOK WAKE
10 setup-makefiles.sh
@@ -15,6 +15,7 @@
15 15 # limitations under the License.
16 16
17 17 DEVICE=infuse4g
  18 +COMMON=aries-common
18 19 MANUFACTURER=samsung
19 20
20 21 mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE
@@ -47,9 +48,10 @@ PRODUCT_COPY_FILES := \\
47 48 packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml
48 49
49 50 # Pick up overlay for features that depend on non-open-source files
50   -DEVICE_PACKAGE_OVERLAYS := vendor/__MANUFACTURER__/__DEVICE__/overlay
  51 +DEVICE_PACKAGE_OVERLAYS := vendor/__MANUFACTURER__/aries-common/overlay
51 52
52 53 \$(call inherit-product, vendor/__MANUFACTURER__/__DEVICE__/__DEVICE__-vendor-blobs.mk)
  54 +\$(call inherit-product, vendor/__MANUFACTURER__/__COMMON__/aries-vendor-blobs.mk)
53 55 EOF
54 56
55 57
@@ -70,7 +72,7 @@ EOF
70 72
71 73 BOARD_GPS_LIBRARIES := libgps
72 74
73   -USE_CAMERA_STUB := true
  75 +USE_CAMERA_STUB := false
74 76
75 77 BOARD_USES_GENERIC_AUDIO := false
76 78
@@ -82,8 +84,8 @@ BOARD_NO_32BPP := false
82 84 EOF
83 85
84 86
85   -mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/overlay/packages/apps/Launcher2/res/layout
86   -(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/overlay/packages/apps/Launcher2/res/layout/all_apps.xml
  87 +mkdir -p ../../../vendor/$MANUFACTURER/$COMMON/overlay/packages/apps/Launcher2/res/layout
  88 +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$COMMON/overlay/packages/apps/Launcher2/res/layout/all_apps.xml
87 89 <?xml version="1.0" encoding="utf-8"?>
88 90 <!-- Copyright (C) 2010 The Android Open Source Project
89 91
5 setupenv.sh
... ... @@ -0,0 +1,5 @@
  1 +#!/system/bin/sh
  2 +
  3 +rm -rf /sbin/sh
  4 +
  5 +exit
1  ueventd.dempsey.rc
@@ -16,6 +16,7 @@
16 16
17 17 # for Sensor HAL
18 18 /dev/yamaha_compass 0660 system system
  19 +/dev/akm8973 0660 system system
19 20 /dev/accelerometer 0660 system system
20 21
21 22 # for GPS
6 updater.sh
@@ -11,7 +11,7 @@ test_mount()
11 11 if ! /tmp/busybox mount -t ext4 /dev/block/$2 /$1; then
12 12 umount_format $1 $2
13 13 else
14   - echo "Partition is already EXT4."
  14 + echo "Partition $1 is already EXT4."
15 15 fi
16 16 }
17 17
@@ -25,7 +25,7 @@ umount_format()
25 25 echo "Successfully converted $1 on $2"
26 26 else
27 27 echo "Cannot unmount $1 on $2"
28   - exit $;
  28 + exit $?
29 29 fi
30 30 }
31 31
@@ -36,4 +36,4 @@ test_mount cache stl11
36 36 test_mount dbdata stl10
37 37 test_mount data mmcblk0p2
38 38
39   -exit 0;
  39 +exit 0
2  vold.fstab
@@ -16,4 +16,4 @@
16 16 dev_mount sdcard /mnt/sdcard 1 /devices/platform/s3c-sdhci.0/mmc_host/mmc0
17 17
18 18 # external sdcard
19   -dev_mount emmc /mnt/emmc auto /devices/platform/s3c-sdhci.2/mmc_host/mmc2
  19 +dev_mount emmc /mnt/emmc auto /devices/platform/s3c-sdhci.2/mmc_host/mmc1

0 comments on commit 64aa7d8

Please sign in to comment.
Something went wrong with that request. Please try again.