[meta-freescale] [meta-fsl-arm][PATCH] update to the commit for Layerscape1

[Daiane Angolini]

On Tue, Nov 4, 2014 at 4:59 AM,  <b40290 at freescale.com> wrote:
> From: Chunrong Guo <B40290 at freescale.com>
>
There are more than only "update to commit" in this patch. You changed
UBOOT_CONFIG and the DTB file name

Would you mind to add a verbose commit log? And please, change the
subject using something like "ls1021: Change....."


Daiane

> Signed-off-by: Chunrong Guo <B40290 at freescale.com>
> ---
>  conf/machine/ls1021aqds.conf           | 10 +++++-----
>  conf/machine/ls1021atwr.conf           |  8 ++++----
>  recipes-bsp/rcw/rcw_git.bb             |  2 +-
>  recipes-bsp/u-boot/u-boot-ls1.inc      |  2 +-
>  recipes-kernel/linux/linux-ls1_3.12.bb |  2 +-
>  5 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/conf/machine/ls1021aqds.conf b/conf/machine/ls1021aqds.conf
> index 012edb1..d659196 100644
> --- a/conf/machine/ls1021aqds.conf
> +++ b/conf/machine/ls1021aqds.conf
> @@ -10,12 +10,12 @@ require conf/machine/include/tune-cortexa7.inc
>  SOC_FAMILY = "ls102xa"
>
>  UBOOT_CONFIG ??= "nor"
> -UBOOT_CONFIG[nor] = "ls1021aqds_nor"
> -UBOOT_CONFIG[spi] = "ls1021aqds_spi"
> -UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot"
> -UBOOT_CONFIG[letech] = "ls1021aqds_letech"
> +UBOOT_CONFIG[nor] = "ls1021aqds_nor_config"
> +UBOOT_CONFIG[qspi] = "ls1021aqds_qspi_config"
> +UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot_config"
> +UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config"
>
> -KERNEL_DEVICETREE = "ls1021a-qds.dtb"
> +KERNEL_DEVICETREE = "ls1021aqds.dtb"
>
>  SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
>  SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
> diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
> index c7ab6b8..f66b779 100644
> --- a/conf/machine/ls1021atwr.conf
> +++ b/conf/machine/ls1021atwr.conf
> @@ -10,11 +10,11 @@ require conf/machine/include/tune-cortexa7.inc
>  SOC_FAMILY = "ls102xa"
>
>  UBOOT_CONFIG ??= "nor"
> -UBOOT_CONFIG[nor] = "ls1021atwr_nor"
> -UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard,sdcard"
> -UBOOT_CONFIG[letech] = "ls1021atwr_letech"
> +UBOOT_CONFIG[nor] = "ls1021atwr_nor_config"
> +UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard"
> +UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config"
>
> -KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
> +KERNEL_DEVICETREE ?= "ls1021atwr.dtb"
>
>  SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
>  SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
> diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
> index 5849a7c..5af2e3a 100644
> --- a/recipes-bsp/rcw/rcw_git.bb
> +++ b/recipes-bsp/rcw/rcw_git.bb
> @@ -8,7 +8,7 @@ DEPENDS += "u-boot-ls1-tools-native"
>  inherit deploy
>
>  SRCBRANCH = "LS1-SDK"
> -SRCREV = "7b358441dfd35afbf01491649cc3f4396154a546"
> +SRCREV = "38ec2c9111b483203797f7228db5f92549e9fe73"
>  SRC_URI = "git://git.freescale.com/layerscape/ls1021a/rcw.git;branch=${SRCBRANCH} \
>      file://rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch \
>  "
> diff --git a/recipes-bsp/u-boot/u-boot-ls1.inc b/recipes-bsp/u-boot/u-boot-ls1.inc
> index 49d757c..371773f 100644
> --- a/recipes-bsp/u-boot/u-boot-ls1.inc
> +++ b/recipes-bsp/u-boot/u-boot-ls1.inc
> @@ -10,6 +10,6 @@ LIC_FILES_CHKSUM = " \
>
>  SRCBRANCH = "LS1-dev"
>  SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}"
> -SRCREV = "48bfc6985a0524bc5c388bb9a9a6a6bc4a121ec5"
> +SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469"
>
>  S = "${WORKDIR}/git"
> diff --git a/recipes-kernel/linux/linux-ls1_3.12.bb b/recipes-kernel/linux/linux-ls1_3.12.bb
> index 7aa5bd8..4e1e85b 100644
> --- a/recipes-kernel/linux/linux-ls1_3.12.bb
> +++ b/recipes-kernel/linux/linux-ls1_3.12.bb
> @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-ls1.inc
>  require recipes-kernel/linux/linux-dtb.inc
>
>  SRCBRANCH = "ls1-dev"
> -SRCREV = "de1cb4b3c16be38cf3981fd0afa143ad24283d07"
> +SRCREV = "3ced9e82f9f3f7b232bea0bd18c9a62572c06b44"
>
>  COMPATIBLE_MACHINE = "(ls102xa)"
> --
> 1.9.2
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale