new file mode 100644

@@ -0,0 +1,41 @@

+From a7e044eece1d28a53f343503890e361322de96e3 Mon Sep 17 00:00:00 2001

+From: Alexander Graf <agraf@suse.de>

+Date: Wed, 13 Apr 2016 13:44:29 +0200

+Subject: [PATCH] XXX openSUSE XXX: Load dtb from partition 2

+

+Upstream U-Boot loads the device tree from the EFI partition. This is

+mostly because upstream we don't know which partition really holds the

+boot data.

+

+For openSUSE however we do know, so let's just patch the boot script to

+load device trees from partition 2.

+

+Signed-off-by: Alexander Graf <agraf@suse.de>

+---

+ include/config_distro_bootcmd.h | 6 +++---

+ 1 file changed, 3 insertions(+), 3 deletions(-)

+

+diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h

+index e0d0034ed3..120e22e995 100644

+--- a/include/config_distro_bootcmd.h

+@@ -126,16 +126,16 @@

+ 		"fi\0"                                                    \

+ 	\

+ 	"load_efi_dtb="                                                   \

+-		"load ${devtype} ${devnum}:${distro_bootpart} "           \

++		"load ${devtype} ${devnum}:2 "           \

+ 			"${fdt_addr_r} ${prefix}${efi_fdtfile}\0"         \

+ 	\

+-	"efi_dtb_prefixes=/ /dtb/ /dtb/current/\0"                        \

++	"efi_dtb_prefixes=/ /dtb/ /dtb/current/ /boot/ /boot/dtb/ /boot/dtb/current/\0" \

+ 	"scan_dev_for_efi="                                               \

+ 		"setenv efi_fdtfile ${fdtfile}; "                         \

+ 		BOOTENV_EFI_SET_FDTFILE_FALLBACK                          \

+ 		"for prefix in ${efi_dtb_prefixes}; do "                  \

+ 			"if test -e ${devtype} "                          \

+-					"${devnum}:${distro_bootpart} "   \

++					"${devnum}:2 "   \

+ 					"${prefix}${efi_fdtfile}; then "  \

+ 				"run load_efi_dtb; "                      \

+ 			"fi;"                                             \

new file mode 100644

@@ -0,0 +1,23 @@

+From cb274c28c8e72fbf1e4c6cd41833442fd3f1a3db Mon Sep 17 00:00:00 2001

+From: Guillaume GARDET <guillaume.gardet@free.fr>

+Date: Thu, 16 Nov 2017 13:20:12 +0100

+Subject: [PATCH] Fix MMC1 (external SD slot) on Samsung Snow (Chromebook ARM)

+

+---

+ drivers/mmc/dw_mmc.c | 3 ++-

+ 1 file changed, 2 insertions(+), 1 deletion(-)

+

+diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c

+index 23f642980b..a6a0934eef 100644

+--- a/drivers/mmc/dw_mmc.c

+@@ -508,7 +508,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct dwmci_host *host,

+ 		cfg->host_caps |= MMC_MODE_4BIT;

+ 		cfg->host_caps &= ~MMC_MODE_8BIT;

+ 	}

+-	cfg->host_caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz;

++	/* MMC_MODE_HS_52MHz is broken (at least) on Samsung Snow, so disbale it for now */

++	cfg->host_caps |= MMC_MODE_HS;

+ 

+ 	cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;

+ }

new file mode 100644

@@ -0,0 +1,65 @@

+%global security_hardening none

+%global debug_package %{nil}

+Summary:        U-Boot EFI firmware for the rpi3

+Name:		u-boot-rpi3

+Version:	2017.11

+Release:	1%{?dist}

+License:	GPLv2

+Url:            http://www.denx.de/wiki/U-Boot

+Vendor:		VMware, Inc.

+Distribution:	Photon

+Source0:        ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2

+Patch0:		0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch

+Patch1:		0004-Fix-MMC1-external-SD-slot-on-Samsun.patch

+BuildRequires:  bc

+BuildRequires:  openssl-devel

+BuildRequires:  python2-devel

+BuildRequires:  swig

+

