From 51085b3ec8ff02856252d5d753af54f5ac920739 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 18 May 2014 17:38:16 +0000 Subject: [PATCH] alarm/uboot-udoo to 2013.10-2 --- alarm/uboot-udoo/PKGBUILD | 4 ++-- alarm/uboot-udoo/alarm.patch | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/alarm/uboot-udoo/PKGBUILD b/alarm/uboot-udoo/PKGBUILD index 6c188a218..2c34d981b 100644 --- a/alarm/uboot-udoo/PKGBUILD +++ b/alarm/uboot-udoo/PKGBUILD @@ -6,7 +6,7 @@ buildarch=4 pkgbase=uboot-udoo pkgname=('uboot-udoo-dual' 'uboot-udoo-quad') pkgver=2013.10 -pkgrel=1 +pkgrel=2 arch=('armv7h') url="https://github.com/UDOOboard/U-Boot_Unico-2013" license=('GPL') @@ -15,7 +15,7 @@ option=('!strip') source=("uboot::git+https://github.com/UDOOboard/U-Boot_Unico-2013.git" 'alarm.patch') md5sums=('SKIP' - '330f9fa3963708dc8e70a86415d00d73') + '6a7b2c125b8ff29fa47d1dd6cbd61f7f') prepare() { cd uboot diff --git a/alarm/uboot-udoo/alarm.patch b/alarm/uboot-udoo/alarm.patch index 6b20aa4a1..8d5718098 100644 --- a/alarm/uboot-udoo/alarm.patch +++ b/alarm/uboot-udoo/alarm.patch @@ -1,7 +1,7 @@ diff -urN a/include/configs/udoo.h b/include/configs/udoo.h ---- a/include/configs/udoo.h 2014-04-06 13:29:26.927572479 -0600 -+++ b/include/configs/udoo.h 2014-04-06 14:00:46.383454580 -0600 -@@ -118,102 +118,68 @@ +--- a/include/configs/udoo.h 2014-05-18 11:32:41.255898800 -0600 ++++ b/include/configs/udoo.h 2014-05-18 11:34:20.295534234 -0600 +@@ -118,102 +118,72 @@ #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_CMD_EXT2 @@ -12,7 +12,11 @@ diff -urN a/include/configs/udoo.h b/include/configs/udoo.h +#define CONFIG_IDENT_STRING " Arch Linux ARM" + ++#if defined(CONFIG_MX6Q) #define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb" ++#else ++#define CONFIG_DEFAULT_FDT_FILE "imx6dl-udoo.dtb" ++#endif #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \