瀏覽代碼

Merge "Use L kernel with M shim (1.7)" into android-6.0

James Christopher Adduono 10 年之前
父節點
當前提交
029b6a344c
共有 6 個文件被更改,包括 2 次插入7 次删除
  1. 2 7
      BoardConfig.mk
  2. 0 0
      dtb.img
  3. 二進制
      dtb.img-M
  4. 二進制
      zImage
  5. 二進制
      zImage-L
  6. 二進制
      zImage-M

+ 2 - 7
BoardConfig.mk

@@ -33,13 +33,8 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x2E59F7C00 # 0x2E59FBC00 - 16384 (footer)
 BOARD_CACHEIMAGE_PARTITION_SIZE    := 0x00C800000
 BOARD_FLASH_BLOCK_SIZE := 131072
 
-ifdef KLTE_MARSHMALLOW
-	TARGET_PREBUILT_KERNEL := device/samsung/klte/zImage-M
-	TARGET_PREBUILT_DTB := device/samsung/klte/dtb.img-M
-else
-	TARGET_PREBUILT_KERNEL := device/samsung/klte/zImage-L
-	TARGET_PREBUILT_DTB := device/samsung/klte/dtb.img-L
-endif
+TARGET_PREBUILT_KERNEL := device/samsung/klte/zImage
+TARGET_PREBUILT_DTB := device/samsung/klte/dtb.img
 
 # Use this flag if the board has a ext4 partition larger than 2gb
 BOARD_HAS_LARGE_FILESYSTEM := true

+ 0 - 0
dtb.img-L → dtb.img


二進制
dtb.img-M


二進制
zImage


二進制
zImage-L


二進制
zImage-M