summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distribution/yocto-advanced/poky/meta-mini/README70
-rw-r--r--distribution/yocto-advanced/poky/meta-mini/classes/image_types_fsl.bbclass22
-rw-r--r--distribution/yocto-advanced/poky/meta-mini/conf/distro/lxt.conf51
-rw-r--r--distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/files/imx6qsabrelite/defconfig6
-rw-r--r--distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.16.1.bb6
5 files changed, 47 insertions, 108 deletions
diff --git a/distribution/yocto-advanced/poky/meta-mini/README b/distribution/yocto-advanced/poky/meta-mini/README
index b9be59e..8014dc2 100644
--- a/distribution/yocto-advanced/poky/meta-mini/README
+++ b/distribution/yocto-advanced/poky/meta-mini/README
@@ -1,68 +1,4 @@
-This README file contains information on the contents of the
-mini layer.
+this is a mini layer for the sabrelite and beaglebone black board
-Please see the corresponding sections below for details.
-
-
-Dependencies
-============
-
-This layer depends on:
-
- URI: git://git.openembedded.org/bitbake
- branch: master
-
- URI: git://git.openembedded.org/openembedded-core
- layers: meta
- branch: master
-
- URI: git://git.yoctoproject.org/xxxx
- layers: xxxx
- branch: master
-
-
-Patches
-=======
-
-Please submit any patches against the mini layer to the
-xxxx mailing list (xxxx@zzzz.org) and cc: the maintainer:
-
-Maintainer: XXX YYYYYY <xxx.yyyyyy@zzzzz.com>
-
-
-Table of Contents
-=================
-
- I. Adding the mini layer to your build
- II. Misc
-
-
-I. Adding the mini layer to your build
-=================================================
-
---- replace with specific instructions for the mini layer ---
-
-In order to use this layer, you need to make the build system aware of
-it.
-
-Assuming the mini layer exists at the top-level of your
-yocto build tree, you can add it to the build system by adding the
-location of the mini layer to bblayers.conf, along with any
-other layers needed. e.g.:
-
- BBLAYERS ?= " \
- /path/to/yocto/meta \
- /path/to/yocto/meta-yocto \
- /path/to/yocto/meta-yocto-bsp \
- /path/to/yocto/meta-mini \
- "
-
-
-II. Misc
-========
-
---- replace with specific information about the mini layer ---
-=======
-this is a mini layer for the sabrelite board
-
-use DISTRO='mini' in your local.conf and 'bitbake mini-image'
+use DISTRO='lxt' MACHINE='beaglebone-black | sabrelite' in your local.conf
+and 'bitbake mini-image'
diff --git a/distribution/yocto-advanced/poky/meta-mini/classes/image_types_fsl.bbclass b/distribution/yocto-advanced/poky/meta-mini/classes/image_types_fsl.bbclass
index c0fa9b6..9b363a9 100644
--- a/distribution/yocto-advanced/poky/meta-mini/classes/image_types_fsl.bbclass
+++ b/distribution/yocto-advanced/poky/meta-mini/classes/image_types_fsl.bbclass
@@ -91,6 +91,28 @@ SDCARD_GENERATION_COMMAND_mx25 = "generate_imx_sdcard"
SDCARD_GENERATION_COMMAND_mx5 = "generate_imx_sdcard"
SDCARD_GENERATION_COMMAND_mx6 = "generate_imx_sdcard"
SDCARD_GENERATION_COMMAND_vf60 = "generate_imx_sdcard"
+SDCARD_GENERATION_COMMAND_ti33x = "generate_ti_sdcard"
+
+generate_ti_sdcard () {
+ parted -s ${SDCARD} mklabel msdos
+ parted -s ${SDCARD} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED})
+ parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE)
+ parted ${SDCARD} print
+
+ BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \
+ | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }')
+ mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
+
+ # copy files to /boot
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/MLO-${MACHINE} ::/MLO
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ::/u-boot.bin
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE}
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-am335x-boneblack.dtb ::/am335x-boneblack.dtb
+
+ # Burn Partition
+ dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+ dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+}
#
# Create an image that can by written onto a SD card using dd for use
diff --git a/distribution/yocto-advanced/poky/meta-mini/conf/distro/lxt.conf b/distribution/yocto-advanced/poky/meta-mini/conf/distro/lxt.conf
index 85aef9c..945fdbb 100644
--- a/distribution/yocto-advanced/poky/meta-mini/conf/distro/lxt.conf
+++ b/distribution/yocto-advanced/poky/meta-mini/conf/distro/lxt.conf
@@ -34,11 +34,6 @@ DISTRO = "lxt"
# FIXME: consider adding a new "tiny" feature
#DISTRO_FEATURES_append = " tiny"
-# Distro config is evaluated after the machine config, so we have to explicitly
-# set the kernel provider to override a machine config.
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny"
-PREFERRED_VERSION_linux-yocto-tiny = "3.8%"
-
# We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny
#POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot"
# Drop kernel-module-af-packet from RRECOMMENDS
@@ -51,42 +46,28 @@ TCLIBCAPPEND = ""
# in the LIBC features below.
ENABLE_WIDEC="false"
+SANITY_TESTED_DISTROS = "Debian-unstable Debian-testing"
+
# Drop native language support. This removes the
# eglibc->bash->gettext->libc-posix-clang-wchar dependency.
USE_NLS="no"
# Reconfigure eglibc for a smaller installation
# Comment out any of the lines below to disable them in the build
-DISTRO_FEATURES_LIBC_TINY = "libc-libm libc-crypt"
-DISTRO_FEATURES_LIBC_TINY_append_x86-64 = " libc-libm-big"
-
-# Required for "who"
-DISTRO_FEATURES_LIBC_MINIMAL = "libc-utmp libc-getlogin"
-DISTRO_FEATURES_LIBC_REGEX = "libc-posix-regexp"
-DISTRO_FEATURES_LIBC_NET = "libc-inet libc-nis"
-
-DISTRO_FEATURES_LIBC = "${DISTRO_FEATURES_LIBC_TINY} \
- ${DISTRO_FEATURES_LIBC_MINIMAL} \
- ${DISTRO_FEATURES_LIBC_REGEX} \
- ${DISTRO_FEATURES_LIBC_NET} \
- "
-
-# Comment out any of the lines below to disable them in the build
-# DISTRO_FEATURES options:
-# alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci
-DISTRO_FEATURES_TINY = "pci"
-DISTRO_FEATURES_NET = "ipv4"
-DISTRO_FEATURES_USB = "usbhost"
-#DISTRO_FEATURES_USBGADGET = "usbgadget"
-#DISTRO_FEATURES_WIFI = "wifi"
-
-DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
- ${DISTRO_FEATURES_NET} \
- ${DISTRO_FEATURES_USB} \
- ${DISTRO_FEATURES_USBGADGET} \
- ${DISTRO_FEATURES_WIFI} \
- ${DISTRO_FEATURES_LIBC} \
- "
+#DISTRO_FEATURES_LIBC_TINY = "libc-posix-clang-wchar libc-posix-regexp\
+# libc-posix-regexp-glibc libc-libm libc-crypt libc-spawn"
+#DISTRO_FEATURES_LIBC_TINY_append_x86-64 = " libc-libm-big"
+#
+## Required for "who"
+#DISTRO_FEATURES_LIBC_MINIMAL = "libc-utmp libc-getlogin"
+#DISTRO_FEATURES_LIBC_REGEX = "libc-posix-regexp"
+#DISTRO_FEATURES_LIBC_NET = "libc-inet libc-nis"
+#
+#DISTRO_FEATURES_LIBC = "${DISTRO_FEATURES_LIBC_TINY} \
+# ${DISTRO_FEATURES_LIBC_MINIMAL} \
+# ${DISTRO_FEATURES_LIBC_REGEX} \
+# ${DISTRO_FEATURES_LIBC_NET} \
+# "
# Enable LFS - see bug YOCTO #5865
DISTRO_FEATURES_append_libc-uclibc = " largefile"
diff --git a/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/files/imx6qsabrelite/defconfig b/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/files/imx6qsabrelite/defconfig
index ca8a9c6..d4b216a 100644
--- a/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/files/imx6qsabrelite/defconfig
+++ b/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/files/imx6qsabrelite/defconfig
@@ -582,10 +582,10 @@ CONFIG_ATAGS=y
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
# CONFIG_ARM_APPENDED_DTB is not set
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_CMDLINE="noinitrd console=ttymxc1,115200 init=/usr/bin/hello root=/dev/m"
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
# CONFIG_CMDLINE_EXTEND is not set
-# CONFIG_CMDLINE_FORCE is not set
+CONFIG_CMDLINE_FORCE=y
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
CONFIG_AUTO_ZRELADDR=y
diff --git a/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.16.1.bb b/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.16.1.bb
index e52948b..4f1e406 100644
--- a/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.16.1.bb
+++ b/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.16.1.bb
@@ -16,10 +16,10 @@ KERNEL_DEVICETREE_beaglebone-black = "arch/arm/boot/dts/am335x-boneblack.dts"
S = "${WORKDIR}/linux-${PV}"
-SRC_URI = "\
-https://www.kernel.org/pub/linux/kernel/v3.x/linux-${PV}.tar.xz \
-file://defconfig \
+SRC_URI = "https://www.kernel.org/pub/linux/kernel/v3.x/linux-${PV}.tar.xz \
+ file://defconfig \
"
+
SRC_URI[md5sum] = "e7a985a243b7941b6bc6240fcbc797fc"
SRC_URI[sha256sum] = "be37dda8ea090525661d64e5c7fc8580f313b7f9ba8592e32120f1332bc57d71"