u-boot: add stable 2015.07 mainline

Add new stable 2015.07 mainline u-boot version.
Add correct mainline u-boot names to machine configs.
Add overwrite for different names for old sunxi u-boot.

Signed-off-by: Jens Lucius <info@jenslucius.com>
This commit is contained in:
Jens Lucius 2015-06-21 18:07:56 +02:00
parent 1092ae5117
commit be0e113009
4 changed files with 8 additions and 8 deletions

View File

@ -6,5 +6,5 @@
require conf/machine/include/sun5i.inc require conf/machine/include/sun5i.inc
KERNEL_DEVICETREE = "sun5i-a10s-olinuxino-micro.dtb" KERNEL_DEVICETREE = "sun5i-a10s-olinuxino-micro.dtb"
UBOOT_MACHINE = "A10s-OLinuXino-Micro_config" UBOOT_MACHINE = "A10s-OLinuXino-M_config"
SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex" SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex"

View File

@ -6,5 +6,5 @@
require conf/machine/include/sun7i.inc require conf/machine/include/sun7i.inc
KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb" KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb"
UBOOT_MACHINE = "A20-OLinuXino-Micro_config" UBOOT_MACHINE = "A20-OLinuXino_MICRO_config"
SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex" SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex"

View File

@ -13,6 +13,10 @@ DEFAULT_PREFERENCE_sun4i="1"
DEFAULT_PREFERENCE_sun5i="1" DEFAULT_PREFERENCE_sun5i="1"
DEFAULT_PREFERENCE_sun7i="1" DEFAULT_PREFERENCE_sun7i="1"
# Sunxi U-Boot uses different names for some boards
UBOOT_MACHINE_olinuxino-a20 = "A20-OLinuXino-Micro_config"
UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-Micro_config"
SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi" SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi"
PE = "1" PE = "1"

View File

@ -25,15 +25,11 @@ DEFAULT_PREFERENCE_sun4i="1"
DEFAULT_PREFERENCE_sun5i="1" DEFAULT_PREFERENCE_sun5i="1"
DEFAULT_PREFERENCE_sun7i="1" DEFAULT_PREFERENCE_sun7i="1"
# Mainline U-Boot uses different names for some boards
UBOOT_MACHINE_olinuxino-a20 = "A20-OLinuXino_MICRO_config"
UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-M_config"
SRC_URI += "file://boot.cmd" SRC_URI += "file://boot.cmd"
SRCREV = "dfc8bb1f16f7d7c20b7446da95c23f247a02e583" SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94"
PV = "v2015.07-rc2${SRCPV}" PV = "v2015.07${SRCPV}"
PE = "1" PE = "1"