uboot-imx6: update to 2014.04

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

SVN-Revision: 40805
This commit is contained in:
Luka Perkov 2014-05-20 21:01:18 +00:00
parent 44c890b6f1
commit b10140d832
3 changed files with 28 additions and 22 deletions

View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2013 OpenWrt.org # Copyright (C) 2013-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=u-boot PKG_NAME:=u-boot
PKG_VERSION:=2013.10 PKG_VERSION:=2014.04
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)
@ -16,7 +16,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \
http://mirror2.openwrt.org/sources \ http://mirror2.openwrt.org/sources \
ftp://ftp.denx.de/pub/u-boot ftp://ftp.denx.de/pub/u-boot
PKG_MD5SUM:=a076a044b64371edc52f7e562b13f6b2 PKG_MD5SUM:=6d2116d1385a66e9a59742caa9d62a54
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -98,11 +100,13 @@ UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),openwrt-$(BOARD)-$(BUILD_VARIANT)-u-boot.bin
endif endif
define Build/Configure define Build/Configure
$(MAKE) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIG)_config +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(UBOOT_CONFIG)_config
endef endef
define Build/Compile define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS) +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CROSS_COMPILE=$(TARGET_CROSS)
endef endef
define Package/uboot/install/default define Package/uboot/install/default

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
@@ -242,4 +242,7 @@ @@ -238,4 +238,7 @@
#define CONFIG_CMD_CACHE #define CONFIG_CMD_CACHE
#endif #endif

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
@@ -48,7 +48,7 @@ @@ -49,7 +49,7 @@
#define CONFIG_CMD_BMODE #define CONFIG_CMD_BMODE
#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_SETEXPR
@ -9,24 +9,24 @@
#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)
@@ -101,13 +101,15 @@ @@ -102,13 +102,15 @@
#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
#define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
+#define CONFIG_OWRT_NAME "openwrt-imx6-imx6dl-wandboard-fit-uImage.itb" +#define CONFIG_OWRT_NAME "openwrt-imx6-imx6dl-wandboard-fit-uImage.itb"
#elif defined(CONFIG_MX6Q) #elif defined(CONFIG_MX6Q)
#define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb" #define CONFIG_DEFAULT_FDT_FILE "imx6q-wandboard.dtb"
+#define CONFIG_OWRT_NAME "openwrt-imx6-imx6q-wandboard-fit-uImage.itb" +#define CONFIG_OWRT_NAME "openwrt-imx6-imx6q-wandboard-fit-uImage.itb"
#endif #endif
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
- "uimage=uImage\0" \ - "image=zImage\0" \
+ "uimage=" CONFIG_OWRT_NAME "\0" \ + "image=" CONFIG_OWRT_NAME "\0" \
"console=ttymxc0\0" \ "console=ttymxc0\0" \
"splashpos=m,m\0" \ "splashpos=m,m\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
@@ -136,11 +138,11 @@ @@ -137,11 +139,11 @@
"mmcargs=setenv bootargs console=${console},${baudrate} " \ "mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \ "root=${mmcroot}\0" \
"loadbootscript=" \ "loadbootscript=" \
@ -34,17 +34,18 @@
+ "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \ "bootscript=echo Running bootscript from mmc ...; " \
"source\0" \ "source\0" \
- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+ "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
"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 " \
@@ -155,30 +157,6 @@ @@ -155,31 +157,7 @@
"fi; " \
"fi; " \ "fi; " \
"else " \ "else " \
"bootm; " \ - "bootz; " \
- "fi;\0" \ - "fi;\0" \
- "netargs=setenv bootargs console=${console},${baudrate} " \ - "netargs=setenv bootargs console=${console},${baudrate} " \
- "root=/dev/nfs " \ - "root=/dev/nfs " \
@ -56,25 +57,26 @@
- "else " \ - "else " \
- "setenv get_cmd tftp; " \ - "setenv get_cmd tftp; " \
- "fi; " \ - "fi; " \
- "${get_cmd} ${uimage}; " \ - "${get_cmd} ${image}; " \
- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
- "bootm ${loadaddr} - ${fdt_addr}; " \ - "bootz ${loadaddr} - ${fdt_addr}; " \
- "else " \ - "else " \
- "if test ${boot_fdt} = try; then " \ - "if test ${boot_fdt} = try; then " \
- "bootm; " \ - "bootz; " \
- "else " \ - "else " \
- "echo WARN: Cannot load the DT; " \ - "echo WARN: Cannot load the DT; " \
- "fi; " \ - "fi; " \
- "fi; " \ - "fi; " \
- "else " \ - "else " \
- "bootm; " \ - "bootz; " \
+ "bootm; " \
"fi;\0" "fi;\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
@@ -188,10 +166,10 @@ @@ -189,10 +167,10 @@
"else " \ "else " \
"if run loaduimage; then " \ "if run loadimage; then " \
"run mmcboot; " \ "run mmcboot; " \
- "else run netboot; " \ - "else run netboot; " \
+ "else echo WARN: Can not boot the image; " \ + "else echo WARN: Can not boot the image; " \