From 60a0a371e51f2a81553e011c87989dc048311707 Mon Sep 17 00:00:00 2001 From: Jeff Hatch Date: Mon, 13 Feb 2017 16:37:06 -0600 Subject: Fix at91bootstrap-3.5.3 build on Yocto 2.1 (krogoth) --- ...strap-3.5.2-onetime-slow-clock-switch.patch.swp | Bin 12288 -> 0 bytes .../at91bootstrap-3.5.3-remove-std-includes.patch | 12 +++++++++ recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb | 30 +++++++++++++++++++++ .../at91bootstrap/at91bootstrap_3.5.3.bb.orig | 30 --------------------- 4 files changed, 42 insertions(+), 30 deletions(-) delete mode 100644 recipes-bsp/at91bootstrap/at91bootstrap-3.5.3/.at91bootstrap-3.5.2-onetime-slow-clock-switch.patch.swp create mode 100644 recipes-bsp/at91bootstrap/at91bootstrap-3.5.3/at91bootstrap-3.5.3-remove-std-includes.patch create mode 100644 recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb delete mode 100644 recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb.orig diff --git a/recipes-bsp/at91bootstrap/at91bootstrap-3.5.3/.at91bootstrap-3.5.2-onetime-slow-clock-switch.patch.swp b/recipes-bsp/at91bootstrap/at91bootstrap-3.5.3/.at91bootstrap-3.5.2-onetime-slow-clock-switch.patch.swp deleted file mode 100644 index f31477d..0000000 Binary files a/recipes-bsp/at91bootstrap/at91bootstrap-3.5.3/.at91bootstrap-3.5.2-onetime-slow-clock-switch.patch.swp and /dev/null differ diff --git a/recipes-bsp/at91bootstrap/at91bootstrap-3.5.3/at91bootstrap-3.5.3-remove-std-includes.patch b/recipes-bsp/at91bootstrap/at91bootstrap-3.5.3/at91bootstrap-3.5.3-remove-std-includes.patch new file mode 100644 index 0000000..01920c2 --- /dev/null +++ b/recipes-bsp/at91bootstrap/at91bootstrap-3.5.3/at91bootstrap-3.5.3-remove-std-includes.patch @@ -0,0 +1,12 @@ +Index: at91bootstrap-3.5.3/driver/debug.c +=================================================================== +--- at91boostrap-3.5.3.orig/driver/debug.c.orig 2017-02-13 16:14:17.214217038 -0600 ++++ at91boostrap-3.5.3/driver/debug.c 2017-02-13 15:48:44.106262425 -0600 +@@ -27,7 +27,6 @@ + */ + #include "dbgu.h" + #include "debug.h" +-#include + #include + + #define MAX_BUFFER 128 diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb b/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb new file mode 100644 index 0000000..2e5f086 --- /dev/null +++ b/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb @@ -0,0 +1,30 @@ +require at91bootstrap_3.5.inc + +PR = "r3" + +LICENSE = "custom-freely-distributable" +LIC_FILES_CHKSUM = "file://main.c;beginline=6;endline=26;md5=6fca71334c9e8b7d033296123c91437f" + +SRCREV = "v${PV}" +SRC_URI = "git://github.com/linux4sam/at91bootstrap \ + file://at91bootstrap-3.5.2-add-install.patch \ + file://at91bootstrap-3.5.2-onetime-slow-clock-switch.patch \ + file://at91sam9x5_4bit_pmecc_header.bin \ + file://at91bootstrap-3.5.3-disable-rtc-interrupts.patch" + +S = "${WORKDIR}/git" + +SRC_URI_append_mtcdt = " file://at91bootstrap-3.5.3-mtcdt.patch " +SRC_URI_append_mtcap = " file://at91bootstrap-3.5.3-mtcdt.patch " + +# generate a bootstrap file padded with the header needed for 4-bit PMECC +# The padded file can be flashed via u-boot without any need to set the PMECC header using SAM-BA +do_pad_4bit_pmecc() { + cp -f ${WORKDIR}/at91sam9x5_4bit_pmecc_header.bin ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin + cat ${DEPLOY_DIR_IMAGE}/at91bootstrap.bin >> ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin +} + +do_install_append() { + do_pad_4bit_pmecc +} + diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb.orig b/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb.orig deleted file mode 100644 index 2e5f086..0000000 --- a/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb.orig +++ /dev/null @@ -1,30 +0,0 @@ -require at91bootstrap_3.5.inc - -PR = "r3" - -LICENSE = "custom-freely-distributable" -LIC_FILES_CHKSUM = "file://main.c;beginline=6;endline=26;md5=6fca71334c9e8b7d033296123c91437f" - -SRCREV = "v${PV}" -SRC_URI = "git://github.com/linux4sam/at91bootstrap \ - file://at91bootstrap-3.5.2-add-install.patch \ - file://at91bootstrap-3.5.2-onetime-slow-clock-switch.patch \ - file://at91sam9x5_4bit_pmecc_header.bin \ - file://at91bootstrap-3.5.3-disable-rtc-interrupts.patch" - -S = "${WORKDIR}/git" - -SRC_URI_append_mtcdt = " file://at91bootstrap-3.5.3-mtcdt.patch " -SRC_URI_append_mtcap = " file://at91bootstrap-3.5.3-mtcdt.patch " - -# generate a bootstrap file padded with the header needed for 4-bit PMECC -# The padded file can be flashed via u-boot without any need to set the PMECC header using SAM-BA -do_pad_4bit_pmecc() { - cp -f ${WORKDIR}/at91sam9x5_4bit_pmecc_header.bin ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin - cat ${DEPLOY_DIR_IMAGE}/at91bootstrap.bin >> ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin -} - -do_install_append() { - do_pad_4bit_pmecc -} - -- cgit v1.2.3