From 386dd637903de2f747512477dabf7a5278ebba41 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Fri, 18 May 2018 14:28:57 +0200 Subject: Remove u-boot support for minnowboard Was already broken --- .../recipes-bsp/bootfiles/files/uEnv-ota.txt | 17 --- .../recipes-bsp/bootfiles/minnowboard-bootfiles.bb | 25 ---- ...-Load-environment-from-the-boot-partition.patch | 24 ---- ...ps-with-built-in-code-to-remove-dependenc.patch | 142 --------------------- .../recipes-bsp/u-boot/u-boot-ota_2016.11.bb | 36 ------ 5 files changed, 244 deletions(-) delete mode 100644 meta-sota-minnowboard/recipes-bsp/bootfiles/files/uEnv-ota.txt delete mode 100644 meta-sota-minnowboard/recipes-bsp/bootfiles/minnowboard-bootfiles.bb delete mode 100644 meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0001-Load-environment-from-the-boot-partition.patch delete mode 100644 meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch delete mode 100644 meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota_2016.11.bb diff --git a/meta-sota-minnowboard/recipes-bsp/bootfiles/files/uEnv-ota.txt b/meta-sota-minnowboard/recipes-bsp/bootfiles/files/uEnv-ota.txt deleted file mode 100644 index 2b0f293..0000000 --- a/meta-sota-minnowboard/recipes-bsp/bootfiles/files/uEnv-ota.txt +++ /dev/null @@ -1,17 +0,0 @@ -bootkaddr=0x01000000 -bootiaddr=0x04000000 - -bootargs_console=console=ttyS0,115200 -bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2 - -bootargs_root=ostree_root=/dev/mmcblk0p2 root=/dev/ram0 ramdisk_size=16384 - -bootmmc=1:2 - -booteload_sd=ext4load mmc ${bootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize} - -bootkload_sd=ext4load mmc ${bootmmc} ${bootkaddr} boot/${kernel_image} -bootiload_sd=ext4load mmc ${bootmmc} ${bootiaddr} boot/${ramdisk_image} - -bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; zboot ${bootkaddr} - ${bootiaddr} ${filesize} - diff --git a/meta-sota-minnowboard/recipes-bsp/bootfiles/minnowboard-bootfiles.bb b/meta-sota-minnowboard/recipes-bsp/bootfiles/minnowboard-bootfiles.bb deleted file mode 100644 index 74d1f18..0000000 --- a/meta-sota-minnowboard/recipes-bsp/bootfiles/minnowboard-bootfiles.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Boot files (bootscripts etc.) for Minnowboard Max/Turbot" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -inherit deploy - -COMPATIBLE_MACHINE = "intel-corei7-64" - -S = "${WORKDIR}" - -SRC_URI_append_sota = "file://uEnv-ota.txt" - -do_deploy() { - install -d ${DEPLOYDIR}/${PN} -} - -do_deploy_append_sota() { - install -m 0755 ${WORKDIR}/uEnv-ota.txt ${DEPLOYDIR}/${PN}/uEnv.txt -} - -addtask deploy before do_package after do_install -do_deploy[dirs] += "${DEPLOYDIR}/${PN}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - diff --git a/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0001-Load-environment-from-the-boot-partition.patch b/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0001-Load-environment-from-the-boot-partition.patch deleted file mode 100644 index 02d0e4c..0000000 --- a/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0001-Load-environment-from-the-boot-partition.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0161adf28590d95eaf234acc97156bc7dd989c8c Mon Sep 17 00:00:00 2001 -From: Anton Gerasimov -Date: Wed, 28 Dec 2016 16:53:35 +0100 -Subject: [PATCH] Load environment from the boot partition - ---- - include/configs/minnowmax.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h -index 3aa22d2..02f6980 100644 ---- a/include/configs/minnowmax.h -+++ b/include/configs/minnowmax.h -@@ -41,4 +41,7 @@ - #define CONFIG_ENV_SECT_SIZE 0x1000 - #define CONFIG_ENV_OFFSET 0x006ef000 - -+#undef CONFIG_BOOTCOMMAND -+#define CONFIG_BOOTCOMMAND "fatload mmc 1:1 0x01000000 uEnv.txt; env import -t 0x01000000 ${filesize}; run bootcmd" -+ - #endif /* __CONFIG_H */ --- -2.9.3 - diff --git a/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch b/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch deleted file mode 100644 index f1fcd06..0000000 --- a/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch +++ /dev/null @@ -1,142 +0,0 @@ -From ab0d7e270d89f6eb99582197d2d58bf60c9c3d26 Mon Sep 17 00:00:00 2001 -From: Anton Gerasimov -Date: Thu, 15 Sep 2016 16:49:32 +0200 -Subject: [PATCH 2/2] Replace wraps with built-in code to remove dependency on - multilib - ---- - arch/x86/config.mk | 3 --- - arch/x86/lib/gcc.c | 104 ++++++++++++++++++++++++++++++++++++++++++++--------- - 2 files changed, 87 insertions(+), 20 deletions(-) - -diff --git a/arch/x86/config.mk b/arch/x86/config.mk -index d7addd8..892e0fc 100644 ---- a/arch/x86/config.mk -+++ b/arch/x86/config.mk -@@ -21,9 +21,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden - - PLATFORM_LDFLAGS += -Bsymbolic -Bsymbolic-functions -m elf_i386 - --LDFLAGS_FINAL += --wrap=__divdi3 --wrap=__udivdi3 --LDFLAGS_FINAL += --wrap=__moddi3 --wrap=__umoddi3 -- - # This is used in the top-level Makefile which does not include - # PLATFORM_LDFLAGS - LDFLAGS_EFI_PAYLOAD := -Bsymbolic -Bsymbolic-functions -shared --no-undefined -diff --git a/arch/x86/lib/gcc.c b/arch/x86/lib/gcc.c -index 497ad75..c321b11 100644 ---- a/arch/x86/lib/gcc.c -+++ b/arch/x86/lib/gcc.c -@@ -19,22 +19,92 @@ - - #ifdef __GNUC__ - --/* -- * GCC's libgcc handling is quite broken. While the libgcc functions -- * are always regparm(0) the code that calls them uses whatever the -- * compiler call specifies. Therefore we need a wrapper around those -- * functions. See gcc bug PR41055 for more information. -- */ --#define WRAP_LIBGCC_CALL(type, name) \ -- type __normal_##name(type a, type b) __attribute__((regparm(0))); \ -- type __wrap_##name(type a, type b); \ -- type __attribute__((no_instrument_function)) \ -- __wrap_##name(type a, type b) \ -- { return __normal_##name(a, b); } -- --WRAP_LIBGCC_CALL(long long, __divdi3) --WRAP_LIBGCC_CALL(unsigned long long, __udivdi3) --WRAP_LIBGCC_CALL(long long, __moddi3) --WRAP_LIBGCC_CALL(unsigned long long, __umoddi3) -+#include -+#include -+ -+uint64_t __udivmoddi4 ( uint64_t num, -+ uint64_t den, -+ uint64_t *rem_p ) -+{ -+ uint64_t quot = 0, qbit = 1; -+ -+ if ( den == 0 ) { -+ return 1/((unsigned)den); /* Intentional divide by zero, without -+ triggering a compiler warning which -+ would abort the build */ -+ } -+ -+ /* Left-justify denominator and count shift */ -+ while ( (int64_t)den >= 0 ) { -+ den <<= 1; -+ qbit <<= 1; -+ } -+ -+ while ( qbit ) { -+ if ( den <= num ) { -+ num -= den; -+ quot += qbit; -+ } -+ den >>= 1; -+ qbit >>= 1; -+ } -+ -+ if ( rem_p ) -+ *rem_p = num; -+ -+ return quot; -+} -+uint64_t __udivdi3( uint64_t num, uint64_t den ) -+{ -+ return __udivmoddi4(num, den, NULL); -+} -+ -+uint64_t __umoddi3 ( uint64_t num, uint64_t den ) -+{ -+ uint64_t v; -+ -+ (void) __udivmoddi4(num, den, &v); -+ return v; -+} -+ -+int64_t __divmoddi4 ( int64_t num, -+ int64_t den, -+ int64_t* rem_p ) -+{ -+ int minus = 0; -+ int64_t v; -+ -+ if ( num < 0 ) { -+ num = -num; -+ minus = 1; -+ } -+ if ( den < 0 ) { -+ den = -den; -+ minus ^= 1; -+ } -+ -+ v = __udivmoddi4(num, den, (uint64_t *)rem_p); -+ if ( minus ) { -+ v = -v; -+ if ( rem_p ) -+ *rem_p = -(*rem_p); -+ } -+ -+ return v; -+} -+ -+ -+int64_t __moddi3 (int64_t num, int64_t den) -+{ -+ int64_t v; -+ -+ (void) __divmoddi4(num, den, &v); -+ return v; -+} -+ -+int64_t __divdi3(int64_t num, int64_t den) -+{ -+ return __divmoddi4(num, den, NULL); -+} - - #endif --- -2.9.3 - diff --git a/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota_2016.11.bb b/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota_2016.11.bb deleted file mode 100644 index c0603f0..0000000 --- a/meta-sota-minnowboard/recipes-bsp/u-boot/u-boot-ota_2016.11.bb +++ /dev/null @@ -1,36 +0,0 @@ -include recipes-bsp/u-boot/u-boot.inc -DEPENDS += "dtc-native intel-fsp-native iasl-native" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -# This revision corresponds to the tag "v2016.11" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71" - -SRC_URI += "file://0001-Load-environment-from-the-boot-partition.patch \ - file://0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch \ - http://firmware.intel.com/sites/default/files/MinnowBoard.MAX_.X64.92.R01.zip \ - " - -# Hashes for MinnowBoard.MAX_.X64.92.R01.zip -SRC_URI[md5sum] = "236070e3d0fb193e03a102939822cf59" -SRC_URI[sha256sum] = "708f00d835cc9c49df4e937ef59852ccb6b95026291ac9779b5411dd09baed1f" - -PV = "v2016.11+git${SRCPV}" - -EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline BUILD_ROM=y" - -UBOOT_SUFFIX = "rom" - -do_configure_prepend() { - make ${UBOOT_MACHINE} - make tools - ./tools/ifdtool -x ${WORKDIR}/MNW2MAX1.X64.0092.R01.1605221712.bin - cp flashregion_0_flashdescriptor.bin ./board/intel/minnowmax/descriptor.bin - cp flashregion_2_intel_me.bin ./board/intel/minnowmax/me.bin - cp ${STAGING_DIR_NATIVE}/${datadir}/IntelFsp/BayTrailFSP.fd ./board/intel/minnowmax/fsp.bin - cp ${STAGING_DIR_NATIVE}/${datadir}/IntelFsp/Vga.dat ./board/intel/minnowmax/vga.bin -} - -- cgit v1.2.3-54-g00ecf