diff options
| -rw-r--r-- | board-info.txt | 6 | ||||
| -rw-r--r-- | device.mk | 4 | ||||
| -rwxr-xr-x | init.herring.rc (renamed from init.smdkc110.rc) | 12 | ||||
| -rwxr-xr-x | kernel | bin | 2394768 -> 2397444 bytes | |||
| -rw-r--r-- | setup_fs.c | 21 | ||||
| -rw-r--r-- | ueventd.herring.rc (renamed from ueventd.smdkc110.rc) | 0 | ||||
| -rw-r--r-- | vold.fstab | 2 |
7 files changed, 29 insertions, 16 deletions
diff --git a/board-info.txt b/board-info.txt index ab214a1..efc6977 100644 --- a/board-info.txt +++ b/board-info.txt @@ -1,3 +1,3 @@ -require board=crespo|herring -require version-bootloader=I9020XXJI5 -require version-baseband=I9020XXJI2 +require board=herring +require version-bootloader=I9020XXJI6 +require version-baseband=I9020XXJI4 @@ -49,8 +49,8 @@ PRODUCT_COPY_FILES := \ # Init files PRODUCT_COPY_FILES += \ - device/samsung/crespo/init.smdkc110.rc:root/init.smdkc110.rc \ - device/samsung/crespo/ueventd.smdkc110.rc:root/ueventd.smdkc110.rc + device/samsung/crespo/init.herring.rc:root/init.herring.rc \ + device/samsung/crespo/ueventd.herring.rc:root/ueventd.herring.rc # Prebuilt kl keymaps PRODUCT_COPY_FILES += \ diff --git a/init.smdkc110.rc b/init.herring.rc index 3b2c14c..c24fd25 100755 --- a/init.smdkc110.rc +++ b/init.herring.rc @@ -1,8 +1,8 @@ on boot mount debugfs /sys/kernel/debug /sys/kernel/debug - setprop ro.build.product smdkc110 - setprop ro.product.device smdkc110 + setprop ro.build.product herring + setprop ro.product.device herring setprop ro.radio.noril yes setprop ro.bt.bdaddr_path "/efs/bluetooth/bt_addr" @@ -85,9 +85,9 @@ on boot on fs mkdir /efs 0775 radio radio mount yaffs2 mtd@efs /efs nosuid nodev - mount ext4 /dev/block/mmcblk0p2 /system wait ro - mount ext4 /dev/block/mmcblk0p3 /cache wait noatime - mount ext4 /dev/block/mmcblk0p4 /data wait noatime + mount ext4 /dev/block/platform/s3c-sdhci.0/by-name/system /system wait ro + mount ext4 /dev/block/platform/s3c-sdhci.0/by-name/cache /cache wait noatime + mount ext4 /dev/block/platform/s3c-sdhci.0/by-name/userdata /data wait noatime # permissions for bluetooth. chown bluetooth bluetooth ro.bt.bdaddr_path @@ -105,7 +105,7 @@ service glgps /system/vendor/bin/gpsd/glgps_samsungJupiter -c /system/etc/jupite group system inet # create filesystems if necessary -service setup_fs /system/bin/setup_fs mmcblk0p3 mmcblk0p4 +service setup_fs /system/bin/setup_fs /dev/block/platform/s3c-sdhci.0/by-name/cache /dev/block/platform/s3c-sdhci.0/by-name/userdata user root group root oneshot Binary files differ@@ -9,10 +9,23 @@ const char *mkfs = "/system/bin/make_ext4fs"; int setup_fs(const char *blockdev) { - char buf[128]; + char buf[256], path[128]; pid_t child; - int status; + int status, n; + /* we might be looking at an indirect reference */ + n = readlink(blockdev, path, sizeof(path) - 1); + if (n > 0) { + path[n] = 0; + if (!memcmp(path, "/dev/block/", 11)) + blockdev = path + 11; + } + + if (strchr(blockdev,'/')) { + fprintf(stderr,"not a block device name: %s\n", blockdev); + return 0; + } + sprintf(buf,"/sys/fs/ext4/%s", blockdev); if (access(buf, F_OK) == 0) { fprintf(stderr,"device %s already has a filesystem\n", blockdev); @@ -44,8 +57,8 @@ int main(int argc, char **argv) int need_reboot = 0; while (argc > 1) { - if (strlen(argv[1]) > 32) continue; - need_reboot |= setup_fs(argv[1]); + if (strlen(argv[1]) < 128) + need_reboot |= setup_fs(argv[1]); argv++; argc--; } diff --git a/ueventd.smdkc110.rc b/ueventd.herring.rc index dff0ca3..dff0ca3 100644 --- a/ueventd.smdkc110.rc +++ b/ueventd.herring.rc @@ -12,4 +12,4 @@ ## <sysfs_path> - List of sysfs paths to source devices ###################### -dev_mount sdcard /mnt/sdcard 1 /devices/platform/s3c-sdhci.0/mmc_host/mmc0/mmc0:0001/block/mmcblk0 +dev_mount sdcard /mnt/sdcard 4 /devices/platform/s3c-sdhci.0/mmc_host/mmc0/mmc0:0001/block/mmcblk0 |