KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uboot-imx6: update to v2013.07

Browse source 
Update includes upstream support for Wandboard Quad too.

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 37858
This commit is contained in:
Luka Perkov 2013-08-29 23:06:31 +00:00
parent cdd6361649
commit e29acfd8e9
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
package/boot/uboot-imx6/Makefile
View file

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=u-boot PKG_NAME:=u-boot
PKG_VERSION:=2013.04 PKG_VERSION:=2013.07
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
PKG_MD5SUM:=21bf962d69938ed4ed783b792b2b074e PKG_MD5SUM:=8445162690052e6afd4b8f87af2bb557
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -32,9 +32,14 @@ define uboot/wandboard_dl
TITLE:=U-Boot for the Wandboard Dual Lite TITLE:=U-Boot for the Wandboard Dual Lite
endef endef
define uboot/wandboard_quad
TITLE:=U-Boot for the Wandboard Quad
endef
UBOOTS := \ UBOOTS := \
wandboard_solo \ wandboard_solo \
wandboard_dl wandboard_dl \
wandboard_quad
define Package/uboot/template define Package/uboot/template
define Package/uboot-imx6-$(1) define Package/uboot-imx6-$(1)

2
package/boot/uboot-imx6/patches/100-wandboard-enable-fit.patch
View file

@ -1,6 +1,6 @@
--- a/include/configs/wandboard.h --- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h +++ b/include/configs/wandboard.h
@@ -206,4 +206,7 @@ @@ -242,4 +242,7 @@
#define CONFIG_CMD_CACHE #define CONFIG_CMD_CACHE
#endif #endif

17
package/boot/uboot-imx6/patches/110-wandboard-owrt-env-patch → package/boot/uboot-imx6/patches/110-wandboard-owrt-env.patch
View file

@ -1,19 +1,22 @@
--- a/include/configs/wandboard.h --- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h +++ b/include/configs/wandboard.h
@@ -47,7 +47,7 @@ @@ -51,7 +51,7 @@
#define CONFIG_CMD_BMODE
#undef CONFIG_CMD_IMLS #define CONFIG_CMD_SETEXPR
-#define CONFIG_BOOTDELAY 5 -#define CONFIG_BOOTDELAY 5
+#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 3
#define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_START 0x10000000
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
@@ -83,13 +83,15 @@ @@ -103,15 +103,18 @@
#if defined(CONFIG_MX6DL) #if defined(CONFIG_MX6DL)
#define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
+#define CONFIG_OWRT_NAME "openwrt-imx6dl-wandboard-uImage.itb" +#define CONFIG_OWRT_NAME "openwrt-imx6dl-wandboard-uImage.itb"
#elif defined(CONFIG_MX6Q)
#define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb"
+#define CONFIG_OWRT_NAME "openwrt-imx6q-wandboard-uImage.itb"
#elif defined(CONFIG_MX6S) #elif defined(CONFIG_MX6S)
#define CONFIG_DEFAULT_FDT_FILE "imx6s-wandboard.dtb" #define CONFIG_DEFAULT_FDT_FILE "imx6s-wandboard.dtb"
+#define CONFIG_OWRT_NAME "openwrt-imx6s-wandboard-uImage.itb" +#define CONFIG_OWRT_NAME "openwrt-imx6s-wandboard-uImage.itb"
@ -26,7 +29,7 @@
"console=ttymxc0\0" \ "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
@@ -103,11 +105,11 @@ @@ -139,11 +142,11 @@
"mmcargs=setenv bootargs console=${console},${baudrate} " \ "mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \ "root=${mmcroot}\0" \
"loadbootscript=" \ "loadbootscript=" \
@ -41,7 +44,7 @@
"mmcboot=echo Booting from mmc ...; " \ "mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \ "run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
@@ -122,30 +124,6 @@ @@ -158,30 +161,6 @@
"fi; " \ "fi; " \
"else " \ "else " \
"bootm; " \ "bootm; " \
@ -72,7 +75,7 @@
"fi;\0" "fi;\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
@@ -155,10 +133,10 @@ @@ -191,10 +170,10 @@
"else " \ "else " \
"if run loaduimage; then " \ "if run loaduimage; then " \
"run mmcboot; " \ "run mmcboot; " \