aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/boot/uboot-mvebu/Makefile4
-rw-r--r--package/boot/uboot-mvebu/patches/002-enable_random_mac_addr.patch4
-rw-r--r--package/boot/uboot-mvebu/patches/003-boot_script.patch26
-rw-r--r--package/boot/uboot-mvebu/patches/200-clearfog-reset-usom-onboard-1512-phy.patch7
4 files changed, 26 insertions, 15 deletions
diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile
index a20c4b4f2d..2c280faa21 100644
--- a/package/boot/uboot-mvebu/Makefile
+++ b/package/boot/uboot-mvebu/Makefile
@@ -8,10 +8,10 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
-PKG_VERSION:=2016.03
+PKG_VERSION:=2017.03
PKG_RELEASE:=1
-PKG_HASH:=e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb
+PKG_HASH:=f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f
include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk
diff --git a/package/boot/uboot-mvebu/patches/002-enable_random_mac_addr.patch b/package/boot/uboot-mvebu/patches/002-enable_random_mac_addr.patch
index 2dd9f28283..85bd03f40b 100644
--- a/package/boot/uboot-mvebu/patches/002-enable_random_mac_addr.patch
+++ b/package/boot/uboot-mvebu/patches/002-enable_random_mac_addr.patch
@@ -1,6 +1,8 @@
+diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
+index 1264871e83..41e94e6daf 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
-@@ -14,6 +14,7 @@ CONFIG_DEBUG_UART=y
+@@ -47,6 +47,7 @@ CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_CLOCK=250000000
CONFIG_DEBUG_UART_SHIFT=2
diff --git a/package/boot/uboot-mvebu/patches/003-boot_script.patch b/package/boot/uboot-mvebu/patches/003-boot_script.patch
index 2e156b7c8c..9bb679dad5 100644
--- a/package/boot/uboot-mvebu/patches/003-boot_script.patch
+++ b/package/boot/uboot-mvebu/patches/003-boot_script.patch
@@ -1,6 +1,20 @@
+diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
+index 41e94e6daf..f23e65e345 100644
+--- a/configs/clearfog_defconfig
++++ b/configs/clearfog_defconfig
+@@ -11,6 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
+ CONFIG_BOOTDELAY=3
+ CONFIG_SYS_CONSOLE_INFO_QUIET=y
+ # CONFIG_DISPLAY_BOARDINFO is not set
++CONFIG_HUSH_PARSER=y
+ CONFIG_SPL=y
+ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x141
+ CONFIG_SPL_I2C_SUPPORT=y
+diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
+index 0c51d2a288..e52ba8145f 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
-@@ -107,7 +107,18 @@
+@@ -82,7 +82,18 @@
/* Keep device tree and initrd in lower memory so the kernel can access them */
#define CONFIG_EXTRA_ENV_SETTINGS \
"fdt_high=0x10000000\0" \
@@ -20,13 +34,3 @@
/* SPL */
/*
---- a/configs/clearfog_defconfig
-+++ b/configs/clearfog_defconfig
-@@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y
- CONFIG_SYS_MALLOC_F_LEN=0x2000
- CONFIG_TARGET_CLEARFOG=y
- CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
-+CONFIG_HUSH_PARSER=y
- CONFIG_SPL=y
- # CONFIG_CMD_IMLS is not set
- # CONFIG_CMD_FLASH is not set
diff --git a/package/boot/uboot-mvebu/patches/200-clearfog-reset-usom-onboard-1512-phy.patch b/package/boot/uboot-mvebu/patches/200-clearfog-reset-usom-onboard-1512-phy.patch
index 3c470409ec..4954353611 100644
--- a/package/boot/uboot-mvebu/patches/200-clearfog-reset-usom-onboard-1512-phy.patch
+++ b/package/boot/uboot-mvebu/patches/200-clearfog-reset-usom-onboard-1512-phy.patch
@@ -1,4 +1,4 @@
-From 15d52c4067b8d8a1d7a002aec41c5e6c0a8678cd Mon Sep 17 00:00:00 2001
+From 98848106b9558244ae36a85229caabcdb57d0f7b Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Fri, 23 Sep 2016 13:58:14 +0200
Subject: [PATCH] clearfog: reset usom onboard 1512 phy
@@ -15,6 +15,8 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
board/solidrun/clearfog/clearfog.c | 4 ++++
1 file changed, 4 insertions(+)
+diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
+index 2773f5957e..3a8257cac3 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -131,8 +131,12 @@ int board_init(void)
@@ -30,3 +32,6 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
mdelay(10);
/* Init I2C IO expanders */
+--
+2.12.2
+