From 2e5b8429cb9cf7efccd0a5893cdd0262745fd1b0 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 16 Sep 2018 18:08:54 +0200 Subject: package/boot/uboot*: probably from OpenWRT --- package/boot/uboot-envtools/Makefile | 6 +++--- .../300-support-env-in-ubivol-chardev.patch | 25 ++++++++++++++-------- package/boot/uboot-kirkwood/Makefile | 4 ++-- .../boot/uboot-kirkwood/patches/110-dockstar.patch | 14 ++++++------ .../boot/uboot-kirkwood/patches/120-iconnect.patch | 14 ++++++------ .../boot/uboot-kirkwood/patches/130-ib62x0.patch | 14 ++++++------ package/boot/uboot-mxs/Makefile | 6 +++--- 7 files changed, 45 insertions(+), 38 deletions(-) diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index fa49c13..c6f1fba 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-envtools PKG_DISTNAME:=u-boot -PKG_VERSION:=2014.07 -PKG_RELEASE:=1 +PKG_VERSION:=2014.04 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://mirror2.openwrt.org/sources \ ftp://ftp.denx.de/pub/u-boot -PKG_MD5SUM:=36d4bad687edcafa396fee607e505d4e +PKG_MD5SUM:=6d2116d1385a66e9a59742caa9d62a54 PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION) diff --git a/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch b/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch index 557fa97..41089c5 100644 --- a/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch +++ b/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch @@ -9,9 +9,11 @@ Signed-off-by: Daniel Golle tools/env/fw_env.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 71 insertions(+), 10 deletions(-) +diff --git a/tools/env/Makefile b/tools/env/Makefile +index f5368bc..526d44d 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile -@@ -24,6 +24,11 @@ ifeq ($(MTD_VERSION),old) +@@ -20,6 +20,11 @@ ifeq ($(MTD_VERSION),old) HOST_EXTRACFLAGS += -DMTD_OLD endif @@ -23,9 +25,11 @@ Signed-off-by: Daniel Golle always := fw_printenv hostprogs-y := fw_printenv_unstripped +diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c +index 30d5b03..2217a25 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c -@@ -30,6 +30,9 @@ +@@ -29,6 +29,9 @@ # include #endif @@ -35,7 +39,7 @@ Signed-off-by: Daniel Golle #include "fw_env.h" #include -@@ -810,6 +813,11 @@ static int flash_write_buf (int dev, int +@@ -809,6 +812,11 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, off_t top_of_range; /* end of the last block we may use */ loff_t blockstart; /* running start of the current block - MEMGETBADBLOCK needs 64 bits */ @@ -47,7 +51,7 @@ Signed-off-by: Daniel Golle int rc; /* -@@ -915,7 +923,30 @@ static int flash_write_buf (int dev, int +@@ -914,7 +922,30 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, continue; } @@ -79,7 +83,7 @@ Signed-off-by: Daniel Golle erase.start = blockstart; ioctl(fd, MEMUNLOCK, &erase); /* These do not need an explicit erase cycle */ -@@ -932,7 +963,8 @@ static int flash_write_buf (int dev, int +@@ -931,7 +962,8 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, fprintf (stderr, "Seek error on %s: %s\n", DEVNAME (dev), strerror (errno)); @@ -89,7 +93,7 @@ Signed-off-by: Daniel Golle } #ifdef DEBUG -@@ -942,10 +974,11 @@ static int flash_write_buf (int dev, int +@@ -941,10 +973,11 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, if (write (fd, data + processed, erasesize) != erasesize) { fprintf (stderr, "Write error on %s: %s\n", DEVNAME (dev), strerror (errno)); @@ -103,7 +107,7 @@ Signed-off-by: Daniel Golle ioctl(fd, MEMLOCK, &erase); processed += erasesize; -@@ -956,6 +989,11 @@ static int flash_write_buf (int dev, int +@@ -955,6 +988,11 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, if (write_total > count) free (data); @@ -115,7 +119,7 @@ Signed-off-by: Daniel Golle return processed; } -@@ -1067,12 +1105,8 @@ static int flash_read (int fd) +@@ -1066,12 +1104,8 @@ static int flash_read (int fd) if (S_ISCHR(st.st_mode)) { rc = ioctl(fd, MEMGETINFO, &mtdinfo); @@ -130,7 +134,7 @@ Signed-off-by: Daniel Golle mtdinfo.type != MTD_NANDFLASH && mtdinfo.type != MTD_DATAFLASH && mtdinfo.type != MTD_UBIVOLUME) { -@@ -1080,6 +1114,28 @@ static int flash_read (int fd) +@@ -1079,6 +1113,28 @@ static int flash_read (int fd) mtdinfo.type, DEVNAME(dev_current)); return -1; } @@ -159,3 +163,6 @@ Signed-off-by: Daniel Golle } else { memset(&mtdinfo, 0, sizeof(mtdinfo)); mtdinfo.type = MTD_ABSENT; +-- +2.0.0 + diff --git a/package/boot/uboot-kirkwood/Makefile b/package/boot/uboot-kirkwood/Makefile index f12c13b..0f031431 100644 --- a/package/boot/uboot-kirkwood/Makefile +++ b/package/boot/uboot-kirkwood/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=u-boot -PKG_VERSION:=2014.07 +PKG_VERSION:=2014.04 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://mirror2.openwrt.org/sources \ ftp://ftp.denx.de/pub/u-boot -PKG_MD5SUM:=36d4bad687edcafa396fee607e505d4e +PKG_MD5SUM:=6d2116d1385a66e9a59742caa9d62a54 PKG_TARGETS:=bin PKG_BUILD_PARALLEL:=1 diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch index a040e40..e8507f0 100644 --- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch +++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch @@ -132,10 +132,10 @@ --- a/boards.cfg +++ b/boards.cfg @@ -198,6 +198,7 @@ Active arm arm926ejs kirkw - Active arm arm926ejs kirkwood Marvell sheevaplug sheevaplug - Prafulla Wadaskar - Active arm arm926ejs kirkwood raidsonic ib62x0 ib62x0 - Luka Perkov - Active arm arm926ejs kirkwood Seagate dockstar dockstar - Eric Cooper -+Active arm arm926ejs kirkwood Seagate dockstar dockstar_second_stage dockstar:SECOND_STAGE Luka Perkov - Active arm arm926ejs kirkwood Seagate goflexhome goflexhome - Suriyan Ramasami - Active arm arm926ejs lpc32xx timll devkit3250 devkit3250 - Vladimir Zapolskiy - Active arm arm926ejs mb86r0x syteco jadecpu jadecpu - Matthias Weisser + Active arm arm926ejs kirkwood Marvell openrd openrd_ultimate openrd:BOARD_IS_OPENRD_ULTIMATE - + Active arm arm926ejs kirkwood raidsonic ib62x0 ib62x0 - Luka Perkov + Active arm arm926ejs kirkwood Seagate - dockstar - Eric Cooper ++Active arm arm926ejs kirkwood Seagate dockstar dockstar_second_stage dockstar:SECOND_STAGE Luka Perkov + Active arm arm926ejs kirkwood Seagate - goflexhome - Suriyan Ramasami + Active arm arm926ejs lpc32xx timll devkit3250 devkit3250 - Vladimir Zapolskiy + Active arm arm926ejs mb86r0x syteco jadecpu jadecpu - Matthias Weisser diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch index 4b57cc6..3103dc3 100644 --- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch +++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch @@ -48,10 +48,10 @@ --- a/boards.cfg +++ b/boards.cfg @@ -170,6 +170,7 @@ Active arm arm926ejs kirkw - Active arm arm926ejs kirkwood cloudengines pogo_e02 pogo_e02 - Dave Purdy - Active arm arm926ejs kirkwood d-link dns325 dns325 - Stefan Herbrechtsmeier - Active arm arm926ejs kirkwood iomega iconnect iconnect - Luka Perkov -+Active arm arm926ejs kirkwood iomega iconnect iconnect_second_stage iconnect:SECOND_STAGE Luka Perkov - Active arm arm926ejs kirkwood karo tk71 tk71 - - - Active arm arm926ejs kirkwood keymile km_arm km_kirkwood km_kirkwood:KM_KIRKWOOD Valentin Longchamp - Active arm arm926ejs kirkwood keymile km_arm km_kirkwood_128m16 km_kirkwood:KM_KIRKWOOD_128M16 Valentin Longchamp + Active arm arm926ejs kirkwood cloudengines - pogo_e02 - Dave Purdy + Active arm arm926ejs kirkwood d-link - dns325 - Stefan Herbrechtsmeier + Active arm arm926ejs kirkwood iomega - iconnect - Luka Perkov ++Active arm arm926ejs kirkwood iomega iconnect iconnect_second_stage iconnect:SECOND_STAGE Luka Perkov + Active arm arm926ejs kirkwood karo tk71 tk71 - - + Active arm arm926ejs kirkwood keymile km_arm km_kirkwood km_kirkwood:KM_KIRKWOOD Valentin Longchamp + Active arm arm926ejs kirkwood keymile km_arm km_kirkwood_128m16 km_kirkwood:KM_KIRKWOOD_128M16 Valentin Longchamp diff --git a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch index cfbb58a..6c98184 100644 --- a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch +++ b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch @@ -1,13 +1,13 @@ --- a/boards.cfg +++ b/boards.cfg @@ -198,6 +198,7 @@ Active arm arm926ejs kirkw - Active arm arm926ejs kirkwood Marvell rd6281a rd6281a - Prafulla Wadaskar - Active arm arm926ejs kirkwood Marvell sheevaplug sheevaplug - Prafulla Wadaskar - Active arm arm926ejs kirkwood raidsonic ib62x0 ib62x0 - Luka Perkov -+Active arm arm926ejs kirkwood raidsonic ib62x0 ib62x0_second_stage ib62x0:SECOND_STAGE Luka Perkov - Active arm arm926ejs kirkwood Seagate dockstar dockstar - Eric Cooper - Active arm arm926ejs kirkwood Seagate dockstar dockstar_second_stage dockstar:SECOND_STAGE Luka Perkov - Active arm arm926ejs kirkwood Seagate goflexhome goflexhome - Suriyan Ramasami + Active arm arm926ejs kirkwood Marvell openrd openrd_client openrd:BOARD_IS_OPENRD_CLIENT - + Active arm arm926ejs kirkwood Marvell openrd openrd_ultimate openrd:BOARD_IS_OPENRD_ULTIMATE - + Active arm arm926ejs kirkwood raidsonic ib62x0 ib62x0 - Luka Perkov ++Active arm arm926ejs kirkwood raidsonic ib62x0 ib62x0_second_stage ib62x0:SECOND_STAGE Luka Perkov + Active arm arm926ejs kirkwood Seagate - dockstar - Eric Cooper + Active arm arm926ejs kirkwood Seagate dockstar dockstar_second_stage dockstar:SECOND_STAGE Luka Perkov + Active arm arm926ejs kirkwood Seagate - goflexhome - Suriyan Ramasami --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -91,7 +91,8 @@ diff --git a/package/boot/uboot-mxs/Makefile b/package/boot/uboot-mxs/Makefile index a6773b8..8d4a83e 100644 --- a/package/boot/uboot-mxs/Makefile +++ b/package/boot/uboot-mxs/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=u-boot -PKG_VERSION:=2014.07 +PKG_VERSION:=2013.10 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://mirror2.openwrt.org/sources \ ftp://ftp.denx.de/pub/u-boot -PKG_MD5SUM:=36d4bad687edcafa396fee607e505d4e +PKG_MD5SUM:=8445162690052e6afd4b8f87af2bb557 include $(INCLUDE_DIR)/package.mk @@ -27,7 +27,7 @@ define uboot/Default endef define uboot/mx23_olinuxino - TITLE:=U-Boot 2014.07 for the Olinuxino i.MX233 + TITLE:=U-Boot 2013.10 for the Olinuxino i.MX233 endef UBOOTS := \ -- cgit v1.1