Commit Graph

29 Commits

Author SHA1 Message Date
Matthias Scheifinger
02bf3fcd80 fix sd-card creation - use new syntax 2021-12-10 10:45:50 +01:00
Marek Belisko
6a1103b726 misc: More fixes for new syntax
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
2021-09-20 09:39:18 +02:00
Marius Kriegerowski
c03a8988b8 default to 'boot' as boot partition label
Defaulting to the $MACHINE may lead to failure if the name was
longer than the limit of allowed volume label of fat (11 chars).

Signed-off-by: Marius Kriegerowski <marius.kriegerowski@gmail.com>
2021-05-17 13:10:45 +02:00
Marek Belisko
5eff0296b5
Merge pull request #169 from Embedlynx/master
Copy a splash.bmp splash screen for u-boot to the SD card VFAT partit…
2020-05-26 07:47:04 +02:00
Sergey Matyukevich
f9ad5fa55b sdcard_image-sunxi.bbclass: fix dtb naming conventions
DTB naming conventions has been changed on deploy, see:
poky: c5b70d7155a76b727400db225c446d1b2f7072a6
oe-core: 1860d9d3c62e2e94cd68a809385873ffd8270b6d

Modify sdcard_image-sunxi.bbclass accordingly.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
2018-11-09 23:09:54 +03:00
Martin Kelly
418ea17239 sdimage: fix incorrect comment
The comment says ext3 but the code says ext4, so fix the comment.

Signed-off-by: Martin Kelly <mkelly@xevo.com>
2018-01-10 12:21:59 -08:00
Sergey Matyukevich
416af351cb sdimage: add support for sun50i sunxi boards
Modify sdcard_image-sunxi bbclass to support both sun50i and older
SoC families. Major changes are as follows:
- update comments: disk layout info
- increase boot partition size: aarch64 unified kernels can be large
- kernel image in boot partition: replace explicit name by KERNEL_IMAGETYPE
- SPL image: replace explicit name by SPL_BINARY
- implement flexible DTB file location in boot partition
  -- e.g. by defaut sun50i u-boot looks for dtb in allwinner subdirectory
  -- follow kernel dtb naming conventions, e.g. allwinner/<board>.dtb
- copy aarch64 u-boot image to image
  -- sunxi arm boards use unified u-boot/spl image
  -- sunxi aarch64 boards use two different images

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
2017-12-03 22:32:13 +03:00
Trevor Woerner
77c1026676 sdcard_image-sunxi.bbclass: fix deprecated notation
The older "IMAGE_DEPENDS_*" notation has been deprecated in favour of the
"do_image_...[depends]" notation.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
2017-07-17 09:01:30 -04:00
Enrico Butera
a84d6a40c1 sdcard_image-sunxi: fix dependency loop
As suggested by Andrei Gherzan (see #178):

"The current implementation inherits sdcard_image-sunxi.bbclass
unconditionally which in turn, sets two depends on do_rootfs
unconditionally again.

This means that if I want to build an initramfs image in the
kernel image I will get a dependency loop."

Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net>
2017-04-26 23:34:47 +02:00
Enrico Butera
eb6cb19b84 sdcard_image-sunxi: build fix
Signed-off-by: Enrico Butera <ebutera@users.sourceforge.net>
(cherry picked from commit 941171c912)
2017-04-06 23:12:24 +02:00
Radoslav Kolev
4b669303a3 Copy a splash.bmp splash screen for u-boot to the SD card VFAT partition if one is found in the deploy dir 2017-03-17 14:40:52 +02:00
Jonathan Liu
93ec9da1e4 sdcard_image-sunxi.bbclass: remove redundant IMAGEDATESTAMP
The IMAGE_NAME variable already contains the date and time so it is
redundant to also include the date again with IMAGEDATESTAMP
when writing to image-version-info in the boot partition.

Signed-off-by: Jonathan Liu <net147@gmail.com>
2016-09-13 12:04:05 +10:00
Jonathan Liu
f6417032a0 sdcard_image-sunxi.bbclass: add vardepsexclude to fix taskhash mismatch
IMAGEDATESTAMP may change while bitbake is running which can result in
a taskhash mismatch error for do_image_sunxi_sdimg.

Signed-off-by: Jonathan Liu <net147@gmail.com>
2016-09-11 22:18:11 +10:00
Jonathan Liu
26c32a3228 sdcard_image-sunxi.bbclass: fix copying device tree files not working
The image class assumes the working directory is the directory
containg the kernel and device tree files but this isn't always the
case.

Signed-off-by: Jonathan Liu <net147@gmail.com>
2016-09-09 22:43:21 +10:00
Jonathan Liu
0da0fd6531 sdcard_image-sunxi.bbclass: change deployment dir to IMGDEPLOYIDR
This fixes building images after OE-Core revision
6d969bacc718e21a5246d4da9bf9639dcae29b02.

Signed-off-by: Jonathan Liu <net147@gmail.com>
2016-09-09 22:23:12 +10:00
Jens Lucius
b05f2dbb8b Remove image dependency on fex for mainline
Remove image dependency on building fex files which are not needed
any more for mainline kernel (replaced by devicetree).
Add dependency for fex to linux-sunxi kernel.
Also update to latest sunxi-linux revision.

Signed-off-by: Jens Lucius <info@jenslucius.com>
2015-11-19 16:58:24 +01:00
Jens Lucius
784e893ac5 change filesystem from ext3 to ext4
ext3 filesystem is getting deprecated in favor of ext4 and openembedded
will default to ext4 in the next release, so switch to ext4 as well.

Signed-off-by: Jens Lucius <info@jenslucius.com>
2015-09-21 14:32:41 +02:00
Jens Lucius
ec8d7afb9c fix alignment in sdcard class 2015-07-22 10:21:35 +02:00
Jens Lucius
b326149b1b Fix build error with new dosfstools
oe-core has updated dosfstools to the latest version 3.0.28 with mkfs.vfat
returning an error when a file already exists. Remove the old file before
creating a new one.

Issue discovered and fixed by Gary Thomas <gary@mlbassoc.com> for
RaspberryPi and Freescale layers.

Signed-off-by: Jens Lucius <info@jenslucius.com>
2015-06-26 12:50:19 +02:00
Aguirre
cb66c3eafb Merge pull request #91 from Noxenious/master
Add mainline linux
2015-06-16 00:19:37 +02:00
Elric Milon
d5fa6bc501 Add boot.scr to sdcard image's boot/ if found. 2015-06-11 14:51:54 +02:00
Jens Lucius
b10c844cb2 kernel: move devicetree to machine files, include in sd-card
Move device tree configuration to machine files. Check for device tree
in sd card creation and include device tree file in first partition.

Signed-off-by: Jens Lucius <info@jenslucius.com>
2015-06-10 22:01:24 +02:00
Kristof Robot
a27c9aa7e4 sdcard_image-sunxi.bbclass: reverting to deploy dir instead of staging dir (resolves #81)
To resolve the race condition described in #15,
a patch was introduced to use the kernel source from staging dir
rather than deploy dir.

After the reorganization of the kernel source location by
6a1ff0e7ea
this no longer works.

Reverting the previous patch,
and introducing explicit rootfs dependency instead.

Signed-off-by: Kristof Robot <krirobo@gmail.com>
2015-02-01 13:22:11 +01:00
Jonathan Liu
aecfa42445 sdcard_image-sunxi.bbclass: make sunxi-sdimg image dependent on rootfs type
The rootfs may be using a filesystem type other than ext3 so it should
not be hardcoded.

Signed-off-by: Jonathan Liu <net147@gmail.com>
2014-03-06 00:39:47 +11:00
Kristof Robot
9a2692fcde sdcard_image-sunxi.bbclass: adding ext3 dependency (resolves #46)
Without this explicit dependency,
a race condition would be present between the generation of the sd image
and the generation of the ext3 file,
which leads to corrupt SD images in some circumstances.

Based on meta-raspberrypi commit a760ea5fa2
2014-03-04 22:37:31 +01:00
Jonathan Liu
2c36a963ba classes/sdcard_image-sunxi: use absolute path to rootfs 2014-02-17 18:07:26 +11:00
Kristof Robot
a248d37b35 sdcard_image-sunxi.bbclass: fixing race condition with virtual/kernel (resolves #15)
Fixing a race condition with virtual/kernel:do_deploy,
which needs to deploy the image before the IMAGE_CMD_sunxi-sdimg () code is being run
as part of image:do_rootfs, otherwise the following error would sometimes occur
when compiling with multiple threads (BB_NUMBER_THREADS=2):
"[..]/deploy/images/cubieboard2/uImage-cubieboard2.bin: No such file or directory"

Fixing this by using the kernel image in sysrootfs instead.

At the same time, also adding an explicit rootfs dependency on sunxi-board-fex:do_deploy because of
"${DEPLOY_DIR_IMAGE}/fex.bin", although this never seems to pose problems in practice.
2013-12-19 10:06:55 +01:00
Kristof Robot
7880894810 sdcard_image-sunxi.bbclass: fixed .xz check
.xz check was relying on a bash check that was not working,
returning "]] : not found" error.
Replaced that check with an sh-compatible check,
from https://github.com/djwillis/meta-raspberrypi/blob/master/classes/sdcard_image-rpi.bbclass
2013-12-14 20:31:36 +01:00
Nicolas Aguirre
ef1284c09e Change filename for sunxi-img class to match the new one. 2013-11-15 18:57:41 +01:00