From c2b2edbd68d2074a8c9010dd6270ebdeef763375 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Wed, 5 Sep 2018 15:17:45 +0200 Subject: Enable agl-sota for h3ulcb Change-Id: I3c2d0df6e3afd4aa0671261f7d143ac15d88a836 Signed-off-by: Anton Gerasimov --- meta-agl-bsp/conf/include/agl_h3ulcb.inc | 3 +++ meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 3 +++ meta-agl-bsp/conf/include/agl_m3ulcb.inc | 3 +++ meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc | 2 +- .../bootfiles/files/uEnv-ota-h3ulcb.txt | 18 +++++++++++++++ .../bootfiles/files/uEnv-ota-m3ulcb.txt | 18 +++++++++++++++ .../recipes-bsp/bootfiles/files/uEnv-ota.txt | 19 ---------------- .../recipes-bsp/bootfiles/m3ulcb-ota-bootfiles.bb | 25 --------------------- .../recipes-bsp/bootfiles/renesas-ota-bootfiles.bb | 26 ++++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot_2015.04.bbappend | 7 ++++++ 10 files changed, 79 insertions(+), 45 deletions(-) create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota.txt delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/m3ulcb-ota-bootfiles.bb create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc index 60c266d10..00c2a70a3 100644 --- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc @@ -1,2 +1,5 @@ require conf/include/agl_ulcb.inc SOC_FAMILY = "r8a7795" +BOARD_NAME = "h3ulcb" + +DTB_SUFFIX = "r8a7795-h3ulcb" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index 0a7f9438a..a5789c324 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -1,5 +1,8 @@ require conf/include/agl_ulcb-nogfx.inc SOC_FAMILY = "r8a7796" +BOARD_NAME = "m3ulcb" + +DTB_SUFFIX = "r8a7796-m3ulcb" # Mask graphic Pkgs BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc index d7dc444f9..7a1d6add4 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -1,2 +1,5 @@ require conf/include/agl_ulcb.inc SOC_FAMILY = "r8a7796" +BOARD_NAME = "m3ulcb" + +DTB_SUFFIX = "r8a7796-m3ulcb" diff --git a/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc index c713d71ec..8d97996f9 100644 --- a/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc @@ -1,7 +1,7 @@ DISTRO_FEATURES_append = " sota" OSTREE_KERNEL = "Image" -IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-${SOC_FAMILY}-m3ulcb.dtb" +IMAGE_BOOT_FILES_sota = "renesas-ota-bootfiles/* Image-${DTB_SUFFIX}.dtb" OSTREE_BOOTLOADER ?= "u-boot" WKS_FILE = "singlepart-noloader.wks" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt new file mode 100644 index 000000000..ff86b4e8f --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt @@ -0,0 +1,18 @@ +bootkaddr=0x49090000 +bootdaddr=0x48000000 +bootiaddr=0x5C3F9520 + +bootargs_console=console=ttySC0,115200 ignore_loglevel +bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2 +bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384 + +bootmmc=0:1 +rootmmc=0:2 + +booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize} +bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image} +bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize} +bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} Image-r8a7795-h3ulcb.dtb + +bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr} + diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt new file mode 100644 index 000000000..64f83330c --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt @@ -0,0 +1,18 @@ +bootkaddr=0x49090000 +bootdaddr=0x48000000 +bootiaddr=0x5C3F9520 + +bootargs_console=console=ttySC0,115200 ignore_loglevel +bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2 +bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384 + +bootmmc=0:1 +rootmmc=0:2 + +booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize} +bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image} +bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize} +bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} Image-r8a7796-m3ulcb.dtb + +bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr} + diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota.txt deleted file mode 100644 index 87d362a37..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota.txt +++ /dev/null @@ -1,19 +0,0 @@ -bootkaddr=0x49090000 -bootdaddr=0x48000000 -bootiaddr=0x5C3F9520 - -bootargs_console=console=ttySC0,115200 ignore_loglevel -bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2 -bootargs_video=vmalloc=384M video=HDMI-A-1:1280x960-32@60 -bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384 - -bootmmc=0:1 -rootmmc=0:2 - -booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize} -bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image} -bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize} -bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} Image-r8a7796-m3ulcb.dtb - -bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_video} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr} - diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/m3ulcb-ota-bootfiles.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/m3ulcb-ota-bootfiles.bb deleted file mode 100644 index f0e04c06a..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/m3ulcb-ota-bootfiles.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Boot files (bootscripts etc.) for Renesas RCar-M3 board" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -inherit deploy - -COMPATIBLE_MACHINE = "m3ulcb" - -S = "${WORKDIR}" - -SRC_URI_append_sota = "file://uEnv-ota.txt" - -do_deploy() { - install -d ${DEPLOYDIR}/${PN} -} - -do_deploy_append_sota() { - install -m 0755 ${WORKDIR}/uEnv-ota.txt ${DEPLOYDIR}/${PN}/uEnv.txt -} - -addtask deploy before do_package after do_install -do_deploy[dirs] += "${DEPLOYDIR}/${PN}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb new file mode 100644 index 000000000..f247ef743 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Boot files (bootscripts etc.) for Renesas RCar-M3 board" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +inherit deploy + +COMPATIBLE_MACHINE = "(m3ulcb|h3ulcb)" + +S = "${WORKDIR}" + +SRC_URI_append_sota = "file://uEnv-ota-m3ulcb.txt \ + file://uEnv-ota-h3ulcb.txt" + +do_deploy() { + install -d ${DEPLOYDIR}/${PN} +} + +do_deploy_append_sota() { + install -m 0755 ${WORKDIR}/uEnv-ota-${BOARD_NAME}.txt ${DEPLOYDIR}/${PN}/uEnv.txt +} + +addtask deploy before do_package after do_install +do_deploy[dirs] += "${DEPLOYDIR}/${PN}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bbappend index 6f30fa18e..f6271908f 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bbappend @@ -4,6 +4,13 @@ SRC_URI_append = " \ file://0001-fixup-build-with-gcc7.patch \ " +# Config names have changed in mainline u-boot since 2015.04, +# here we want to use the old ones. +UBOOT_MACHINE = "${BOARD_NAME}_defconfig" + +# Also override the override +UBOOT_MACHINE_sota = "${BOARD_NAME}_defconfig" + do_deploy_prepend() { ln -sf ${B}/${UBOOT_SREC} ${S}/${UBOOT_SREC} } -- cgit 1.2.3-korg