@@ -82,8 +82,13 @@ endif

 TOOLS_BIN := $(SRCROOT)/tools/bin

 CONTAIN := $(TOOLS_BIN)/contain

+ifeq ($(ARCH),x86_64)

 VIXDISKUTIL := $(TOOLS_BIN)/vixdiskutil

 IMGCONVERTER := $(TOOLS_BIN)/imgconverter

+else

+VIXDISKUTIL :=

+IMGCONVERTER :=

+endif

 .PHONY : all iso clean photon-build-machine photon-vagrant-build photon-vagrant-local cloud-image \

 check-tools check-docker check-bison check-g++ check-gawk check-repo-tool check-kpartx check-vagrant check-packer check-packer-ovf-plugin check-sanity \

new file mode 100644

@@ -0,0 +1,18 @@

+diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi

+index e36c392a2b8f..409ee0460b22 100644

+--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi

+@@ -27,6 +27,13 @@

+ 			firmware = <&firmware>;

+ 			#power-domain-cells = <1>;

+ 		};

++		vchiq: vchiq {

++			compatible = "brcm,bcm2835-vchiq";

++			reg = <0x7e00b840 0xf>;

++			interrupts = <0 2>;

++			cache-line-size = <32>;

++			firmware = <&firmware>;

++		};

+ 	};

+ };

+ 

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:        4.14.8

-Release:        1%{?kat_build:.%kat_build}%{?dist}

+Release:        2%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -25,6 +25,8 @@ Patch3:         SUNRPC-Do-not-reuse-srcport-for-TIME_WAIT-socket.patch

 Patch4:         SUNRPC-xs_bind-uses-ip_local_reserved_ports.patch

 Patch5:         vsock-transport-for-9p.patch

 Patch6:         x86-vmware-STA-support.patch

+# rpi3 dts

+Patch10:	arm-dts-add-vchiq-entry.patch

 #HyperV patches

 Patch13:        0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch

 # TODO: Is CONFIG_HYPERV_VSOCKETS the same?

@@ -105,6 +107,15 @@ Requires:       audit

 %description tools

 This package contains the 'perf' performance analysis tools for Linux kernel.

+%ifarch aarch64

+%package dtb-rpi3

+Summary:        Kernel Device Tree Blob files for Raspberry Pi3

+Group:          System Environment/Kernel

+Requires:       %{name} = %{version}-%{release}

+%description dtb-rpi3

+Kernel Device Tree Blob files for Raspberry Pi3

+%endif

+

 %prep

 %setup -q -n linux-%{version}

@@ -117,6 +128,7 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch4 -p1

 %patch5 -p1

 %patch6 -p1

+%patch10 -p1

 %patch13 -p1

 %patch24 -p1

 %patch26 -p1

@@ -176,6 +188,7 @@ install -vdm 755 %{buildroot}%{_defaultdocdir}/%{name}-%{uname_r}

 install -vdm 755 %{buildroot}/usr/src/%{name}-headers-%{uname_r}

 install -vdm 755 %{buildroot}/usr/lib/debug/lib/modules/%{uname_r}

 make INSTALL_MOD_PATH=%{buildroot} modules_install

+

 %ifarch x86_64

 # install ENA module

 bldroot=`pwd`

@@ -197,9 +210,14 @@ if [ "$ID1" != "$ID2" ] ; then

 fi

 install -vm 644 arch/x86/boot/bzImage %{buildroot}/boot/vmlinuz-%{uname_r}

 %endif

+

 %ifarch aarch64

 install -vm 644 arch/arm64/boot/Image %{buildroot}/boot/vmlinuz-%{uname_r}

+# Install DTB files

+install -vdm 755 %{buildroot}/boot/dtb

+install -vm 640 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dtb %{buildroot}/boot/dtb/

 %endif

+

 # Restrict the permission on System.map-X file

 install -vm 400 System.map %{buildroot}/boot/System.map-%{uname_r}

 install -vm 644 .config %{buildroot}/boot/config-%{uname_r}

