diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf index c5b90a638..85bda517c 100644 --- a/meta-digi-arm/conf/machine/ccardimx28js.conf +++ b/meta-digi-arm/conf/machine/ccardimx28js.conf @@ -4,14 +4,9 @@ include conf/machine/include/ccardimx28.inc -IMXBOOTLETS_MACHINE = "CCARDIMX28JS" - # U-Boot configurations UBOOT_CONFIG ??= "ccardimx28js" UBOOT_CONFIG[ccardimx28js] = "ccardimx28js_config" -# Only for u-boot 'v2009.08': -UBOOT_CONFIG[ccardimx28js_261MHz] = "ccardimx28js_261MHz_config" -UBOOT_CONFIG[ccardimx28js_360MHz] = "ccardimx28js_360MHz_config" KERNEL_DEVICETREE = "imx28-${MACHINE}.dtb" diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index b595f664f..5e3aeefdf 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -10,11 +10,7 @@ SOC_FAMILY = "mxs:mx28:${DIGI_FAMILY}" # Platform u-boot settings (IS_KERNEL_2X implies also u-boot v2009.08) UBOOT_ENTRYPOINT = "0x40008000" UBOOT_SUFFIX = "sb" - -# Add '-ivt' to binary and symlink for old u-boot (v2009.08) -UBOOT_BSTR = "${@base_conditional('IS_KERNEL_2X', '1' , '-ivt', '', d)}" -UBOOT_BINARY = "u-boot${UBOOT_BSTR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-${MACHINE}${UBOOT_BSTR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" # wpa_supplicant driver to use in '/etc/network/interfaces' WPA_DRIVER = "nl80211" diff --git a/meta-digi-arm/recipes-bsp/imx-bootlets-dey/imx-bootlets-dey_git.bb b/meta-digi-arm/recipes-bsp/imx-bootlets-dey/imx-bootlets-dey_git.bb deleted file mode 100644 index de671fefd..000000000 --- a/meta-digi-arm/recipes-bsp/imx-bootlets-dey/imx-bootlets-dey_git.bb +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (C) 2012 Digi International - -SUMMARY = "IMX bootlets for Digi platforms" -SECTION = "base" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRCREV_external = "1079b5c01162c0386952da2329cfd723a6889714" -SRCREV_internal = "83b374ca20962cd241bcffb9eeb2efee77d077f2" -SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" - -SRC_URI_external = "${DIGI_GITHUB_GIT}/imx-bootlets.git;protocol=git;nobranch=1" -SRC_URI_internal = "${DIGI_MTK_GIT}linux/imx-bootlets.git;protocol=ssh;nobranch=1" -SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}" - -S = "${WORKDIR}/git" - -# Disable parallel building or it may fail to build. -PARALLEL_MAKE = "" - -EXTRA_OEMAKE = "\ - BOARD='${IMXBOOTLETS_MACHINE}' \ - CROSS_COMPILE='${TARGET_PREFIX}' \ - CC='${CC}' \ - LD='${LD}' \ -" - -# Ensure machine defines the IMXBOOTLETS_MACHINE -python () { - if not d.getVar("IMXBOOTLETS_MACHINE", True): - PN = d.getVar("PN", True) - FILE = os.path.basename(d.getVar("FILE", True)) - bb.debug(1, "To build %s, see %s for instructions on \ - setting up your machine config" % (PN, FILE)) - raise bb.parse.SkipPackage("because IMXBOOTLETS_MACHINE is not set") -} - -do_install () { - install -d ${STAGING_DIR_TARGET}/boot - install -m 644 boot_prep/boot_prep power_prep/power_prep \ - linux_prep/output-target/linux_prep \ - uboot.bd uboot_ivt.bd linux.bd linux_ivt.bd \ - ${STAGING_DIR_TARGET}/boot - install -d ${D}/boot - install -m 644 boot_prep/boot_prep power_prep/power_prep \ - linux_prep/output-target/linux_prep \ - uboot.bd uboot_ivt.bd linux.bd linux_ivt.bd \ - ${D}/boot -} - -FILES_${PN} = "/boot" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mxs)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2009.08/ccardimx28/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2009.08/ccardimx28/boot.txt deleted file mode 100644 index 6a8d81050..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2009.08/ccardimx28/boot.txt +++ /dev/null @@ -1,3 +0,0 @@ -setenv kimg uimage-ccardimx28js.bin -setenv mmc_rpart /dev/mmcblk0p3 -dboot linux mmc 0:2 fat diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb index 579077d6c..456a10629 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb @@ -9,17 +9,8 @@ PROVIDES += "u-boot" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b" -SRC_URI_append_mxs = " file://boot.txt" - S = "${WORKDIR}/git" -DEPENDS_mxs += "elftosb-native imx-bootlets-dey u-boot-mkimage-native" - EXTRA_OEMAKE += 'HOSTSTRIP=true' -EXTRA_OEMAKE_append_mxs = ' BOOTLETS_DIR=${STAGING_DIR_TARGET}/boot' -do_deploy_append_mxs() { - mkimage -T script -n bootscript -C none -d ${WORKDIR}/boot.txt ${DEPLOYDIR}/boot.scr -} - -COMPATIBLE_MACHINE = "(mxs|mx5)" +COMPATIBLE_MACHINE = "(mx5)"