diff options
Diffstat (limited to 'meta-yocto-bsp')
27 files changed, 340 insertions, 532 deletions
diff --git a/meta-yocto-bsp/README.hardware b/meta-yocto-bsp/README.hardware deleted file mode 100644 index 9803af006a..0000000000 --- a/meta-yocto-bsp/README.hardware +++ /dev/null | |||
@@ -1,265 +0,0 @@ | |||
1 | Yocto Project Hardware Reference BSPs README | ||
2 | ============================================ | ||
3 | |||
4 | This file gives details about using the Yocto Project hardware reference BSPs. | ||
5 | The machines supported can be seen in the conf/machine/ directory and are listed | ||
6 | below. There is one per supported hardware architecture and these are primarily | ||
7 | used to validate that the Yocto Project works on the hardware arctectures of | ||
8 | those machines. | ||
9 | |||
10 | If you are in doubt about using Poky/OpenEmbedded/Yocto Project with your hardware, | ||
11 | consult the documentation for your board/device. | ||
12 | |||
13 | Support for additional devices is normally added by adding BSP layers to your | ||
14 | configuration. For more information please see the Yocto Board Support Package | ||
15 | (BSP) Developer's Guide - documentation source is in documentation/bspguide or | ||
16 | download the PDF from: | ||
17 | |||
18 | http://yoctoproject.org/documentation | ||
19 | |||
20 | Note that these reference BSPs use the linux-yocto kernel and in general don't | ||
21 | pull in binary module support for the platforms. This means some device functionality | ||
22 | may be limited compared to a 'full' BSP which may be available. | ||
23 | |||
24 | |||
25 | Hardware Reference Boards | ||
26 | ========================= | ||
27 | |||
28 | The following boards are supported by the meta-yocto-bsp layer: | ||
29 | |||
30 | * Texas Instruments Beaglebone (beaglebone-yocto) | ||
31 | * Ubiquiti Networks EdgeRouter Lite (edgerouter) | ||
32 | * General IA platforms (genericx86 and genericx86-64) | ||
33 | |||
34 | For more information see the board's section below. The appropriate MACHINE | ||
35 | variable value corresponding to the board is given in brackets. | ||
36 | |||
37 | Reference Board Maintenance | ||
38 | =========================== | ||
39 | |||
40 | Send pull requests, patches, comments or questions about meta-yocto-bsps to poky@yoctoproject.org | ||
41 | |||
42 | Maintainers: Kevin Hao <kexin.hao@windriver.com> | ||
43 | Bruce Ashfield <bruce.ashfield@windriver.com> | ||
44 | |||
45 | Consumer Devices | ||
46 | ================ | ||
47 | |||
48 | The following consumer devices are supported by the meta-yocto-bsp layer: | ||
49 | |||
50 | * Intel x86 based PCs and devices (genericx86) | ||
51 | * Ubiquiti Networks EdgeRouter Lite (edgerouter) | ||
52 | |||
53 | For more information see the device's section below. The appropriate MACHINE | ||
54 | variable value corresponding to the device is given in brackets. | ||
55 | |||
56 | |||
57 | |||
58 | Specific Hardware Documentation | ||
59 | =============================== | ||
60 | |||
61 | |||
62 | Intel x86 based PCs and devices (genericx86*) | ||
63 | ============================================= | ||
64 | |||
65 | The genericx86 and genericx86-64 MACHINE are tested on the following platforms: | ||
66 | |||
67 | Intel Xeon/Core i-Series: | ||
68 | + Intel NUC5 Series - ix-52xx Series SOC (Broadwell) | ||
69 | + Intel NUC6 Series - ix-62xx Series SOC (Skylake) | ||
70 | + Intel Shumway Xeon Server | ||
71 | |||
72 | Intel Atom platforms: | ||
73 | + MinnowBoard MAX - E3825 SOC (Bay Trail) | ||
74 | + MinnowBoard MAX - Turbot (ADI Engineering) - E3826 SOC (Bay Trail) | ||
75 | - These boards can be either 32bot or 64bit modes depending on firmware | ||
76 | - See minnowboard.org for details | ||
77 | + Intel Braswell SOC | ||
78 | |||
79 | and is likely to work on many unlisted Atom/Core/Xeon based devices. The MACHINE | ||
80 | type supports ethernet, wifi, sound, and Intel/vesa graphics by default in | ||
81 | addition to common PC input devices, busses, and so on. | ||
82 | |||
83 | Depending on the device, it can boot from a traditional hard-disk, a USB device, | ||
84 | or over the network. Writing generated images to physical media is | ||
85 | straightforward with a caveat for USB devices. The following examples assume the | ||
86 | target boot device is /dev/sdb, be sure to verify this and use the correct | ||
87 | device as the following commands are run as root and are not reversable. | ||
88 | |||
89 | USB Device: | ||
90 | 1. Build a live image. This image type consists of a simple filesystem | ||
91 | without a partition table, which is suitable for USB keys, and with the | ||
92 | default setup for the genericx86 machine, this image type is built | ||
93 | automatically for any image you build. For example: | ||
94 | |||
95 | $ bitbake core-image-minimal | ||
96 | |||
97 | 2. Use the "dd" utility to write the image to the raw block device. For | ||
98 | example: | ||
99 | |||
100 | # dd if=core-image-minimal-genericx86.hddimg of=/dev/sdb | ||
101 | |||
102 | If the device fails to boot with "Boot error" displayed, or apparently | ||
103 | stops just after the SYSLINUX version banner, it is likely the BIOS cannot | ||
104 | understand the physical layout of the disk (or rather it expects a | ||
105 | particular layout and cannot handle anything else). There are two possible | ||
106 | solutions to this problem: | ||
107 | |||
108 | 1. Change the BIOS USB Device setting to HDD mode. The label will vary by | ||
109 | device, but the idea is to force BIOS to read the Cylinder/Head/Sector | ||
110 | geometry from the device. | ||
111 | |||
112 | 2. Use a ".wic" image with an EFI partition | ||
113 | |||
114 | a) With a default grub-efi bootloader: | ||
115 | # dd if=core-image-minimal-genericx86-64.wic of=/dev/sdb | ||
116 | |||
117 | b) Use systemd-boot instead | ||
118 | - Build an image with EFI_PROVIDER="systemd-boot" then use the above | ||
119 | dd command to write the image to a USB stick. | ||
120 | |||
121 | |||
122 | Texas Instruments Beaglebone (beaglebone-yocto) | ||
123 | =============================================== | ||
124 | |||
125 | The Beaglebone is an ARM Cortex-A8 development board with USB, Ethernet, 2D/3D | ||
126 | accelerated graphics, audio, serial, JTAG, and SD/MMC. The Black adds a faster | ||
127 | CPU, more RAM, eMMC flash and a micro HDMI port. The beaglebone MACHINE is | ||
128 | tested on the following platforms: | ||
129 | |||
130 | o Beaglebone Black A6 | ||
131 | o Beaglebone A6 (the original "White" model) | ||
132 | |||
133 | The Beaglebone Black has eMMC, while the White does not. Pressing the USER/BOOT | ||
134 | button when powering on will temporarily change the boot order. But for the sake | ||
135 | of simplicity, these instructions assume you have erased the eMMC on the Black, | ||
136 | so its boot behavior matches that of the White and boots off of SD card. To do | ||
137 | this, issue the following commands from the u-boot prompt: | ||
138 | |||
139 | # mmc dev 1 | ||
140 | # mmc erase 0 512 | ||
141 | |||
142 | To further tailor these instructions for your board, please refer to the | ||
143 | documentation at http://www.beagleboard.org/bone and http://www.beagleboard.org/black | ||
144 | |||
145 | From a Linux system with access to the image files perform the following steps: | ||
146 | |||
147 | 1. Build an image. For example: | ||
148 | |||
149 | $ bitbake core-image-minimal | ||
150 | |||
151 | 2. Use the "dd" utility to write the image to the SD card. For example: | ||
152 | |||
153 | # dd if=core-image-minimal-beaglebone-yocto.wic of=/dev/sdb | ||
154 | |||
155 | 3. Insert the SD card into the Beaglebone and boot the board. | ||
156 | |||
157 | Ubiquiti Networks EdgeRouter Lite (edgerouter) | ||
158 | ============================================== | ||
159 | |||
160 | The EdgeRouter Lite is part of the EdgeMax series. It is a MIPS64 router | ||
161 | (based on the Cavium Octeon processor) with 512MB of RAM, which uses an | ||
162 | internal USB pendrive for storage. | ||
163 | |||
164 | Setup instructions | ||
165 | ------------------ | ||
166 | |||
167 | You will need the following: | ||
168 | * RJ45 -> serial ("rollover") cable connected from your PC to the CONSOLE | ||
169 | port on the device | ||
170 | * Ethernet connected to the first ethernet port on the board | ||
171 | |||
172 | If using NFS as part of the setup process, you will also need: | ||
173 | * NFS root setup on your workstation | ||
174 | * TFTP server installed on your workstation (if fetching the kernel from | ||
175 | TFTP, see below). | ||
176 | |||
177 | --- Preparation --- | ||
178 | |||
179 | Build an image (e.g. core-image-minimal) using "edgerouter" as the MACHINE. | ||
180 | In the following instruction it is based on core-image-minimal. Another target | ||
181 | may be similiar with it. | ||
182 | |||
183 | --- Booting from NFS root / kernel via TFTP --- | ||
184 | |||
185 | Load the kernel, and boot the system as follows: | ||
186 | |||
187 | 1. Get the kernel (vmlinux) file from the tmp/deploy/images/edgerouter | ||
188 | directory, and make them available on your TFTP server. | ||
189 | |||
190 | 2. Connect the board's first serial port to your workstation and then start up | ||
191 | your favourite serial terminal so that you will be able to interact with | ||
192 | the serial console. If you don't have a favourite, picocom is suggested: | ||
193 | |||
194 | $ picocom /dev/ttyS0 -b 115200 | ||
195 | |||
196 | 3. Power up or reset the board and press a key on the terminal when prompted | ||
197 | to get to the U-Boot command line | ||
198 | |||
199 | 4. Set up the environment in U-Boot: | ||
200 | |||
201 | => setenv ipaddr <board ip> | ||
202 | => setenv serverip <tftp server ip> | ||
203 | |||
204 | 5. Download the kernel and boot: | ||
205 | |||
206 | => tftp tftp $loadaddr vmlinux | ||
207 | => bootoctlinux $loadaddr coremask=0x3 root=/dev/nfs rw nfsroot=<nfsroot ip>:<rootfs path> ip=<board ip>:<server ip>:<gateway ip>:<netmask>:edgerouter:eth0:off mtdparts=phys_mapped_flash:512k(boot0),512k(boot1),64k@3072k(eeprom) | ||
208 | |||
209 | --- Booting from USB disk --- | ||
210 | |||
211 | To boot from the USB disk, you either need to remove it from the edgerouter | ||
212 | box and populate it from another computer, or use a previously booted NFS | ||
213 | image and populate from the edgerouter itself. | ||
214 | |||
215 | Type 1: Use partitioned image | ||
216 | ----------------------------- | ||
217 | |||
218 | Steps: | ||
219 | |||
220 | 1. Remove the USB disk from the edgerouter and insert it into a computer | ||
221 | that has access to your build artifacts. | ||
222 | |||
223 | 2. Flash the image. | ||
224 | |||
225 | # dd if=core-image-minimal-edgerouter.wic of=/dev/sdb | ||
226 | |||
227 | 3. Insert USB disk into the edgerouter and boot it. | ||
228 | |||
229 | Type 2: NFS | ||
230 | ----------- | ||
231 | |||
232 | Note: If you place the kernel on the ext3 partition, you must re-create the | ||
233 | ext3 filesystem, since the factory u-boot can only handle 128 byte inodes and | ||
234 | cannot read the partition otherwise. | ||
235 | |||
236 | These boot instructions assume that you have recreated the ext3 filesystem with | ||
237 | 128 byte inodes, you have an updated uboot or you are running and image capable | ||
238 | of making the filesystem on the board itself. | ||
239 | |||
240 | |||
241 | 1. Boot from NFS root | ||
242 | |||
243 | 2. Mount the USB disk partition 2 and then extract the contents of | ||
244 | tmp/deploy/core-image-XXXX.tar.bz2 into it. | ||
245 | |||
246 | Before starting, copy core-image-minimal-xxx.tar.bz2 and vmlinux into | ||
247 | rootfs path on your workstation. | ||
248 | |||
249 | and then, | ||
250 | |||
251 | # mount /dev/sda2 /media/sda2 | ||
252 | # tar -xvjpf core-image-minimal-XXX.tar.bz2 -C /media/sda2 | ||
253 | # cp vmlinux /media/sda2/boot/vmlinux | ||
254 | # umount /media/sda2 | ||
255 | # reboot | ||
256 | |||
257 | 3. Reboot the board and press a key on the terminal when prompted to get to the U-Boot | ||
258 | command line: | ||
259 | |||
260 | # reboot | ||
261 | |||
262 | 4. Load the kernel and boot: | ||
263 | |||
264 | => ext2load usb 0:2 $loadaddr boot/vmlinux | ||
265 | => bootoctlinux $loadaddr coremask=0x3 root=/dev/sda2 rw rootwait mtdparts=phys_mapped_flash:512k(boot0),512k(boot1),64k@3072k(eeprom) | ||
diff --git a/meta-yocto-bsp/README.hardware.md b/meta-yocto-bsp/README.hardware.md new file mode 100644 index 0000000000..6045c3d867 --- /dev/null +++ b/meta-yocto-bsp/README.hardware.md | |||
@@ -0,0 +1,182 @@ | |||
1 | Yocto Project Hardware Reference BSPs README | ||
2 | ============================================ | ||
3 | |||
4 | This file gives details about using the Yocto Project hardware reference BSPs. | ||
5 | The machines supported can be seen in the conf/machine/ directory and are listed | ||
6 | below. There is one per supported hardware architecture and these are primarily | ||
7 | used to validate that the Yocto Project works on the hardware arctectures of | ||
8 | those machines. | ||
9 | |||
10 | If you are in doubt about using Poky/OpenEmbedded/Yocto Project with your hardware, | ||
11 | consult the documentation for your board/device. | ||
12 | |||
13 | Support for additional devices is normally added by adding BSP layers to your | ||
14 | configuration. For more information please see the Yocto Board Support Package | ||
15 | (BSP) Developer's Guide - documentation source is in documentation/bspguide or | ||
16 | download the PDF from https://docs.yoctoproject.org/ | ||
17 | |||
18 | Note that these reference BSPs use the linux-yocto kernel and in general don't | ||
19 | pull in binary module support for the platforms. This means some device functionality | ||
20 | may be limited compared to a 'full' BSP which may be available. | ||
21 | |||
22 | |||
23 | Hardware Reference Boards | ||
24 | ========================= | ||
25 | |||
26 | The following boards are supported by the meta-yocto-bsp layer: | ||
27 | |||
28 | * Texas Instruments Beaglebone (`beaglebone-yocto`) | ||
29 | * General 64-bit Arm SystemReady platforms (`genericarm64`) | ||
30 | * General IA platforms (`genericx86` and `genericx86-64`) | ||
31 | |||
32 | For more information see the board's section below. The appropriate MACHINE | ||
33 | variable value corresponding to the board is given in brackets. | ||
34 | |||
35 | Reference Board Maintenance and Contributions | ||
36 | ============================================= | ||
37 | |||
38 | Please refer to our contributor guide here: https://docs.yoctoproject.org/dev/contributor-guide/ | ||
39 | for full details on how to submit changes. | ||
40 | |||
41 | As a quick guide, patches should be sent to <poky@lists.yoctoproject.org> | ||
42 | The git command to do that would be: | ||
43 | |||
44 | git send-email -M -1 --to poky@lists.yoctoproject.org | ||
45 | |||
46 | Send pull requests, patches, comments or questions about meta-yocto-bsp to | ||
47 | <poky@lists.yoctoproject.org>. | ||
48 | |||
49 | Maintainers: | ||
50 | * Kevin Hao <kexin.hao@windriver.com> | ||
51 | * Bruce Ashfield <bruce.ashfield@gmail.com> | ||
52 | |||
53 | Consumer Devices | ||
54 | ================ | ||
55 | |||
56 | The following consumer devices are supported by the meta-yocto-bsp layer: | ||
57 | |||
58 | * Arm-based SystemReady devices (`genericarm64`) | ||
59 | * Intel x86 based PCs and devices (`genericx86` and `genericx86-64`) | ||
60 | |||
61 | For more information see the device's section below. The appropriate MACHINE | ||
62 | variable value corresponding to the device is given in brackets. | ||
63 | |||
64 | |||
65 | Specific Hardware Documentation | ||
66 | =============================== | ||
67 | |||
68 | |||
69 | Intel x86 based PCs and devices (genericx86*) | ||
70 | --------------------------------------------- | ||
71 | |||
72 | The genericx86 and genericx86-64 MACHINE are tested on the following platforms: | ||
73 | |||
74 | Intel Xeon/Core i-Series: | ||
75 | + Intel NUC5 Series - ix-52xx Series SOC (Broadwell) | ||
76 | + Intel NUC6 Series - ix-62xx Series SOC (Skylake) | ||
77 | + Intel Shumway Xeon Server | ||
78 | |||
79 | Intel Atom platforms: | ||
80 | + MinnowBoard MAX - E3825 SOC (Bay Trail) | ||
81 | + MinnowBoard MAX - Turbot (ADI Engineering) - E3826 SOC (Bay Trail) | ||
82 | - These boards can be either 32bot or 64bit modes depending on firmware | ||
83 | - See minnowboard.org for details | ||
84 | + Intel Braswell SOC | ||
85 | |||
86 | and is likely to work on many unlisted Atom/Core/Xeon based devices. The MACHINE | ||
87 | type supports ethernet, wifi, sound, and Intel/vesa graphics by default in | ||
88 | addition to common PC input devices, busses, and so on. | ||
89 | |||
90 | Depending on the device, it can boot from a traditional hard-disk, a USB device, | ||
91 | or over the network. Writing generated images to physical media is | ||
92 | straightforward with a caveat for USB devices. The following examples assume the | ||
93 | target boot device is /dev/sdb, be sure to verify this and use the correct | ||
94 | device as the following commands are run as root and are not reversable. | ||
95 | |||
96 | USB Device: | ||
97 | |||
98 | 1. Build a live image. This image type consists of a simple filesystem | ||
99 | without a partition table, which is suitable for USB keys, and with the | ||
100 | default setup for the genericx86 machine, this image type is built | ||
101 | automatically for any image you build. For example: | ||
102 | |||
103 | $ bitbake core-image-minimal | ||
104 | |||
105 | 2. Use the `dd` utility to write the image to the raw block device. For | ||
106 | example: | ||
107 | |||
108 | # dd if=core-image-minimal-genericx86.hddimg of=/dev/sdb | ||
109 | |||
110 | If the device fails to boot with "Boot error" displayed, or apparently | ||
111 | stops just after the SYSLINUX version banner, it is likely the BIOS cannot | ||
112 | understand the physical layout of the disk (or rather it expects a | ||
113 | particular layout and cannot handle anything else). There are two possible | ||
114 | solutions to this problem: | ||
115 | |||
116 | 1. Change the BIOS USB Device setting to HDD mode. The label will vary by | ||
117 | device, but the idea is to force BIOS to read the Cylinder/Head/Sector | ||
118 | geometry from the device. | ||
119 | |||
120 | 2. Use a ".wic" image with an EFI partition | ||
121 | |||
122 | 1. With a default grub-efi bootloader: | ||
123 | |||
124 | # dd if=core-image-minimal-genericx86-64.wic of=/dev/sdb | ||
125 | |||
126 | 2. Use systemd-boot instead. Build an image with `EFI_PROVIDER="systemd-boot"` then use the above | ||
127 | `dd` command to write the image to a USB stick. | ||
128 | |||
129 | |||
130 | SystemReady Arm Platforms (genericarm64) | ||
131 | ---------------------------------------- | ||
132 | |||
133 | The genericarm64 MACHINE is designed to work on standard SystemReady IR | ||
134 | compliant boards with preinstalled firmware. | ||
135 | |||
136 | The genericarm64 MACHINE is currently tested on the following platforms: | ||
137 | |||
138 | * Texas Instruments BeaglePlay | ||
139 | |||
140 | The images built are EFI bootable disk images and can be written directly to a | ||
141 | SD card for booting, for example. | ||
142 | |||
143 | There is also limited support for booting a genericarm64 image inside QEMU. When | ||
144 | building the image also build the `u-boot` recipe to build the required | ||
145 | firmware (note that this firmware will _not_ boot on real hardware), then use | ||
146 | `runqemu` as usual. | ||
147 | |||
148 | |||
149 | Texas Instruments Beaglebone (beaglebone-yocto) | ||
150 | ----------------------------------------------- | ||
151 | |||
152 | The Beaglebone is an ARM Cortex-A8 development board with USB, Ethernet, 2D/3D | ||
153 | accelerated graphics, audio, serial, JTAG, and SD/MMC. The Black adds a faster | ||
154 | CPU, more RAM, eMMC flash and a micro HDMI port. The beaglebone MACHINE is | ||
155 | tested on the following platforms: | ||
156 | |||
157 | * Beaglebone Black A6 | ||
158 | * Beaglebone A6 (the original "White" model) | ||
159 | |||
160 | The Beaglebone Black has eMMC, while the White does not. Pressing the USER/BOOT | ||
161 | button when powering on will temporarily change the boot order. But for the sake | ||
162 | of simplicity, these instructions assume you have erased the eMMC on the Black, | ||
163 | so its boot behavior matches that of the White and boots off of SD card. To do | ||
164 | this, issue the following commands from the u-boot prompt: | ||
165 | |||
166 | # mmc dev 1 | ||
167 | # mmc erase 0 512 | ||
168 | |||
169 | To further tailor these instructions for your board, please refer to the | ||
170 | documentation at http://www.beagleboard.org/bone and http://www.beagleboard.org/black | ||
171 | |||
172 | From a Linux system with access to the image files perform the following steps: | ||
173 | |||
174 | 1. Build an image. For example: | ||
175 | |||
176 | $ bitbake core-image-minimal | ||
177 | |||
178 | 2. Use the "dd" utility to write the image to the SD card. For example: | ||
179 | |||
180 | # dd if=core-image-minimal-beaglebone-yocto.wic of=/dev/sdb | ||
181 | |||
182 | 3. Insert the SD card into the Beaglebone and boot the board. | ||
diff --git a/meta-yocto-bsp/conf/layer.conf b/meta-yocto-bsp/conf/layer.conf index bf0c1bfece..60902b4de9 100644 --- a/meta-yocto-bsp/conf/layer.conf +++ b/meta-yocto-bsp/conf/layer.conf | |||
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yoctobsp" | |||
9 | BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_yoctobsp = "5" | 10 | BBFILE_PRIORITY_yoctobsp = "5" |
11 | LAYERVERSION_yoctobsp = "4" | 11 | LAYERVERSION_yoctobsp = "4" |
12 | LAYERSERIES_COMPAT_yoctobsp = "gatesgarth" | 12 | LAYERSERIES_COMPAT_yoctobsp = "scarthgap" |
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index f8368ebd0e..459c83f5c2 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | |||
@@ -3,42 +3,38 @@ | |||
3 | #@DESCRIPTION: Reference machine configuration for http://beagleboard.org/bone and http://beagleboard.org/black boards | 3 | #@DESCRIPTION: Reference machine configuration for http://beagleboard.org/bone and http://beagleboard.org/black boards |
4 | 4 | ||
5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
6 | XSERVER ?= "xserver-xorg \ | ||
7 | xf86-video-modesetting \ | ||
8 | " | ||
9 | 6 | ||
10 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree" | 7 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" |
11 | 8 | ||
12 | EXTRA_IMAGEDEPENDS += "u-boot" | 9 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" |
13 | 10 | ||
14 | DEFAULTTUNE ?= "cortexa8hf-neon" | 11 | DEFAULTTUNE ?= "cortexa8hf-neon" |
15 | include conf/machine/include/tune-cortexa8.inc | 12 | include conf/machine/include/arm/armv7a/tune-cortexa8.inc |
16 | 13 | ||
17 | IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" | 14 | IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" |
18 | EXTRA_IMAGECMD_jffs2 = "-lnp " | 15 | EXTRA_IMAGECMD:jffs2 = "-lnp " |
19 | WKS_FILE ?= "beaglebone-yocto.wks" | 16 | WKS_FILE ?= "beaglebone-yocto.wks" |
20 | IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" | 17 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image kernel-devicetree" |
21 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy" | 18 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy" |
22 | 19 | ||
23 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" | 20 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" |
24 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
25 | 21 | ||
26 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 22 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
27 | PREFERRED_VERSION_linux-yocto ?= "5.10%" | 23 | PREFERRED_VERSION_linux-yocto ?= "6.6%" |
28 | 24 | ||
29 | KERNEL_IMAGETYPE = "zImage" | 25 | KERNEL_IMAGETYPE = "zImage" |
30 | KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" | 26 | DTB_FILES = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" |
31 | KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | 27 | KERNEL_DEVICETREE = '${@' '.join('ti/omap/%s' % d for d in '${DTB_FILES}'.split())}' |
28 | |||
29 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" | ||
32 | 30 | ||
33 | SPL_BINARY = "MLO" | 31 | SPL_BINARY = "MLO" |
34 | UBOOT_SUFFIX = "img" | 32 | UBOOT_SUFFIX = "img" |
35 | UBOOT_MACHINE = "am335x_evm_defconfig" | 33 | UBOOT_MACHINE = "am335x_evm_defconfig" |
36 | UBOOT_ENTRYPOINT = "0x80008000" | ||
37 | UBOOT_LOADADDRESS = "0x80008000" | ||
38 | 34 | ||
39 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa" | 35 | MACHINE_FEATURES = "usbgadget usbhost vfat alsa" |
40 | 36 | ||
41 | IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE}" | 37 | IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${DTB_FILES}" |
42 | 38 | ||
43 | # support runqemu | 39 | # support runqemu |
44 | EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" | 40 | EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" |
diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf deleted file mode 100644 index fbe33be9d1..0000000000 --- a/meta-yocto-bsp/conf/machine/edgerouter.conf +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: Edgerouter | ||
3 | #@DESCRIPTION: Machine configuration for a generic edgerouter | ||
4 | |||
5 | require conf/machine/include/tune-mips64.inc | ||
6 | |||
7 | MACHINE_FEATURES = "pci ext2 ext3 serial" | ||
8 | |||
9 | KERNEL_IMAGETYPE = "vmlinux" | ||
10 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | ||
11 | KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" | ||
12 | |||
13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | ||
14 | PREFERRED_VERSION_linux-yocto ?= "5.10%" | ||
15 | |||
16 | SERIAL_CONSOLES = "115200;ttyS0" | ||
17 | USE_VT ?= "0" | ||
18 | |||
19 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" | ||
20 | |||
21 | IMAGE_FSTYPES ?= "jffs2 tar.bz2 wic wic.bmap" | ||
22 | JFFS2_ERASEBLOCK = "0x10000" | ||
23 | |||
24 | WKS_FILE ?= "edgerouter.wks" | ||
25 | IMAGE_BOOT_FILES ?= "vmlinux;vmlinux.64" | ||
26 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | ||
diff --git a/meta-yocto-bsp/conf/machine/genericarm64.conf b/meta-yocto-bsp/conf/machine/genericarm64.conf new file mode 100644 index 0000000000..4fa9395b31 --- /dev/null +++ b/meta-yocto-bsp/conf/machine/genericarm64.conf | |||
@@ -0,0 +1,60 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: genericarm64 | ||
3 | #@DESCRIPTION: Generic Arm64 machine for typical SystemReady IR/ES platforms, which | ||
4 | #have working firmware and boot via EFI. | ||
5 | |||
6 | require conf/machine/include/arm/arch-armv8a.inc | ||
7 | |||
8 | # Arm Base System Architecture says v8.0+ is allowed, but FEAT_CRC32 is required | ||
9 | DEFAULTTUNE = "armv8a-crc" | ||
10 | |||
11 | MACHINE_FEATURES = "acpi alsa bluetooth efi keyboard pci qemu-usermode rtc screen usbhost vfat wifi" | ||
12 | |||
13 | KERNEL_IMAGETYPE = "Image" | ||
14 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | ||
15 | |||
16 | # Install all the kernel modules into the rootfs | ||
17 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" | ||
18 | # Install selected pieces of firmware | ||
19 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx linux-firmware-wl18xx linux-firmware-rtl-nic" | ||
20 | |||
21 | # Use an initramfs and populate it with the kernel modules and key firmware | ||
22 | INITRAMFS_IMAGE ?= "core-image-initramfs-boot" | ||
23 | PACKAGE_INSTALL:append:pn-core-image-initramfs-boot = " ${MACHINE_EXTRA_RRECOMMENDS}" | ||
24 | |||
25 | IMAGE_FSTYPES ?= "wic" | ||
26 | WKS_FILE ?= "genericarm64.wks.in" | ||
27 | |||
28 | EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}" | ||
29 | |||
30 | # Try to bring up one physical serial console, or a virtualized serial console | ||
31 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" | ||
32 | |||
33 | # Allow u-boot to be built for use with qemu-system-aarch64. | ||
34 | # This u-boot is _not_ suitable for use with real hardware, and the expectation | ||
35 | # of this machine is that real hardware comes with the firmware pre-loaded. | ||
36 | UBOOT_MACHINE = "qemu_arm64_defconfig" | ||
37 | |||
38 | # runqemu configuration to run a genericarm64 image inside a qemu-system-aarch64. You will need | ||
39 | # to build u-boot explicitly. | ||
40 | IMAGE_CLASSES += "qemuboot" | ||
41 | QB_SYSTEM_NAME = "qemu-system-aarch64" | ||
42 | # Boot the virtual machine with either an emulated Cortex-A76, or the host if using KVM | ||
43 | QB_MACHINE = "-machine virt" | ||
44 | QB_CPU = "-cpu cortex-a76" | ||
45 | QB_CPU_KVM = "-cpu host -machine gic-version=3" | ||
46 | QB_SMP = "-smp 4" | ||
47 | # Boot into U-Boot and let that scan the disk for the next step, don't pass any kernel or filesystem hints | ||
48 | QB_DEFAULT_BIOS = "u-boot.bin" | ||
49 | QB_DEFAULT_KERNEL = "none" | ||
50 | QB_DEFAULT_FSTYPE = "wic" | ||
51 | QB_FSINFO = "wic:no-kernel-in-fs" | ||
52 | # Mount the wic rootfs as a virtio block device | ||
53 | QB_ROOTFS_OPT = "-drive id=root,file=@ROOTFS@,if=none,format=raw -device virtio-blk-pci,drive=root" | ||
54 | # Virtio graphics | ||
55 | QB_GRAPHICS = "-device virtio-gpu-pci" | ||
56 | # Virtio serial consoles | ||
57 | QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" | ||
58 | QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" | ||
59 | # Virtio networking | ||
60 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | ||
diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf index 81ec24e971..f19a1c1527 100644 --- a/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf | |||
@@ -3,9 +3,8 @@ | |||
3 | #@DESCRIPTION: Machine configuration for generic x86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. | 3 | #@DESCRIPTION: Machine configuration for generic x86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. |
4 | 4 | ||
5 | DEFAULTTUNE ?= "core2-64" | 5 | DEFAULTTUNE ?= "core2-64" |
6 | require conf/machine/include/tune-core2.inc | 6 | require conf/machine/include/x86/tune-core2.inc |
7 | require conf/machine/include/genericx86-common.inc | 7 | require conf/machine/include/genericx86-common.inc |
8 | 8 | ||
9 | SERIAL_CONSOLES_CHECK = "ttyS0" | ||
10 | #For runqemu | 9 | #For runqemu |
11 | QB_SYSTEM_NAME = "qemu-system-x86_64" | 10 | QB_SYSTEM_NAME = "qemu-system-x86_64" |
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf index 1387bde852..34e1448a8c 100644 --- a/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/meta-yocto-bsp/conf/machine/genericx86.conf | |||
@@ -3,9 +3,8 @@ | |||
3 | #@DESCRIPTION: Machine configuration for generic x86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. | 3 | #@DESCRIPTION: Machine configuration for generic x86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. |
4 | 4 | ||
5 | DEFAULTTUNE ?= "core2-32" | 5 | DEFAULTTUNE ?= "core2-32" |
6 | require conf/machine/include/tune-core2.inc | 6 | require conf/machine/include/x86/tune-core2.inc |
7 | require conf/machine/include/genericx86-common.inc | 7 | require conf/machine/include/genericx86-common.inc |
8 | 8 | ||
9 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" | ||
10 | #For runqemu | 9 | #For runqemu |
11 | QB_SYSTEM_NAME = "qemu-system-i386" | 10 | QB_SYSTEM_NAME = "qemu-system-i386" |
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 1de069011d..50a233dd8f 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc | |||
@@ -1,8 +1,8 @@ | |||
1 | include conf/machine/include/x86-base.inc | 1 | include conf/machine/include/x86/x86-base.inc |
2 | require conf/machine/include/qemuboot-x86.inc | 2 | require conf/machine/include/x86/qemuboot-x86.inc |
3 | MACHINE_FEATURES += "wifi efi pcbios" | 3 | MACHINE_FEATURES += "wifi efi pcbios" |
4 | 4 | ||
5 | PREFERRED_VERSION_linux-yocto ?= "5.10%" | 5 | PREFERRED_VERSION_linux-yocto ?= "6.6%" |
6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
8 | XSERVER ?= "${XSERVER_X86_BASE} \ | 8 | XSERVER ?= "${XSERVER_X86_BASE} \ |
@@ -16,10 +16,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
16 | 16 | ||
17 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" | 17 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" |
18 | 18 | ||
19 | GLIBC_ADDONS = "nptl" | ||
20 | |||
21 | EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" | ||
22 | |||
23 | IMAGE_FSTYPES += "wic wic.bmap" | 19 | IMAGE_FSTYPES += "wic wic.bmap" |
24 | WKS_FILE ?= "genericx86.wks.in" | 20 | WKS_FILE ?= "genericx86.wks.in" |
25 | EFI_PROVIDER ??= "grub-efi" | 21 | EFI_PROVIDER ??= "grub-efi" |
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py index 0f1aeb398f..7af3e1dac7 100644 --- a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py +++ b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py | |||
@@ -24,11 +24,10 @@ import subprocess | |||
24 | import sys | 24 | import sys |
25 | import pexpect | 25 | import pexpect |
26 | 26 | ||
27 | import oeqa.utils.sshcontrol as sshcontrol | 27 | from oeqa.controllers.controllerimage import ControllerImageHardwareTarget |
28 | from oeqa.controllers.masterimage import MasterImageHardwareTarget | ||
29 | 28 | ||
30 | 29 | ||
31 | class BeagleBoneTarget(MasterImageHardwareTarget): | 30 | class BeagleBoneTarget(ControllerImageHardwareTarget): |
32 | 31 | ||
33 | dtbs = {'uImage-am335x-bone.dtb': 'am335x-bone.dtb', 'uImage-am335x-boneblack.dtb': 'am335x-boneblack.dtb'} | 32 | dtbs = {'uImage-am335x-bone.dtb': 'am335x-bone.dtb', 'uImage-am335x-boneblack.dtb': 'am335x-boneblack.dtb'} |
34 | 33 | ||
@@ -57,21 +56,21 @@ class BeagleBoneTarget(MasterImageHardwareTarget): | |||
57 | 56 | ||
58 | 57 | ||
59 | def _deploy(self): | 58 | def _deploy(self): |
60 | self.master.run("umount /boot; umount /mnt/testrootfs;") | 59 | self.controller.run("umount /boot; umount /mnt/testrootfs;") |
61 | self.master.ignore_status = False | 60 | self.controller.ignore_status = False |
62 | # Kernel and dtb files may not be in the image, so copy them just in case | 61 | # Kernel and dtb files may not be in the image, so copy them just in case |
63 | self.master.copy_to(self.kernel, "~/test-kernel") | 62 | self.controller.copy_to(self.kernel, "~/test-kernel") |
64 | kernelpath = os.path.dirname(self.kernel) | 63 | kernelpath = os.path.dirname(self.kernel) |
65 | for dtborig, dtbfn in self.dtbs.iteritems(): | 64 | for dtborig, dtbfn in self.dtbs.iteritems(): |
66 | dtbfile = os.path.join(kernelpath, dtborig) | 65 | dtbfile = os.path.join(kernelpath, dtborig) |
67 | if os.path.exists(dtbfile): | 66 | if os.path.exists(dtbfile): |
68 | self.master.copy_to(dtbfile, "~/%s" % dtbfn) | 67 | self.controller.copy_to(dtbfile, "~/%s" % dtbfn) |
69 | self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype) | 68 | self.controller.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype) |
70 | for cmd in self.deploy_cmds: | 69 | for cmd in self.deploy_cmds: |
71 | self.master.run(cmd) | 70 | self.controller.run(cmd) |
72 | 71 | ||
73 | def _start(self, params=None): | 72 | def _start(self, params=None): |
74 | self.power_cycle(self.master) | 73 | self.power_cycle(self.controller) |
75 | try: | 74 | try: |
76 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) | 75 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) |
77 | # We'd wait for "U-Boot" here but sometimes we connect too late on BeagleBone white to see it | 76 | # We'd wait for "U-Boot" here but sometimes we connect too late on BeagleBone white to see it |
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py b/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py deleted file mode 100644 index 9c47b5b044..0000000000 --- a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | # Copyright (C) 2014 Intel Corporation | ||
2 | # | ||
3 | # Released under the MIT license (see COPYING.MIT) | ||
4 | |||
5 | # This module adds support to testimage.bbclass to deploy images and run | ||
6 | # tests on a Ubiquiti Networks EdgeRouter Lite. The device must be set up | ||
7 | # to boot into the master image already - the easiest way to do that is as | ||
8 | # follows: | ||
9 | # | ||
10 | # 1. Take out the internal USB drive and plug it into your PC | ||
11 | # 2. Repartition the USB drive so that you have three partitions in this | ||
12 | # order: | ||
13 | # 1: vfat, labelled "boot" (it will need to be formatted with mkfs.vfat | ||
14 | # for this to be possible, since FAT partitions formatted under | ||
15 | # DOS/Windows will only support uppercase labels) | ||
16 | # 2: ext3 (for master image) labelled "testmaster" | ||
17 | # 3: ext3 (for image under test) labelled "testrootfs" | ||
18 | # 3. Copy the kernel to be used by the master image to the FAT partition | ||
19 | # (it should be named "vmlinux.64" with the factory u-boot configuration) | ||
20 | # 4. Install the master image onto the "testmaster" ext3 partition. If | ||
21 | # you do this by just extracting the contents of an image onto the | ||
22 | # partition, you will also likely need to create the master image marker | ||
23 | # file /etc/masterimage within this partition so that we can tell when | ||
24 | # we're booted into it that it is the master image. | ||
25 | # 5. Put the USB drive back into the device, and ensure the console port | ||
26 | # and first ethernet port are connected before powering on | ||
27 | # | ||
28 | # TEST_SERIALCONTROL_CMD will need to be set in local.conf so that we can | ||
29 | # interact with u-boot over the serial console port. | ||
30 | |||
31 | import os | ||
32 | import bb | ||
33 | import time | ||
34 | import subprocess | ||
35 | import sys | ||
36 | import pexpect | ||
37 | |||
38 | import oeqa.utils.sshcontrol as sshcontrol | ||
39 | from oeqa.controllers.masterimage import MasterImageHardwareTarget | ||
40 | |||
41 | |||
42 | class EdgeRouterTarget(MasterImageHardwareTarget): | ||
43 | |||
44 | def __init__(self, d): | ||
45 | super(EdgeRouterTarget, self).__init__(d) | ||
46 | |||
47 | self.image_fstype = self.get_image_fstype(d) | ||
48 | self.deploy_cmds = [ | ||
49 | 'mount -L boot /boot', | ||
50 | 'mkdir -p /mnt/testrootfs', | ||
51 | 'mount -L testrootfs /mnt/testrootfs', | ||
52 | 'cp ~/test-kernel /boot', | ||
53 | 'rm -rf /mnt/testrootfs/*', | ||
54 | 'tar xvf ~/test-rootfs.%s -C /mnt/testrootfs' % self.image_fstype | ||
55 | ] | ||
56 | if not self.serialcontrol_cmd: | ||
57 | bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.") | ||
58 | |||
59 | |||
60 | def _deploy(self): | ||
61 | self.master.run("umount /mnt/testrootfs;") | ||
62 | self.master.ignore_status = False | ||
63 | self.master.copy_to(self.kernel, "~/test-kernel") | ||
64 | self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype) | ||
65 | for cmd in self.deploy_cmds: | ||
66 | self.master.run(cmd) | ||
67 | |||
68 | def _start(self, params=None): | ||
69 | self.power_cycle(self.master) | ||
70 | try: | ||
71 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) | ||
72 | serialconn.expect("U-Boot") | ||
73 | serialconn.sendline("a") | ||
74 | serialconn.expect("Octeon ubnt_e100#") | ||
75 | serialconn.sendline("fatload usb 0:1 $loadaddr test-kernel") | ||
76 | serialconn.expect(" bytes read") | ||
77 | serialconn.expect("Octeon ubnt_e100#") | ||
78 | serialconn.sendline("bootoctlinux $loadaddr coremask=0x3 root=/dev/sda3 rw rootwait mtdparts=phys_mapped_flash:512k(boot0),512k(boot1),64k@3072k(eeprom)") | ||
79 | serialconn.expect("login:", timeout=120) | ||
80 | serialconn.close() | ||
81 | except pexpect.ExceptionPexpect as e: | ||
82 | bb.fatal('Serial interaction failed: %s' % str(e)) | ||
83 | |||
84 | def _wait_until_booted(self): | ||
85 | try: | ||
86 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) | ||
87 | serialconn.expect("login:", timeout=120) | ||
88 | serialconn.close() | ||
89 | except pexpect.ExceptionPexpect as e: | ||
90 | bb.fatal('Serial interaction failed: %s' % str(e)) | ||
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py b/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py index 7bc807d2bc..c3a98979c5 100644 --- a/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py +++ b/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py | |||
@@ -19,10 +19,9 @@ import subprocess | |||
19 | import sys | 19 | import sys |
20 | import pexpect | 20 | import pexpect |
21 | 21 | ||
22 | import oeqa.utils.sshcontrol as sshcontrol | 22 | from oeqa.controllers.controllerimage import ControllerImageHardwareTarget |
23 | from oeqa.controllers.masterimage import MasterImageHardwareTarget | ||
24 | 23 | ||
25 | class GrubTarget(MasterImageHardwareTarget): | 24 | class GrubTarget(ControllerImageHardwareTarget): |
26 | 25 | ||
27 | def __init__(self, d): | 26 | def __init__(self, d): |
28 | super(GrubTarget, self).__init__(d) | 27 | super(GrubTarget, self).__init__(d) |
@@ -41,16 +40,16 @@ class GrubTarget(MasterImageHardwareTarget): | |||
41 | 40 | ||
42 | def _deploy(self): | 41 | def _deploy(self): |
43 | # make sure these aren't mounted | 42 | # make sure these aren't mounted |
44 | self.master.run("umount /boot; umount /mnt/testrootfs;") | 43 | self.controller.run("umount /boot; umount /mnt/testrootfs;") |
45 | self.master.ignore_status = False | 44 | self.controller.ignore_status = False |
46 | # Kernel files may not be in the image, so copy them just in case | 45 | # Kernel files may not be in the image, so copy them just in case |
47 | self.master.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype) | 46 | self.controller.copy_to(self.rootfs, "~/test-rootfs." + self.image_fstype) |
48 | self.master.copy_to(self.kernel, "~/test-kernel") | 47 | self.controller.copy_to(self.kernel, "~/test-kernel") |
49 | for cmd in self.deploy_cmds: | 48 | for cmd in self.deploy_cmds: |
50 | self.master.run(cmd) | 49 | self.controller.run(cmd) |
51 | 50 | ||
52 | def _start(self, params=None): | 51 | def _start(self, params=None): |
53 | self.power_cycle(self.master) | 52 | self.power_cycle(self.controller) |
54 | try: | 53 | try: |
55 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) | 54 | serialconn = pexpect.spawn(self.serialcontrol_cmd, env=self.origenv, logfile=sys.stdout) |
56 | serialconn.expect("GNU GRUB version 2.00") | 55 | serialconn.expect("GNU GRUB version 2.00") |
diff --git a/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-beaglebone-yocto.txt b/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-beaglebone-yocto.txt new file mode 100644 index 0000000000..b0d98418d1 --- /dev/null +++ b/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-beaglebone-yocto.txt | |||
@@ -0,0 +1,4 @@ | |||
1 | # These should be reviewed to see if they are still needed | ||
2 | l4_wkup_cm | ||
3 | Failed to make EGL context current | ||
4 | glamor initialization failed \ No newline at end of file | ||
diff --git a/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-genericx86-64.txt b/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-genericx86-64.txt new file mode 100644 index 0000000000..9a655564cd --- /dev/null +++ b/meta-yocto-bsp/lib/oeqa/runtime/cases/parselogs-ignores-genericx86-64.txt | |||
@@ -0,0 +1,7 @@ | |||
1 | # These should be reviewed to see if they are still needed | ||
2 | Direct firmware load for i915 | ||
3 | Failed to load firmware i915 | ||
4 | Failed to fetch GuC | ||
5 | Failed to initialize GuC | ||
6 | Failed to load DMC firmware | ||
7 | The driver is built-in, so to load the firmware you need to \ No newline at end of file | ||
diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py index 57599e19aa..6ce9a3b3f8 100644 --- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py +++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py | |||
@@ -2,7 +2,7 @@ import os | |||
2 | 2 | ||
3 | from oeqa.selftest.case import OESelftestTestCase | 3 | from oeqa.selftest.case import OESelftestTestCase |
4 | from oeqa.core.decorator.depends import OETestDepends | 4 | from oeqa.core.decorator.depends import OETestDepends |
5 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu | 5 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu |
6 | 6 | ||
7 | class Systemdboot(OESelftestTestCase): | 7 | class Systemdboot(OESelftestTestCase): |
8 | 8 | ||
@@ -21,8 +21,9 @@ class Systemdboot(OESelftestTestCase): | |||
21 | features += 'MACHINE = "genericx86-64"' | 21 | features += 'MACHINE = "genericx86-64"' |
22 | self.append_config(features) | 22 | self.append_config(features) |
23 | 23 | ||
24 | deploydir = get_bb_var('DEPLOY_DIR_IMAGE', "core-image-minimal") | 24 | image = 'core-image-minimal' |
25 | systemdbootfile = os.path.join(deploydir, 'systemd-bootx64.efi') | 25 | bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image) |
26 | systemdbootfile = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], 'systemd-bootx64.efi') | ||
26 | 27 | ||
27 | # Ensure we're actually testing that this gets built and not that | 28 | # Ensure we're actually testing that this gets built and not that |
28 | # it was around from an earlier build | 29 | # it was around from an earlier build |
@@ -50,8 +51,8 @@ class Systemdboot(OESelftestTestCase): | |||
50 | AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com> | 51 | AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com> |
51 | """ | 52 | """ |
52 | 53 | ||
53 | systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.wic') | 54 | systemdbootimage = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], '%s.wic' % bb_vars['IMAGE_LINK_NAME']) |
54 | imagebootfile = os.path.join(deploydir, 'bootx64.efi') | 55 | imagebootfile = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], 'bootx64.efi') |
55 | 56 | ||
56 | # Clean environment before start the test | 57 | # Clean environment before start the test |
57 | if os.path.isfile(imagebootfile): | 58 | if os.path.isfile(imagebootfile): |
diff --git a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend index 72d991c7e5..4fc41d0580 100644 --- a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend | |||
@@ -1 +1 @@ | |||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | ||
diff --git a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf deleted file mode 100644 index 74d33c871f..0000000000 --- a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | # Mimic modprobe's install funcitonality with busybox's modprobe | ||
2 | install gma500_gfx dmesg | grep gma500_gfx_checked || { /etc/modprobe.d/gma500-gfx-check.sh || modprobe gma500_gfx; } | ||
diff --git a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh deleted file mode 100644 index 75cda99f54..0000000000 --- a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # Check for devices we wish to avoid gma500_gfx for | ||
4 | DEVICES="0x8119 0x4108" | ||
5 | |||
6 | # Checked flag to avoid infinite modprobe | ||
7 | echo "gma500_gfx_checked" >> /dev/kmsg; | ||
8 | |||
9 | for DEVICE in $DEVICES; do | ||
10 | if udevadm trigger --subsystem-match=pci --verbose --attr-match=device=$DEVICE | grep "pci" >> /dev/null ; then | ||
11 | echo "Found $DEVICE, avoiding gma500_gfx module" >> /dev/kmsg; | ||
12 | exit 0 | ||
13 | fi | ||
14 | done | ||
15 | exit 1 | ||
diff --git a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb deleted file mode 100644 index 8f10bd239c..0000000000 --- a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | SUMMARY = "Intel gma500_gfx fix for certain hardware" | ||
2 | DESCRIPTION = "Avoid inserting gma500_gfx module for certain hardware devices." | ||
3 | LICENSE="GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" | ||
5 | |||
6 | SRC_URI = "file://gma500-gfx-check.conf \ | ||
7 | file://gma500-gfx-check.sh " | ||
8 | |||
9 | do_install(){ | ||
10 | install -d ${D}${sysconfdir}/modprobe.d/ | ||
11 | install -m 755 ${WORKDIR}/gma500-gfx-check.sh ${D}${sysconfdir}/modprobe.d/gma500-gfx-check.sh | ||
12 | install -m 644 ${WORKDIR}/gma500-gfx-check.conf ${D}${sysconfdir}/modprobe.d/gma500-gfx-check.conf | ||
13 | } | ||
14 | |||
15 | FILES_${PN}="${sysconfdir}/modprobe.d/gma500-gfx-check.conf \ | ||
16 | ${sysconfdir}/modprobe.d/gma500-gfx-check.sh" | ||
17 | |||
18 | COMPATIBLE_MACHINE = "genericx86" | ||
diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend index 72d991c7e5..4fc41d0580 100644 --- a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | |||
@@ -1 +1 @@ | |||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | ||
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend index 6e5a129dd4..5b1b736b1c 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
@@ -1,13 +1,13 @@ | |||
1 | KBRANCH_genericx86 = "standard/base" | 1 | KBRANCH:genericx86 = "standard/base" |
2 | KBRANCH_genericx86-64 = "standard/base" | 2 | KBRANCH:genericx86-64 = "standard/base" |
3 | KBRANCH_edgerouter = "standard/edgerouter" | 3 | KBRANCH:beaglebone-yocto = "standard/beaglebone" |
4 | KBRANCH_beaglebone-yocto = "standard/beaglebone" | ||
5 | 4 | ||
6 | KMACHINE_genericx86 ?= "common-pc" | 5 | KMACHINE:genericarm64 ?= "genericarm64" |
7 | KMACHINE_genericx86-64 ?= "common-pc-64" | 6 | KMACHINE:genericx86 ?= "common-pc" |
8 | KMACHINE_beaglebone-yocto ?= "beaglebone" | 7 | KMACHINE:genericx86-64 ?= "common-pc-64" |
8 | KMACHINE:beaglebone-yocto ?= "beaglebone" | ||
9 | 9 | ||
10 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | 10 | COMPATIBLE_MACHINE:genericarm64 = "genericarm64" |
11 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | 11 | COMPATIBLE_MACHINE:genericx86 = "genericx86" |
12 | COMPATIBLE_MACHINE_edgerouter = "edgerouter" | 12 | COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" |
13 | COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" | 13 | COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" |
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend deleted file mode 100644 index 87e47352a6..0000000000 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | KBRANCH_genericx86 = "v5.10/standard/base" | ||
2 | KBRANCH_genericx86-64 = "v5.10/standard/base" | ||
3 | KBRANCH_edgerouter = "v5.10/standard/edgerouter" | ||
4 | KBRANCH_beaglebone-yocto = "v5.10/standard/beaglebone" | ||
5 | |||
6 | KMACHINE_genericx86 ?= "common-pc" | ||
7 | KMACHINE_genericx86-64 ?= "common-pc-64" | ||
8 | KMACHINE_beaglebone-yocto ?= "beaglebone" | ||
9 | |||
10 | SRCREV_machine_genericx86 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" | ||
11 | SRCREV_machine_genericx86-64 ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" | ||
12 | SRCREV_machine_edgerouter ?= "2e1fb8f84f09ca768eb531f33a126a40bb90e791" | ||
13 | SRCREV_machine_beaglebone-yocto ?= "cdca78778415b4b3bd64e8390ee8adf04bf7e17a" | ||
14 | |||
15 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | ||
16 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | ||
17 | COMPATIBLE_MACHINE_edgerouter = "edgerouter" | ||
18 | COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" | ||
19 | |||
20 | LINUX_VERSION_genericx86 = "5.10.12" | ||
21 | LINUX_VERSION_genericx86-64 = "5.10.12" | ||
22 | LINUX_VERSION_edgerouter = "5.10.12" | ||
23 | LINUX_VERSION_beaglebone-yocto = "5.10.12" | ||
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend deleted file mode 100644 index 35147d2da8..0000000000 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | KBRANCH_genericx86 = "v5.4/standard/base" | ||
2 | KBRANCH_genericx86-64 = "v5.4/standard/base" | ||
3 | KBRANCH_edgerouter = "v5.4/standard/edgerouter" | ||
4 | KBRANCH_beaglebone-yocto = "v5.4/standard/beaglebone" | ||
5 | |||
6 | KMACHINE_genericx86 ?= "common-pc" | ||
7 | KMACHINE_genericx86-64 ?= "common-pc-64" | ||
8 | KMACHINE_beaglebone-yocto ?= "beaglebone" | ||
9 | |||
10 | SRCREV_machine_genericx86 ?= "31db2b47ac7d8508080fbb7344399b501216de66" | ||
11 | SRCREV_machine_genericx86-64 ?= "31db2b47ac7d8508080fbb7344399b501216de66" | ||
12 | SRCREV_machine_edgerouter ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" | ||
13 | SRCREV_machine_beaglebone-yocto ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" | ||
14 | |||
15 | COMPATIBLE_MACHINE_genericx86 = "genericx86" | ||
16 | COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" | ||
17 | COMPATIBLE_MACHINE_edgerouter = "edgerouter" | ||
18 | COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" | ||
19 | |||
20 | LINUX_VERSION_genericx86 = "5.4.94" | ||
21 | LINUX_VERSION_genericx86-64 = "5.4.94" | ||
22 | LINUX_VERSION_edgerouter = "5.4.58" | ||
23 | LINUX_VERSION_beaglebone-yocto = "5.4.58" | ||
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend new file mode 100644 index 0000000000..3f33ec991d --- /dev/null +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend | |||
@@ -0,0 +1,21 @@ | |||
1 | COMPATIBLE_MACHINE:genericarm64 = "genericarm64" | ||
2 | COMPATIBLE_MACHINE:genericx86 = "genericx86" | ||
3 | COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" | ||
4 | COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" | ||
5 | |||
6 | KBRANCH:genericx86 = "v6.6/standard/base" | ||
7 | KBRANCH:genericx86-64 = "v6.6/standard/base" | ||
8 | KBRANCH:beaglebone-yocto = "v6.6/standard/beaglebone" | ||
9 | |||
10 | KMACHINE:genericarm64 ?= "genericarm64" | ||
11 | KMACHINE:genericx86 ?= "common-pc" | ||
12 | KMACHINE:genericx86-64 ?= "common-pc-64" | ||
13 | KMACHINE:beaglebone-yocto ?= "beaglebone" | ||
14 | |||
15 | SRCREV_machine:genericx86 ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" | ||
16 | SRCREV_machine:genericx86-64 ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" | ||
17 | SRCREV_machine:beaglebone-yocto ?= "06644f0d7193d7ec39d7fe41939a21953e7a0c65" | ||
18 | |||
19 | LINUX_VERSION:genericx86 = "6.6.21" | ||
20 | LINUX_VERSION:genericx86-64 = "6.6.21" | ||
21 | LINUX_VERSION:beaglebone-yocto = "6.6.21" | ||
diff --git a/meta-yocto-bsp/wic/beaglebone-yocto.wks b/meta-yocto-bsp/wic/beaglebone-yocto.wks index 701ae0b3d4..7a28fb23dc 100644 --- a/meta-yocto-bsp/wic/beaglebone-yocto.wks +++ b/meta-yocto-bsp/wic/beaglebone-yocto.wks | |||
@@ -2,6 +2,6 @@ | |||
2 | # long-description: Creates a partitioned SD card image for Beaglebone. | 2 | # long-description: Creates a partitioned SD card image for Beaglebone. |
3 | # Boot files are located in the first vfat partition. | 3 | # Boot files are located in the first vfat partition. |
4 | 4 | ||
5 | part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --size 16 --sourceparams="loader=u-boot" --use-uuid | 5 | part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --fixed-size 32 --sourceparams="loader=u-boot" --use-uuid |
6 | part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4 --use-uuid | 6 | part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4 --use-uuid |
7 | bootloader --append="console=ttyS0,115200" | 7 | bootloader --append="console=ttyS0,115200" |
diff --git a/meta-yocto-bsp/wic/edgerouter.wks b/meta-yocto-bsp/wic/edgerouter.wks deleted file mode 100644 index 7176fe436b..0000000000 --- a/meta-yocto-bsp/wic/edgerouter.wks +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | # short-description: Create SD card image for Edgerouter | ||
2 | # long-description: Create a partitioned SD card image for MIPS64 Edgerouter reference hardware. | ||
3 | part /boot --source bootimg-partition --ondisk sda --fstype=vfat --label boot --active --align 4 --size 16 | ||
4 | part / --source rootfs --ondisk sda --fstype=ext4 --label root --align 4 | ||
diff --git a/meta-yocto-bsp/wic/genericarm64.wks.in b/meta-yocto-bsp/wic/genericarm64.wks.in new file mode 100644 index 0000000000..ee7da87ded --- /dev/null +++ b/meta-yocto-bsp/wic/genericarm64.wks.in | |||
@@ -0,0 +1,11 @@ | |||
1 | # short-description: Create an EFI disk image | ||
2 | # long-description: Creates a partitioned EFI disk image that the user | ||
3 | # can directly dd to boot media. | ||
4 | |||
5 | part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER},initrd=${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES}" --label boot --active --align 1024 --use-uuid | ||
6 | |||
7 | part swap --size 44 --label swap --fstype=swap --use-uuid | ||
8 | |||
9 | part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid | ||
10 | |||
11 | bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4" | ||