@@ -316,7 +334,16 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/perf-core/strace/groups/file

 /usr/share/doc/*

+%ifarch aarch64

+%files dtb-rpi3

+%defattr(-,root,root)

+/boot/dtb/bcm2837-rpi-3-b.dtb

+%endif

+

 %changelog

+*   Fri Jan 26 2018 Alexey Makhalov <amakhalov@vmware.com> 4.14.8-2

+-   Added vchiq entry to rpi3 dts

+-   Added dtb-rpi3 subpackage

 *   Fri Dec 22 2017 Alexey Makhalov <amakhalov@vmware.com> 4.14.8-1

 -   Version update

 *   Wed Dec 13 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.66-4

@@ -1,12 +1,14 @@

 {

     "packages":["glibc", "zlib", "filesystem",

-                "pkg-config", "bash", "bzip2", "shadow", "procps-ng", "coreutils", "bc", "libtool", "net-tools",

-                "findutils", "xz", "iproute2", "util-linux", "kmod", "linux", "ca-certificates", "curl", "iptables", "Linux-PAM",

-                "systemd", "dbus", "file", "e2fsprogs", "rpm","gawk","gptfdisk",

+                "pkg-config", "bash", "bzip2", "shadow", "procps-ng",

+		"coreutils", "bc", "libtool", "net-tools", "findutils", "xz",

+		"iproute2", "util-linux", "kmod", "linux", "linux-dtb-rpi3",

+		"ca-certificates", "curl", "iptables", "Linux-PAM", "systemd",

+		"dbus", "file", "e2fsprogs", "rpm","gawk","gptfdisk",

                 "openssh", "gdbm", "parted",

                 "photon-release", "photon-repos",

                 "sed", "grep", "cpio", "gzip", "vim", "libdb", "tdnf",

-                "which", "tzdata", "motd", "gdbm"]

+                "which", "tzdata", "motd", "gdbm", "u-boot-rpi3" ]

 }

@@ -63,13 +63,16 @@ def create_vmdk_and_partition(config, vmdk_path):

             partitions_data['root'] = line.replace("ROOT_PARTITION=", "").strip()

             partitions_data['boot'] = partitions_data['root']

             partitions_data['bootdirectory'] = '/boot/'

-            count += 1

-

-    if count == 2:

-        partitions_data['partitions'] = [{'path': partitions_data['root'], 'mountpoint': '/',

+            partitions_data['partitions'] = [{'path': partitions_data['root'], 'mountpoint': '/',

                                           'filesystem': 'ext4'}]

+            count += 1

+        elif line.startswith("ESP_PARTITION="):

+            partitions_data['esp'] = line.replace("ESP_PARTITION=", "").strip()

+            partitions_data['partitions'].append({'path': partitions_data['esp'], 'mountpoint': '/boot/esp',

+                                          'filesystem': 'vfat'})

+            count += 1

-    return partitions_data, count == 2

+    return partitions_data, count == 2 or count == 3

 def get_file_name_with_last_folder(filename):

     basename = os.path.basename(filename)

deleted file mode 100755

Binary files a/support/cloud-image-builder/rpi3/esp/EFI/BOOT/bootaa64.efi and /dev/null differ

Binary files a/support/cloud-image-builder/rpi3/esp/bootcode.bin and b/support/cloud-image-builder/rpi3/esp/bootcode.bin differ

@@ -2,12 +2,9 @@

 # or on https://www.raspberrypi.org/documentation/configuration/config-txt.md

 # Our kernels are located on a Linux partition. Chainload U-Boot to load them.

 kernel=u-boot.bin

-# Use 64 MB for GPU for RPi with 256 MB (Min 16 - Max 192 MB)

-gpu_mem_256=64

-# Use 64 MB for GPU for RPi with 512 MB (Min 16 - Max 448 MB)

-gpu_mem_512=64

 # Use 128 MB for GPU for RPi with 1024 MB (Min 16 - Max 944 MB)

-gpu_mem_1024=128

+gpu_mem=256

+start_x=1

 # Turbo mode: 0 = enable dynamic freq/voltage - 1 = always max

 force_turbo=0

 # Start in turbo mode for 30 seconds or until cpufreq sets a frequency

@@ -19,4 +16,7 @@ arm_control=0x200

 # Fix mini UART input frequency, and setup/enable up the UART.

 enable_uart=1

 # Disable warning overlays as they don't work well together with linux's graphical output

-avoid_warnings=1

+avoid_warnings=2

+dtoverlay=vc4-kms-v3d

+

+hdmi_drive=2

Binary files a/support/cloud-image-builder/rpi3/esp/fixup.dat and b/support/cloud-image-builder/rpi3/esp/fixup.dat differ

Binary files a/support/cloud-image-builder/rpi3/esp/start.elf and b/support/cloud-image-builder/rpi3/esp/start.elf differ

new file mode 100755

Binary files /dev/null and b/support/cloud-image-builder/rpi3/esp/start_x.elf differ

deleted file mode 100755

Binary files a/support/cloud-image-builder/rpi3/esp/u-boot.bin and /dev/null differ

@@ -15,15 +15,20 @@

 grub_efi_install()

 {

-    mkdir -p $BUILDROOT/boot/efi

-    #

-    # if it is a loop device then we should mount the dev mapped boot partition

-    #

     BOOT_PARTITION=/dev/mapper/`basename ${HDD}`p1

-    mkfs.fat $BOOT_PARTITION

-    mount -t vfat $BOOT_PARTITION $BUILDROOT/boot/efi

-    cp -r esp/* $BUILDROOT/boot/efi/

-    umount $BUILDROOT/boot/efi

+#    mount -t vfat $BOOT_PARTITION $BUILDROOT/boot/esp

+    # Raspberry prorpiaetary GPU bootloader (1st stage)

+    cp -r esp/* $BUILDROOT/boot/esp/

+    # u-boot (2nd stage) was copied earlier by installer.py

+    # grub efi bootloader (3rd stage)

+    mkdir -p $BUILDROOT/boot/esp/EFI/BOOT/

+    cp EFI_aarch64/BOOT/* $BUILDROOT/boot/esp/EFI/BOOT/

+    mkdir -p $BUILDROOT/boot/esp/boot/grub2

+    cat > $BUILDROOT/boot/esp/boot/grub2/grub.cfg << EOF

+search -n -u ${BOOT_UUID} -s

+configfile ${BOOT_DIRECTORY}grub2/grub.cfg

+EOF

+#    umount $BUILDROOT/boot/esp

 }

 set -o errexit        # exit if error...insurance ;)

@@ -50,7 +55,7 @@ fi

 #

 #    Install grub2.

 #

-#BOOT_UUID=$(blkid -s UUID -o value $BOOT_PARTITION_PATH)

+BOOT_UUID=$(blkid -s UUID -o value $BOOT_PARTITION_PATH)

 mkdir -p $BUILDROOT/boot/grub2

 ln -sfv grub2 $BUILDROOT/boot/grub

@@ -64,7 +69,7 @@ cp boot/splash.png ${BUILDROOT}/boot/grub2/themes/photon/photon.png

 cp boot/terminal_*.tga ${BUILDROOT}/boot/grub2/themes/photon/

 cp boot/theme.txt ${BUILDROOT}/boot/grub2/themes/photon/

-EXTRA_PARAMS="rootwait rw console=ttyS0,115200n8 console=tty0"

+EXTRA_PARAMS="rootwait rw console=ttyS0,115200n8 console=tty0 cma=256M"

 cat > $BUILDROOT/boot/grub2/grub.cfg << EOF

 # Begin /boot/grub2/grub.cfg

@@ -83,10 +83,11 @@ echo "Creating raw disk file " $VMDK_IMAGE_NAME " of size " $TOTAL_SIZE

 dd if=/dev/zero of=$VMDK_IMAGE_NAME bs=1024 count=$(($TOTAL_SIZE * 1024 * 512))

 chmod 755 $VMDK_IMAGE_NAME

+parted -s $VMDK_IMAGE_NAME mklabel msdos mkpart primary fat32 1M 30M mkpart primary ext4 30M 100%

+

 echo "Associating loopdevice to raw disk"

-DISK_DEVICE=`losetup --show -f $VMDK_IMAGE_NAME`

+DISK_DEVICE=`losetup --show -f -P $VMDK_IMAGE_NAME`

-parted -s $DISK_DEVICE mklabel msdos mkpart primary fat32 1M 30M mkpart primary ext4 30M 100%

 #echo "Creating partition on raw disk"

 #if [ $SWAP_PARTITION_SIZE -gt 0 ] 

 #then

@@ -103,15 +104,18 @@ parted -s $DISK_DEVICE mklabel msdos mkpart primary fat32 1M 30M mkpart primary

 #    echo "BIOS boot partition"

 #    sgdisk -t1:ef02 $DISK_DEVICE >> $LOGFILE

 #fi

+

 echo "Mapping device partition to loop device"

 kpartx -avs $DISK_DEVICE >> $LOGFILE

 DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `

-echo "Adding file system to device partition"

-mkfs -t ext4 /dev/mapper/${DEVICE_NAME}p2

+echo "Formatting partitions"

+mkfs.ext4 /dev/mapper/${DEVICE_NAME}p2

+mkfs.fat /dev/mapper/${DEVICE_NAME}p1

 echo "DISK_DEVICE=$DISK_DEVICE"

 echo "ROOT_PARTITION=/dev/mapper/${DEVICE_NAME}p2"

+echo "ESP_PARTITION=/dev/mapper/${DEVICE_NAME}p1"

new file mode 100644

Binary files /dev/null and b/support/cloud-image-builder/rpi3/root/lib/firmware/brcm/brcmfmac43430-sdio.bin differ

new file mode 100644

@@ -0,0 +1,66 @@

+# NVRAM file for BCM943430WLPTH

+# 2.4 GHz, 20 MHz BW mode

+

+# The following parameter values are just placeholders, need to be updated.

+manfid=0x2d0

+prodid=0x0727

+vendid=0x14e4

+devid=0x43e2

+boardtype=0x0727

+boardrev=0x1101

+boardnum=22

+macaddr=00:90:4c:c5:12:38

+sromrev=11

+boardflags=0x00404201

+boardflags3=0x08000000

+xtalfreq=37400

+nocrc=1

+ag0=255

+aa2g=1

+ccode=ALL

+

+pa0itssit=0x20

+extpagain2g=0

+#PA parameters for 2.4GHz, measured at CHIP OUTPUT

+pa2ga0=-168,7161,-820

+AvVmid_c0=0x0,0xc8

+cckpwroffset0=5

+

+# PPR params

+maxp2ga0=84

+txpwrbckof=6

+cckbw202gpo=0

+legofdmbw202gpo=0x66111111

+mcsbw202gpo=0x77711111

+propbw202gpo=0xdd

+

+# OFDM IIR :

+ofdmdigfilttype=18

+ofdmdigfilttypebe=18

+# PAPD mode:

+papdmode=1

+papdvalidtest=1

+pacalidx2g=42

+papdepsoffset=-22

+papdendidx=58

+

+# LTECX flags

+ltecxmux=0

+ltecxpadnum=0x0102

+ltecxfnsel=0x44

+ltecxgcigpio=0x01

+

+il0macaddr=00:90:4c:c5:12:38

+wl0id=0x431b

+

+deadman_to=0xffffffff

+# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG

+muxenab=0x1

+# CLDO PWM voltage settings - 0x4 - 1.1 volt

+#cldo_pwm=0x4

+

+#VCO freq 326.4MHz

+spurconfig=0x3 

+

+edonthd20l=-75

+edoffthd20ul=-80

@@ -13,7 +13,8 @@

     "additionalfiles": [

                             {"photon-dev.repo": "/etc/yum.repos.d/photon-dev.repo"},

                             {"resizefs.sh": "/usr/local/bin/resizefs.sh"},

-                            {"resizefs.service": "/lib/systemd/system/resizefs.service"}

+                            {"resizefs.service": "/lib/systemd/system/resizefs.service"},

+			    {"root/lib/firmware": "/lib/firmware"}

                        ],

     "artifacttype": "xz",

     "keeprawdisk": "true"

@@ -395,6 +395,8 @@ class constants(object):

             # https://github.com/draios/sysdig/issues/833

             "sysdig.spec",

             "falco.spec",

+            # one more fail, not investigated yet

+            "log4cpp.spec",

             # VIVACE packages

             # need to update to mono-4.5