From 5e928acf22cdc956eabe6e4b2327b34eb0ee66da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Fri, 2 Aug 2019 20:35:59 +0200
Subject: brcm2708: add bcm2711 subtarget (RPi 4B aarch64)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 target/linux/brcm2708/image/Makefile               | 31 +++++++++++++++++++---
 .../linux/brcm2708/image/config-bcm2711-arm64.txt  | 14 ++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 target/linux/brcm2708/image/config-bcm2711-arm64.txt

(limited to 'target/linux/brcm2708/image')

diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
index c850acdc25..50c741b77b 100644
--- a/target/linux/brcm2708/image/Makefile
+++ b/target/linux/brcm2708/image/Makefile
@@ -28,7 +28,7 @@ define Build/boot-common
 	mcopy -i $@.boot $(KDIR)/bootcode.bin ::
 	mcopy -i $@.boot $(KDIR)/LICENCE.broadcom ::
 	mcopy -i $@.boot cmdline.txt ::
-	mcopy -i $@.boot config.txt ::
+	mcopy -i $@.boot $(BOOT_CONFIG) ::config.txt
 	mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG)
 	$(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::;)
 	mmd -i $@.boot ::/overlays
@@ -45,7 +45,7 @@ define Build/boot-2708
 	mcopy -i $@.boot $(KDIR)/fixup_x.dat ::
 endef
 
- define Build/boot-2711
+define Build/boot-2711
 	mcopy -i $@.boot $(KDIR)/start4.elf ::
 	mcopy -i $@.boot $(KDIR)/start4cd.elf ::
 	mcopy -i $@.boot $(KDIR)/start4x.elf ::
@@ -54,6 +54,10 @@ endef
 	mcopy -i $@.boot $(KDIR)/fixup4x.dat ::
 endef
 
+define Build/boot-armstub8
+	mcopy -i $@.boot $(KDIR)/armstub8-gic.bin ::
+endef
+
 define Build/sdcard-img
 	./gen_rpi_sdcard_img.sh $@ $@.boot $(IMAGE_ROOTFS) \
 		$(CONFIG_TARGET_KERNEL_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE)
@@ -66,6 +70,7 @@ define Device/Default
   IMAGES := factory.img.gz sysupgrade.img.gz
   IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | sdcard-img | gzip | append-metadata
   IMAGE/factory.img.gz := boot-common | boot-2708 | sdcard-img | gzip
+  BOOT_CONFIG := config.txt
 endef
 
 define Device/rpi
@@ -92,7 +97,8 @@ define Device/rpi-2
 	rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm \
 	raspberrypi,2-model-b \
 	raspberrypi,3-model-b raspberrypi,3-model-b-plus \
-	raspberrypi,3-compute-module raspberrypi,compute-module-3
+	raspberrypi,3-compute-module raspberrypi,compute-module-3 \
+	raspberrypi,4-model-b
   DEVICE_PACKAGES := \
 	brcmfmac-firmware-43430-sdio \
 	brcmfmac-firmware-43430-sdio-rpi-3b \
@@ -125,4 +131,23 @@ ifeq ($(SUBTARGET),bcm2710)
   TARGET_DEVICES += rpi-3
 endif
 
+define Device/rpi-4
+  KERNEL_IMG := kernel8.img
+  DEVICE_TITLE := Raspberry Pi 4B
+  DEVICE_DTS := broadcom/bcm2711-rpi-4-b
+  SUPPORTED_DEVICES := \
+	raspberrypi,4-model-b
+  DEVICE_PACKAGES := \
+	brcmfmac-firmware-43455-sdio brcmfmac-firmware-43455-clm_blob \
+	brcmfmac-firmware-43455-sdio-rpi-4b \
+	kmod-brcmfmac wpad-basic \
+	brcm27xx-armstub
+  IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | boot-armstub8 | sdcard-img | gzip | append-metadata
+  IMAGE/factory.img.gz := boot-common | boot-2711 | boot-armstub8 | sdcard-img | gzip
+  BOOT_CONFIG := config-bcm2711-arm64.txt
+endef
+ifeq ($(SUBTARGET),bcm2711)
+  TARGET_DEVICES += rpi-4
+endif
+
 $(eval $(call BuildImage))
diff --git a/target/linux/brcm2708/image/config-bcm2711-arm64.txt b/target/linux/brcm2708/image/config-bcm2711-arm64.txt
new file mode 100644
index 0000000000..525d7039ed
--- /dev/null
+++ b/target/linux/brcm2708/image/config-bcm2711-arm64.txt
@@ -0,0 +1,14 @@
+################################################################################
+# Bootloader configuration - config.txt
+################################################################################
+
+################################################################################
+# For overclocking and various other settings, see:
+# https://www.raspberrypi.org/documentation/configuration/config-txt/README.md
+################################################################################
+
+# Force aarch64
+arm_64bit=1
+
+# USBs not working with > 3GB
+total_mem=3072
-- 
cgit v1.2.3