summaryrefslogtreecommitdiff
path: root/libre-testing/uboot4grub-udoo
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-10-16 17:14:15 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-10-16 17:15:10 -0300
commitb9c11b8528a906f60545b4713fa6ab9a91fe6d54 (patch)
tree615f3a2bfcbcc52ad7640cebc7791e131c1639e8 /libre-testing/uboot4grub-udoo
parentcba8660e29848615d06ca26b8594ae146e1e165e (diff)
uboot4grub-udoo: add new package to [libre-testing]
Diffstat (limited to 'libre-testing/uboot4grub-udoo')
-rw-r--r--libre-testing/uboot4grub-udoo/0001-parabola-arm-modifications+grub-support.patch366
-rw-r--r--libre-testing/uboot4grub-udoo/0002-kernel-add-support-for-gcc-5.patch97
-rw-r--r--libre-testing/uboot4grub-udoo/PKGBUILD78
-rw-r--r--libre-testing/uboot4grub-udoo/uboot4grub-udoo.install27
4 files changed, 568 insertions, 0 deletions
diff --git a/libre-testing/uboot4grub-udoo/0001-parabola-arm-modifications+grub-support.patch b/libre-testing/uboot4grub-udoo/0001-parabola-arm-modifications+grub-support.patch
new file mode 100644
index 000000000..a75c5c5ff
--- /dev/null
+++ b/libre-testing/uboot4grub-udoo/0001-parabola-arm-modifications+grub-support.patch
@@ -0,0 +1,366 @@
+diff -Nur u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg u-boot-2015.01/board/udoo/1066mhz_4x256mx16_dl.cfg
+--- u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg 1969-12-31 21:00:00.000000000 -0300
++++ u-boot-2015.01/board/udoo/1066mhz_4x256mx16_dl.cfg 2015-10-16 14:43:36.733740112 -0300
+@@ -0,0 +1,58 @@
++/*
++ * Copyright (C) 2013 Seco USA Inc
++ *
++ * SPDX-License-Identifier: GPL-2.0+
++ */
++
++
++DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D
++DATA 4, MX6_MMDC_P0_MDOTC, 0x00333040
++
++DATA 4, MX6_MMDC_P0_MDCFG0, 0x3F4352F3
++DATA 4, MX6_MMDC_P0_MDCFG1, 0xB66D8B63
++DATA 4, MX6_MMDC_P0_MDCFG2, 0x01FF00DB
++
++DATA 4, MX6_MMDC_P0_MDMISC, 0x00001740
++DATA 4, MX6_MMDC_P0_MDSCR, 0x00008000
++DATA 4, MX6_MMDC_P0_MDRWD, 0x000026D2
++
++
++DATA 4, MX6_MMDC_P0_MDOR, 0x00431023
++DATA 4, MX6_MMDC_P0_MDASP, 0x00000027
++DATA 4, MX6_MMDC_P0_MDCTL, 0x831A0000
++
++DATA 4, MX6_MMDC_P0_MDSCR, 0x02008032
++DATA 4, MX6_MMDC_P0_MDSCR, 0x00008033
++DATA 4, MX6_MMDC_P0_MDSCR, 0x00048031
++DATA 4, MX6_MMDC_P0_MDSCR, 0x05208030
++DATA 4, MX6_MMDC_P0_MDSCR, 0x04008040
++
++DATA 4, MX6_MMDC_P0_MPZQHWCTRL, 0xa1390003
++DATA 4, MX6_MMDC_P1_MPZQHWCTRL, 0xa1390003
++
++DATA 4, MX6_MMDC_P0_MDREF, 0x00007800
++
++DATA 4, MX6_MMDC_P0_MPODTCTRL, 0x00022227
++DATA 4, MX6_MMDC_P1_MPODTCTRL, 0x00022227
++
++DATA 4, MX6_MMDC_P0_MPDGCTRL0, 0x425C0251
++DATA 4, MX6_MMDC_P0_MPDGCTRL1, 0x021B021E
++DATA 4, MX6_MMDC_P1_MPDGCTRL0, 0x021B021E
++DATA 4, MX6_MMDC_P1_MPDGCTRL1, 0x01730200
++
++DATA 4, MX6_MMDC_P0_MPRDDLCTL, 0x45474C45
++DATA 4, MX6_MMDC_P1_MPRDDLCTL, 0x44464744
++DATA 4, MX6_MMDC_P0_MPWRDLCTL, 0x3F3F3336
++DATA 4, MX6_MMDC_P1_MPWRDLCTL, 0x32383630
++
++DATA 4, MX6_MMDC_P0_MPWLDECTRL0, 0x002F0038
++DATA 4, MX6_MMDC_P0_MPWLDECTRL1, 0x001F001F
++DATA 4, MX6_MMDC_P1_MPWLDECTRL0, 0x001F001F
++DATA 4, MX6_MMDC_P1_MPWLDECTRL1, 0x001F001F
++
++DATA 4, MX6_MMDC_P0_MPMUR0, 0x00000000
++DATA 4, MX6_MMDC_P1_MPMUR0, 0x00000000
++
++DATA 4, MX6_MMDC_P0_MDPDC, 0x0002556D
++DATA 4, MX6_MMDC_P0_MAPSR, 0x00011006
++DATA 4, MX6_MMDC_P0_MDSCR, 0x00000000
+diff -Nur u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg u-boot-2015.01/board/udoo/ddr-setup_dl.cfg
+--- u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg 1969-12-31 21:00:00.000000000 -0300
++++ u-boot-2015.01/board/udoo/ddr-setup_dl.cfg 2015-10-16 14:43:36.733740112 -0300
+@@ -0,0 +1,84 @@
++/*
++ * Copyright (C) 2013 Seco USA Inc
++ *
++ * SPDX-License-Identifier: GPL-2.0+
++ *
++ * Device Configuration Data (DCD)
++ *
++ * Each entry must have the format:
++ * Addr-type Address Value
++ *
++ * where:
++ * Addr-type register length (1,2 or 4 bytes)
++ * Address absolute address of the register
++ * value value to be stored in the register
++ */
++
++/*
++ * DDR3 settings
++ * MX6Q ddr is limited to 1066 Mhz currently 1056 MHz(528 MHz clock),
++ * memory bus width: 64 bits x16/x32/x64
++ * MX6DL ddr is limited to 800 MHz(400 MHz clock)
++ * memory bus width: 64 bits x16/x32/x64
++ * MX6SOLO ddr is limited to 800 MHz(400 MHz clock)
++ * memory bus width: 32 bits x16/x32
++ */
++DATA 4, MX6_IOM_DRAM_SDQS0, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDQS1, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDQS2, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDQS3, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDQS4, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDQS5, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDQS6, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDQS7, 0x00000028
++
++DATA 4, MX6_IOM_GRP_B0DS, 0x00000028
++DATA 4, MX6_IOM_GRP_B1DS, 0x00000028
++DATA 4, MX6_IOM_GRP_B2DS, 0x00000028
++DATA 4, MX6_IOM_GRP_B3DS, 0x00000028
++DATA 4, MX6_IOM_GRP_B4DS, 0x00000028
++DATA 4, MX6_IOM_GRP_B5DS, 0x00000028
++DATA 4, MX6_IOM_GRP_B6DS, 0x00000028
++DATA 4, MX6_IOM_GRP_B7DS, 0x00000028
++DATA 4, MX6_IOM_GRP_ADDDS, 0x00000028
++
++DATA 4, MX6_IOM_GRP_CTLDS, 0x00000028
++
++DATA 4, MX6_IOM_DRAM_DQM0, 0x00000028
++DATA 4, MX6_IOM_DRAM_DQM1, 0x00000028
++DATA 4, MX6_IOM_DRAM_DQM2, 0x00000028
++DATA 4, MX6_IOM_DRAM_DQM3, 0x00000028
++DATA 4, MX6_IOM_DRAM_DQM4, 0x00000028
++DATA 4, MX6_IOM_DRAM_DQM5, 0x00000028
++DATA 4, MX6_IOM_DRAM_DQM6, 0x00000028
++DATA 4, MX6_IOM_DRAM_DQM7, 0x00000028
++
++DATA 4, MX6_IOM_DRAM_CAS, 0x00000028
++DATA 4, MX6_IOM_DRAM_RAS, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDCLK_0, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDCLK_1, 0x00000028
++
++DATA 4, MX6_IOM_DRAM_RESET, 0x00000028
++
++DATA 4, MX6_IOM_DRAM_SDODT0, 0x00000028
++DATA 4, MX6_IOM_DRAM_SDODT1, 0x00000028
++
++/* (differential input) */
++DATA 4, MX6_IOM_DDRMODE_CTL, 0x00020000
++/* (differential input) */
++DATA 4, MX6_IOM_GRP_DDRMODE, 0x00020000
++/* disable ddr pullups */
++DATA 4, MX6_IOM_GRP_DDRPKE, 0x00000000
++DATA 4, MX6_IOM_DRAM_SDBA2, 0x00000000
++/* 40 Ohm drive strength for cs0/1,sdba2,cke0/1,sdwe */
++DATA 4, MX6_IOM_GRP_DDR_TYPE, 0x000C0000
++
++/* Read data DQ Byte0-3 delay */
++DATA 4, MX6_MMDC_P0_MPRDDQBY0DL, 0x33333333
++DATA 4, MX6_MMDC_P0_MPRDDQBY1DL, 0x33333333
++DATA 4, MX6_MMDC_P0_MPRDDQBY2DL, 0x33333333
++DATA 4, MX6_MMDC_P0_MPRDDQBY3DL, 0x33333333
++DATA 4, MX6_MMDC_P1_MPRDDQBY0DL, 0x33333333
++DATA 4, MX6_MMDC_P1_MPRDDQBY1DL, 0x33333333
++DATA 4, MX6_MMDC_P1_MPRDDQBY2DL, 0x33333333
++DATA 4, MX6_MMDC_P1_MPRDDQBY3DL, 0x33333333
+diff -Nur u-boot-2015.01.orig/board/udoo/udoo-dl.cfg u-boot-2015.01/board/udoo/udoo-dl.cfg
+--- u-boot-2015.01.orig/board/udoo/udoo-dl.cfg 1969-12-31 21:00:00.000000000 -0300
++++ u-boot-2015.01/board/udoo/udoo-dl.cfg 2015-10-16 14:43:36.733740112 -0300
+@@ -0,0 +1,29 @@
++/*
++ * Copyright (C) 2013 Boundary Devices
++ *
++ * SPDX-License-Identifier: GPL-2.0+
++ *
++ * Refer doc/README.imximage for more details about how-to configure
++ * and create imximage boot image
++ *
++ * The syntax is taken as close as possible with the kwbimage
++ */
++
++/* image version */
++IMAGE_VERSION 2
++
++/*
++ * Boot Device : one of
++ * spi, sd (the board has no nand neither onenand)
++ */
++BOOT_FROM sd
++
++#define __ASSEMBLY__
++#include <config.h>
++#include "asm/arch/mx6-ddr.h"
++#include "asm/arch/iomux.h"
++#include "asm/arch/crm_regs.h"
++
++#include "ddr-setup_dl.cfg"
++#include "1066mhz_4x256mx16_dl.cfg"
++#include "clocks.cfg"
+diff -Nur u-boot-2015.01.orig/configs/udoo_dl_defconfig u-boot-2015.01/configs/udoo_dl_defconfig
+--- u-boot-2015.01.orig/configs/udoo_dl_defconfig 1969-12-31 21:00:00.000000000 -0300
++++ u-boot-2015.01/configs/udoo_dl_defconfig 2015-10-16 14:43:36.747072798 -0300
+@@ -0,0 +1,3 @@
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo-dl.cfg,MX6DL,DDR_MB=1024"
++CONFIG_ARM=y
++CONFIG_TARGET_UDOO=y
+diff -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/configs/udoo.h
+--- u-boot-2015.01.orig/include/configs/udoo.h 2015-01-12 12:39:08.000000000 -0200
++++ u-boot-2015.01/include/configs/udoo.h 2015-10-16 15:06:43.329468013 -0300
+@@ -78,7 +78,7 @@
+ #define CONFIG_CMD_BMODE
+ #define CONFIG_CMD_SETEXPR
+
+-#define CONFIG_BOOTDELAY 3
++#define CONFIG_BOOTDELAY 1
+
+ #define CONFIG_SYS_MEMTEST_START 0x10000000
+ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
+@@ -96,60 +96,79 @@
+ #define CONFIG_BOUNCE_BUFFER
+ #define CONFIG_CMD_EXT2
+ #define CONFIG_CMD_FAT
++#define CONFIG_CMD_EXT4
++#define CONFIG_CMD_FS_GENERIC
+ #define CONFIG_DOS_PARTITION
+
++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
++
++#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
++#define CONFIG_DEFAULT_FDT_FILE "imx6dl-udoo.dtb"
++#elif defined(CONFIG_MX6Q)
+ #define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb"
++#endif
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+- "script=boot.scr\0" \
+- "image=zImage\0" \
+- "console=ttymxc1\0" \
++ "grubfile=grub/arm-uboot/core.img\0" \
++ "bootdir=/boot\0" \
++ "console=ttymxc1,115200\0" \
+ "splashpos=m,m\0" \
+- "fdt_high=0xffffffff\0" \
+- "initrd_high=0xffffffff\0" \
+- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+- "fdt_addr=0x18000000\0" \
+- "boot_fdt=try\0" \
+ "ip_dyn=yes\0" \
++ "optargs=\0" \
++ "video=\0" \
+ "mmcdev=0\0" \
+- "mmcpart=1\0" \
+- "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+- "update_sd_firmware_filename=u-boot.imx\0" \
+- "update_sd_firmware=" \
+- "if test ${ip_dyn} = yes; then " \
+- "setenv get_cmd dhcp; " \
++ "mmcroot=/dev/mmcblk0p1 rw rootwait\0" \
++ "mmcargs=setenv bootargs console=${console} " \
++ "${optargs} " \
++ "root=${mmcroot} " \
++ "video=${video}\0" \
++ "videoargs=" \
++ "setenv nextcon 0; " \
++ "if hdmidet; then " \
++ "setenv bootargs ${bootargs} " \
++ "video=mxcfb${nextcon}:dev=hdmi,1280x720M@60," \
++ "if=RGB24; " \
++ "setenv fbmem fbmem=28M; " \
++ "setexpr nextcon ${nextcon} + 1; " \
+ "else " \
+- "setenv get_cmd tftp; " \
++ "echo - no HDMI monitor;" \
+ "fi; " \
+- "if mmc dev ${mmcdev}; then " \
+- "if ${get_cmd} ${update_sd_firmware_filename}; then " \
+- "setexpr fw_sz ${filesize} / 0x200; " \
+- "setexpr fw_sz ${fw_sz} + 1; " \
+- "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
+- "fi; " \
+- "fi\0" \
+- "mmcargs=setenv bootargs console=${console},${baudrate} " \
+- "root=${mmcroot}\0" \
+- "loadbootscript=" \
+- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+- "bootscript=echo Running bootscript from mmc ...; " \
+- "source\0" \
+- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
+- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+- "mmcboot=echo Booting from mmc ...; " \
+- "run mmcargs; " \
+- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+- "if run loadfdt; then " \
+- "bootz ${loadaddr} - ${fdt_addr}; " \
++ "i2c dev 1; " \
++ "if i2c probe 0x10; then " \
++ "setenv bootargs ${bootargs} " \
++ "video=mxcfb${nextcon}:dev=lcd,800x480@60," \
++ "if=RGB666; " \
++ "if test 0 -eq ${nextcon}; then " \
++ "setenv fbmem fbmem=10M; " \
+ "else " \
+- "if test ${boot_fdt} = try; then " \
+- "bootz; " \
+- "else " \
+- "echo WARN: Cannot load the DT; " \
+- "fi; " \
++ "setenv fbmem ${fbmem},10M; " \
+ "fi; " \
++ "setexpr nextcon ${nextcon} + 1; " \
+ "else " \
+- "bootz; " \
++ "echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
++ "fi; " \
++ "setenv bootargs ${bootargs} ${fbmem}\0" \
++ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${grubfile}\0" \
++ "mmcboot=mmc dev ${mmcdev}; " \
++ "if mmc rescan; then " \
++ "echo SD/MMC found on device ${mmcdev};" \
++ "setenv bootpart ${mmcdev}:1; " \
++ "echo Checking for: ${bootdir}/uEnv.txt ...;" \
++ "if test -e mmc ${bootpart} ${bootdir}/uEnv.txt; then " \
++ "load mmc ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \
++ "env import -t ${loadaddr} ${filesize};" \
++ "echo Loaded environment from ${bootdir}/uEnv.txt;" \
++ "echo Checking if uenvcmd is set ...;" \
++ "if test -n ${uenvcmd}; then " \
++ "echo Running uenvcmd ...;" \
++ "run uenvcmd;" \
++ "fi;" \
++ "fi; " \
++ "if run loadimage; then " \
++ "run mmcargs;" \
++ "else " \
++ "echo No GRUB found;" \
++ "fi;" \
+ "fi;\0" \
+ "netargs=setenv bootargs console=${console},${baudrate} " \
+ "root=/dev/nfs " \
+@@ -161,32 +180,10 @@
+ "else " \
+ "setenv get_cmd tftp; " \
+ "fi; " \
+- "${get_cmd} ${image}; " \
+- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+- "bootz ${loadaddr} - ${fdt_addr}; " \
+- "else " \
+- "if test ${boot_fdt} = try; then " \
+- "bootz; " \
+- "else " \
+- "echo WARN: Cannot load the DT; " \
+- "fi; " \
+- "fi; " \
+- "else " \
+- "bootz; " \
+- "fi;\0"
++ "${get_cmd} ${grubfile};\0"
+
+ #define CONFIG_BOOTCOMMAND \
+- "mmc dev ${mmcdev}; if mmc rescan; then " \
+- "if run loadbootscript; then " \
+- "run bootscript; " \
+- "else " \
+- "if run loadimage; then " \
+- "run mmcboot; " \
+- "else run netboot; " \
+- "fi; " \
+- "fi; " \
+- "else run netboot; fi"
++ "run mmcboot;"
+
+ /* Miscellaneous configurable options */
+ #define CONFIG_SYS_LONGHELP
+@@ -227,6 +224,7 @@
+
+ #define CONFIG_OF_LIBFDT
+ #define CONFIG_CMD_BOOTZ
++#define CONFIG_SUPPORT_RAW_INITRD
+
+ #ifndef CONFIG_SYS_DCACHE_OFF
+ #define CONFIG_CMD_CACHE
diff --git a/libre-testing/uboot4grub-udoo/0002-kernel-add-support-for-gcc-5.patch b/libre-testing/uboot4grub-udoo/0002-kernel-add-support-for-gcc-5.patch
new file mode 100644
index 000000000..30718c561
--- /dev/null
+++ b/libre-testing/uboot4grub-udoo/0002-kernel-add-support-for-gcc-5.patch
@@ -0,0 +1,97 @@
+From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sasha.levin@oracle.com>
+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 <sasha.levin@oracle.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ 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 <linux/compiler-gcc5.h> directly, include <linux/compiler.h> 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-testing/uboot4grub-udoo/PKGBUILD b/libre-testing/uboot4grub-udoo/PKGBUILD
new file mode 100644
index 000000000..f0b7c6f55
--- /dev/null
+++ b/libre-testing/uboot4grub-udoo/PKGBUILD
@@ -0,0 +1,78 @@
+# U-Boot: UDOO
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+buildarch=4
+
+pkgbase=uboot4grub-udoo
+pkgname=('uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
+pkgver=2015.01
+pkgrel=1
+arch=('armv7h')
+url="http://git.denx.de/u-boot.git/"
+license=('GPL')
+makedepends=('bc')
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
+ '0001-parabola-arm-modifications+grub-support.patch'
+ '0002-kernel-add-support-for-gcc-5.patch')
+md5sums=('7f08dc9e98a71652bd6968888ed6ec95'
+ '712292157e0819785662f1ae42630889'
+ '721a46867e189d8dedc6b6f86a536a34')
+
+prepare() {
+ cd u-boot-${pkgver}
+
+ patch -Np1 -i ../0001-parabola-arm-modifications+grub-support.patch
+ patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch
+}
+
+build() {
+ cd u-boot-${pkgver}
+
+ unset CFLAGS CXXFLAGS LDFLAGS
+
+ mkdir bins
+ for i in dl quad; do
+ make distclean
+ make udoo_${i}_config
+ make
+ mv u-boot.imx bins/u-boot-${i}.imx
+ done
+}
+
+package_uboot4grub-udoo_dl() {
+ pkgdesc="U-Boot with GRUB support for UDOO Dual"
+ replaces=('uboot-udoo-dual' 'uboot-udoo-dual-linux-libre'
+ 'uboot-udoo-dual-linux-libre-lts' 'uboot-udoo-dual-linux-libre-grsec'
+ 'uboot-udoo-dual-linux-libre-pck' 'uboot-udoo-dual-linux-libre-knock'
+ 'uboot-udoo-dual-linux-libre-lts-knock' 'uboot-udoo-dual-linux-libre-audit'
+ 'uboot-udoo-dual-linux-libre-rt' 'uboot-udoo-dual-linux-libre-grsec-knock')
+ conflicts=('uboot4grub' 'uboot-udoo-dual' 'uboot-udoo-dual-linux-libre'
+ 'uboot-udoo-dual-linux-libre-lts' 'uboot-udoo-dual-linux-libre-grsec'
+ 'uboot-udoo-dual-linux-libre-pck' 'uboot-udoo-dual-linux-libre-knock'
+ 'uboot-udoo-dual-linux-libre-lts-knock' 'uboot-udoo-dual-linux-libre-audit'
+ 'uboot-udoo-dual-linux-libre-rt' 'uboot-udoo-dual-linux-libre-grsec-knock')
+ provides=('uboot4grub' 'uboot-udoo-dual')
+ install=${pkgbase}.install
+
+ mkdir -p "${pkgdir}"/boot
+ cp u-boot-${pkgver}/bins/u-boot-dl.imx "${pkgdir}"/boot/u-boot.imx
+}
+
+package_uboot4grub-udoo_quad() {
+ pkgdesc="U-Boot with GRUB support for UDOO Quad"
+ replaces=('uboot-udoo-quad' 'uboot-udoo-quad-linux-libre'
+ 'uboot-udoo-quad-linux-libre-lts' 'uboot-udoo-quad-linux-libre-grsec'
+ 'uboot-udoo-quad-linux-libre-pck' 'uboot-udoo-quad-linux-libre-knock'
+ 'uboot-udoo-quad-linux-libre-lts-knock' 'uboot-udoo-quad-linux-libre-audit'
+ 'uboot-udoo-quad-linux-libre-rt' 'uboot-udoo-quad-linux-libre-grsec-knock')
+ conflicts=('uboot4grub' 'uboot-udoo-quad' 'uboot-udoo-quad-linux-libre'
+ 'uboot-udoo-quad-linux-libre-lts' 'uboot-udoo-quad-linux-libre-grsec'
+ 'uboot-udoo-quad-linux-libre-pck' 'uboot-udoo-quad-linux-libre-knock'
+ 'uboot-udoo-quad-linux-libre-lts-knock' 'uboot-udoo-quad-linux-libre-audit'
+ 'uboot-udoo-quad-linux-libre-rt' 'uboot-udoo-quad-linux-libre-grsec-knock')
+ provides=('uboot4grub' 'uboot-udoo-quad')
+ install=${pkgbase}.install
+
+ mkdir -p "${pkgdir}"/boot
+ cp u-boot-${pkgver}/bins/u-boot-quad.imx "${pkgdir}"/boot/u-boot.imx
+}
diff --git a/libre-testing/uboot4grub-udoo/uboot4grub-udoo.install b/libre-testing/uboot4grub-udoo/uboot4grub-udoo.install
new file mode 100644
index 000000000..59d33a027
--- /dev/null
+++ b/libre-testing/uboot4grub-udoo/uboot4grub-udoo.install
@@ -0,0 +1,27 @@
+flash_uboot() {
+ echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
+ echo "Do you want to do this now? [y|N]"
+ read -r shouldwe
+ if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
+ dd if=/boot/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
+ grub-install /dev/mmcblk0
+ grub-mkconfig -o /boot/grub/grub.cfg
+ sync
+ else
+ echo "You can do this later by running:"
+ echo "# dd if=/boot/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
+ echo "# grub-install /dev/mmcblk0"
+ echo "# grub-mkconfig -o /boot/grub/grub.cfg"
+ fi
+}
+
+## arg 1: the new package version
+post_install() {
+ flash_uboot
+}
+
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ flash_uboot
+}