rpi3: Initial rpi3.mk file for Raspberry Pi 3

Besides the rpi3.mk file itself, this also contains the additional
kconfig files and flags used when building Linux and U-Boot.

A set of firmware images are also included.

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: David Brown <david.brown@linaro.org>

common.mk

@@ -5,6 +5,7 @@
 BASH ?= bash
 ROOT ?= $(shell pwd)/..
 
+BUILD_PATH			?= $(ROOT)/build
 LINUX_PATH			?= $(ROOT)/linux
 OPTEE_GENDRV_MODULE		?= $(LINUX_PATH)/drivers/tee/optee/optee.ko
 GEN_ROOTFS_PATH			?= $(ROOT)/gen_rootfs

kconfigs/rpi3.conf

+CONFIG_TEE=y
+CONFIG_OPTEE=y

rpi3.mk

+################################################################################
+# Following variables defines how the NS_USER (Non Secure User - Client
+# Application), NS_KERNEL (Non Secure Kernel), S_KERNEL (Secure Kernel) and
+# S_USER (Secure User - TA) are compiled
+################################################################################
+override COMPILE_NS_USER   := 64
+override COMPILE_NS_KERNEL := 64
+override COMPILE_S_USER    := 64
+override COMPILE_S_KERNEL  := 64
+
+# Firmware package to download, for convenience later on when unpacking etc,
+# we split it up in three different variables. Note that this should be updated
+# when newer firmware packages will be used.
+RPI3_FIRMWARE_URL = https://github.com/raspberrypi/firmware/archive
+RPI3_FIRMWARE_FILE = 046effa13ebc4cc7601df4f06f4834bd0eebb0f8
+RPI3_FIRMWARE_FILE_EXT = zip
+
+-include common.mk
+
+################################################################################
+# Mandatory definition to use common.mk
+################################################################################
+ifeq ($(COMPILE_NS_USER),64)
+MULTIARCH			:= aarch64-linux-gnu
+else
+MULTIARCH			:= arm-linux-gnueabihf
+endif
+
+################################################################################
+# Paths to git projects and various binaries
+################################################################################
+ARM_TF_PATH		?= $(ROOT)/arm-trusted-firmware
+ARM_TF_OUT		?= $(ARM_TF_PATH)/build/rpi3/debug
+ARM_TF_BIN		?= $(ARM_TF_OUT)/bl31.bin
+ARM_TF_TMP		?= $(ARM_TF_OUT)/bl31.tmp
+ARM_TF_HEAD		?= $(ARM_TF_OUT)/bl31.head
+ARM_TF_BOOT             ?= $(ARM_TF_OUT)/optee.bin
+
+U-BOOT_PATH		?= $(ROOT)/u-boot
+U-BOOT_BIN		?= $(U-BOOT_PATH)/u-boot.bin
+U-BOOT_JTAG_BIN		?= $(U-BOOT_PATH)/u-boot-jtag.bin
+
+RPI3_FIRMWARE_PATH	?= $(BUILD_PATH)/rpi3/firmware
+RPI3_HEAD_BIN		?= $(RPI3_FIRMWARE_PATH)/head.bin
+RPI3_BOOT_CONFIG	?= $(RPI3_FIRMWARE_PATH)/config.txt
+RPI3_UBOOT_ENV		?= $(RPI3_FIRMWARE_PATH)/uboot.env
+RPI3_STOCK_FW_PATH	?= $(ROOT)/rpi3_firmware
+
+OPTEE_OS_PAGER		?= $(OPTEE_OS_PATH)/out/arm/core/tee-pager.bin
+
+LINUX_IMAGE		?= $(LINUX_PATH)/arch/arm64/boot/Image
+LINUX_DTB		?= $(LINUX_PATH)/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dtb
+MODULE_OUTPUT		?= $(ROOT)/module_output
+
+################################################################################
+# Targets
+################################################################################
+all: rpi3-firmware arm-tf optee-os optee-client xtest u-boot \
+	linux update_rootfs
+all-clean: arm-tf-clean busybox-clean u-boot-clean optee-os-clean \
+	optee-client-clean rpi3-firmware-clean
+
+-include toolchain.mk
+
+################################################################################
+# ARM Trusted Firmware
+################################################################################
+ARM_TF_EXPORTS ?= \
+	CFLAGS="-O0 -gdwarf-2" \
+	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)"
+
+ARM_TF_FLAGS ?= \
+	BL32=$(OPTEE_OS_BIN) \
+	DEBUG=1 \
+	V=0 \
+	CRASH_REPORTING=1 \
+	LOG_LEVEL=40 \
+	PLAT=rpi3 \
+	SPD=opteed
+
+arm-tf: optee-os
+	$(ARM_TF_EXPORTS) $(MAKE) -C $(ARM_TF_PATH) $(ARM_TF_FLAGS) all
+	cd $(ARM_TF_OUT) && \
+	  dd if=/dev/zero of=scratch bs=1c count=131072 && \
+	  cat $(ARM_TF_BIN) scratch > $(ARM_TF_TMP) && \
+	  dd if=$(ARM_TF_TMP) of=$(ARM_TF_HEAD) bs=1c count=131072 && \
+	  cat $(ARM_TF_HEAD) $(OPTEE_OS_PAGER) > $(ARM_TF_BOOT) && \
+	  rm scratch $(ARM_TF_TMP) $(ARM_TF_HEAD)
+
+arm-tf-clean:
+	$(ARM_TF_EXPORTS) $(MAKE) -C $(ARM_TF_PATH) $(ARM_TF_FLAGS) clean
+
+################################################################################
+# Das U-Boot
+################################################################################
+
+U-BOOT_EXPORTS ?= CROSS_COMPILE=$(LEGACY_AARCH64_CROSS_COMPILE) ARCH=arm64
+
+.PHONY: u-boot
+u-boot:
+	$(U-BOOT_EXPORTS) $(MAKE) -C $(U-BOOT_PATH) rpi_3_defconfig
+	$(U-BOOT_EXPORTS) $(MAKE) -C $(U-BOOT_PATH) all
+	cd $(U-BOOT_PATH) && cat $(RPI3_HEAD_BIN) $(U-BOOT_BIN) > $(U-BOOT_JTAG_BIN)
+
+u-boot-clean:
+	$(U-BOOT_EXPORTS) $(MAKE) -C $(U-BOOT_PATH) clean
+
+################################################################################
+# Busybox
+################################################################################
+BUSYBOX_COMMON_TARGET = rpi3
+BUSYBOX_CLEAN_COMMON_TARGET = rpi3 clean
+
+busybox: busybox-common
+
+busybox-clean: busybox-clean-common
+
+busybox-cleaner: busybox-cleaner-common
+################################################################################
+# Linux kernel
+################################################################################
+LINUX_DEFCONFIG_COMMON_ARCH := arm64
+LINUX_DEFCONFIG_COMMON_FILES := \
+		$(LINUX_PATH)/arch/arm64/configs/bcmrpi3_defconfig \
+		$(CURDIR)/kconfigs/rpi3.conf
+
+linux-defconfig: $(LINUX_PATH)/.config
+
+LINUX_COMMON_FLAGS += ARCH=arm64
+
+linux: linux-common
+	$(MAKE) -C $(LINUX_PATH) $(LINUX_COMMON_FLAGS) INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$(MODULE_OUTPUT) modules_install
+
+linux-defconfig-clean: linux-defconfig-clean-common
+
+LINUX_CLEAN_COMMON_FLAGS += ARCH=arm64
+
+linux-clean: linux-clean-common
+
+LINUX_CLEANER_COMMON_FLAGS += ARCH=arm64
+
+linux-cleaner: linux-cleaner-common
+
+################################################################################
+# OP-TEE
+################################################################################
+OPTEE_OS_COMMON_FLAGS += PLATFORM=rpi3
+optee-os: optee-os-common
+
+OPTEE_OS_CLEAN_COMMON_FLAGS += PLATFORM=rpi3
+optee-os-clean: optee-os-clean-common
+
+optee-client: optee-client-common
+
+optee-client-clean: optee-client-clean-common
+
+################################################################################
+# Raspberry Pi 3 firmware
+################################################################################
+.PHONY: rpi3-firmware
+rpi3-firmware:
+ifeq ("$(wildcard $(ROOT)/out/$(RPI3_FIRMWARE_FILE).$(RPI3_FIRMWARE_FILE_EXT))","")
+	echo "Downloading Raspberry Pi 3 firmware ..."
+	mkdir -p $(ROOT)/out
+	wget $(RPI3_FIRMWARE_URL)/$(RPI3_FIRMWARE_FILE).$(RPI3_FIRMWARE_FILE_EXT) -O $(ROOT)/out/$(RPI3_FIRMWARE_FILE).$(RPI3_FIRMWARE_FILE_EXT)
+	unzip -a $(ROOT)/out/$(RPI3_FIRMWARE_FILE).$(RPI3_FIRMWARE_FILE_EXT) -d $(ROOT)
+	mv $(ROOT)/firmware-$(RPI3_FIRMWARE_FILE) $(RPI3_STOCK_FW_PATH)
+endif
+
+.PHONY: rpi3-firmware-clean
+rpi3-firmware-clean:
+	rm -f $(ROOT)/out/$(RPI3_FIRMWARE_FILE).$(RPI3_FIRMWARE_FILE_EXT)
+
+################################################################################
+# xtest / optee_test
+################################################################################
+xtest: xtest-common
+
+xtest-clean: xtest-clean-common
+
+xtest-patch: xtest-patch-common
+
+################################################################################
+# hello_world
+################################################################################
+helloworld: helloworld-common
+
+helloworld-clean: helloworld-clean-common
+
+################################################################################
+# Root FS
+################################################################################
+.PHONY: filelist-tee
+filelist-tee: helloworld
+	@echo "# xtest / optee_test" > $(GEN_ROOTFS_FILELIST)
+	@find $(OPTEE_TEST_OUT_PATH) -type f -name "xtest" | sed 's/\(.*\)/file \/bin\/xtest \1 755 0 0/g' >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /bin/hello_world $(HELLOWORLD_PATH)/host/hello_world 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "# TAs" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/optee_armtz 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@find $(OPTEE_TEST_OUT_PATH) -name "*.ta" | \
+		sed 's/\(.*\)\/\(.*\)/file \/lib\/optee_armtz\/\2 \1\/\2 444 0 0/g' >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/optee_armtz/8aaaf200-2450-11e4-abe20002a5d5c51b.ta $(HELLOWORLD_PATH)/ta/8aaaf200-2450-11e4-abe20002a5d5c51b.ta 444 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "# Secure storage dir" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /data 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /data/tee 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /data/tee 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /usr/bin 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@if [ -e $(OPTEE_GENDRV_MODULE) ]; then \
+		echo "# OP-TEE device" >> $(GEN_ROOTFS_FILELIST); \
+		echo "dir /lib/modules 755 0 0" >> $(GEN_ROOTFS_FILELIST); \
+		echo "dir /lib/modules/$(call KERNEL_VERSION) 755 0 0" >> $(GEN_ROOTFS_FILELIST); \
+		echo "file /lib/modules/$(call KERNEL_VERSION)/optee.ko $(OPTEE_GENDRV_MODULE) 755 0 0" >> $(GEN_ROOTFS_FILELIST); \
+	fi
+	@echo "# OP-TEE Client" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /usr/include/tee_client_api.h $(OPTEE_CLIENT_EXPORT)/include/tee_client_api.h 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /usr/include/teec_trace.h $(OPTEE_CLIENT_EXPORT)/include/teec_trace.h 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /bin/tee-supplicant $(OPTEE_CLIENT_EXPORT)/bin/tee-supplicant 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/libteec.so.1.0 $(OPTEE_CLIENT_EXPORT)/lib/libteec.so.1.0 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "slink /lib/libteec.so.1 libteec.so.1.0 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "slink /lib/libteec.so libteec.so.1 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /boot 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/bcm2710-rpi-3-b.dtb $(LINUX_DTB) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/config.txt $(RPI3_BOOT_CONFIG) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/Image $(LINUX_IMAGE) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/optee.bin $(ARM_TF_BOOT) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/uboot.env $(RPI3_UBOOT_ENV) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/u-boot-jtag.bin $(U-BOOT_JTAG_BIN) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@cd $(MODULE_OUTPUT) && find ! -path . -type d | sed 's/\.\(.*\)/dir \1 755 0 0/g' >> $(GEN_ROOTFS_FILELIST)
+	@cd $(MODULE_OUTPUT) && find -type f | sed "s|\.\(.*\)|file \1 $(MODULE_OUTPUT)\1 755 0 0|g" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/bootcode.bin $(RPI3_STOCK_FW_PATH)/boot/bootcode.bin 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/COPYING.linux $(RPI3_STOCK_FW_PATH)/boot/COPYING.linux 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/fixup_cd.dat $(RPI3_STOCK_FW_PATH)/boot/fixup_cd.dat 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/fixup.dat $(RPI3_STOCK_FW_PATH)/boot/fixup.dat 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/fixup_db.dat $(RPI3_STOCK_FW_PATH)/boot/fixup_db.dat 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/fixup_x.dat $(RPI3_STOCK_FW_PATH)/boot/fixup_x.dat 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/LICENCE.broadcom $(RPI3_STOCK_FW_PATH)/boot/LICENCE.broadcom 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/start_cd.elf $(RPI3_STOCK_FW_PATH)/boot/start_cd.elf 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/start_db.elf $(RPI3_STOCK_FW_PATH)/boot/start_db.elf 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/start.elf $(RPI3_STOCK_FW_PATH)/boot/start.elf 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /boot/start_x.elf $(RPI3_STOCK_FW_PATH)/boot/start_x.elf 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+
+.PHONY: update_rootfs
+update_rootfs: arm-tf busybox u-boot optee-client xtest filelist-tee linux
+	cat $(GEN_ROOTFS_PATH)/filelist-final.txt $(GEN_ROOTFS_PATH)/filelist-tee.txt > $(GEN_ROOTFS_PATH)/filelist.tmp
+	cd $(GEN_ROOTFS_PATH) && \
+	        $(LINUX_PATH)/usr/gen_init_cpio $(GEN_ROOTFS_PATH)/filelist.tmp | gzip > $(GEN_ROOTFS_PATH)/filesystem.cpio.gz
+
+# Creating images etc, could wipe out a drive on the system, therefore we don't
+# want to automate that in script or make target. Instead we just simply provide
+# the steps here.
+.PHONY: img-help
+img-help:
+	@echo "$$ fdisk /dev/sdx   # where sdx is the name of your sd-card"
+	@echo "   > p             # prints partition table"
+	@echo "   > d             # repeat until all partitions are deleted"
+	@echo "   > n             # create a new partition"
+	@echo "   > p             # create primary"
+	@echo "   > 1             # make it the first partition"
+	@echo "   > <enter>       # use the default sector"
+	@echo "   > +32M          # create a boot partition with 32MB of space"
+	@echo "   > n             # create rootfs partition"
+	@echo "   > p"
+	@echo "   > 2"
+	@echo "   > <enter>"
+	@echo "   > <enter>       # fill the remaining disk, adjust size to fit your needs"
+	@echo "   > t             # change partition type"
+	@echo "   > 1             # select first partition"
+	@echo "   > e             # use type 'e' (FAT16)"
+	@echo "   > a             # make partition bootable"
+	@echo "   > 1             # select first partition"
+	@echo "   > p             # double check everything looks right"
+	@echo "   > w             # write partition table to disk."
+	@echo ""
+	@echo "run the following as root"
+	@echo "   $$ mkfs.vfat -F16 -n BOOT /dev/sdx1"
+	@echo "   $$ mkdir -p /media/boot"
+	@echo "   $$ mount /dev/sdx1 /media/boot"
+	@echo "   $$ cd /media"
+	@echo "   $$ gunzip -cd $(GEN_ROOTFS_PATH)/filesystem.cpio.gz | sudo cpio -idmv \"boot/*\""
+	@echo "   $$ umount boot"
+	@echo ""
+	@echo "run the following as root"
+	@echo "   $$ mkfs.ext4 -L rootfs /dev/sdx2"
+	@echo "   $$ mkdir -p /media/rootfs"
+	@echo "   $$ mount /dev/sdx2 /media/rootfs"
+	@echo "   $$ cd rootfs"
+	@echo "   $$ gunzip -cd $(GEN_ROOTFS_PATH)/filesystem.cpio.gz | sudo cpio -idmv"
+	@echo "   $$ rm -rf /media/rootfs/boot/*"
+	@echo "   $$ cd .. && umount rootfs"

rpi3/firmware/config.txt

+enable_uart=1
+arm_control=0x200
+kernel_old=1
+
+kernel=u-boot-jtag.bin
+
+disable_commandline_tags=1
+
+# set display mode to 1920x1080
+##hdmi_group=2
+##hdmi_mode=82
+
+