From 9f31eaf9da3fd7956cde0b32ecf2971bd08a8f7b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 20 Aug 2014 12:11:57 +0200
Subject: add u-boot update for hummingboardrd, add some basic infrastructure
---
package/u-boot-imx6/Makefile | 10 +++---
.../patches/patch-include_configs_mx6_cubox-i_h | 37 ++++++++++++----------
2 files changed, 24 insertions(+), 23 deletions(-)
(limited to 'package/u-boot-imx6')
diff --git a/package/u-boot-imx6/Makefile b/package/u-boot-imx6/Makefile
index 6d7ac4781..e54f9472a 100644
--- a/package/u-boot-imx6/Makefile
+++ b/package/u-boot-imx6/Makefile
@@ -4,17 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= u-boot-imx6
-PKG_VERSION:= 20140416
+PKG_VERSION:= 20140819
PKG_RELEASE:= 1
-PKG_MD5SUM:= f2a5f697670c340eef8074f6a5f26476
-PKG_DESCR:= bootloader for imx6 (cubox-i)
+PKG_MD5SUM:= 41ae410a775e336c81a9a22ce836a74f
+PKG_DESCR:= bootloader for imx6 (cubox-i/hummingboard)
PKG_SECTION:= base/boot
PKG_URL:= https://github.com/SolidRun/u-boot-imx6.git
PKG_SITES:= http://openadk.org/distfiles/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
-PKG_SYSTEM_DEPENDS:= cubox-i
+PKG_SYSTEM_DEPENDS:= cubox-i hummingboard
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h b/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h
index d2174480a..cd02db031 100644
--- a/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h
+++ b/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h
@@ -1,5 +1,5 @@
---- u-boot-imx6-20140416.orig/include/configs/mx6_cubox-i.h 2014-04-17 15:53:51.000000000 +0200
-+++ u-boot-imx6-20140416/include/configs/mx6_cubox-i.h 2014-06-30 12:44:38.808082044 +0200
+--- u-boot-imx6-20140819.orig/include/configs/mx6_cubox-i.h 2014-08-19 09:42:57.000000000 +0200
++++ u-boot-imx6-20140819/include/configs/mx6_cubox-i.h 2014-08-19 13:26:15.775439757 +0200
@@ -158,7 +158,7 @@
"script=boot.scr\0" \
"bootfile=auto\0" \
@@ -18,30 +18,33 @@
"update_sd_firmware_filename=u-boot.imx\0" \
"update_sd_firmware=" \
"if test ${ip_dyn} = yes; then " \
-@@ -212,19 +212,19 @@
+@@ -217,7 +217,7 @@
"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
"env import -t ${loadaddr} ${filesize};\0" \
- "autobootfdt=echo Booting ${boot_file}; " \
-- "if test ${boot_file} = zImage; then " \
-+ "if test ${boot_file} = kernel; then " \
- "bootz ${loadaddr} - ${fdt_addr}; " \
- "else " \
- "bootm ${loadaddr} - ${fdt_addr}; " \
- "fi;\0 " \
"autoboot=echo Booting ${boot_file}; " \
- "if test ${boot_file} = zImage; then " \
+ "if test ${boot_file} = kernel; then " \
- "bootz; " \
+ "bootz ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
"else " \
- "bootm; " \
- "fi;\0 " \
- "bootit=setenv boot_file ${bootfile}; " \
+ "bootm ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
+@@ -232,14 +232,14 @@
+ "else " \
+ "setenv ramdisk_addr -; " \
+ "fi; " \
- "if test ${boot_file} = zImage; then " \
+ "if test ${boot_file} = kernel; then " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \
- "run autobootfdt; " \
-@@ -260,7 +260,7 @@
+ "echo Loaded ${fdt_file}; " \
+ "else " \
+ "setenv fdt_addr; " \
+ "if test ${boot_fdt} = try; then " \
+- "echo WARN: Cannot load the DTB and boot file is type zImage;" \
++ "echo WARN: Cannot load the DTB and boot file is type kernel;" \
+ "echo if you have not appended a dtb to the file it may;" \
+ "echo hang after displaying Starting kernel...;" \
+ "echo ;" \
+@@ -269,7 +269,7 @@
"setenv get_cmd tftp; " \
"fi; " \
"if test ${bootfile} = auto; then " \
@@ -50,7 +53,7 @@
"if ${get_cmd} ${bootfile}; then " \
"run bootit; " \
"else " \
-@@ -286,7 +286,7 @@
+@@ -295,7 +295,7 @@
"fi; " \
"if test ${bootfile} = auto; then " \
"setenv origbootfile auto; " \
--
cgit v1.2.3