raspberrypi*: Define ARMSTUB for all machines

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
agherzan · Jul 20, 2019 · ca13d79 · ca13d79
1 parent 220c3bf
commit ca13d79
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 0 deletions.
diff --git a/conf/machine/raspberrypi-cm.conf b/conf/machine/raspberrypi-cm.conf
@@ -4,3 +4,5 @@
 
 MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
 include conf/machine/raspberrypi.conf
+
+ARMSTUB ?= "armstub.bin"
diff --git a/conf/machine/raspberrypi-cm3.conf b/conf/machine/raspberrypi-cm3.conf
@@ -10,3 +10,5 @@ KBUILD_DEFCONFIG ?= "bcm2709_defconfig"
 SDIMG_KERNELIMAGE ?= "kernel7.img"
 UBOOT_MACHINE = "rpi_3_32b_config"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
+
+ARMSTUB ?= "armstub.bin"
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
@@ -10,3 +10,5 @@ include conf/machine/include/rpi-base.inc
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
 UBOOT_MACHINE = "rpi_config"
+
+ARMSTUB ?= "armstub.bin"
diff --git a/conf/machine/raspberrypi0-wifi.conf b/conf/machine/raspberrypi0-wifi.conf
@@ -14,3 +14,5 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 SDIMG_KERNELIMAGE ?= "kernel.img"
 UBOOT_MACHINE ?= "rpi_0_w_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0"
+
+ARMSTUB ?= "armstub.bin"
diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
@@ -10,3 +10,5 @@ include conf/machine/include/rpi-base.inc
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
 UBOOT_MACHINE = "rpi_2_config"
+
+ARMSTUB ?= "armstub7.bin"
diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
@@ -31,3 +31,5 @@ KERNEL_IMAGETYPE_UBOOT ?= "Image"
 # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
 KERNEL_IMAGETYPE_DIRECT ?= "Image"
 KERNEL_BOOTCMD ?= "booti"
+
+ARMSTUB ?= "armstub8.bin"
diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf
@@ -16,3 +16,5 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 SDIMG_KERNELIMAGE ?= "kernel7.img"
 UBOOT_MACHINE = "rpi_3_32b_config"
 SERIAL_CONSOLES ?= "115200;ttyS0"
+
+ARMSTUB ?= "armstub7.bin"
diff --git a/conf/machine/raspberrypi4-64.conf b/conf/machine/raspberrypi4-64.conf
@@ -32,3 +32,5 @@ KERNEL_IMAGETYPE_DIRECT ?= "Image"
 KERNEL_BOOTCMD ?= "booti"
 
 RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1"
+
+ARMSTUB ?= "armstub8-gic.bin"
diff --git a/conf/machine/raspberrypi4.conf b/conf/machine/raspberrypi4.conf
@@ -18,3 +18,4 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
 
 MACHINE_FEATURES_append = " vc4graphics"
 VC4DTBO ?= "vc4-fkms-v3d"
+ARMSTUB ?= "armstub7.bin"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@

		MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
		include conf/machine/raspberrypi.conf

		ARMSTUB ?= "armstub.bin"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,5 @@ include conf/machine/include/rpi-base.inc
		SERIAL_CONSOLES ?= "115200;ttyAMA0"

		UBOOT_MACHINE = "rpi_config"

		ARMSTUB ?= "armstub.bin"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,3 +32,5 @@ KERNEL_IMAGETYPE_DIRECT ?= "Image"
		KERNEL_BOOTCMD ?= "booti"

		RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1"

		ARMSTUB ?= "armstub8-gic.bin"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ SERIAL_CONSOLES ?= "115200;ttyS0"

		MACHINE_FEATURES_append = " vc4graphics"
		VC4DTBO ?= "vc4-fkms-v3d"
		ARMSTUB ?= "armstub7.bin"