+%define sha1 u-boot=6a3932b39a0f165aba210663ea2500bcfb9c8794

+%description

+Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for

+Embedded PowerPC, ARM, MIPS and x86 processors.

+

+%package doc

+Summary:        Documentation for the U-Boot Firmware

+Group:          Documentation/Other

+%description doc

+Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for

+Embedded PowerPC, ARM, MIPS and x86 processors.

+

+%prep

+%setup -q -n u-boot-%{version}

+%patch0 -p1

+%patch1 -p1

+

+%build

+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" rpi_3_defconfig

+echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config

+make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes

+

+%install

+install -D -m 0644 u-boot.bin %{buildroot}/boot/esp/u-boot.bin

+

+%files

+%defattr(-,root,root)

+/boot/esp/*

+%doc Licenses/gpl-2.0.txt README

+

+%files doc

+%defattr(-,root,root)

+# Generic documents

+%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands

+%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns

+%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi

+%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb

+%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST

+# Copy some useful kermit scripts as well

+%doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image

+# Now any h/w dependent Documentation

+%doc doc/README.ARM-memory-map

+

+%changelog

+*   Fri Dec 15 2017 Alexey Makhalov <amakhalov@vmware.com> 2017.11-1

+-   Based on OpenSuse u-boot-rpi3-2017.11-266.2 from Thu Nov 16 2017

+    by guillaume@opensuse.org

Binary files a/installer/EFI_aarch64/BOOT/bootaa64.efi and b/installer/EFI_aarch64/BOOT/bootaa64.efi differ

@@ -61,6 +61,9 @@ cp EFI_$(uname -m)/BOOT/* ${BUILDROOT}/installer/EFI/BOOT/

 # grubx64.efi is generated on Photon OS by using grub2-efi >= 2.02-7:

 # # grub2-efi-mkimage -o grubx64.efi -p /boot/grub2 -O x86_64-efi  fat iso9660 part_gpt part_msdos  normal boot linux configfile loopback chain  efifwsetup efi_gop efi_uga  ls search search_label search_fs_uuid search_fs_file  gfxterm gfxterm_background gfxterm_menu test all_video loadenv  exfat ext2 udf halt gfxmenu png tga lsefi help linuxefi

+# grubaa64.efi is generated on Photon OS by using grub2-efi >= 2.02-7:

+#grub2-mkimage -o bootaa64.efi -p /boot/grub2 -O arm64-efi  fat iso9660 part_gpt part_msdos  normal boot linux configfile loopback chain efifwsetup efi_gop efinet ls search search_label search_fs_uuid search_fs_file  gfxterm gfxterm_background gfxterm_menu test all_video loadenv  exfat ext2 udf halt gfxmenu png tga lsefi help all_video

+

 # both bootx64.efi and grubx64.efi are signed with VMware key

 EFI_IMAGE=boot/grub2/efiboot.img

 EFI_FOLDER=`readlink -f ${STAGE_PATH}/efiboot`

@@ -43,7 +43,7 @@ PHOTON_SPECDEPS_DIR=$(SRCROOT)/support/package-builder

 PHOTON_SPECDEPS=$(PHOTON_SPECDEPS_DIR)/SpecDeps.py

 PHOTON_PACKAGE_BUILDER=$(PHOTON_PKG_BUILDER_DIR)/builder.py

 ifdef PHOTON_PULLSOURCES_CONFIG

-PHOTON_PULLSOURCES_CONFIG=$(abspath $(PHOTON_PULLSOURCES_CONFIG))

+PHOTON_PULLSOURCES_CONFIG:=$(abspath $(PHOTON_PULLSOURCES_CONFIG))

 else

 PHOTON_PULLSOURCES_CONFIG?=$(PHOTON_PKG_BUILDER_DIR)/bintray.conf

 endif

@@ -346,7 +346,9 @@ class constants(object):

     # list of spec files to skip for parsing for given arch

     skipSpecsForArch={

-        "x86_64":[],

+        "x86_64":[

+            "u-boot-rpi3.spec"

+            ],

         "aarch64":[

             # fakeroot-ng does not support aarch64

             "fakeroot-ng.spec",