From dc03e9458770958bb7d3138f0596a8ca3e364e1a Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Thu, 18 Sep 2014 18:36:12 +0200 Subject: [PATCH] Update u-boot_git.bb, Correct U-Boot machine names The latest revision of U-Boot requires changing the U-Boot machine names for olimex based boards, as these were changed in U-Boot. U-Boot tested on Olimex A20 Olinuxino Signed-off-by: Jens Lucius --- conf/machine/olinuxino-a10s.conf | 2 +- conf/machine/olinuxino-a20.conf | 2 +- conf/machine/olinuxino-a20som.conf | 2 +- recipes-bsp/u-boot/u-boot_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/olinuxino-a10s.conf b/conf/machine/olinuxino-a10s.conf index dd56136..431e9ef 100644 --- a/conf/machine/olinuxino-a10s.conf +++ b/conf/machine/olinuxino-a10s.conf @@ -10,7 +10,7 @@ require conf/machine/include/tune-cortexa8.inc require conf/machine/include/sunxi.inc -UBOOT_MACHINE = "A10s-OLinuXino-M_config" +UBOOT_MACHINE = "A10s-OLinuXino-Micro_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/olinuxino-a20.conf b/conf/machine/olinuxino-a20.conf index 52c4878..8c174b2 100644 --- a/conf/machine/olinuxino-a20.conf +++ b/conf/machine/olinuxino-a20.conf @@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa7.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "A20-OLinuXino_MICRO_config" +UBOOT_MACHINE = "A20-OLinuXino-Micro_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/conf/machine/olinuxino-a20som.conf b/conf/machine/olinuxino-a20som.conf index 3aff740..0d1aa0b 100644 --- a/conf/machine/olinuxino-a20som.conf +++ b/conf/machine/olinuxino-a20som.conf @@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa7.inc require conf/machine/include/sunxi.inc require conf/machine/include/sunxi-mali.inc -UBOOT_MACHINE = "A20-SOM_config" +UBOOT_MACHINE = "Olimex_A20-SOM_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb index c7fee80..8e58d55 100644 --- a/recipes-bsp/u-boot/u-boot_git.bb +++ b/recipes-bsp/u-boot/u-boot_git.bb @@ -21,7 +21,7 @@ SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sun PE = "1" PV = "v2014.04+git${SRCPV}" -SRCREV = "36080eb05e9a1e96d58e3168631d3cc9c612a0e3" +SRCREV = "ee425f94b488a4304c136a171bb8fdec0d835032" S = "${WORKDIR}/git"