aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Gerasimov <tossel@gmail.com>2018-09-05 15:17:45 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-11-30 19:31:41 +0000
commitc2b2edbd68d2074a8c9010dd6270ebdeef763375 (patch)
treea405b927c45ab41dfedad0bf41cef2ec7e852be4
parentf6585ce144bee5cc847990408366104984c73826 (diff)
Enable agl-sota for h3ulcb
Change-Id: I3c2d0df6e3afd4aa0671261f7d143ac15d88a836 Signed-off-by: Anton Gerasimov <tossel@gmail.com>
-rw-r--r--meta-agl-bsp/conf/include/agl_h3ulcb.inc3
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc3
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb.inc3
-rw-r--r--meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc2
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt18
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt (renamed from meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota.txt)3
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb (renamed from meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/m3ulcb-ota-bootfiles.bb)7
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bbappend7
8 files changed, 40 insertions, 6 deletions
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.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt
index 87d362a37..64f83330c 100644
--- 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-m3ulcb.txt
@@ -4,7 +4,6 @@ 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
@@ -15,5 +14,5 @@ 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}
+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/m3ulcb-ota-bootfiles.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb
index f0e04c06a..f247ef743 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/m3ulcb-ota-bootfiles.bb
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb
@@ -4,18 +4,19 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
inherit deploy
-COMPATIBLE_MACHINE = "m3ulcb"
+COMPATIBLE_MACHINE = "(m3ulcb|h3ulcb)"
S = "${WORKDIR}"
-SRC_URI_append_sota = "file://uEnv-ota.txt"
+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.txt ${DEPLOYDIR}/${PN}/uEnv.txt
+ install -m 0755 ${WORKDIR}/uEnv-ota-${BOARD_NAME}.txt ${DEPLOYDIR}/${PN}/uEnv.txt
}
addtask deploy before do_package after do_install
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}
}