Commit Graph

9 Commits

Author SHA1 Message Date
Thomas Petazzoni
f57d4c5b9f board/orangepi/orangepi-r1/genimage.cfg: use correct partition type
The boot partition is not an EFI System Partition, it is a normal FAT
formatted partition, so using type F instead of U makes more sense.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-07-23 15:36:22 +02:00
Thomas Petazzoni
e6951c8309 board/orangepi/orangepi-r1/genimage.cfg: remove double quotes around partition-type-uuid values
This allows to comply with the recently specified genimage.cfg writing
rules.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-07-23 15:36:22 +02:00
Peter Korsgaard
b59f938302 board/*/genimage.cfg: use partition-table-type = "gpt" for genimage-15
Genimage 15 deprecated the gpt option and now prints a warning when it is
used:

INFO: hdimage(sdcard.img): The option 'gpt' is deprecated. Use 'partition-table-type' instead

So change the genimage configuration files to use that instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2021-12-27 15:41:51 +01:00
Peter Korsgaard
50963f8f2f board/orangepi/orangepi-r1/genimage.cfg: fix build after move to genimage 15
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935239

ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type

So change to partition-type-uuid instead.  With that fixed, genimage-15 then
also complains about the overlap between the u-boot partition and the GPT:

ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000)

So adjust the u-boot partition to end just before the GPT.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2021-12-27 15:41:29 +01:00
Giulio Benetti
7a5f2aac93 board/orangepi/orangepi-r1/genimage.cfg: beautify file
Beatify this genimage .cfg file to have consistency with all genimage .cfg
files in Buildroot.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2021-11-08 22:59:31 +01:00
Yann E. MORIN
6e4f081d0c configs/orangepi_r1_defconfig: fix typo in comment
In commit 38d04e6b13, I did a last-minute change by adding the comment
to explain where the PARTLABEL was coming from, and introduced a typo in
that comment.

Fix it.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2021-02-03 23:16:09 +01:00
Peter Korsgaard
38d04e6b13 configs/orangepi_r1_defconfig: change to GPT partitions for root=PARTLABEL support
GPT provides partition labels, which can be used to tell the kernel to find
the rootfs based on it (root=PARTLABEL=rootfs) as a nicer/more extensible
solution than the MBR disk signature / PARTUUID.

When using GPT, the name of the partition in genimage.cfg is used as the
label for that partition.

The default GPT partition table location unfortunately conflicts with the
SPL location, so move the 16KB GPT table after it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[yann.morin.1998@free.fr: add the comment about 'rootfs']
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2021-01-25 21:53:10 +01:00
Peter Korsgaard
34cce93adb configs/orangepi_r1_defconfig: bump kernel to 5.10.10, u-boot to 2020.10
The probing order of the two mmc controllers (sdcard and sdio wifi) has
changed in kernel 5.10 since commit 21b2cec61c04bd1 (mmc: Set
PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4), so change to
root=PARTUUID=.. instead of hardcoding /dev/mmcblkXp2.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[yann.morin.1998@free.fr: use feedc0de as magic]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2021-01-24 23:42:33 +01:00
Peter Korsgaard
d7d82a318b config: add defconfig for orangepi-r1
Very similar to orangepi-zero, except that the board has a 16MB SPI flash, a
2nd ethernet port is provided through a Realtek RTL8152 and wifi is provided
through a Realtek RTL8189FTV (no mainline driver, not supported).

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-05-05 21:12:04 +02:00