From 820895f2adc8539cd8add8231253c37ad8c44f5d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 2 Mar 2016 03:11:59 -0300 Subject: uboot-trimslice: add new package to [libre] --- .../0002-kernel-add-support-for-gcc-5.patch | 97 ---------------------- libre/uboot-trimslice-linux-libre/PKGBUILD | 53 ------------ libre/uboot-trimslice-linux-libre/boot.txt | 21 ----- .../0001-kernel-add-support-for-gcc-5.patch | 97 ++++++++++++++++++++++ libre/uboot-trimslice/PKGBUILD | 52 ++++++++++++ libre/uboot-trimslice/boot.txt | 21 +++++ 6 files changed, 170 insertions(+), 171 deletions(-) delete mode 100644 libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch delete mode 100644 libre/uboot-trimslice-linux-libre/PKGBUILD delete mode 100644 libre/uboot-trimslice-linux-libre/boot.txt create mode 100644 libre/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch create mode 100644 libre/uboot-trimslice/PKGBUILD create mode 100644 libre/uboot-trimslice/boot.txt (limited to 'libre') diff --git a/libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch b/libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch deleted file mode 100644 index 30718c561..000000000 --- a/libre/uboot-trimslice-linux-libre/0002-kernel-add-support-for-gcc-5.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 13 Oct 2014 15:51:05 -0700 -Subject: [PATCH 2/6] kernel: add support for gcc 5 - -We're missing include/linux/compiler-gcc5.h which is required now -because gcc branched off to v5 in trunk. - -Just copy the relevant bits out of include/linux/compiler-gcc4.h, -no new code is added as of now. - -This fixes a build error when using gcc 5. - -Signed-off-by: Sasha Levin -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds ---- - include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - create mode 100644 include/linux/compiler-gcc5.h - -diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h -new file mode 100644 -index 0000000..cdd1cc2 ---- /dev/null -+++ b/include/linux/compiler-gcc5.h -@@ -0,0 +1,66 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include directly, include instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * Fixed in GCC 4.8.2 and later versions. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.4.4 - diff --git a/libre/uboot-trimslice-linux-libre/PKGBUILD b/libre/uboot-trimslice-linux-libre/PKGBUILD deleted file mode 100644 index b35cfe06e..000000000 --- a/libre/uboot-trimslice-linux-libre/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# U-Boot: TrimSlice -# Maintainer (Arch): Kevin Mihelich -# Contributor: André Silva - -buildarch=4 - -_pkgname=linux-libre -pkgname=uboot-trimslice-${_pkgname} -pkgver=2014.10 -pkgrel=1 -pkgdesc="U-Boot for TrimSlice (built for the linux-libre kernel package)" -arch=('armv7h') -url="http://git.denx.de/u-boot.git/" -makedepends=('cbootimage' 'dtc' 'uboot-tools') -depends=('linux-libre') -replaces=('uboot-trimslice') -license=('GPL') -source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" - "git+https://github.com/NVIDIA/cbootimage-configs.git" - "boot.txt" - "0002-kernel-add-support-for-gcc-5.patch") -md5sums=('3ddcaee2f05b7c464778112ec83664b5' - 'SKIP' - '9374fbadb4b4c1298ea050ad4ea79f46' - '721a46867e189d8dedc6b6f86a536a34') - -prepare() { - cd u-boot-${pkgver} - - patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch -} - -build() { - cd u-boot-${pkgver} - - unset LDFLAGS - - make distclean - make trimslice_config - make -} - -package() { - mkdir -p "${pkgdir}/boot/${pkgname}" - mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "TrimSlice" -d boot.txt "${pkgdir}/boot/${pkgname}"/boot.scr - cp boot.txt "${pkgdir}/boot/${pkgname}" - - cd cbootimage-configs/tegra20/compulab/trimslice - ln -s ${srcdir}/u-boot-${pkgver}/u-boot-dtb-tegra.bin u-boot.bin - ./build.sh - - cp trimslice-mmc.img trimslice-spi.img "${pkgdir}/boot/${pkgname}" -} diff --git a/libre/uboot-trimslice-linux-libre/boot.txt b/libre/uboot-trimslice-linux-libre/boot.txt deleted file mode 100644 index 100d4b6de..000000000 --- a/libre/uboot-trimslice-linux-libre/boot.txt +++ /dev/null @@ -1,21 +0,0 @@ -if test "${devtype}" = "mmc"; then - if test ${devnum} -eq 1; then - setenv root /dev/mmcblk0p1; - else - if mmc dev 1; then - setenv root /dev/mmcblk1p1; - mmc dev 0; - else - setenv root /dev/mmcblk0p1; - fi; - fi; -else - setenv root /dev/sda1; -fi - -setenv bootargs "root=${root} rw rootwait console=tty1 console=ttyS0,115200n8 mem=384M@0M mem=512M@512M nvmem=128M@384M vmalloc=248M video=tegrafb" - -load ${devtype} ${devnum}:${bootpart} ${loadaddr} /boot/vmlinuz-linux-libre -load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/linux-libre/tegra20-trimslice.dtb - -bootz ${loadaddr} - ${fdt_addr_r} diff --git a/libre/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch b/libre/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch new file mode 100644 index 000000000..30718c561 --- /dev/null +++ b/libre/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch @@ -0,0 +1,97 @@ +From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Oct 2014 15:51:05 -0700 +Subject: [PATCH 2/6] kernel: add support for gcc 5 + +We're missing include/linux/compiler-gcc5.h which is required now +because gcc branched off to v5 in trunk. + +Just copy the relevant bits out of include/linux/compiler-gcc4.h, +no new code is added as of now. + +This fixes a build error when using gcc 5. + +Signed-off-by: Sasha Levin +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +--- + include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + create mode 100644 include/linux/compiler-gcc5.h + +diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h +new file mode 100644 +index 0000000..cdd1cc2 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -0,0 +1,66 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include directly, include instead." ++#endif ++ ++#define __used __attribute__((__used__)) ++#define __must_check __attribute__((warn_unused_result)) ++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ++ ++/* Mark functions as cold. gcc will assume any path leading to a call ++ to them will be unlikely. This means a lot of manual unlikely()s ++ are unnecessary now for any paths leading to the usual suspects ++ like BUG(), printk(), panic() etc. [but let's keep them for now for ++ older compilers] ++ ++ Early snapshots of gcc 4.3 don't support this and we can't detect this ++ in the preprocessor, but we can live with this because they're unreleased. ++ Maketime probing would be overkill here. ++ ++ gcc also has a __attribute__((__hot__)) to move hot functions into ++ a special section, but I don't see any sense in this right now in ++ the kernel context */ ++#define __cold __attribute__((__cold__)) ++ ++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) ++ ++#ifndef __CHECKER__ ++# define __compiletime_warning(message) __attribute__((warning(message))) ++# define __compiletime_error(message) __attribute__((error(message))) ++#endif /* __CHECKER__ */ ++ ++/* ++ * Mark a position in code as unreachable. This can be used to ++ * suppress control flow warnings after asm blocks that transfer ++ * control elsewhere. ++ * ++ * Early snapshots of gcc 4.5 don't support this and we can't detect ++ * this in the preprocessor, but we can live with this because they're ++ * unreleased. Really, we need to have autoconf for the kernel. ++ */ ++#define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ ++/* ++ * Tell the optimizer that something else uses this function or variable. ++ */ ++#define __visible __attribute__((externally_visible)) ++ ++/* ++ * GCC 'asm goto' miscompiles certain code sequences: ++ * ++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 ++ * ++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. ++ * Fixed in GCC 4.8.2 and later versions. ++ * ++ * (asm goto is automatically volatile - the naming reflects this.) ++ */ ++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) ++ ++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP ++#define __HAVE_BUILTIN_BSWAP32__ ++#define __HAVE_BUILTIN_BSWAP64__ ++#define __HAVE_BUILTIN_BSWAP16__ ++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ +-- +2.4.4 + diff --git a/libre/uboot-trimslice/PKGBUILD b/libre/uboot-trimslice/PKGBUILD new file mode 100644 index 000000000..a3cdc2d8b --- /dev/null +++ b/libre/uboot-trimslice/PKGBUILD @@ -0,0 +1,52 @@ +# U-Boot: TrimSlice +# Maintainer: André Silva + +buildarch=4 + +pkgname=uboot-trimslice +pkgver=2014.10 +pkgrel=1.parabola1 +pkgdesc="U-Boot for TrimSlice" +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +makedepends=('cbootimage' 'dtc' 'uboot-tools') +depends=('linux-libre') +replaces=('uboot-trimslice-linux-libre') +conflicts=('uboot4extlinux-trimslice' 'uboot4grub-trimslice') +license=('GPL') +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + "git+https://github.com/NVIDIA/cbootimage-configs.git" + "boot.txt" + "0001-kernel-add-support-for-gcc-5.patch") +md5sums=('3ddcaee2f05b7c464778112ec83664b5' + 'SKIP' + '9374fbadb4b4c1298ea050ad4ea79f46' + '721a46867e189d8dedc6b6f86a536a34') + +prepare() { + cd u-boot-${pkgver} + + patch -Np1 -i ../0001-kernel-add-support-for-gcc-5.patch +} + +build() { + cd u-boot-${pkgver} + + unset LDFLAGS + + make distclean + make trimslice_config + make +} + +package() { + mkdir -p "${pkgdir}"/boot + mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "TrimSlice" -d boot.txt "${pkgdir}"/boot/boot.scr + cp boot.txt "${pkgdir}"/boot + + cd cbootimage-configs/tegra20/compulab/trimslice + ln -s ${srcdir}/u-boot-${pkgver}/u-boot-dtb-tegra.bin u-boot.bin + ./build.sh + + cp trimslice-mmc.img trimslice-spi.img "${pkgdir}"/boot +} diff --git a/libre/uboot-trimslice/boot.txt b/libre/uboot-trimslice/boot.txt new file mode 100644 index 000000000..100d4b6de --- /dev/null +++ b/libre/uboot-trimslice/boot.txt @@ -0,0 +1,21 @@ +if test "${devtype}" = "mmc"; then + if test ${devnum} -eq 1; then + setenv root /dev/mmcblk0p1; + else + if mmc dev 1; then + setenv root /dev/mmcblk1p1; + mmc dev 0; + else + setenv root /dev/mmcblk0p1; + fi; + fi; +else + setenv root /dev/sda1; +fi + +setenv bootargs "root=${root} rw rootwait console=tty1 console=ttyS0,115200n8 mem=384M@0M mem=512M@512M nvmem=128M@384M vmalloc=248M video=tegrafb" + +load ${devtype} ${devnum}:${bootpart} ${loadaddr} /boot/vmlinuz-linux-libre +load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/linux-libre/tegra20-trimslice.dtb + +bootz ${loadaddr} - ${fdt_addr_r} -- cgit v1.2.3