diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-19 19:33:36 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-19 20:05:53 +0100 |
commit | 0d641c8fa918b1c5ecce2cb9918c47bb3c4e1510 (patch) | |
tree | 0ec5841a1cbaf6e62466b17428fbdfd1ab639f86 | |
parent | c99fe712d64fd0a9e1cf776f0c4ff48e258cf8cf (diff) | |
download | meta-raspberrypi-0d641c8fa918b1c5ecce2cb9918c47bb3c4e1510.tar.gz |
raspberrypi*: Define ARMSTUB for all machines
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-rw-r--r-- | conf/machine/raspberrypi-cm.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi-cm3.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi0-wifi.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi2.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi3-64.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi3.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi4-64.conf | 2 | ||||
-rw-r--r-- | conf/machine/raspberrypi4.conf | 1 |
9 files changed, 17 insertions, 0 deletions
diff --git a/conf/machine/raspberrypi-cm.conf b/conf/machine/raspberrypi-cm.conf index 2da7d50..f9371df 100644 --- a/conf/machine/raspberrypi-cm.conf +++ b/conf/machine/raspberrypi-cm.conf | |||
@@ -4,3 +4,5 @@ | |||
4 | 4 | ||
5 | MACHINEOVERRIDES = "raspberrypi:${MACHINE}" | 5 | MACHINEOVERRIDES = "raspberrypi:${MACHINE}" |
6 | include conf/machine/raspberrypi.conf | 6 | include conf/machine/raspberrypi.conf |
7 | |||
8 | ARMSTUB ?= "armstub.bin" | ||
diff --git a/conf/machine/raspberrypi-cm3.conf b/conf/machine/raspberrypi-cm3.conf index c8677b4..638c2ea 100644 --- a/conf/machine/raspberrypi-cm3.conf +++ b/conf/machine/raspberrypi-cm3.conf | |||
@@ -10,3 +10,5 @@ KBUILD_DEFCONFIG ?= "bcm2709_defconfig" | |||
10 | SDIMG_KERNELIMAGE ?= "kernel7.img" | 10 | SDIMG_KERNELIMAGE ?= "kernel7.img" |
11 | UBOOT_MACHINE = "rpi_3_32b_config" | 11 | UBOOT_MACHINE = "rpi_3_32b_config" |
12 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 12 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
13 | |||
14 | ARMSTUB ?= "armstub.bin" | ||
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index e94ad86..b23687b 100644 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf | |||
@@ -10,3 +10,5 @@ include conf/machine/include/rpi-base.inc | |||
10 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
11 | 11 | ||
12 | UBOOT_MACHINE = "rpi_config" | 12 | UBOOT_MACHINE = "rpi_config" |
13 | |||
14 | ARMSTUB ?= "armstub.bin" | ||
diff --git a/conf/machine/raspberrypi0-wifi.conf b/conf/machine/raspberrypi0-wifi.conf index 2c4f760..8689bca 100644 --- a/conf/machine/raspberrypi0-wifi.conf +++ b/conf/machine/raspberrypi0-wifi.conf | |||
@@ -14,3 +14,5 @@ MACHINE_EXTRA_RRECOMMENDS += "\ | |||
14 | SDIMG_KERNELIMAGE ?= "kernel.img" | 14 | SDIMG_KERNELIMAGE ?= "kernel.img" |
15 | UBOOT_MACHINE ?= "rpi_0_w_defconfig" | 15 | UBOOT_MACHINE ?= "rpi_0_w_defconfig" |
16 | SERIAL_CONSOLES ?= "115200;ttyS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyS0" |
17 | |||
18 | ARMSTUB ?= "armstub.bin" | ||
diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf index bd191c3..505c6f2 100644 --- a/conf/machine/raspberrypi2.conf +++ b/conf/machine/raspberrypi2.conf | |||
@@ -10,3 +10,5 @@ include conf/machine/include/rpi-base.inc | |||
10 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
11 | 11 | ||
12 | UBOOT_MACHINE = "rpi_2_config" | 12 | UBOOT_MACHINE = "rpi_2_config" |
13 | |||
14 | ARMSTUB ?= "armstub7.bin" | ||
diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index 80b6bc4..60fe8bd 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf | |||
@@ -31,3 +31,5 @@ KERNEL_IMAGETYPE_UBOOT ?= "Image" | |||
31 | # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet | 31 | # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet |
32 | KERNEL_IMAGETYPE_DIRECT ?= "Image" | 32 | KERNEL_IMAGETYPE_DIRECT ?= "Image" |
33 | KERNEL_BOOTCMD ?= "booti" | 33 | KERNEL_BOOTCMD ?= "booti" |
34 | |||
35 | ARMSTUB ?= "armstub8.bin" | ||
diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf index 49252fc..581e47c 100644 --- a/conf/machine/raspberrypi3.conf +++ b/conf/machine/raspberrypi3.conf | |||
@@ -16,3 +16,5 @@ MACHINE_EXTRA_RRECOMMENDS += "\ | |||
16 | SDIMG_KERNELIMAGE ?= "kernel7.img" | 16 | SDIMG_KERNELIMAGE ?= "kernel7.img" |
17 | UBOOT_MACHINE = "rpi_3_32b_config" | 17 | UBOOT_MACHINE = "rpi_3_32b_config" |
18 | SERIAL_CONSOLES ?= "115200;ttyS0" | 18 | SERIAL_CONSOLES ?= "115200;ttyS0" |
19 | |||
20 | ARMSTUB ?= "armstub7.bin" | ||
diff --git a/conf/machine/raspberrypi4-64.conf b/conf/machine/raspberrypi4-64.conf index 2914c74..e308577 100644 --- a/conf/machine/raspberrypi4-64.conf +++ b/conf/machine/raspberrypi4-64.conf | |||
@@ -32,3 +32,5 @@ KERNEL_IMAGETYPE_DIRECT ?= "Image" | |||
32 | KERNEL_BOOTCMD ?= "booti" | 32 | KERNEL_BOOTCMD ?= "booti" |
33 | 33 | ||
34 | RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1" | 34 | RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1" |
35 | |||
36 | ARMSTUB ?= "armstub8-gic.bin" | ||
diff --git a/conf/machine/raspberrypi4.conf b/conf/machine/raspberrypi4.conf index b4fd271..42c765f 100644 --- a/conf/machine/raspberrypi4.conf +++ b/conf/machine/raspberrypi4.conf | |||
@@ -18,3 +18,4 @@ SERIAL_CONSOLES ?= "115200;ttyS0" | |||
18 | 18 | ||
19 | MACHINE_FEATURES_append = " vc4graphics" | 19 | MACHINE_FEATURES_append = " vc4graphics" |
20 | VC4DTBO ?= "vc4-fkms-v3d" | 20 | VC4DTBO ?= "vc4-fkms-v3d" |
21 | ARMSTUB ?= "armstub7.bin" | ||