Move u-boot to BSP layers

3 files changed, 0 insertions, 203 deletions

diff --git a/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch b/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
deleted file mode 100644
index 5172fdd..0000000
--- a/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ebb26338d0c2f436a86fd4d7cb8d723a90d6a369 Mon Sep 17 00:00:00 2001
-From: Anton Gerasimov <anton@advancedtelematic.com>
-Date: Thu, 15 Sep 2016 17:52:41 +0200
-Subject: [PATCH 1/2] Set up environment for OSTree integration
-
----
- include/configs/qemu-x86.h | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
-index 78c296f..79df455 100644
---- a/include/configs/qemu-x86.h
-+++ b/include/configs/qemu-x86.h
-@@ -74,4 +74,24 @@
- #undef CONFIG_ENV_IS_IN_SPI_FLASH
- #define CONFIG_ENV_IS_NOWHERE
- 
-+#undef CONFIG_BOOTARGS
-+#define CONFIG_BOOTARGS "root=/dev/hda2 console=ttyS0"
-+
-+#undef CONFIG_BOOTDELAY
-+#define CONFIG_BOOTDELAY 3
-+
-+#undef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND "run loadenv;" \
-+                          "setenv bootargs $bootargs\" console=ttyS0 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda ramdisk_size=16384 \";" \
-+                          "ext2load ide 0 $loadaddr \"/boot\"$kernel_image;" \
-+                          "ext2load ide 0 $ramdiskaddr \"/boot\"$ramdisk_image;" \
-+                          "zboot $loadaddr - $ramdiskaddr $filesize"
-+
-+#undef CONFIG_EXTRA_ENV_SETTINGS
-+#define CONFIG_EXTRA_ENV_SETTINGS "kernel_image=/bzImage\0" \
-+                                 "ramdisk_image=/initrd\0" \
-+                                 "ramdiskaddr=0x4000000\0" \
-+                                 "bootdelay=3\0" \
-+                                 "loadenv=if ext2load ide 0 $loadaddr /boot/loader/uEnv.txt; then env import -t $loadaddr $filesize; fi;" 
-+
- #endif /* __CONFIG_H */
--- 
-2.9.3
-
diff --git a/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch b/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch
deleted file mode 100644
index 7540b74..0000000
--- a/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From ab0d7e270d89f6eb99582197d2d58bf60c9c3d26 Mon Sep 17 00:00:00 2001
-From: Anton Gerasimov <anton@advancedtelematic.com>
-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 |   2 --
- arch/x86/lib/gcc.c | 104 ++++++++++++++++++++++++++++++++++++++++++++---------
- 2 files changed, 87 insertions(+), 19 deletions(-)
-
-diff --git a/arch/x86/config.mk b/arch/x86/config.mk
-index 999143e..139576e 100644
---- a/arch/x86/config.mk
-+++ b/arch/x86/config.mk
-@@ -22,5 +22,3 @@ PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden
- PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions -m elf_i386
- 
- LDFLAGS_FINAL += --gc-sections -pie
--LDFLAGS_FINAL += --wrap=__divdi3 --wrap=__udivdi3
--LDFLAGS_FINAL += --wrap=__moddi3 --wrap=__umoddi3
-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 <stdint.h>
-+#include <stddef.h>
-+
-+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/recipes-bsp/u-boot/u-boot-ota_2015.07.bb b/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
deleted file mode 100644
index ab5d403..0000000
--- a/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-include recipes-bsp/u-boot/u-boot.inc
-DEPENDS += "dtc-native"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
-
-# This revision corresponds to the tag "v2015.07"
-# We use the revision in order to avoid having to fetch it from the
-# repo during parse
-SRCREV = "baba2f57e8f4ed3fa67fe213d22da0de5e00f204"
-
-SRC_URI += "file://0001-Set-up-environment-for-OSTree-integration.patch \
-            file://0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch \
-            "
-
-PV = "v2015.07+git${SRCPV}"
-
-EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline "
-EXTRA_OEMAKE_append_qemux86 = " BUILD_ROM=y"
-EXTRA_OEMAKE_append_qemux86-64 = " BUILD_ROM=y"
-
-UBOOT_SUFFIX = "bin"
-UBOOT_SUFFIX_qemux86 = "rom"
-UBOOT_SUFFIX_qemux86-64 = "rom"