From d71626909fbc349ea2b9643402e28a76495bba12 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Mon, 5 Jun 2017 22:15:55 +0200 Subject: letux defconfig for kernel/u-boot and unified fstab The kernel image name needs to be set. The new fstab format has the disadvantage that a recovery partition is mandatory. Signed-off-by: Wolfgang Wiedmeyer --- BoardConfig.mk | 9 +++++---- recovery/recovery.fstab | 6 ------ rootdir/fstab.gta04 | 2 ++ 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 recovery/recovery.fstab diff --git a/BoardConfig.mk b/BoardConfig.mk index 472d47d..57f99c5 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -35,6 +35,7 @@ TARGET_NO_BOOTLOADER := true TARGET_NO_KERNEL := false BOARD_USES_UBOOT := true BOARD_CUSTOM_BOOTIMG_MK := device/goldelico/gta04/bootimg.mk +BOARD_KERNEL_IMAGE_NAME := uImage # Partitions TARGET_USERIMAGES_USE_EXT4 := true @@ -44,20 +45,20 @@ BOARD_FLASH_BLOCK_SIZE := 4096 # Bootloaders TARGET_UBOOT_SOURCE := bootable/bootloader/goldelico/gta04/u-boot/ -TARGET_UBOOT_CONFIG := omap3_gta04_config +TARGET_UBOOT_CONFIG := letux_gta04_defconfig TARGET_XLOADER_SOURCE := bootable/bootloader/goldelico/gta04/x-loader/ TARGET_XLOADER_CONFIG := omap3530gta04_config TARGET_XLOADER_MLO := true # Kernel TARGET_KERNEL_SOURCE := kernel/goldelico/gta04 -TARGET_KERNEL_CONFIG := gta04_defconfig -TARGET_KERNEL_RECOVERY_CONFIG := gta04_recovery_defconfig +TARGET_KERNEL_CONFIG := letux_defconfig +TARGET_KERNEL_RECOVERY_CONFIG := letux_recovery_defconfig TARGET_KERNEL_LOADADDR := 0x80008000 TARGET_USES_LOGD := true # Recovery -TARGET_RECOVERY_FSTAB := device/goldelico/gta04/recovery/recovery.fstab +TARGET_RECOVERY_FSTAB := device/goldelico/gta04/rootdir/fstab.gta04 BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/goldelico/gta04/recovery/recovery_keys.c TARGET_RECOVERY_PRE_COMMAND := "echo 1 > /cache/.startrecovery" TARGET_RELEASETOOLS_EXTENSIONS := device/goldelico/gta04 diff --git a/recovery/recovery.fstab b/recovery/recovery.fstab deleted file mode 100644 index 625dcdf..0000000 --- a/recovery/recovery.fstab +++ /dev/null @@ -1,6 +0,0 @@ -/boot vfat /dev/block/mmcblk0p1 -/system ext4 /dev/block/mmcblk0p2 -/cache ext4 /dev/block/mmcblk0p3 -/data ext4 /dev/block/mmcblk0p4 - -/sdcard datamedia /dev/null diff --git a/rootdir/fstab.gta04 b/rootdir/fstab.gta04 index 862e7af..e66909e 100644 --- a/rootdir/fstab.gta04 +++ b/rootdir/fstab.gta04 @@ -2,3 +2,5 @@ /dev/block/mmcblk0p2 /system ext4 ro wait /dev/block/mmcblk0p3 /cache ext4 nosuid wait /dev/block/mmcblk0p4 /data ext4 nosuid wait,encryptable=/boot/crypt + +/dev/block/mmcblk0p5 /recovery vfat rw recoveryonly -- cgit v1.1