From b5d24149feea733a97f12c2eed2595f22982a4fe Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 27 Jun 2014 00:18:15 +0000 Subject: u-boot: switch from SPL/MLO to "ais" image for omapl138 SOCs Signed-off-by: Denys Dmytriyenko Cc: Tom Rini --- conf/machine/am180x-evm.conf | 4 +++- recipes-bsp/u-boot/u-boot-ti.inc | 4 ++-- recipes-bsp/u-boot/u-boot_2014.07.bb | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/conf/machine/am180x-evm.conf b/conf/machine/am180x-evm.conf index 3182e8a0..f83814e1 100644 --- a/conf/machine/am180x-evm.conf +++ b/conf/machine/am180x-evm.conf @@ -5,7 +5,9 @@ require conf/machine/include/davinci.inc require conf/machine/include/omapl138.inc -UBOOT_MACHINE = "da850evm_config" +UBOOT_MACHINE = "da850_am18xxevm_config" +UBOOT_SUFFIX = "ais" + UBOOT_ENTRYPOINT = "0xc0008000" UBOOT_LOADADDRESS = "0xc0008000" diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index c024e963..0cb53ea9 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc @@ -1,3 +1,5 @@ +UBOOT_SUFFIX ?= "img" + require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:" @@ -14,8 +16,6 @@ PKG_${PN}-dbg = "u-boot-dbg" S = "${WORKDIR}/git" -UBOOT_SUFFIX = "img" - # SPL (Second Program Loader) to be loaded over UART SPL_UART_BINARY ?= "" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" diff --git a/recipes-bsp/u-boot/u-boot_2014.07.bb b/recipes-bsp/u-boot/u-boot_2014.07.bb index b326aa13..9da6f7d2 100644 --- a/recipes-bsp/u-boot/u-boot_2014.07.bb +++ b/recipes-bsp/u-boot/u-boot_2014.07.bb @@ -25,3 +25,6 @@ SRCREV = "76b21026ceb5a6a83fc53b0ecdf425f240318022" SPL_BINARY = "MLO" SPL_UART_BINARY = "u-boot-spl.bin" + +SPL_BINARY_omapl138 = "" +SPL_UART_BINARY_omapl138 = "" -- cgit v1.2.3-54-g00ecf