diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-26 06:55:05 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 17:22:49 +0300 |
| commit | d7bf8c17eca8f8c89898a7794462c773c449e983 (patch) | |
| tree | d18618fca85ca5f0c077032cc7b009344b60f663 /import-layers/yocto-poky/meta-yocto-bsp/conf | |
| parent | e2b5abdc9f28cdf8578e5b9be803c8e697443c20 (diff) | |
| download | openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.tar.xz | |
Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/yocto-poky/meta-yocto-bsp/conf')
5 files changed, 3 insertions, 6 deletions
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/layer.conf b/import-layers/yocto-poky/meta-yocto-bsp/conf/layer.conf index 44dbca60f..7b565f222 100644 --- a/import-layers/yocto-poky/meta-yocto-bsp/conf/layer.conf +++ b/import-layers/yocto-poky/meta-yocto-bsp/conf/layer.conf @@ -9,3 +9,4 @@ BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" LAYERVERSION_yoctobsp = "3" +LAYERSERIES_COMPAT_yoctobsp = "rocko" diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/beaglebone.conf b/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/beaglebone.conf index 4a90ba5ab..1bdd4dfb7 100644 --- a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/beaglebone.conf +++ b/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/beaglebone.conf @@ -26,7 +26,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "4.12%" KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb" +KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" SPL_BINARY = "MLO" diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86-64.conf b/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86-64.conf index bfedd84c3..12f7c0d20 100644 --- a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -7,6 +7,4 @@ DEFAULTTUNE ?= "core2-64" require conf/machine/include/tune-core2.inc require conf/machine/include/genericx86-common.inc -PREFERRED_VERSION_linux-yocto ?= "4.10%" - SERIAL_CONSOLES_CHECK = "ttyS0" diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86.conf b/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86.conf index af03b8689..798b62ec2 100644 --- a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86.conf @@ -8,5 +8,3 @@ require conf/machine/include/tune-core2.inc require conf/machine/include/genericx86-common.inc MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" - -PREFERRED_VERSION_linux-yocto ?= "4.10%" diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf index 6e2d31652..371a3db3d 100644 --- a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ b/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf @@ -30,6 +30,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" IMAGE_FSTYPES ?= "jffs2 tar.bz2" JFFS2_ERASEBLOCK = "0x4000" -IMAGE_FSTYPES += "wic" +IMAGE_FSTYPES += "wic wic.bmap" WKS_FILE ?= 'mpc8315e-rdb.wks' IMAGE_BOOT_FILES ?= "u-boot.bin uImage uImage-mpc8315erdb.dtb;dtb" |