Boot Brillo on picoimx board

Modify the boot partition to mmcblk0.
Modify the boot configuration for kernel.

Change-Id: Ia9ffcf75d221c8fdd61e20b527fc2f0ebbb8098d
Signed-off-by: Guoyin Chen <guoyin.chen@freescale.com>
Signed-off-by: Hui Fang <hui.fang@freescale.com>
Signed-off-by: Haoran Wang <Haoran.Wang@freescale.com>

5 files changed, 19 insertions, 19 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1aad358..e2d8b15 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,12 +24,8 @@ TARGET_KERNEL_ARCH := $(TARGET_ARCH)
 
 TARGET_NO_BOOTLOADER := false
 TARGET_NO_KERNEL := false
-
-TARGET_KERNEL_DTB := imx6ul-14x14-evk.dtb
 BOARD_KERNEL_BASE := 0x82800000
 
-BOARD_KERNEL_CMDLINE := console=ttymxc0,115200 init=/init androidboot.console=ttymxc0 consoleblank=0 androidboot.hardware=freescale
-
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 131072
@@ -37,6 +33,10 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 268435456
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 134217728
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
+TARGET_BOOTLOADER_BOARD_NAME := picoimx
+
+TARGET_KERNEL_DTB := imx6ul-picosom-hobbit.dtb
+BOARD_KERNEL_CMDLINE := console=ttymxc5,115200 init=/init androidboot.console=ttymxc5 androidboot.hardware=freescale cma=96M
 
 BOARD_SEPOLICY_DIRS += device/freescale/picoimx/sepolicy
 
diff --git a/base_product/picoimx.mk b/base_product/picoimx.mk
index b6a1656..48f7f06 100755
--- a/base_product/picoimx.mk
+++ b/base_product/picoimx.mk
@@ -17,7 +17,7 @@
 $(call inherit-product, device/generic/brillo/brillo_base.mk)
 
 # Set soc_name
-soc_name := imx
+soc_name := imx6ul
 
 # Add wifi controlller
 $(call add_peripheral, freescale, wifi/bcm4339)
diff --git a/fstab.device b/fstab.device
index aa6898d..02b98bc 100755
--- a/fstab.device
+++ b/fstab.device
@@ -1,4 +1,4 @@
 /dev/block/by-name/system       /system      ext4    ro,barrier=1,discard                                   wait,slotselect
-/dev/block/mmcblk1p4    /data        ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard         wait,check,encryptable=footer
-/dev/block/mmcblk1p6    /cache       ext4    nosuid,nodev,nomblk_io_submit                          wait
-/dev/block/mmcblk1p9    /misc        emmc    defaults                                               defaults
+/dev/block/mmcblk0p4    /data        ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard         wait,check,encryptable=footer
+/dev/block/mmcblk0p6    /cache       ext4    nosuid,nodev,nomblk_io_submit                          wait
+/dev/block/mmcblk0p9    /misc        emmc    defaults                                               defaults
diff --git a/init.freescale.rc b/init.freescale.rc
index 6b790c9..1222d06 100755
--- a/init.freescale.rc
+++ b/init.freescale.rc
@@ -18,18 +18,18 @@ import init.freescale.usb.rc
 
 on init
    mkdir /dev/block/by-name
-   symlink /dev/block/mmcblk1p1 /dev/block/by-name/boot_a
-   symlink /dev/block/mmcblk1p7 /dev/block/by-name/boot_b
-   symlink /dev/block/mmcblk1p5 /dev/block/by-name/system_a
-   symlink /dev/block/mmcblk1p8 /dev/block/by-name/system_b
-   symlink /dev/block/mmcblk1p9 /dev/block/by-name/misc
+   symlink /dev/block/mmcblk0p1 /dev/block/by-name/boot_a
+   symlink /dev/block/mmcblk0p7 /dev/block/by-name/boot_b
+   symlink /dev/block/mmcblk0p5 /dev/block/by-name/system_a
+   symlink /dev/block/mmcblk0p8 /dev/block/by-name/system_b
+   symlink /dev/block/mmcblk0p9 /dev/block/by-name/misc
 
 on fs
    mount_all /fstab.device
    setprop ro.board.platform imx6ul
 
 on post-fs
-   restorecon /dev/block/mmcblk1p9
+   restorecon /dev/block/mmcblk0p9
    restorecon /dev/block/by-name/boot_a
    restorecon /dev/block/by-name/boot_b
    restorecon /dev/block/by-name/system_a
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index d6d36c6..1c29f2e 100755
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -3,8 +3,8 @@
 /dev/FreescaleAccelerometer     u:object_r:sensors_device:s0
 /dev/FreescaleMagnetometer      u:object_r:sensors_device:s0
 /dev/FreescaleGyroscope         u:object_r:sensors_device:s0
-/dev/block/mmcblk1p9            u:object_r:misc_device:s0
-/dev/block/mmcblk1p1            u:object_r:boot_block_device:s0
-/dev/block/mmcblk1p7            u:object_r:boot_block_device:s0
-/dev/block/mmcblk1p5            u:object_r:system_block_device:s0
-/dev/block/mmcblk1p8            u:object_r:system_block_device:s0
+/dev/block/mmcblk0p9            u:object_r:misc_device:s0
+/dev/block/mmcblk0p1            u:object_r:boot_block_device:s0
+/dev/block/mmcblk0p7            u:object_r:boot_block_device:s0
+/dev/block/mmcblk0p5            u:object_r:system_block_device:s0
+/dev/block/mmcblk0p8            u:object_r:system_block_device:s0