From 1621191e108c046ec3dd2612f6e5df25f61f23f4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 10 Oct 2014 19:18:10 -0300 Subject: u-boot-fslc: Update to 2014.10 upcoming release This updates the U-Boot to the 2014.10 based branch. On top of the original code we still have following changes applied: 75ce95e embestmx6boards: Change default bootenv configuration 472bfb3 ot1200: add sata support 4e8b5ee ot1200: fix sf detection 857ccfd ARM: i.MX6: include prototype for get_board_rev() 2b542e6 video: ipu_disp: remove pixclk fixup 499a8ca video: ipu: fix debug and comment c970aa2 lcd: Fix build error with CONFIG_LCD_BMP_RLE8 37a6b36 mx6sabre_common: Add HDMI config to common code 56f29bf mx6qsabreauto: Add HDMI support 2878ac3 ot1200: remove superfluous "string" tag d2104d6 ARM: i.MX video: declare displays and display_count publicly 2d6e2ec ARM: i.MX: provide declaration for board_spi_cs_gpio d09ced3 ARM: prevent compiler warnings from bootm.c 34fd658 wandboard: Use 32bit color depth for Fusion LCD 92e4fa9 mx6sabresd: Use LDO dtb file until LDO bypass support is added d859ee7 mx6slevk: Use LDO dtb file until LDO bypass support is added 47ac5b6 mx6sabresd: Use mmcblk0 for CONFIG_MMCROOT Due the changes on the way U-Boot works now, heavily relying on kconfig, it is required to use the 'configure' step to properly setup it for the 'sandbox' before building the tools. Signed-off-by: Otavio Salvador --- recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb | 30 -------------------- recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.10.bb | 34 +++++++++++++++++++++++ recipes-bsp/u-boot/u-boot-fslc.inc | 2 +- recipes-bsp/u-boot/u-boot-fslc_2014.07.bb | 6 ---- recipes-bsp/u-boot/u-boot-fslc_2014.10.bb | 6 ++++ 5 files changed, 41 insertions(+), 37 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.10.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2014.07.bb create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2014.10.bb diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb deleted file mode 100644 index 76a8409..0000000 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.07.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "U-boot bootloader mxsboot tool" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb" -SECTION = "bootloader" -DEPENDS = "openssl" -PROVIDES = "u-boot-mxsboot" - -PV = "v2014.07" - -SRCREV = "e36968af0a033e9d66535928886103370620cb4d" -SRCBRANCH = "patches-2014.07" -SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=${SRCBRANCH}" - -S = "${WORKDIR}/git" - -inherit fsl-u-boot-localversion - -EXTRA_OEMAKE = 'HOSTCC="${CC} ${CPPFLAGS}" HOSTLDFLAGS="-L${libdir} -L${base_libdir}" HOSTSTRIP=true CONFIG_MX28=y' - -do_compile () { - oe_runmake tools-only -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot - ln -sf uboot-mxsboot ${D}${bindir}/mxsboot -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.10.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.10.bb new file mode 100644 index 0000000..e4aaf36 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2014.10.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "U-boot bootloader mxsboot tool" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +SECTION = "bootloader" +DEPENDS = "openssl" +PROVIDES = "u-boot-mxsboot" + +PV = "v2014.10+git${SRCPV}" + +SRCREV = "75ce95e627609c9b9e537e935e69c4ecef26c8f7" +SRCBRANCH = "patches-2014.10" +SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=${SRCBRANCH}" + +S = "${WORKDIR}/git" + +inherit fsl-u-boot-localversion + +EXTRA_OEMAKE = 'HOSTCC="${CC} ${CPPFLAGS}" HOSTLDFLAGS="-L${libdir} -L${base_libdir}" HOSTSTRIP=true CONFIG_MX28=y' + +do_configure () { + oe_runmake sandbox_defconfig +} + +do_compile () { + oe_runmake tools-only +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 tools/mxsboot ${D}${bindir}/uboot-mxsboot + ln -sf uboot-mxsboot ${D}${bindir}/mxsboot +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc b/recipes-bsp/u-boot/u-boot-fslc.inc index a1e4de8..e598b1f 100644 --- a/recipes-bsp/u-boot/u-boot-fslc.inc +++ b/recipes-bsp/u-boot/u-boot-fslc.inc @@ -7,7 +7,7 @@ inherit fsl-u-boot-localversion DESCRIPTION = "U-boot bootloader for Freescale ARM platforms" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)" DEPENDS_mxs += "elftosb-native openssl-native" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb deleted file mode 100644 index 6991baa..0000000 --- a/recipes-bsp/u-boot/u-boot-fslc_2014.07.bb +++ /dev/null @@ -1,6 +0,0 @@ -include u-boot-fslc.inc - -PV = "v2014.07" - -SRCREV = "e36968af0a033e9d66535928886103370620cb4d" -SRCBRANCH = "patches-2014.07" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb new file mode 100644 index 0000000..860e9a4 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc_2014.10.bb @@ -0,0 +1,6 @@ +include u-boot-fslc.inc + +PV = "v2014.10+git${SRCPV}" + +SRCREV = "75ce95e627609c9b9e537e935e69c4ecef26c8f7" +SRCBRANCH = "patches-2014.10" -- cgit v1.2.3-54-g00ecf