diff --git a/packages/tools/u-boot-v2/package.mk b/packages/tools/u-boot-v2/package.mk index 8526b00480..b4f916b6bb 100644 --- a/packages/tools/u-boot-v2/package.mk +++ b/packages/tools/u-boot-v2/package.mk @@ -16,7 +16,7 @@ # along with LibreELEC. If not, see . ################################################################################ PKG_NAME="u-boot-v2" -PKG_VERSION="2016.03" +PKG_VERSION="2017.01" PKG_SITE="" PKG_URL="ftp://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2" PKG_SOURCE_DIR="u-boot-$PKG_VERSION" diff --git a/packages/tools/u-boot-v2/patches/u-boot-v2-010-tbs2910.patch b/packages/tools/u-boot-v2/patches/u-boot-v2-010-tbs2910.patch index cf86b22638..24527d4e1c 100644 --- a/packages/tools/u-boot-v2/patches/u-boot-v2-010-tbs2910.patch +++ b/packages/tools/u-boot-v2/patches/u-boot-v2-010-tbs2910.patch @@ -1,7 +1,9 @@ stuff ported from u-boot-imx6-e817fa3 ---- a/include/configs/tbs2910.h 2015-10-12 17:14:27.000000000 +0200 -+++ b/include/configs/tbs2910.h 2015-10-19 16:46:51.396448700 +0200 +diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h +index 0dc4a28..31adfb3 100644 +--- a/include/configs/tbs2910.h ++++ b/include/configs/tbs2910.h @@ -11,6 +11,19 @@ #include "mx6_common.h" @@ -11,18 +13,18 @@ stuff ported from u-boot-imx6-e817fa3 + +#define CONFIG_FS_FAT +#define CONFIG_FS_EXT4 -+#define CONFIG_CMD_FS_GENERIC /* Generic load commands */ -+#define CONFIG_CMD_BOOTZ /* bootz zImage support */ ++/*#define CONFIG_CMD_FS_GENERIC*/ /* Generic load commands */ ++/*#define CONFIG_CMD_BOOTZ*/ /* bootz zImage support */ +#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */ -+#define CONFIG_CMD_EXT2 -+#define CONFIG_CMD_EXT4 -+#define CONFIG_CMD_FAT ++/*#define CONFIG_CMD_EXT2*/ ++/*#define CONFIG_CMD_EXT4*/ ++/*#define CONFIG_CMD_FAT*/ +#define CONFIG_DOS_PARTITION + /* General configuration */ #define CONFIG_SYS_THUMB_BUILD -@@ -183,35 +196,133 @@ +@@ -151,36 +164,133 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -42,12 +44,13 @@ stuff ported from u-boot-imx6-e817fa3 - "bootm 0x10800000 0x10d00000\0" \ - "console=ttymxc0\0" \ - "fan=gpio set 92\0" \ -- "set_con_serial=setenv stdin serial; " \ -- "setenv stdout serial; " \ +- "set_con_serial=setenv stdout serial; " \ - "setenv stderr serial;\0" \ -- "set_con_usb_hdmi=setenv stdin serial,usbkbd; " \ -- "setenv stdout serial,vga; " \ -- "setenv stderr serial,vga;\0" +- "set_con_hdmi=setenv stdout serial,vga; " \ +- "setenv stderr serial,vga;\0" \ +- "stderr=serial,vga;\0" \ +- "stdin=serial,usbkbd;\0" \ +- "stdout=serial,vga;\0" + "zImage=KERNEL\0" \ + "script=boot.scr\0" \ + "uimage=uImage\0" \ diff --git a/packages/tools/u-boot-v2/patches/u-boot-v2-020-udoo.patch b/packages/tools/u-boot-v2/patches/u-boot-v2-020-udoo.patch index b8a691c2e6..e7df0c3129 100644 --- a/packages/tools/u-boot-v2/patches/u-boot-v2-020-udoo.patch +++ b/packages/tools/u-boot-v2/patches/u-boot-v2-020-udoo.patch @@ -1,7 +1,8 @@ -diff -aurN a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c ---- a/board/udoo/udoo_spl.c 2016-03-14 15:20:21.000000000 +0100 -+++ b/board/udoo/udoo_spl.c 2016-04-15 11:33:04.501383916 +0200 -@@ -214,7 +214,7 @@ +diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c +index f24d21e..a28c9e0 100644 +--- a/board/udoo/udoo_spl.c ++++ b/board/udoo/udoo_spl.c +@@ -216,7 +216,7 @@ static void gpr_init(void) struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; /* enable AXI cache for VDOA/VPU/IPU */ @@ -10,27 +11,28 @@ diff -aurN a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */ writel(0x007F007F, &iomux->gpr[6]); writel(0x007F007F, &iomux->gpr[7]); -diff -aurN a/include/configs/udoo.h b/include/configs/udoo.h ---- a/include/configs/udoo.h 2016-03-14 15:20:21.000000000 +0100 -+++ b/include/configs/udoo.h 2016-04-15 11:32:41.181971400 +0200 -@@ -11,8 +11,8 @@ +diff --git a/include/configs/udoo.h b/include/configs/udoo.h +index 0a7767c..6d8cb08 100644 +--- a/include/configs/udoo.h ++++ b/include/configs/udoo.h +@@ -11,6 +11,9 @@ #include "mx6_common.h" --#define CONFIG_SPL_LIBCOMMON_SUPPORT - #define CONFIG_SPL_MMC_SUPPORT ++/*#define CONFIG_SPL_MMC_SUPPORT*/ +#define CONFIG_SPL_FAT_SUPPORT ++ #include "imx6_spl.h" #define MACH_TYPE_UDOO 4800 -@@ -27,6 +27,35 @@ +@@ -25,6 +28,35 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE +/* USB and USB Mass Storage support */ + +#define CONFIG_CMD_USB -+#define CONFIG_CMD_FAT ++/*#define CONFIG_CMD_FAT*/ +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_MX6 +#define CONFIG_USB_STORAGE @@ -59,12 +61,13 @@ diff -aurN a/include/configs/udoo.h b/include/configs/udoo.h /* SATA Configs */ #define CONFIG_CMD_SATA -@@ -63,11 +92,14 @@ +@@ -58,11 +90,15 @@ /* MMC Configuration */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 +#undef CONFIG_BOOTDELAY +#define CONFIG_BOOTDELAY 1 ++ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -75,7 +78,7 @@ diff -aurN a/include/configs/udoo.h b/include/configs/udoo.h "console=ttymxc1\0" \ "splashpos=m,m\0" \ "fdt_high=0xffffffff\0" \ -@@ -76,9 +108,12 @@ +@@ -71,9 +107,12 @@ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ @@ -89,7 +92,7 @@ diff -aurN a/include/configs/udoo.h b/include/configs/udoo.h "update_sd_firmware_filename=u-boot.imx\0" \ "update_sd_firmware=" \ "if test ${ip_dyn} = yes; then " \ -@@ -94,27 +129,36 @@ +@@ -89,27 +128,36 @@ "fi; " \ "fi\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ @@ -131,7 +134,7 @@ diff -aurN a/include/configs/udoo.h b/include/configs/udoo.h "fi;\0" \ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs " \ -@@ -150,16 +194,23 @@ +@@ -145,16 +193,23 @@ #define CONFIG_BOOTCOMMAND \ "run findfdt; " \ diff --git a/projects/imx6/options b/projects/imx6/options index e556871fec..34ab5a2035 100644 --- a/projects/imx6/options +++ b/projects/imx6/options @@ -44,9 +44,9 @@ UBOOT_CONFIG="mx6_cubox-i_config" UBOOT_CONFIG="$UBOOT_CONFIG matrix" - UBOOT_CONFIG_V2="udoo_config" - UBOOT_CONFIG_V2="$UBOOT_CONFIG_V2 tbs2910_config" - #UBOOT_CONFIG_V2="$UBOOT_CONFIG_V2 wandboard_config" + # for second u-boot + UBOOT_CONFIG_V2="udoo_config \ + tbs2910_config" # Target Configfile for u-boot UBOOT_CONFIGFILE=""