From 3e0b1ff99c9087fae4b22bea9d2ee31b9c7cc296 Mon Sep 17 00:00:00 2001 From: Raspbian forward porter Date: Thu, 17 Dec 2015 02:12:51 +0000 Subject: [PATCH] Import u-boot_2015.10+dfsg1-4+rpi1.debian.tar.xz [dgit import tarball u-boot 2015.10+dfsg1-4+rpi1 u-boot_2015.10+dfsg1-4+rpi1.debian.tar.xz] --- bin/u-boot-install-targets | 10 + bin/update-lintian-overrides | 38 + bin/update-substvars | 12 + changelog | 1019 +++++++++++++++++ compat | 1 + control | 37 + copyright | 411 +++++++ env-configs/efikamx.config | 9 + env-configs/guruplug.config | 10 + env-configs/kurobox_pro.config | 9 + env-configs/linkstation-mini.config | 7 + env-configs/linkstation_pro_live.config | 9 + env-configs/lsmipsel.config | 9 + env-configs/lsppchg.config | 9 + env-configs/mx6cuboxi.config | 9 + env-configs/openmoko_gta01.config | 7 + env-configs/openmoko_gta02.config | 7 + env-configs/qnap_ts101.config | 9 + env-configs/qnap_ts109-209.config | 9 + env-configs/qnap_ts119-219.config | 11 + env-configs/sheevaplug.config | 9 + env-configs/udoo_quad.config | 9 + env-configs/wandboard.config | 9 + manpages/fw_printenv.8 | 31 + manpages/fw_setenv.8 | 27 + ...AP3-Revamp-IGEP-default-configuration.diff | 89 ++ patches/Makefile-add-kwb-target-to-all.patch | 12 + patches/add-debian-revision-to-u-boot-version | 16 + patches/arndale/board-spl-rule.diff | 17 + .../beagleboneblack/usb-mass-storage.patch | 16 + .../ensure-config-sandbox-for-make-env.patch | 18 + patches/hurd.diff | 20 + patches/mipsel-native-endianness.diff | 54 + patches/mksunxiboot-spl.patch | 14 + patches/mx53loco | 14 + patches/mx6cuboxi/serial_console_speed.patch | 13 + patches/n900-bootz-raw-initrd.diff | 17 + patches/no-force-CROSS_COMPILE-powerpc.diff | 15 + ...itch-novena-to-config_distro_bootcmd.patch | 79 ++ patches/series | 44 + patches/sh4-fix-linker-name-prefix.patch | 30 + patches/tools-generic-builds.patch | 14 + .../tools-only-in-no-dot-config-targets.diff | 21 + patches/udoo/udoo-standardized-variables | 28 + patches/udoo/udoo_quad-support.patch | 82 ++ ...otcmd.h-Use-a-private-variable-for-b.patch | 82 ++ ..._common.h-Add-default-addresses-for-.patch | 30 + ...s-am335x_evm-Support-distro-bootcmds.patch | 101 ++ ...andboard-to-use-config_distro_bootcm.patch | 143 +++ ...x6cuboxi-to-use-config_distro_bootcm.patch | 147 +++ ...s-due-to-switch-to-distro-environmen.patch | 60 + ...Android-booting-with-ramdisk-and-or-.patch | 33 + ...-Add-support-for-the-Lamobo-R1-board.patch | 375 ++++++ ...x-generating-multi-and-script-images.patch | 69 ++ ...ing-from-fix-for-generating-multi-an.patch | 48 + ...gw_ventana-Fix-use-of-pfuze100-bit-d.patch | 61 + ...6-novena-Enable-extfs-support-in-SPL.patch | 29 + rules | 99 ++ source/format | 1 + source/include-binaries | 1 + targets | 24 + u-boot-exynos.install | 2 + u-boot-exynos.lintian-overrides | 13 + u-boot-exynos.substvars | 1 + u-boot-imx.README.Debian | 21 + u-boot-imx.install | 2 + u-boot-imx.lintian-overrides | 23 + u-boot-imx.substvars | 1 + u-boot-omap.README.Debian | 13 + u-boot-omap.install | 2 + u-boot-omap.lintian-overrides | 19 + u-boot-omap.substvars | 1 + u-boot-rockchip.docs | 1 + u-boot-rockchip.install | 2 + u-boot-rockchip.lintian-overrides | 11 + u-boot-sunxi.README.Debian | 11 + u-boot-sunxi.install | 2 + u-boot-sunxi.lintian-overrides | 39 + u-boot-sunxi.substvars | 1 + u-boot-tegra.README.Debian | 16 + u-boot-tegra.install | 2 + u-boot-tegra.lintian-overrides | 11 + u-boot-tools.install | 17 + u-boot-tools.links | 1 + u-boot.README.Debian | 25 + u-boot.install | 2 + u-boot.lintian-overrides | 27 + watch | 4 + 88 files changed, 3913 insertions(+) create mode 100755 bin/u-boot-install-targets create mode 100755 bin/update-lintian-overrides create mode 100755 bin/update-substvars create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 env-configs/efikamx.config create mode 100644 env-configs/guruplug.config create mode 100644 env-configs/kurobox_pro.config create mode 100644 env-configs/linkstation-mini.config create mode 100644 env-configs/linkstation_pro_live.config create mode 100644 env-configs/lsmipsel.config create mode 100644 env-configs/lsppchg.config create mode 100644 env-configs/mx6cuboxi.config create mode 100644 env-configs/openmoko_gta01.config create mode 100644 env-configs/openmoko_gta02.config create mode 100644 env-configs/qnap_ts101.config create mode 100644 env-configs/qnap_ts109-209.config create mode 100644 env-configs/qnap_ts119-219.config create mode 100644 env-configs/sheevaplug.config create mode 100644 env-configs/udoo_quad.config create mode 100644 env-configs/wandboard.config create mode 100644 manpages/fw_printenv.8 create mode 100644 manpages/fw_setenv.8 create mode 100644 patches/ARM-OMAP3-Revamp-IGEP-default-configuration.diff create mode 100644 patches/Makefile-add-kwb-target-to-all.patch create mode 100644 patches/add-debian-revision-to-u-boot-version create mode 100644 patches/arndale/board-spl-rule.diff create mode 100644 patches/beagleboneblack/usb-mass-storage.patch create mode 100644 patches/ensure-config-sandbox-for-make-env.patch create mode 100644 patches/hurd.diff create mode 100644 patches/mipsel-native-endianness.diff create mode 100644 patches/mksunxiboot-spl.patch create mode 100644 patches/mx53loco create mode 100644 patches/mx6cuboxi/serial_console_speed.patch create mode 100644 patches/n900-bootz-raw-initrd.diff create mode 100644 patches/no-force-CROSS_COMPILE-powerpc.diff create mode 100644 patches/novena/0001-arm-novena-Switch-novena-to-config_distro_bootcmd.patch create mode 100644 patches/series create mode 100644 patches/sh4-fix-linker-name-prefix.patch create mode 100644 patches/tools-generic-builds.patch create mode 100644 patches/tools-only-in-no-dot-config-targets.diff create mode 100644 patches/udoo/udoo-standardized-variables create mode 100644 patches/udoo/udoo_quad-support.patch create mode 100644 patches/upstream/am33x_distro_bootcmd/0001-config_distro_bootcmd.h-Use-a-private-variable-for-b.patch create mode 100644 patches/upstream/am33x_distro_bootcmd/0002-configs-ti_armv7_common.h-Add-default-addresses-for-.patch create mode 100644 patches/upstream/am33x_distro_bootcmd/0003-configs-am335x_evm-Support-distro-bootcmds.patch create mode 100644 patches/upstream/distro-bootcmd-imx/0001-arm-imx-Switch-Wandboard-to-use-config_distro_bootcm.patch create mode 100644 patches/upstream/distro-bootcmd-imx/0002-arm-imx-Switch-mx6cuboxi-to-use-config_distro_bootcm.patch create mode 100644 patches/upstream/distro-bootcmd-imx/0003-imx6-fix-warnings-due-to-switch-to-distro-environmen.patch create mode 100644 patches/upstream/image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch create mode 100644 patches/upstream/lamobo-r1/0001-sunxi-Add-support-for-the-Lamobo-R1-board.patch create mode 100644 patches/upstream/mkimage-fix-multi-script/0001-mkimage-Fix-generating-multi-and-script-images.patch create mode 100644 patches/upstream/mkimage-fix-multi-script/0002-mkimage-Fix-warning-from-fix-for-generating-multi-an.patch create mode 100644 patches/upstream/novena/0001-arm-imx6-novena-gw_ventana-Fix-use-of-pfuze100-bit-d.patch create mode 100644 patches/upstream/novena/0002-arm-imx6-novena-Enable-extfs-support-in-SPL.patch create mode 100755 rules create mode 100644 source/format create mode 100644 source/include-binaries create mode 100644 targets create mode 100755 u-boot-exynos.install create mode 100644 u-boot-exynos.lintian-overrides create mode 100644 u-boot-exynos.substvars create mode 100644 u-boot-imx.README.Debian create mode 100755 u-boot-imx.install create mode 100644 u-boot-imx.lintian-overrides create mode 100644 u-boot-imx.substvars create mode 100644 u-boot-omap.README.Debian create mode 100755 u-boot-omap.install create mode 100644 u-boot-omap.lintian-overrides create mode 100644 u-boot-omap.substvars create mode 100644 u-boot-rockchip.docs create mode 100755 u-boot-rockchip.install create mode 100644 u-boot-rockchip.lintian-overrides create mode 100644 u-boot-sunxi.README.Debian create mode 100755 u-boot-sunxi.install create mode 100644 u-boot-sunxi.lintian-overrides create mode 100644 u-boot-sunxi.substvars create mode 100644 u-boot-tegra.README.Debian create mode 100755 u-boot-tegra.install create mode 100644 u-boot-tegra.lintian-overrides create mode 100755 u-boot-tools.install create mode 100644 u-boot-tools.links create mode 100644 u-boot.README.Debian create mode 100755 u-boot.install create mode 100644 u-boot.lintian-overrides create mode 100644 watch diff --git a/bin/u-boot-install-targets b/bin/u-boot-install-targets new file mode 100755 index 000000000..d5e996eea --- /dev/null +++ b/bin/u-boot-install-targets @@ -0,0 +1,10 @@ +#!/bin/sh +target=$1 +docs="$2" +subarch_install_file="debian/build/targets.${target}" +if [ -f "${subarch_install_file}" ]; then + cat "${subarch_install_file}" +fi +for doc in ${docs} ; do + echo ${doc} /usr/share/doc/u-boot-${target}/ +done diff --git a/bin/update-lintian-overrides b/bin/update-lintian-overrides new file mode 100755 index 000000000..b6c17c184 --- /dev/null +++ b/bin/update-lintian-overrides @@ -0,0 +1,38 @@ +#!/bin/sh + +target_file=debian/targets + +awk '/^[a-z0-9]/{print $2}' ${target_file} | sort -u | while read subarch ; do + case ${subarch} in + -) package=u-boot ;; + *) package=u-boot-${subarch} ;; + esac + overrides=debian/${package}.lintian-overrides + + cat >${overrides}<> ${overrides} + + cat >>${overrides}<> ${overrides} + + cat >>${overrides}<> debian/${package}.substvars +done diff --git a/changelog b/changelog new file mode 100644 index 000000000..1477e461e --- /dev/null +++ b/changelog @@ -0,0 +1,1019 @@ +u-boot (2015.10+dfsg1-4+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 2014.10+dfsg1-2+rpi1 by Peter Michael Green at Fri, 28 Nov 2014 06:00:07 +0000] + * Don't build versions for various armv7 devices, build rpi version instead. + + -- Raspbian forward porter Thu, 17 Dec 2015 02:12:51 +0000 + +u-boot (2015.10+dfsg1-4) unstable; urgency=medium + + * Fix reproducibility issue with targets listed in package descriptions + by always sorting using C locale. + * u-boot-imx: Updates to novena patches: + - Sync with submitted patch for distro_bootcmd support. + - Add upstream patch to fix USB support. + - Add upstream patch to enable loading u-boot.img from EXT + filesystems. + * Add upstream patches to fix mkimage support for multi and script + images (Closes: #805434). + + -- Vagrant Cascadian Tue, 08 Dec 2015 08:59:47 -0800 + +u-boot (2015.10+dfsg1-3) unstable; urgency=medium + + * u-boot-install-targets: Add support to install documentation. + * u-boot-exynos: Install README.odroid. + * u-boot-rockchip: Install README.rockchip. + * u-boot-omap: Install README.nokia_rx51. + * Add included platforms to u-boot package descriptions. + * u-boot-sunxi: Enable the A10s-OLinuXino-M target. Thanks to Benedikt + Wildenhain (Closes: #806151). + * u-boot-imx: Add novena patches to include fdtfile variable, and load + fdt file into correct address. + * u-boot-sunxi: Backport patches from upstream to enable the Lamobo_R1 + target. + + -- Vagrant Cascadian Tue, 24 Nov 2015 14:14:29 -0800 + +u-boot (2015.10+dfsg1-2) unstable; urgency=medium + + * Add missing content to u-boot-rockchip package. + * Update wandboard and mx6cuboxi patches to use config_distro_bootcmd + patches from u-boot-imx. + * Patch mx6cuboxi to specify the baudrate in the console setting. + * Update BeagleBone Black patches to use config_distro_bootcmd from + upstream. + * Patch to switch novena to use distro_bootcmd. + + -- Vagrant Cascadian Sat, 14 Nov 2015 09:22:47 -0600 + +u-boot (2015.10+dfsg1-2~exp1) experimental; urgency=medium + + * Build rockchip package, with firefly-rk3288 as the initial + target. Thanks to Emilio Pozuelo Monfort and Sjoerd Simons. + (Closes: #803166). + + -- Vagrant Cascadian Mon, 02 Nov 2015 07:59:36 -0800 + +u-boot (2015.10+dfsg1-1) unstable; urgency=medium + + [ Vagrant Cascadian ] + * New upstream version. + * Remove patch to fix variation caused by timezone differences, applied + upstream. + * Add patch to use a relative path to include the sunxi spl header, + which allows mksunxiboot to build on any architecture. Thanks to Ian + Campbell for the initial patch! + * Add patch from upstream to fix non-Android booting with ramdisk and/or + device tree. + + [ Karsten Merker ] + * u-boot-sunxi: Enable the A20-Olimex-SOM-EVB target (Closes: #803335). + + -- Vagrant Cascadian Thu, 29 Oct 2015 13:35:23 -0700 + +u-boot (2015.10~rc4+dfsg1-1) unstable; urgency=medium + + * New upstream release candidate. + * Updated udoo patches and debian/targets, upstream switched to a single + target that supports both udoo quad and dual. + * u-boot-sunxi: Add Linksprite_pcDuino target (Closes: #799035). Thanks + to Robert Hegner for testing! + * Refreshed patches for beaglebone black. + * Add patch to fix build variation based on timezone, by removing call + to "mktime". + * debian/copyright: Updated new locations for exynos files. + + -- Vagrant Cascadian Wed, 30 Sep 2015 12:00:30 -0700 + +u-boot (2015.10~rc2+dfsg1-1) experimental; urgency=medium + + * New upstream release candidate. + * Install mkenvimage. Patch from Ubuntu. + * Refreshed patches for arndale, beaglebone black, and mx53loco. + * Remove reproducibility patch, applied upstream. + + -- Vagrant Cascadian Tue, 01 Sep 2015 17:10:40 -0500 + +u-boot (2015.07+dfsg1-1) unstable; urgency=medium + + [ Jochen Sprickerhof ] + * u-boot-sunxi: enable Mini-X target (Closes: #787266). + + [ Ian Campbell ] + * Add support for Tegra Jetson TK-1 (Closes: #788689) + + [ Vagrant Cascadian ] + New upstream version: + * mx6cuboxi: + - Remove patches applied upstream. + - Refresh distro bootcmd patch. + * wandboard: + - Remove wandboard SPL patch, applied upstream. + - Refresh distro bootcmd patch. + * beagleboneblack: + - Refresh distro bootcmd patch. + * udoo_quad: + - Refresh support patch. + * Drop no-error-on-set-but-unused-variable patch, no longer relevent. + * Add patch to ensure that CONFIG_SANDBOX is set when running "make env". + + * Use patch applied upstream to use SOURCE_DATE_EPOCH when set. + * debian/rules: Use the Date from debian/changelog to set + SOURCE_DATE_EPOCH. + + * Add example fw_env.config for mx6cuboxi (Closes: #786877). + * Add example fw_env.config for wandboard. + + * Add Build-Depends on dpkg-dev (>= 1.17.0), as debian/rules uses + "dpkg-parsechangelog --show-field" introduced in that + version. (Closes: #768099). + + * debian/watch: Update to use ftp server. + + -- Vagrant Cascadian Sat, 01 Aug 2015 07:29:07 -0700 + +u-boot (2015.04+dfsg1-2) unstable; urgency=medium + + [ Joost van Zwieten ] + * u-boot-exynos: Enable odroid target. + + [ Vagrant Cascadian ] + * u-boot-imx/mx6cuboxi: + + Add patches to enable HDMI and USB support. + + Add patches to fix Ethernet PHY detection. + * u-boot-imx/wandboard: Add patch from u-boot-imx to build a single SPL + target for all variants. + + [ Robert Nelson ] + * u-boot-omap: Include u-boot.img instead of u-boot.bin for igep0020, + omap3_beagle and omap4_panda. + + -- Vagrant Cascadian Mon, 25 May 2015 20:36:37 -0700 + +u-boot (2015.04+dfsg1-1) experimental; urgency=medium + + [ Ian Campbell ] + * u-boot-exynos: Fix conflict between arndale and sunxi spl + targets. + * u-boot-sunxi: Update sunxi FEL target. + + [ Vagrant Cascadian ] + * u-boot-imx: + + Add usbarmory target. + + Add novena target. + + Add patches from u-boot-imx to support Cubox-i and Hummingboard and + drop old cubox-i patches. + + Add mx6cuboxi target. + + mx6cuboxi: Add patch to use config_distro_bootcmd. + + wandboard: Add patch to use config_distro_bootcmd and remove old + environment patches. + + * u-boot-omap: + + am335x_boneblack: Remove patch to set voltage. + + am335x_boneblack: Add patch to use config_distro_bootcmd and remove + old patches. + + -- Vagrant Cascadian Mon, 27 Apr 2015 14:54:44 -0700 + +u-boot (2015.04~rc5+dfsg1-1) experimental; urgency=medium + + [ John Paul Adrian Glaubitz ] + * [sh4] Fix FTBFS due to incorrect target names (Closes: #780066). + + [ Vagrant Cascadian ] + * [armel] Use "rpi" for the Raspberry pi target, as it was renamed + upstream. + * [armel] Remove openrd_ultimate target, which fails to build upstream. + * [armel] Remove obsolete mmc guruplug and openrd patches. + * [armhf] Remove arndale patches, applied upstream. + * Fix cross-building of u-boot-tools (Closes: #775614). + * [armhf] u-boot-sunxi: Enable A20-OLinuXino_MICRO. Thanks to Arne + Ploese for testing! + * [armhf] u-boot-sunxi: Enable Linksprite_pcDuino3. Thanks to Patrice Go + for testing! + + -- Vagrant Cascadian Tue, 07 Apr 2015 13:58:39 -0700 + +u-boot (2015.04~rc3+dfsg1-1) experimental; urgency=medium + + * New upstream release candidate. + * Remove patches applied upstream: + - ti_armv7_common-support_raw_initrd.diff + * Refresh patches: + - cubox-i/cubox-i-support.diff + - mipsel-native-endianness.diff + - mx53loco + - openrd-mmc.diff + - series + - wandboard/wandboard-uEnv.txt-bootz-n-fixes.patch + - guruplug_mvfs_and_mmc.diff + * Add patch to enable USB mass-storage support for the BeagleBone Black: + - beagleboneblack/usb-mass-storage.patch + * debian/rules: Add get-orig-source target. + + * Disable patches that fail to apply: + - cubox-i/imx6-spl-support.diff + - arndale/exynos-Enable-config_distro_defaults.h.patch + - arndale/exynos5-Use-config_distro_bootcmd.h.patch + * Disable cubox-i build target and patches, as it fails to build. + + -- Vagrant Cascadian Sun, 08 Mar 2015 12:15:59 -0700 + +u-boot (2014.10+dfsg1-5) unstable; urgency=medium + + [ John Paul Adrian Glaubitz ] + * [sh4] Fix FTBFS due to incorrect target names (Closes: #780066). + + [ Vagrant Cascadian ] + * [armhf] u-boot-sunxi: Enable A20-OLinuXino_MICRO. Thanks to Arne + Ploese for testing! + * [armhf] u-boot-sunxi: Enable Linksprite_pcDuino3. Thanks to Patrice Go + for testing! + + -- Vagrant Cascadian Tue, 07 Apr 2015 13:42:30 -0700 + +u-boot (2014.10+dfsg1-4) unstable; urgency=medium + + [ Karsten Merker ] + * Backport support for the LeMaker Banana Pro board (Closes: #779908). + + [ Vagrant Cascadian ] + * Update lintian rules for BananaPro and A20-OlinuXino-LIME2. + + -- Vagrant Cascadian Sun, 08 Mar 2015 11:13:07 -0700 + +u-boot (2014.10+dfsg1-3) unstable; urgency=medium + + * cubox-i-support.diff: Refresh patch, dropping solidrun.bmp, which + causes FTBFS with newer version of patch (Closes: #777518). + + * Add patch to support A20-OLinuXino-LIME2, backported from u-boot + 2015.01. Thanks to Karsten Merker for the patch (Closes: #777466). + + -- Vagrant Cascadian Sat, 21 Feb 2015 13:13:31 -0800 + +u-boot (2014.10+dfsg1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: + - Add sh4-fix-linker-name-prefix.patch to use the proper + linker name prefix on sh4. Fixes FTBFS. (Closes: #771747) + + -- John Paul Adrian Glaubitz Thu, 11 Dec 2014 00:00:08 +0100 + +u-boot (2014.10+dfsg1-2) unstable; urgency=medium + + [ Steve Langasek ] + * Resync cubox-i patches with github. + - fixes support for booting on the cubox-i2ultra/i2ex. + (Closes: #766266) + + [ Vagrant Cascadian ] + * wandboard, cubox-i: Add patches to use variables expected by + debian-installer bootscript. + * cubox-i: Move importing bootenv before loading the boot script, to + allow environment variables useful to the boot script to be set. + * cubox-i: Run autodetectfdt before attempting to load the boot script. + * Split README.Debian by subarchitecture, and document installing u-boot + on several additional boards. + + -- Vagrant Cascadian Sat, 01 Nov 2014 16:33:33 -0700 + +u-boot (2014.10+dfsg1-1) unstable; urgency=medium + + [ Vagrant Cascadian ] + * New upstream release. + * Refresh cubox-i patches to 2014.10. + * Update cubox-i patches to use generic board. + * Remove debian/patches/kerma-sheevaplug-mvsata.diff, merged upstream. + * Patch to allow tools-only to build without a configuration. + * Update Standards-Version to 3.9.6, no changes needed. + + [ Ian Campbell ] + * Rebase arndale patches onto 2014.10 + + -- Vagrant Cascadian Sun, 19 Oct 2014 11:34:39 -0700 + +u-boot (2014.10~rc3+dfsg1-2) experimental; urgency=medium + + [ Ian Campbell ] + * Add support for the Arndale board (Closes: #763186). + + -- Vagrant Cascadian Thu, 09 Oct 2014 11:41:31 -0700 + +u-boot (2014.10~rc3+dfsg1-1) unstable; urgency=medium + + * New upstream release candidate. + * Remove patches applied upstream: + - bootcmd-scsi-scan-before-scsi.patch + - sunxi/0001-sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME.patch + * Refresh patches: + - am335x-bootscript.diff + - am335x-uenv.txt.diff + - cubox-i/cubox-i-support.diff + - no-force-CROSS_COMPILE-powerpc.diff + + -- Vagrant Cascadian Wed, 08 Oct 2014 09:57:35 -0700 + +u-boot (2014.10~rc2+dfsg1-2) unstable; urgency=medium + + [ Héctor Orón Martínez ] + * Fix cross building. + * Build extra tools for kirkwood and sunxi (Closes: #750108). + * Build extra tools and env just once, and install in PATH again. + * Add nitrogen6q support to u-boot-imx. + + [ Vagrant Cascadian ] + * Use "make all" instead of making individual targets, recording a list + of targets to install in each subarch package. + * Build FEL variants for all sunxi platforms, based on patches from Ian + Campbell. + * Add build-depends on "bc". + * Patch to add the debian revision to the U-boot version. + * Updated cubox-i patches and re-enable mx6_cubox-i target. + * Build tools and env with NO_SDL=1 to avoid complaining about missing + sdl-config. + * Remove mips target dbau1100, an old platform with no testers. + * Swich qemu_mips target to install u-boot.bin, which is what is + actually needed by qemu. + * Add patch to Set DCDC1 DDR3 to 1.35V for Beaglebone Black. Thanks to + Robert Nelson for the patch. + + [ Ian Campbell ] + * Add patch to add u-boot.kwb to "make all" on Kirkwood platforms. + * Build tools out-of-tree too so as not to dirty the source used for the + actual platforms (Closes: #763024). + * Add patch to initialize scsi before trying scsi disks in + config_distro_bootcmd (Closes: #764069). + + -- Vagrant Cascadian Mon, 06 Oct 2014 16:58:04 -0700 + +u-boot (2014.10~rc2+dfsg1-2~exp1) experimental; urgency=medium + + * Split u-boot package into u-boot-imx, u-boot-omap and u-boot-sunxi + packages on armhf. + + * debian/targets: + - Enable A10-OLinuXino-Lime target. + - Enable Cubieboard2 and Cubieboard2_FEL targets (Closes: #762383). + - Enable A20-OLinuXino-LIME target. + - Disable mx6_cubox-i + - Disable efikamx and efikasb. + + * debian/patches: + - Add patch from upstream to support A20-OLinuXino-LIME. + - Disable patches for cubox-i. + + * debian/rules: + - Remove excess conditional architecture check, drop build-dep on + dctrl-tools. + - Remove executable bit from u-boot targets. + + * Updated lintian overrides. + + -- Vagrant Cascadian Mon, 22 Sep 2014 18:30:12 -0500 + +u-boot (2014.10~rc2+dfsg1-1) experimental; urgency=medium + + * New upstream release candidate. + + * Update debian/patches: + - Remove Cubieboard and Cubietruck patches, applied upstream. + - Remove kerma-sheevaplug-mvsdio patch, applied upstream. + - Update openrd-mmc patch, partially applied upstream. + - Add patch to workaround failure when building env tools. + + * [armhf] Add Bananapi target. + + * debian/rules: + - Install fw_printenv and fw_setenv symlink in platform-specific dir. + - Create include/config/auto.conf to allow tools-only target to build. + - Update to use defconfig target rather than config target. + + * debian/copyright: + - Update Files-Excluded as some files were removed upstream. + + * Updated lintian overrides. + + -- Vagrant Cascadian Wed, 03 Sep 2014 23:28:59 -0700 + +u-boot (2014.07+dfsg1-2) unstable; urgency=medium + + [ Steve Langasek ] + * Rebase cubox-i patches on 2014.07 and re-enable the target. + + [ Vagrant Cascadian ] + * Switch to debhelper 9 with executable .install files. + * Remove the efikamx and efikasb targets. + + -- Vagrant Cascadian Sun, 14 Sep 2014 23:01:50 -0500 + +u-boot (2014.07+dfsg1-1) unstable; urgency=medium + + * New upstream version. + * [armhf] Temporarily disable cubox-i target, which needs re-working for + new upstream version. + * Refresh Cubietruck and Cubieboard patches. + + -- Vagrant Cascadian Thu, 28 Aug 2014 12:22:06 -0700 + +u-boot (2014.07~rc4+dfsg1-1) experimental; urgency=medium + + * New upstream release candidate. + * Updated patches for sheevaplug MMC and SATA support. + * Updated openrd patches to use MMC driver. + + -- Vagrant Cascadian Sat, 12 Jul 2014 17:24:51 -0700 + +u-boot (2014.04+dfsg1-3) unstable; urgency=medium + + * Add patch for mx53loco that enables support for ext4, the "load" command, + and using bootz with raw initrds. + * Remove ZUMA platform and drop powerpc from u-boot architectures + (Closes: #754610). + + -- Vagrant Cascadian Mon, 28 Jul 2014 15:30:26 -0700 + +u-boot (2014.04+dfsg1-2) unstable; urgency=medium + + * Enable udoo_quad target, with patch improving the udoo_quad boot + environment. Thanks to Michael Fladischer! (Closes: #753376). + * Enable Cubieboard target and patches. + * Update lintian overrides. + + -- Vagrant Cascadian Wed, 09 Jul 2014 12:37:12 -0700 + +u-boot (2014.04+dfsg1-1) unstable; urgency=medium + + [ Vagrant Cascadian ] + * Repack upstream tarball to remove files containing firmware without + sources (Closes: #750912). + + * Add patches for Cubietruck from upstream. + * Add Cubietruck and Cubietruck_FEL targets (Closes: #750473). + + * Add support for bootscripts to BeagleBone Black. + - Support loading files from either first or second partition. + + * Modified wandboard patches: + - Add support for bootscripts. + - Support both fat and ext filesystems by consistantly using the "load" + command. + - Try loading bootscript from /boot/ as a fallback if not found in /. + + * Update debian/copyright to use copyright format 1.0. + - Document which files are removed in debian/copyright. + * Update debian/watch to handle +dfsg version. + * Update lintian overrides: + - Ignore 'u-boot: statically-linked-binary'. + - Include new u-boot targets. + + [ Andreas Henriksson ] + * Add patches for sunxi AHCI driver (Cubietruck) (Closes: #750473). + + -- Vagrant Cascadian Sun, 15 Jun 2014 21:03:40 -0700 + +u-boot (2014.04-2) unstable; urgency=medium + + * Fix FTBFS on powerpc by not setting CROSS_COMPILE when empty. + + -- Vagrant Cascadian Mon, 26 May 2014 11:32:49 -0700 + +u-boot (2014.04-1) unstable; urgency=low + + [ Steve Langasek ] + * Patches taken from https://github.com/rabeeh/u-boot-imx6.git to support + the SolidRun CuBox-i series: + - debian/patches/spl-sata-support.diff: + Add support for SATA in SPL mode + - debian/patches/imx6-spl-support.diff: + Add support for SPL on i.MX6-based systems + - debian/patches/cubox-support.diff, tools/logos/solidrun.bmp: + Add support for the CuBox-i. + * Build the mx6_cubox-i target (Closes: #741127). + + [ Vagrant Cascadian ] + * Add Nokia nokia_rx51 (n900) to targets to build. + - Patch n900 build to support bootz and raw initrds. + * debian/rules: Fix building of targets for v2014.04. + - Move fw_printenv creation into board-specific targets. + - Build target "tools-only". + - Drop special-casing of MLO, add MLO to debian/targets. + * debian/patches/cubox-i-raw-initrd.diff: + - Patch to support raw initrd on cubox-i. + * debian/watch: Use http. + * debian/control: Bump Standards-Version to 3.9.5, no changes needed. + + -- Vagrant Cascadian Tue, 20 May 2014 10:04:56 -0700 + +u-boot (2014.01-2) unstable; urgency=medium + + * Set Maintainer to Vagrant Cascadian (Closes: #738446). + * Remove Micah Anderson from uploaders. + * Add Clint Adams to uploaders. + * Use grep-dctrl to pull architecture list from debian/control, rather than + hardcoding architectures in debian/rules. + * u-boot-tools: Set architecture to linux-any (Closes: #730833). + * Build raspberry pi (rpi_b) image on armel. + - Patch to to enable EXT2/EXT4 support and raw initrds. + + -- Vagrant Cascadian Tue, 04 Mar 2014 14:13:22 -0800 + +u-boot (2014.01-1) unstable; urgency=low + + * New upstream version. + * Updated patches. + * debian/watch: Update to catch -rc versions. + * debian/control: Update Vcs-* headers. + * u-boot-tools: Strip comment sections from mkimage and fw_printenv. + + -- Vagrant Cascadian Tue, 11 Feb 2014 15:11:47 -0800 + +u-boot (2013.10-3) unstable; urgency=low + + * Move build of dbau1100 from mipsel to mips, which fixes FTBFS on mipsel, + due to dbau1100 being big-endian. + * Disable mipsel builds of u-boot, as it no longer has any targets. + * Add patch to specify default mmc partition to use when loading uEnv.txt + on BeagleBone Black. + * Add patch to support raw initrds on BeagleBone Black. + * Mark u-boot-tools as Multi-Arch: foreign. + * Mark u-boot as Multi-Arch: same. + * Update lintian overrides with list of current platforms. + + -- Vagrant Cascadian Sun, 17 Nov 2013 00:09:32 -0800 + +u-boot (2013.10-2) unstable; urgency=low + + * debian/rules: + - Switch back to explicitly building the specified target. + - Allow building multiple targets per platform. + * debian/targets: + - Build the spl/u-boot-spl.bin target on several armhf platforms, which + generates the MLO file. + + -- Vagrant Cascadian Mon, 21 Oct 2013 11:33:01 -0700 + +u-boot (2013.10-1) unstable; urgency=low + + * New upstream version (Closes: #667680, #726699). + - Update mipsel-native-endianness.diff + * debian/rules: + - Remove various tools/* files on clean target. + - Build each platform target and install MLO file if present. + (Closes: #687562). + - Support parallel builds using DEB_BUILD_OPTIONS=parallel=N. + * Enable BeagleBone Black and Wandboard platforms. + * Add patch to support uEnv.txt and directly loading zimage for Wandboard. + * Include env configs u-boot-tools examples (Closes: #631659, #636214). + * Only build u-boot on architectures which generate images (Closes: #635050). + * Drop i386 builds of u-boot, as the only target (eNET) was removed upstream. + * debian/control: Add myself to uploaders. + + -- Vagrant Cascadian Sun, 20 Oct 2013 10:23:55 -0700 + +u-boot (2013.01.01-4) unstable; urgency=low + + * Upload to unstable. + * Drop transitional packages uboot-envtools and uboot-mkimage. + + -- Clint Adams Thu, 09 May 2013 21:41:25 -0400 + +u-boot (2013.01.01-3) experimental; urgency=low + + * Disable unnecessary JFFS2 on GuruPlug + * Disable MMC on GuruPlug, devices are not detected, + they show up as USB devices instead + + -- Micah Anderson Mon, 25 Mar 2013 22:56:32 -0400 + +u-boot (2013.01.01-2) experimental; urgency=low + + * More properly enable MMC on GuruPlug. + * Use new Efika target names. + * Bump to Standards-Version 3.9.4. + + -- Clint Adams Sun, 24 Mar 2013 21:59:03 -0400 + +u-boot (2013.01.01-1) experimental; urgency=low + + * New upstream version. closes: #699232. + - Drop strip-env-tools.diff (merged). + - Update kerma-sheevaplug-mvsdio.diff. + - Update mipsel-native-endianness.diff + * Enable CONFIG_SYS_MVFS and CONFIG_CMD_MMC for GuruPlug. + + -- Clint Adams Thu, 21 Mar 2013 14:21:33 -0400 + +u-boot (2012.04.01-2) unstable; urgency=low + + * Remove code duplication in kerma-sheevaplug-mvsdio.diff. + closes: #674230. + + -- Clint Adams Thu, 31 May 2012 21:04:49 -0400 + +u-boot (2012.04.01-1) unstable; urgency=low + + * New upstream version. + - Update mipsel-native-endianness.diff. + - Update no-error-on-set-but-unused-variables.diff (partially merged). + - Drop kirkwood_spi-irq_mask.diff (merged). + - Drop kirkwood-disable-l2c.diff (merged). + + -- Clint Adams Tue, 01 May 2012 18:07:19 -0400 + +u-boot (2011.12-3) unstable; urgency=low + + [ Jonathan Nieder ] + * kirkwood: disable L2 cache before Linux boot; thanks to Ian Campbell. + closes: #658904 + + [ Loïc Minier ] + * Add patch to strip env tools; sent to upstream mailing-list. + + -- Loïc Minier Sun, 11 Mar 2012 16:12:50 +0100 + +u-boot (2011.12-2) unstable; urgency=low + + [ Loïc Minier ] + * Build u-boot.imx for efikasb on armhf + + [ Clint Adams ] + * Patch from Ian Campbell to fix Dreamplug breakage. closes: #655102. + + -- Clint Adams Sun, 08 Jan 2012 15:11:03 -0500 + +u-boot (2011.12-1) unstable; urgency=low + + * New upstream version. + - Drop build-timestamp_autogenerated.h-without-config.patch (merged). + - Drop ublimage-NAND-block-size-isn-t-set-at-build-time.patch (merged). + - Update kerma-sheevaplug-mvsdio.diff + - Update mipsel-native-endianness.diff + - Drop dreamplug-v8.patch (merged). + + -- Clint Adams Mon, 02 Jan 2012 17:49:39 -0500 + +u-boot (2011.09-2) unstable; urgency=low + + * Patch from Pino Toscano to build on the Hurd. + closes: #648295. + * Drop gr_xc3s_1500 target. + * Add build-arch and build-indep targets to debian/rules. + + -- Clint Adams Tue, 15 Nov 2011 23:53:01 -0500 + +u-boot (2011.09-1) unstable; urgency=low + + [ Hector Oron ] + * Enable MX53LOCO platform. + * Update lintian overrides. + + [ Loïc Minier ] + * Fix FTBFS on amd64 and allow `make tools` to succeed without + config. + + [ Clint Adams ] + * New upstream version. + - Update kerma-sheevaplug-mvsdio.diff. + - Drop panda-default-console.diff (refactored). + - Replace dreamplug patches with Jason's v8. + * Add Buffalo Linkstation Mini env config from Benjamin Cama. + + -- Clint Adams Fri, 30 Sep 2011 21:22:23 -0400 + +u-boot (2011.06-4) unstable; urgency=low + + * Increase the USB non-bulk timeout by an order of magnitude. + May fix #635774. + + -- Clint Adams Sat, 06 Aug 2011 13:42:52 -0400 + +u-boot (2011.06-3) unstable; urgency=low + + * Add DreamPlug support. + + -- Clint Adams Sun, 24 Jul 2011 09:35:32 -0400 + +u-boot (2011.06-2) unstable; urgency=low + + * Use -Wno-error=unused-but-set-variable on i386. + + -- Clint Adams Sat, 02 Jul 2011 22:14:44 -0400 + +u-boot (2011.06-1) unstable; urgency=low + + * New upstream version. + * Fix i386 and mipsel builds. + + -- Clint Adams Sat, 02 Jul 2011 19:25:28 -0400 + +u-boot (2011.06~rc3-1) unstable; urgency=low + + * New upstream version. + + -- Clint Adams Sat, 02 Jul 2011 15:50:46 -0400 + +u-boot (2011.06~rc2-2) unstable; urgency=low + + * Fix mipsel endianness problem again. + * Try building gr_xc3s_1500 on sparc. + + -- Clint Adams Sat, 18 Jun 2011 10:13:53 -0400 + +u-boot (2011.06~rc2-1) unstable; urgency=low + + * New upstream version. + * Fix tools config selection. + + -- Clint Adams Tue, 14 Jun 2011 20:53:07 -0400 + +u-boot (2011.06~rc1-1) unstable; urgency=low + + * New upstream version. + - Update mipsel-native-endianness.diff + - Drop Drop-config.h-include-in-tools-imximage.h.diff (merged). + - Drop openrd-client-and-ultimate.diff (merged). + - Update openrd-mmc.diff (formerly openrd-mmc-mtd-fat.diff). + - Drop eNET-monitor_flash_len.diff (merged). + - Update snapshot.commit to 2011.06-rc1. + - Use the first target for each arch to build the tools, or + fake it on the other architectures. + * Only build efikamx image on armhf. + + -- Clint Adams Sat, 21 May 2011 11:04:30 -0400 + +u-boot (2011.03-6) unstable; urgency=low + + * Bump to Standards-Version 3.9.2. + * Tweak the u-boot-tools description. + * Drop igep0020, omap3_beagle, and omap4_panda targets from + armel; they are available on armhf. + + -- Clint Adams Tue, 26 Apr 2011 16:11:24 -0400 + +u-boot (2011.03-5) unstable; urgency=low + + [ Sebastian Reichel ] + * Add Pandaboard target. closes: #624123 + * New patch to change default console on Pandaboard. + + -- Clint Adams Mon, 25 Apr 2011 15:36:16 -0400 + +u-boot (2011.03-4) unstable; urgency=low + + * Enable FAT, SD/MMC, MTD, JFFS, UBIFS support on OpenRD boards. + + -- Clint Adams Wed, 13 Apr 2011 18:05:36 -0400 + +u-boot (2011.03-3) unstable; urgency=low + + * Actually pass the right arch_number for OpenRD-Ultimate. + + -- Clint Adams Tue, 12 Apr 2011 14:28:20 -0400 + +u-boot (2011.03-2) unstable; urgency=low + + * Fix i386 FTBFS with eNET-monitor_flash_len.diff + * Add patch for OpenRD-Client and OpenRD-Ultimate. + * Drop openrd_base target and add openrd_ultimate target. + + -- Clint Adams Tue, 05 Apr 2011 15:56:43 -0400 + +u-boot (2011.03-1) unstable; urgency=low + + [ Loïc Minier ] + * Only try to build env tools when Linux MTD headers are present. + closes: #619673. + + [ Clint Adams ] + * New upstream version. + - Drop fix-definition-of-global_data-struct.diff (now upstream). + - Drop EfikaMX-switch-to-MACH_TYPE_MX51_EFIKAMX.diff (upstream now). + - Drop sh-sh7785lcr-Fix-out-of-tree-building.diff (upstream now). + - Drop MIPS-dbau1x00-Remove-unused-flash-driver-stub.diff (upstream now). + - Drop x86-Align-config.mk-and-linker-scripts-with-other-ar.diff + (upstream now). + - Update snapshot.commit to 2011.03 + + -- Clint Adams Fri, 01 Apr 2011 10:30:46 -0400 + +u-boot (2011.03~rc1-4) experimental; urgency=low + + * Add patch x86-Align-config.mk-and-linker-scripts-with-other-ar. + From upstream mailing-list; fixes x86 build (eNET). + + -- Loïc Minier Wed, 09 Feb 2011 14:51:01 +0100 + +u-boot (2011.03~rc1-3) experimental; urgency=low + + * Add debian/source/local-options + - unapply-patches: avoids committing patched tree after a build + - abort-on-upstream-changes: avoids creating a debian-changes-* patch + when building from a dirty tree + * Add patch MIPS-dbau1x00-Remove-unused-flash-driver-stub, + from u-boot-mipsel.git 17a990b55008fd79636e4880d9d10b7172ca87ce and also + sent to the upstream mailing-list; fixes build of dbau1x00 board by + removing board/dbau1x00/flash.c entirely, and hence fixes the build of + u-boot on mipsel. + + -- Loïc Minier Tue, 08 Feb 2011 16:49:05 +0100 + +u-boot (2011.03~rc1-2) experimental; urgency=low + + * New patch sh-sh7785lcr-Fix-out-of-tree-building; from upstream + e72f46787f44c1104a8df18511ab230b6072a1f0; fixes Debian sh4 build; thanks + Nobuhiro Iwamatsu; closes: #611873. + + -- Loïc Minier Mon, 07 Feb 2011 17:20:16 +0100 + +u-boot (2011.03~rc1-1) experimental; urgency=low + + * dpkg-shlibdeps usr/bin/* rather than just mkimage. + * uboot-mkimage's Section is utils. + * Allow overriding CROSS_COMPILE. + * New upstream release candidate. + - Merge commit v2011.03-rc1 + - Update snapshot.commit to 2011.03-rc1 + * Add EfikaMX support. + - Add patch EfikaMX-switch-to-MACH_TYPE_MX51_EFIKAMX from the upstream + mailing-list; fixes build on EfikaMX (EfikaMX: switch to + MACH_TYPE_MX51_EFIKAMX) + - Add patch Drop-config.h-include-in-tools-imximage.h from the upstream + mailing-list; fixes tools-all build of imximage.c. + - Build u-boot.imx for efikamx on armel. + * Refresh patch kerma-sheevaplug-mvsdio to fix fuzz. + + -- Loïc Minier Thu, 03 Feb 2011 13:13:14 +0100 + +u-boot (2010.12-2) unstable; urgency=low + + * Avoid calling dpkg-architecture if DEB_HOST_ARCH is set. + * Misc refactoring of debian/rules. + - Split per architecture list of platform and targets into + debian/targets. + - Actually use INSTALL_FILE/INSTALL_DIR/INSTALL_PROGRAM. + - Add support for cross-builds; these will currently lack tools. + - Build board-specific u-boot files in a separate build dir from the + generic tools + * Fix handling of -Wl,foo LDFLAGS; the upstream build passes LDFLAGS + directly to ld instead of calling gcc for linking; so instead of passing + -Wl,foo in LDFLAGS as in automake builds, one should set LDFLAGS to foo + directly; add a snippet to strip -Wl, from LDFLAGS; alternatively, we + could do as in other special packages like the kernel and simply unset + LDFLAGS entirely; closes: #607613. + * Install and compress upstream mkimage manpage; based on a patch by + Marcin Juszkiewicz. + * Add a dummy uboot-mkimage package for upgrades from squeeze; based on a + patch by Marcin Juszkiewicz; closes: #607618. + * Add new patch, fix-definition-of-global_data-struct, from the upstream + x86 maintainer; fixes build of eNET board which breaks u-boot's build on + i386; closes: #608801. + * Workaround an upstream bug in distclean by removing include/asm/proc and + /arch explicitly for now; patch was sent upstream. + * Don't repeat Section: in binary package. + * Add myself to Uploaders. + * Split tools in u-boot-tools package. + * Drop board-specific tools; these are too dangerous; only ship mkimage for + now. + * Add igep0020 and omap3_beagle builds on armel + * Update snapshot.commit to the 2010.12 release contents; this avoids a + pointless diff with the tarball. + + -- Loïc Minier Mon, 17 Jan 2011 22:43:41 +0100 + +u-boot (2010.12-1) unstable; urgency=low + + * New upstream version. + * Install more tools in preparation for splitting off a + u-boot-tools binary package. + + -- Clint Adams Tue, 28 Dec 2010 17:03:44 -0500 + +u-boot (2010.12~rc3-1) unstable; urgency=low + + * New upstream release candidate. + * Add dockstar target. + + -- Clint Adams Sun, 19 Dec 2010 09:45:42 -0500 + +u-boot (2010.12~rc2-1) unstable; urgency=low + + * New upstream release candidate. + * Add openrd_base target. + + -- Clint Adams Sat, 04 Dec 2010 15:32:38 -0500 + +u-boot (2010.09-2) unstable; urgency=low + + * Enable ext2 commands on GuruPlug. + * Ship ELF files (for loading into RAM with OpenOCD). + + -- Clint Adams Sat, 20 Nov 2010 18:20:40 -0500 + +u-boot (2010.09-1) unstable; urgency=low + + * New upstream release. + + -- Clint Adams Wed, 29 Sep 2010 00:06:25 -0400 + +u-boot (2010.09~rc2-1) unstable; urgency=low + + * New upstrem release candidate. + + -- Clint Adams Sun, 19 Sep 2010 14:20:52 -0400 + +u-boot (2010.09~rc1-2) unstable; urgency=low + + * Add patch from Gérald Kerma to add Sheevaplug mvsata support. + * Add patch from Gérald Kerma to add Sheevaplug mvsdio support. + + -- Clint Adams Sun, 12 Sep 2010 11:48:22 -0400 + +u-boot (2010.09~rc1-1) unstable; urgency=low + + * New upstream release candidate. + - Drop guruplug-miiphy_reset.diff. + - Update mipsel-native-endianness.diff. + - Drop sh4-native-compile.diff. + * Bump to Standards-Version 3.9.1. + + -- Clint Adams Sat, 11 Sep 2010 00:43:04 -0400 + +u-boot (2010.06-1) unstable; urgency=low + + * New upstream version. + + -- Clint Adams Sat, 03 Jul 2010 13:49:46 -0400 + +u-boot (2010.06~rc3-1) unstable; urgency=low + + * New upstream version. + * Fix sh4-native-compile.diff to not break sh64, thanks to Paul + Mundt. + * Ship mkimage, conflict/replace uboot-mkimage, build on all + architectures. + + -- Clint Adams Fri, 25 Jun 2010 14:49:06 -0400 + +u-boot (2010.06~rc2-1) unstable; urgency=medium + + * Add sh4-native-compile.diff from Aurelien Jarno. closes: #586026. + * New upstream version. + - Drop marvell-machtypes.diff. + + -- Clint Adams Tue, 15 Jun 2010 21:37:26 -0400 + +u-boot (2010.06~rc1-6) unstable; urgency=medium + + * Add guruplug-miiphy_reset.diff. + * Clean between targets. closes: #585570. + + -- Clint Adams Fri, 11 Jun 2010 21:57:31 -0400 + +u-boot (2010.06~rc1-5) unstable; urgency=low + + * Replace mipsel-native-endianness.diff with patch adapted + from a 2008 mailing list posting by Shinya Kuribayashi. + + -- Clint Adams Fri, 04 Jun 2010 20:08:27 -0400 + +u-boot (2010.06~rc1-4) unstable; urgency=low + + * Add r2dplus target for sh4. + * mipsel-native-endianness.diff: don't force endianness on mips/mipsel + + -- Clint Adams Thu, 03 Jun 2010 19:32:50 -0400 + +u-boot (2010.06~rc1-3) unstable; urgency=low + + * Fix mipsel typo. + * Apply patch from Nobuhiro Iwamatsu to change sh4 target board + from espt to sh7785lcr_32bit. closes: #584192. + + -- Clint Adams Wed, 02 Jun 2010 08:25:04 -0400 + +u-boot (2010.06~rc1-2) unstable; urgency=low + + * Produce u-boot.bin on i386. + * Switch mipsel target to AMD DBAu1100. + * Add marvell-machtypes.diff. + + -- Clint Adams Mon, 31 May 2010 22:09:29 -0400 + +u-boot (2010.06~rc1-1) unstable; urgency=low + + * Add Vcs-Git and Vcs-Browser headers. + * Add GuruPlug target (armel). + * Switch mipsel target to TB0229. + * Add watch file. + * Update README.Debian for SheevaPlug and GuruPlug. + + -- Clint Adams Mon, 31 May 2010 19:29:40 -0400 + +u-boot (2010.03-1) unstable; urgency=low + + * Initial packaging. closes: #583605. + + -- Clint Adams Fri, 28 May 2010 16:20:39 -0400 diff --git a/compat b/compat new file mode 100644 index 000000000..f11c82a4c --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 \ No newline at end of file diff --git a/control b/control new file mode 100644 index 000000000..f3a9d9501 --- /dev/null +++ b/control @@ -0,0 +1,37 @@ +Source: u-boot +Section: admin +Priority: optional +Maintainer: Vagrant Cascadian +Uploaders: Loïc Minier , Clint Adams +Build-Depends: debhelper (>= 9), bc, device-tree-compiler, dpkg-dev (>= 1.17.0) +Standards-Version: 3.9.6 +Homepage: http://www.denx.de/wiki/U-Boot/ +Vcs-Git: git://anonscm.debian.org/collab-maint/u-boot.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/u-boot.git;a=summary + +Package: u-boot +Architecture: armel armhf avr32 mips sh4 +Multi-Arch: same +Depends: ${misc:Depends} +Description: A boot loader for embedded systems + Das U-Boot is a cross-platform bootloader for embedded systems, + used as the default boot loader by several board vendors. It is + intended to be easy to port and to debug, and runs on many + supported architectures, including PPC, ARM, MIPS, x86, m68k, + NIOS, and Microblaze. + ${uboot:platforms} + +Package: u-boot-tools +Architecture: linux-any +Multi-Arch: foreign +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: uboot-envtools (<< 20081215-3~), + uboot-mkimage (<= 0.4build1), + u-boot (<< 2010.12-2) +Replaces: uboot-envtools (<< 20081215-3~), + uboot-mkimage (<= 0.4build1), + u-boot (<< 2010.12-2) +Description: companion tools for Das U-Boot bootloader + This package includes the mkimage program, which allows generation of U-Boot + images in various formats, and the fw_printenv and fw_setenv programs to read + and modify U-Boot's environment. diff --git a/copyright b/copyright new file mode 100644 index 000000000..df7eb425a --- /dev/null +++ b/copyright @@ -0,0 +1,411 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Das U-Boot +Source: ftp://ftp.denx.de/pub/u-boot/ +Files-Excluded: *fpgadata* + arch/powerpc/cpu/mpc8xx/upatch.c + drivers/dma/MCD_tasks.c + +Files: * +Copyright: 2000-2013 Wolfgang Denk + 1995-2002 Russell King + 1996-1998 Russell King + 1996-1999 Russell King + 1996-2000 Russell King + 1996 Russell King + 1997-1999 Russell King + 1999-2002 Vojtech Pavlik + 1999 Linus Torvalds / 2000-2002 Transmeta Corporation + 1999 Russell King + 2000-2002 Russell King + 2000-2010 David Woodhouse + 2000 Steven J. Hill (sjhill@realitydiluted.com) + 2001, 2002, 2003 / 2004 Gary Jennejohn garyj@denx.de + 2002-2007 Aleph One Ltd + 2002-2011 Aleph One Ltd + 2002 Thomas Gleixner (tglx@linutronix.de) + 2003 Kai-Uwe Bloem / 2000-2002 Transmeta Corporation / 1999 Linus Torvalds + 2004 by David Brownell + 2004 Nokia Corporation + 2004 Thomas Gleixner (tglx@linutronix.de) + 2005-2006 by Texas Instruments + 2005-2006 by Texas Instruments / 2005 Mentor Graphics Corporation / 2006-2007 Nokia Corporation + 2005-2007 Samsung Electronics + 2005-2007 Samsung Electronics / Samsung Electronics, 2009 / Nokia Corporation, 2007 + 2005-2008 Samsung Electronics + 2005 Mentor Graphics Corporation / 2005-2006 by Texas Instruments / 2006-2007 Nokia Corporation + 2005 Mentor Graphics Corporation / 2005-2006 by Texas Instruments / 2008-2009 MontaVista Software, Inc. / 2006-2007 Nokia Corporation + 2005, Seagate Technology LLC / 2008 Stefan Roese , DENX Software Engineering + 2006-2007 Nokia Corporation / 2005-2006 by Texas Instruments / 2005 Mentor Graphics Corporation + 2006-2007 Nokia Corporation / 2005 Mentor Graphics Corporation / 2005-2006 by Texas Instruments + 2006-2007 Nokia Corporation / 2005 Mentor Graphics Corporation / 2005-2006 by Texas Instruments / 2008-2009 MontaVista Software, Inc. + 2006, 2007 University of Szeged, Hungary / 2006-2008 Nokia Corporation + 2006-2008 Nokia Corporation + 2006,2009 Freescale Semiconductor, Inc + 2006-2009 Solarflare Communications Inc + 2006 Freescale Semiconductor, Inc + 2006 Nokia Corporation / 2005-2007 by Texas Instruments + 2006 Pavel Pisa, PiKRON / 2008 Sascha Hauer, Pengutronix / 2009 Ilya Yanok, + 2006 Thomas Gleixner + 2007-2011 Freescale Semiconductor, Inc + 2007 Freescale Semiconductor, Inc + 2008-2009 / 2006-2008 Nokia Corporation + 2008-2009 Freescale Semiconductor, Inc + 2008-2009, MontaVista Software, Inc. / 2010, by Texas Instruments + 2008,2009 STMicroelectronics / 2010 Joakim Axelsson / 2009 Alessandro Rubini + 2008-2010 / 2006-2008 Nokia Corporation + 2008-2011 Freescale Semiconductor, Inc + 2008, 2011 Freescale Semiconductor, Inc + 2008,2011 Freescale Semiconductor, Inc + 2008-2012 Freescale Semiconductor, Inc + 2008 Altera Corporation / 2010 Thomas Chou + 2008 Atmel Corporation / 2013 Jagannadha Sutradharudu Teki, Xilinx Inc + 2008 by Texas Instruments / 2008 Mentor Graphics Corporation + 2008 Dave S.r.l. + 2008 Extreme Engineering Solutions, Inc + 2008 Freescale Semiconductor, Inc + 2008 Jean-Christophe PLAGNIOL-VILLARD / 2004-2007 ARM Limited + 2008 Kim B. Heino / 2009 + 2008 Qstreams Networks, Inc + 2008 Samsung Electronics / 2008-2009 Stefan Roese , DENX Software Engineering + 2008 STMicroelectronics / 2010 Joakim Axelsson / 2009 Alessandro Rubini + 2008 Yoshihiro Shimoda + 2009-2010 eXMeritus, A Boeing Company / 2008-2009 Freescale Semiconductor, Inc + 2009-2010 Freescale Semiconductor, Inc + 2009-2010 Texas Instruments, Inc + 2009-2011 Freescale Semiconductor, Inc + 2009 coresystems GmbH + 2009 Freescale Semiconductor, Inc + 2009 Micrel Inc / 2011 Bticino s.p.a, Roberto Cerati + 2009 MontaVista Software, Inc. / 2006-2007 Nokia Corporation / 2005-2006 by Texas Instruments / 2005 Mentor Graphics Corporation + 2010-2011 Freescale Semiconductor, Inc + 2010-2011 NVIDIA Corporation + 2010-2012 NVIDIA Corporation + 2010-2013 NVIDIA Corporation + 2010 Broadcom / 2012 Oleksandr Tymoshenko / 2012 Stephen Warren + 2010 NISHIMOTO Hiroki / 2010 Renesas Solutions Corp + 2010 Thomas Chou + 2010, Thomas Chou + 2010 Thomas Chou / 2008-2009 Avionic Design GmbH / 2007-2008 Avionic Design Development GmbH + 2010 Thomas Chou / 2008 Altera Corporation + 2011-2012 Renesas Solutions Corp + 2011 - 2012 Samsung Electronics / 2003-2006, Cluster File Systems, Inc, info@clusterfs.com + 2011 Analog Devices Inc + 2011 Freescale Semiconductor, Inc + 2011 Infineon Technologies + 2011 Ivan Djelic + 2011 Macpaul Lin (macpaul@andestech.com) / 2011 Andes Technology Corporation / 1995-2002 Russell King / 2010 Shawn Lin (nobuhiro@andestech.com) + 2011 Macpaul Lin (macpaul@andestech.com) / 2011 Andes Technology Corporation / 1996-1998 Russell King / 2010 Shawn Lin (nobuhiro@andestech.com) + 2011 Macpaul Lin (macpaul@andestech.com) / 2011 Andes Technology Corporation / 2010 Shawn Lin (nobuhiro@andestech.com) + 2011 Maxim Integrated Products + 2011 Parrot S.A + 2011 Renesas Solutions Corp + 2011 Renesas Solutions Corp / 2011 Kuninori Morimoto + 2011 The ChromiumOS Authors. All rights reserved + 2012-2013 Stephen Warren + 2012, by Texas Instruments + 2012, Google Inc + 2012 Renesas Solutions Corp + 2012 Samsung Electronics Co., Ltd + 2012 Stephen Warren + 2012 Texas Instruments Incorporated - http://www.ti.com/ + 2013 Synopsys, Inc. (www.synopsys.com) +License: GPL-2 + +Files: + drivers/tpm/tpm_atmel_twi.c + drivers/gpio/tca642x.c + include/splash.h + include/fdt.h + include/libfdt.h + include/configs/controlcenterd.h + include/configs/mxs.h + include/configs/T1040QDS.h + include/tca642x.h + board/gdsys/p1022/tlb.c + board/gdsys/p1022/sdhc_boot.c + board/gdsys/p1022/ddr.c + board/gdsys/p1022/controlcenterd-id.c + board/gdsys/p1022/diu.c + board/gdsys/p1022/controlcenterd-id.h + board/gdsys/p1022/controlcenterd.c + board/gdsys/p1022/law.c + board/gdsys/common/dp501.h + common/splash.c + fs/jffs2/compr_lzo.c + arch/arm/include/asm/arch-am33xx/hardware_ti816x.h + arch/arm/mach-exynos/dmc_init_exynos4.c + arch/arm/mach-exynos/lowlevel_init.c + arch/arm/mach-exynos/clock_init_exynos4.c + arch/arm/mach-exynos/common_setup.h + arch/arm/cpu/armv7/am33xx/clock_ti816x.c +Copyright: + 2013 Texas Instruments, Inc + 2013, Boundary Devices + 2006 David Gibson, IBM Corporation + 2012 Kim Phillips, Freescale Semiconductor + 2010-2013 Freescale Semiconductor, Inc + 2013 Marek Vasut + 2010-2011 Freescale Semiconductor, Inc + 2004 Patrik Kluba + 1996-2002 Markus Franz Xaver Johannes Oberhumer + 2013 NVIDIA Corporation + 2011 The Chromium OS Authors + 2013 Samsung Electronics + 2013, Adeneo Embedded + 2009, Texas Instruments, Incorporated +License: GPL-2+ + +Files: debian/* +Copyright: Clint Adams + Joey Hess + Marc Singer + Per Andersson + Vagrant Cascadian + Loïc Minier +License: GPL-2+ + +Files: fs/yaffs2/yaffs_allocator.h + fs/yaffs2/yaffs_verify.h + fs/yaffs2/yaffs_packedtags1.h + fs/yaffs2/yaffs_yaffs1.h + fs/yaffs2/ydirectenv.h + fs/yaffs2/yaffs_yaffs2.h + fs/yaffs2/yaffsfs.h + fs/yaffs2/yaffs_osglue.h + fs/yaffs2/yaffs_flashif.h + fs/yaffs2/yaffs_nand.h + fs/yaffs2/yportenv.h + fs/yaffs2/yaffs_packedtags2.h + fs/yaffs2/yaffs_attribs.h + fs/yaffs2/yaffs_ecc.h + fs/yaffs2/yaffs_trace.h + fs/yaffs2/yaffs_guts.h + fs/yaffs2/yaffs_getblockinfo.h + fs/yaffs2/yaffs_bitmap.h + fs/yaffs2/yaffs_nameval.h + fs/yaffs2/yaffscfg.h + fs/yaffs2/yaffs_nandemul2k.h + fs/yaffs2/yaffs_mtdif2.h + fs/yaffs2/yaffs_flashif2.h + fs/yaffs2/yaffs_checkptrw.h + fs/yaffs2/yaffs_tagscompat.h + fs/yaffs2/yaffs_nandif.h + fs/yaffs2/yaffs_summary.h + fs/yaffs2/yaffs_mtdif.h +Copyright: Copyright (C) 2002-2011 Aleph One Ltd. +License: LGPL-2.1 + +Files: lib/sha1.c +Copyright: Copyright (C) 2003-2006 Christophe Devine +License: LGPL-2.1 + +Files: include/bzlib.h + lib/bzip2/* +Copyright: Copyright (C) 1996-2002 Julian R Seward. All rights reserved. +License: bzlib-BSD-3 + +Files: drivers/usb/musb-new/musb_host.h + drivers/usb/musb-new/musb_core.h + drivers/usb/musb-new/musb_core.c + drivers/usb/musb-new/musb_gadget.c + drivers/usb/musb-new/musb_gadget.h + drivers/usb/musb-new/musb_dma.h + drivers/usb/musb-new/musb_regs.h + drivers/usb/musb-new/musb_debug.h + drivers/usb/musb-new/musb_host.c + drivers/usb/musb-new/musb_gadget_ep0.c + drivers/usb/musb-new/musb_io.h +Copyright: Copyright 2005 Mentor Graphics Corporation + Copyright (C) 2005-2006 by Texas Instruments + Copyright (C) 2006-2007 Nokia Corporation + Copyright (C) 2008-2009 MontaVista Software, Inc. +License: GPL-2 + +Files: net/dns.c + include/slre.h + lib/slre.c +Copyright: 2008 Pieter Voorthuijsen + 2004-2005 Sergey Lyubka + 2009 Robin Getz ] +License: Beerware + +Files: include/libfdt.h + include/fdt.h +Copyright: 2006 David Gibson, IBM Corporation + 2012 Kim Phillips, Freescale Semiconductor +License: libfdt-BSD-GPL + +Files: include/pcmcia/yenta.h +Copyright: 1999 David A. Hinds. All Rights Reserved +License: MPL-GPL + +License: MPL-GPL + * The contents of this file are subject to the Mozilla Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License + * at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + * the License for the specific language governing rights and + * limitations under the License. + * + * The initial developer of the original code is David A. Hinds + * . Portions created by David A. Hinds + * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. + * + * Alternatively, the contents of this file may be used under the + * terms of the GNU General Public License version 2 (the "GPL"), in + * which case the provisions of the GPL are applicable instead of the + * above. If you wish to allow the use of your version of this file + * only under the terms of the GPL and not to allow others to use + * your version of this file under the MPL, indicate your decision by + * deleting the provisions above and replace them with the notice and + * other provisions required by the GPL. If you do not delete the + * provisions above, a recipient may use your version of this file + * under either the MPL or the GPL. + +License: libfdt-BSD-GPL + * libfdt is dual licensed: you can use it either under the terms of + * the GPL, or the BSD license, at your option. + * + * a) This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + * + * Alternatively, + * + * b) Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: Beerware + "THE BEER-WARE LICENSE" (Revision 42): + Sergey Lyubka wrote this file. As long as you retain this notice you + can do whatever you want with this stuff. If we meet some day, and you think + this stuff is worth it, you can buy me a beer in return. + +License: GPL-2 + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + version 2 as published by the Free Software Foundation. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: bzlib-BSD-3 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + . + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + . + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: GPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: LGPL-2.1 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 2.1 as + published by the Free Software Foundation. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/LGPL-2.1'. diff --git a/env-configs/efikamx.config b/env-configs/efikamx.config new file mode 100644 index 000000000..1aedc9615 --- /dev/null +++ b/env-configs/efikamx.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd1 0x00000 0x10000 0x01000 diff --git a/env-configs/guruplug.config b/env-configs/guruplug.config new file mode 100644 index 000000000..8b30cbe33 --- /dev/null +++ b/env-configs/guruplug.config @@ -0,0 +1,10 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# +# Hardware : Marvell Plug2L Reference Board +# No redundant environment +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd0 0x40000 0x20000 0x20000 diff --git a/env-configs/kurobox_pro.config b/env-configs/kurobox_pro.config new file mode 100644 index 000000000..83b6c6ac5 --- /dev/null +++ b/env-configs/kurobox_pro.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd0 0x3F000 0x1000 0x1000 diff --git a/env-configs/linkstation-mini.config b/env-configs/linkstation-mini.config new file mode 100644 index 000000000..92ce9de2d --- /dev/null +++ b/env-configs/linkstation-mini.config @@ -0,0 +1,7 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundand +# environment sector is assumed present. + +# for Buffalo Linkstation Mini +# MTD device name Device offset Env. size Flash sector size +/dev/mtd0 0x3f000 0x01000 0x01000 diff --git a/env-configs/linkstation_pro_live.config b/env-configs/linkstation_pro_live.config new file mode 100644 index 000000000..83b6c6ac5 --- /dev/null +++ b/env-configs/linkstation_pro_live.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd0 0x3F000 0x1000 0x1000 diff --git a/env-configs/lsmipsel.config b/env-configs/lsmipsel.config new file mode 100644 index 000000000..abd8bcb50 --- /dev/null +++ b/env-configs/lsmipsel.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd0 0x30000 0x10000 0x10000 diff --git a/env-configs/lsppchg.config b/env-configs/lsppchg.config new file mode 100644 index 000000000..4ccc5769c --- /dev/null +++ b/env-configs/lsppchg.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd4 0x360000 0x10000 0x10000 diff --git a/env-configs/mx6cuboxi.config b/env-configs/mx6cuboxi.config new file mode 100644 index 000000000..a4bd77459 --- /dev/null +++ b/env-configs/mx6cuboxi.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mmcblk0 0x80000 0x2000 diff --git a/env-configs/openmoko_gta01.config b/env-configs/openmoko_gta01.config new file mode 100644 index 000000000..7fd45e398 --- /dev/null +++ b/env-configs/openmoko_gta01.config @@ -0,0 +1,7 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# Notice, that the "Number of sectors" is ignored on NOR. + +# MTD device name Device offset Env. size Flash sector size Number of sectors +/dev/mtd1 0x0000 0x4000 0x4000 2 diff --git a/env-configs/openmoko_gta02.config b/env-configs/openmoko_gta02.config new file mode 100644 index 000000000..1faa2f1f8 --- /dev/null +++ b/env-configs/openmoko_gta02.config @@ -0,0 +1,7 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# Notice, that the "Number of sectors" is ignored on NOR. + +# MTD device name Device offset Env. size Flash sector size Number of sectors +/dev/mtd2 0x0000 0x40000 0x20000 2 diff --git a/env-configs/qnap_ts101.config b/env-configs/qnap_ts101.config new file mode 100644 index 000000000..181c54b8c --- /dev/null +++ b/env-configs/qnap_ts101.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd5 0x00000 0x20000 0x20000 diff --git a/env-configs/qnap_ts109-209.config b/env-configs/qnap_ts109-209.config new file mode 100644 index 000000000..4024e080c --- /dev/null +++ b/env-configs/qnap_ts109-209.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd4 0x0000 0x20000 0x20000 diff --git a/env-configs/qnap_ts119-219.config b/env-configs/qnap_ts119-219.config new file mode 100644 index 000000000..98505a933 --- /dev/null +++ b/env-configs/qnap_ts119-219.config @@ -0,0 +1,11 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# This config is for QNAP TS-119, TS-219 and TS-219P boards. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd4 0x0000 0x1000 0x40000 diff --git a/env-configs/sheevaplug.config b/env-configs/sheevaplug.config new file mode 100644 index 000000000..5bbd38d7f --- /dev/null +++ b/env-configs/sheevaplug.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd0 0x60000 0x20000 0x20000 diff --git a/env-configs/udoo_quad.config b/env-configs/udoo_quad.config new file mode 100644 index 000000000..9ffdf9f28 --- /dev/null +++ b/env-configs/udoo_quad.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mmcblk0 0xC0000 0x2000 diff --git a/env-configs/wandboard.config b/env-configs/wandboard.config new file mode 100644 index 000000000..1d5a97789 --- /dev/null +++ b/env-configs/wandboard.config @@ -0,0 +1,9 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# +# XXX this configuration might miss a fifth parameter for the "Number of +# sectors" + +# MTD device name Device offset Env. size Flash sector size +/dev/mmcblk0 0x60000 0x2000 diff --git a/manpages/fw_printenv.8 b/manpages/fw_printenv.8 new file mode 100644 index 000000000..a288852bc --- /dev/null +++ b/manpages/fw_printenv.8 @@ -0,0 +1,31 @@ +.\" Copyright © 2008 Per Andersson +.\" This man page is covered by the GNU General Public License (GPLv2 or higher). +.TH fw_printenv 8 "August 2008" "Debian Project" "" + +.SH NAME +fw_printenv \- Tool for printing environment for the bootloader U-Boot + +.SH SYNOPSIS +fw_printenv [ \fB\-n\fP \fIname\fP ] [ \fIname\fP \fI...\fP ] + +.SH DESCRIPTION +\fIfw_printenv\fP is a simple tool for printing the environment for the +bootloader U-Boot. All environment variables matching the names given as +arguments are shown. If \fIfw_printenv\fP is called without any arguments the +entire environment is printed. + +.SH OPTIONS +.IP \fB\-n\fP +If the \fBn\fP flag is set \fIfw_printenv\fP only prints the value of the supplied variable \fIname\fP. + +.SH FILES +.IP \fB/etc/fw_env.config\fP +Configuration file for fw_printenv. + +.SH SEE ALSO +fw_setenv(8) + +.SH AUTHOR +Wolfgang Denk +.PP +This manual page was written by Per Andersson diff --git a/manpages/fw_setenv.8 b/manpages/fw_setenv.8 new file mode 100644 index 000000000..5a5114ab1 --- /dev/null +++ b/manpages/fw_setenv.8 @@ -0,0 +1,27 @@ +.\" Copyright © 2008 Per Andersson +.\" This man page is covered by the GNU General Public License (GPLv2 or higher). +.TH fw_setenv 8 "August 2008" "Debian Project" "" + +.SH NAME +fw_setenv \- Tool for modifying the environment for the bootloader U\-Boot + +.SH SYNOPSIS +fw_setenv \fIname\fP [ \fIvalue\fP ] + +.SH DESCRIPTION +\fIfw_setenv\fP is a simple tool for modifying either the environment for the +bootloader U-Boot. If the variable already is set in the environment it is +updated, otherwise it is created and set. If only one argument is given, +variable name, the corresponding variable is deleted. + +.SH FILES +.IP \fB/etc/fw_env.config\fP +Configuration file for fw_setenv. + +.SH SEE ALSO +fw_printenv(8) + +.SH AUTHOR +Wolfgang Denk +.PP +This manual page was written by Per Andersson diff --git a/patches/ARM-OMAP3-Revamp-IGEP-default-configuration.diff b/patches/ARM-OMAP3-Revamp-IGEP-default-configuration.diff new file mode 100644 index 000000000..6cd7624db --- /dev/null +++ b/patches/ARM-OMAP3-Revamp-IGEP-default-configuration.diff @@ -0,0 +1,89 @@ +From ebdb222b0d65bcc050e3f0fd6e97faf17fb3eae4 Mon Sep 17 00:00:00 2001 +Sender: Loïc Minier +From: Enric Balletbo i Serra +Date: Wed, 23 Feb 2011 14:35:41 +0100 +Subject: [PATCH] ARM: OMAP3: Revamp IGEP default configuration +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The default IGEP configuration doesn't do anything useful; using some +boot.scr search logic like BeagleBoard is much more useful. + +Signed-off-by: Loïc Minier +--- + include/configs/igep0020.h | 55 ++++++++++++++++++++++++++++++++++++++++--- + 1 files changed, 51 insertions(+), 4 deletions(-) + +diff --git a/include/configs/igep0020.h b/include/configs/igep0020.h +index c19ecc0..2466562 100644 +--- a/include/configs/igep0020.h ++++ b/include/configs/igep0020.h +@@ -130,13 +130,60 @@ + #define CONFIG_TWL4030_POWER 1 + + /* Environment information */ +-#define CONFIG_BOOTCOMMAND \ +- "mmc init 0 ; fatload mmc 0 0x80000000 setup.ini ; source \0" +- + #define CONFIG_BOOTDELAY 3 + + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "usbtty=cdc_acm\0" ++ "loadaddr=0x82000000\0" \ ++ "usbtty=cdc_acm\0" \ ++ "console=ttyS2,115200n8\0" \ ++ "mpurate=500\0" \ ++ "vram=12M\0" \ ++ "dvimode=1024x768MR-16@60\0" \ ++ "defaultdisplay=dvi\0" \ ++ "mmcdev=0\0" \ ++ "mmcroot=/dev/mmcblk0p2 rw\0" \ ++ "mmcrootfstype=ext3 rootwait\0" \ ++ "nandroot=/dev/mtdblock4 rw\0" \ ++ "nandrootfstype=jffs2\0" \ ++ "mmcargs=setenv bootargs console=${console} " \ ++ "mpurate=${mpurate} " \ ++ "vram=${vram} " \ ++ "omapfb.mode=dvi:${dvimode} " \ ++ "omapfb.debug=y " \ ++ "omapdss.def_disp=${defaultdisplay} " \ ++ "root=${mmcroot} " \ ++ "rootfstype=${mmcrootfstype}\0" \ ++ "nandargs=setenv bootargs console=${console} " \ ++ "mpurate=${mpurate} " \ ++ "vram=${vram} " \ ++ "omapfb.mode=dvi:${dvimode} " \ ++ "omapfb.debug=y " \ ++ "omapdss.def_disp=${defaultdisplay} " \ ++ "root=${nandroot} " \ ++ "rootfstype=${nandrootfstype}\0" \ ++ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ ++ "bootscript=echo Running bootscript from mmc ...; " \ ++ "source ${loadaddr}\0" \ ++ "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ ++ "mmcboot=echo Booting from mmc ...; " \ ++ "run mmcargs; " \ ++ "bootm ${loadaddr}\0" \ ++ "nandboot=echo Booting from nand ...; " \ ++ "run nandargs; " \ ++ "nand read ${loadaddr} 280000 400000; " \ ++ "bootm ${loadaddr}\0" \ ++ ++#define CONFIG_BOOTCOMMAND \ ++ "if mmc rescan ${mmcdev}; then " \ ++ "if run loadbootscript; then " \ ++ "run bootscript; " \ ++ "else " \ ++ "if run loaduimage; then " \ ++ "run mmcboot; " \ ++ "else run nandboot; " \ ++ "fi; " \ ++ "fi; " \ ++ "else run nandboot; fi" + + #define CONFIG_AUTO_COMPLETE 1 + +-- +1.7.2.3 + diff --git a/patches/Makefile-add-kwb-target-to-all.patch b/patches/Makefile-add-kwb-target-to-all.patch new file mode 100644 index 000000000..66676495a --- /dev/null +++ b/patches/Makefile-add-kwb-target-to-all.patch @@ -0,0 +1,12 @@ +Add u-boot.kwb to "make all" target on Kirkwood. + +--- a/Makefile ++++ b/Makefile +@@ -736,6 +736,7 @@ + ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin + ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img + ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin ++ALL-$(CONFIG_KIRKWOOD) += u-boot.kwb + ALL-$(CONFIG_OF_SEPARATE) += u-boot.dtb u-boot-dtb.bin + ifeq ($(CONFIG_SPL_FRAMEWORK),y) + ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb.img diff --git a/patches/add-debian-revision-to-u-boot-version b/patches/add-debian-revision-to-u-boot-version new file mode 100644 index 000000000..8e6bccdb0 --- /dev/null +++ b/patches/add-debian-revision-to-u-boot-version @@ -0,0 +1,16 @@ +Add the debian revision to the U-boot version, which is displayed at +boot and can be helpful to determine which specific version is used. + +Index: u-boot/Makefile +=================================================================== +--- u-boot.orig/Makefile ++++ u-boot/Makefile +@@ -350,7 +350,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ + + # Read UBOOTRELEASE from include/config/uboot.release (if it exists) + UBOOTRELEASE = $(shell cat include/config/uboot.release 2> /dev/null) +-UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) ++UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)$(DEBIAN_REVISION) + + export VERSION PATCHLEVEL SUBLEVEL UBOOTRELEASE UBOOTVERSION + export ARCH CPU BOARD VENDOR SOC CPUDIR BOARDDIR diff --git a/patches/arndale/board-spl-rule.diff b/patches/arndale/board-spl-rule.diff new file mode 100644 index 000000000..2d7a204d0 --- /dev/null +++ b/patches/arndale/board-spl-rule.diff @@ -0,0 +1,17 @@ +Description: Add spl/arndale-spl.bin rule +Author: Ian Campbell + +Index: u-boot/Makefile +=================================================================== +--- u-boot.orig/Makefile ++++ u-boot/Makefile +@@ -1311,6 +1311,9 @@ spl/sunxi-spl.bin: spl/u-boot-spl + spl/u-boot-spl-dtb.sfp: spl/u-boot-spl + @: + ++spl/arndale-spl.bin: spl/u-boot-spl ++ @: ++ + tpl/u-boot-tpl.bin: tools prepare + $(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all + diff --git a/patches/beagleboneblack/usb-mass-storage.patch b/patches/beagleboneblack/usb-mass-storage.patch new file mode 100644 index 000000000..8f3219fd5 --- /dev/null +++ b/patches/beagleboneblack/usb-mass-storage.patch @@ -0,0 +1,16 @@ +Index: u-boot/include/configs/am335x_evm.h +=================================================================== +--- u-boot.orig/include/configs/am335x_evm.h ++++ u-boot/include/configs/am335x_evm.h +@@ -326,9 +326,8 @@ + #endif + + #ifdef CONFIG_USB_MUSB_GADGET +-#define CONFIG_USB_ETHER +-#define CONFIG_USB_ETH_RNDIS +-#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" ++#define CONFIG_CMD_USB_MASS_STORAGE ++#define CONFIG_USB_FUNCTION_MASS_STORAGE + + /* USB TI's IDs */ + #define CONFIG_G_DNL_VENDOR_NUM 0x0451 diff --git a/patches/ensure-config-sandbox-for-make-env.patch b/patches/ensure-config-sandbox-for-make-env.patch new file mode 100644 index 000000000..5d2937ed0 --- /dev/null +++ b/patches/ensure-config-sandbox-for-make-env.patch @@ -0,0 +1,18 @@ +Ensure that CONFIG_SANDBOX is set when running "make env", avoiding a +failure to build caused by config_distro_bootcmd.h following the wrong +codepath... + +Index: u-boot/include/configs/sandbox.h +=================================================================== +--- u-boot.orig/include/configs/sandbox.h ++++ u-boot/include/configs/sandbox.h +@@ -127,6 +127,9 @@ + + #define CONFIG_BOOTCOMMAND "" + ++#ifndef CONFIG_SANDBOX ++#define CONFIG_SANDBOX 1 ++#endif + #include + + #define CONFIG_KEEP_SERVERADDR diff --git a/patches/hurd.diff b/patches/hurd.diff new file mode 100644 index 000000000..546e5fbb2 --- /dev/null +++ b/patches/hurd.diff @@ -0,0 +1,20 @@ +--- a/include/compiler.h ++++ b/include/compiler.h +@@ -15,7 +15,7 @@ + defined(__sun__) || \ + defined(__APPLE__) + # include +-#elif defined(__linux__) || defined(__WIN32__) || defined(__MINGW32__) ++#elif defined(__linux__) || defined(__WIN32__) || defined(__MINGW32__) || defined(__GLIBC__) + # include + #endif + +@@ -41,7 +41,7 @@ + #define O_BINARY 0 + #endif + +-#ifdef __linux__ ++#if defined(__linux__) || defined(__GLIBC__) + # include + # include + #elif defined(__MACH__) || defined(__FreeBSD__) diff --git a/patches/mipsel-native-endianness.diff b/patches/mipsel-native-endianness.diff new file mode 100644 index 000000000..48fbc894a --- /dev/null +++ b/patches/mipsel-native-endianness.diff @@ -0,0 +1,54 @@ +[MIPS] Fix little-endian build with non-ELDK toolchains + +We've been in trouble for a long time when cross compiling with non-ELDK +toolchains. This is caused by -EB passed to CPPFLAGS incorrectly, by the +lack of an endian specifier to LDFLAGS, and by wrong OUTPUT_FORMATs. + +We're going to implement two workarounds. One is the endianness specifier +bugfix not to pass -EB / -EL to CPPFLAGS unless ELDK toolchain is used. +Note that ELDK and non-ELDK toolchains know their default endianness, so +the endianness specifier may not be necessary in principle. + +The other is removal of OUTPUT_FORMAT in *.lds files. If we have this, +it doesn't work unless an endianness specifier is added to LDFLAGS. As +we haven't added that to LDFLAGS so far, it must have not worked properly, +except ELDK; I don't know why and how ELDK works, though. + +With these two changes, all objects will be generated and linked in the +toolchain's default endianness. Then MAKEALL mips_el will work even with +non-ELDK toolchain. + +Note that Linux/MIPS kernel has CONFIG_CPU_BIG_ENDIAN and +CONFIG_CPU_LITTLE_ENDIAN alternatives to allow users to compile kernels +with a toolchain for the other endianness. But U-Boot does not have such +feature for now, and it's another story. + +Signed-off-by: Shinya Kuribayashi +--- + board/dbau1x00/u-boot.lds | 4 ---- + board/gth2/u-boot.lds | 4 ---- + board/incaip/u-boot.lds | 4 ---- + board/pb1x00/u-boot.lds | 4 ---- + board/purple/u-boot.lds | 4 ---- + board/qemu-mips/u-boot.lds | 4 ---- + board/tb0229/u-boot.lds | 2 -- + cpu/mips/config.mk | 8 -------- + examples/mips.lds | 4 ---- + mips_config.mk | 26 ++++++++++++++++++++++++++ + 10 files changed, 26 insertions(+), 38 deletions(-) + +Index: u-boot/examples/standalone/mips.lds +=================================================================== +--- u-boot.orig/examples/standalone/mips.lds ++++ u-boot/examples/standalone/mips.lds +@@ -5,10 +5,6 @@ + * SPDX-License-Identifier: GPL-2.0+ + */ + +-/* +-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-bigmips") +-*/ +-OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips") + OUTPUT_ARCH(mips) + SECTIONS + { diff --git a/patches/mksunxiboot-spl.patch b/patches/mksunxiboot-spl.patch new file mode 100644 index 000000000..49d443e3b --- /dev/null +++ b/patches/mksunxiboot-spl.patch @@ -0,0 +1,14 @@ +Use a relative path to include the sunxi spl header, which allows +mksunxiboot to build on any arch. + +--- a/tools/mksunxiboot.c ++++ b/tools/mksunxiboot.c +@@ -15,7 +15,7 @@ + #include + #include + #include +-#include "asm/arch/spl.h" ++#include "../arch/arm/include/asm/arch-sunxi/spl.h" + + #define STAMP_VALUE 0x5F0A6C39 + diff --git a/patches/mx53loco b/patches/mx53loco new file mode 100644 index 000000000..7aa1b7c4c --- /dev/null +++ b/patches/mx53loco @@ -0,0 +1,14 @@ +Enables support for ext4, the "load" command, and using bootz with raw initrds. + +Index: u-boot/include/configs/mx53loco.h +=================================================================== +--- u-boot.orig/include/configs/mx53loco.h ++++ u-boot/include/configs/mx53loco.h +@@ -46,6 +46,7 @@ + #define CONFIG_CMD_FS_GENERIC + #define CONFIG_CMD_FAT + #define CONFIG_CMD_EXT2 ++#define CONFIG_CMD_EXT4 + #define CONFIG_DOS_PARTITION + + /* Eth Configs */ diff --git a/patches/mx6cuboxi/serial_console_speed.patch b/patches/mx6cuboxi/serial_console_speed.patch new file mode 100644 index 000000000..b482a2272 --- /dev/null +++ b/patches/mx6cuboxi/serial_console_speed.patch @@ -0,0 +1,13 @@ +Index: u-boot/include/configs/mx6cuboxi.h +=================================================================== +--- u-boot.orig/include/configs/mx6cuboxi.h ++++ u-boot/include/configs/mx6cuboxi.h +@@ -99,7 +99,7 @@ + "initrd_high=0xffffffff\0" \ + "fdt_high=0xffffffff\0" \ + "ip_dyn=yes\0" \ +- "console=" CONFIG_CONSOLE_DEV "\0" \ ++ "console=" CONFIG_CONSOLE_DEV ",115200\0" \ + "bootm_size=0x10000000\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ + "update_sd_firmware=" \ diff --git a/patches/n900-bootz-raw-initrd.diff b/patches/n900-bootz-raw-initrd.diff new file mode 100644 index 000000000..eb7dda5ed --- /dev/null +++ b/patches/n900-bootz-raw-initrd.diff @@ -0,0 +1,17 @@ +Enable booting of zImage/vmlinuz and initrd without requiring the use of +mkimage to create uImage/uInitrd. + +Index: u-boot/include/configs/nokia_rx51.h +=================================================================== +--- u-boot.orig/include/configs/nokia_rx51.h 2014-05-13 15:05:59.000000000 -0700 ++++ u-boot/include/configs/nokia_rx51.h 2014-05-13 15:07:43.213088875 -0700 +@@ -136,6 +136,9 @@ + #define CONFIG_CMD_BOOTMENU /* ANSI terminal Boot Menu */ + #define CONFIG_CMD_CLEAR /* ANSI terminal clear screen command */ + ++#define CONFIG_CMD_BOOTZ /* boot zImage */ ++#define CONFIG_SUPPORT_RAW_INITRD ++ + #ifdef ONENAND_SUPPORT + + #define CONFIG_CMD_ONENAND /* ONENAND support */ diff --git a/patches/no-force-CROSS_COMPILE-powerpc.diff b/patches/no-force-CROSS_COMPILE-powerpc.diff new file mode 100644 index 000000000..f4ec66e82 --- /dev/null +++ b/patches/no-force-CROSS_COMPILE-powerpc.diff @@ -0,0 +1,15 @@ +Index: u-boot/arch/powerpc/config.mk +=================================================================== +--- u-boot.orig/arch/powerpc/config.mk ++++ u-boot/arch/powerpc/config.mk +@@ -5,10 +5,6 @@ + # SPDX-License-Identifier: GPL-2.0+ + # + +-ifeq ($(CROSS_COMPILE),) +-CROSS_COMPILE := ppc_8xx- +-endif +- + CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000 + LDFLAGS_FINAL += --gc-sections + LDFLAGS_FINAL += --bss-plt diff --git a/patches/novena/0001-arm-novena-Switch-novena-to-config_distro_bootcmd.patch b/patches/novena/0001-arm-novena-Switch-novena-to-config_distro_bootcmd.patch new file mode 100644 index 000000000..6ee5dd459 --- /dev/null +++ b/patches/novena/0001-arm-novena-Switch-novena-to-config_distro_bootcmd.patch @@ -0,0 +1,79 @@ +Forwarded: https://patchwork.ozlabs.org/patch/548343/ +From: Marek Vasut +From: Vagrant Cascadian +Description: Switch Novena to distro bootcmd + +Signed-off-by: Vagrant Cascadian +Signed-off-by: Marek Vasut +Cc: Sean Cross +Cc: Stefano Babic +--- + include/configs/novena.h | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +V2: Add fdtfile to specify the device tree blob. + Fix fdt_addr_r to point past kernel address. + +Index: u-boot/include/configs/novena.h +=================================================================== +--- u-boot.orig/include/configs/novena.h ++++ u-boot/include/configs/novena.h +@@ -16,6 +16,7 @@ + #define CONFIG_FIT + #define CONFIG_KEYBOARD + ++#include + #include "mx6_common.h" + + /* U-Boot Commands */ +@@ -58,7 +59,7 @@ + /* Booting Linux */ + #define CONFIG_BOOTFILE "fitImage" + #define CONFIG_BOOTARGS "console=ttymxc1,115200 " +-#define CONFIG_BOOTCOMMAND "run net_nfs" ++#define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run net_nfs" + #define CONFIG_HOSTNAME novena + + /* Physical Memory Map */ +@@ -189,6 +190,7 @@ + #endif + + /* Extra U-Boot environment. */ ++#ifndef CONFIG_SPL_BUILD + #define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ +@@ -197,7 +199,12 @@ + "bootdev=/dev/mmcblk0p1\0" \ + "rootdev=/dev/mmcblk0p2\0" \ + "netdev=eth0\0" \ +- "kernel_addr_r=0x18000000\0" \ ++ "kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0" \ ++ "pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0" \ ++ "scriptaddr="__stringify(CONFIG_LOADADDR)"\0" \ ++ "ramdisk_addr_r=0x28000000\0" \ ++ "fdt_addr_r=0x18000000\0" \ ++ "fdtfile=imx6q-novena.dtb\0" \ + "addcons=" \ + "setenv bootargs ${bootargs} " \ + "console=${consdev},${baudrate}\0" \ +@@ -241,5 +248,19 @@ + "fatwrite mmc 0:1 ${loadaddr} u-boot.img ${filesize} ; "\ + "fi ; " \ + "fi\0" \ ++ BOOTENV ++ ++#define BOOT_TARGET_DEVICES(func) \ ++ func(MMC, mmc, 0) \ ++ func(USB, usb, 0) \ ++ func(SATA, sata, 0) \ ++ func(PXE, pxe, na) \ ++ func(DHCP, dhcp, na) ++ ++#include ++ ++#else ++#define CONFIG_EXTRA_ENV_SETTINGS ++#endif /* CONFIG_SPL_BUILD */ + + #endif /* __CONFIG_H */ diff --git a/patches/series b/patches/series new file mode 100644 index 000000000..f73a5eacb --- /dev/null +++ b/patches/series @@ -0,0 +1,44 @@ +add-debian-revision-to-u-boot-version +mipsel-native-endianness.diff +no-force-CROSS_COMPILE-powerpc.diff +tools-generic-builds.patch +tools-only-in-no-dot-config-targets.diff +Makefile-add-kwb-target-to-all.patch +hurd.diff + +udoo/udoo_quad-support.patch +udoo/udoo-standardized-variables + +mx53loco + +n900-bootz-raw-initrd.diff + +beagleboneblack/usb-mass-storage.patch + +arndale/board-spl-rule.diff + +sh4-fix-linker-name-prefix.patch + +ensure-config-sandbox-for-make-env.patch +mksunxiboot-spl.patch + +upstream/image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch + +upstream/distro-bootcmd-imx/0001-arm-imx-Switch-Wandboard-to-use-config_distro_bootcm.patch +upstream/distro-bootcmd-imx/0002-arm-imx-Switch-mx6cuboxi-to-use-config_distro_bootcm.patch +upstream/distro-bootcmd-imx/0003-imx6-fix-warnings-due-to-switch-to-distro-environmen.patch + +mx6cuboxi/serial_console_speed.patch + +upstream/am33x_distro_bootcmd/0001-config_distro_bootcmd.h-Use-a-private-variable-for-b.patch +upstream/am33x_distro_bootcmd/0002-configs-ti_armv7_common.h-Add-default-addresses-for-.patch +upstream/am33x_distro_bootcmd/0003-configs-am335x_evm-Support-distro-bootcmds.patch + +novena/0001-arm-novena-Switch-novena-to-config_distro_bootcmd.patch +upstream/novena/0001-arm-imx6-novena-gw_ventana-Fix-use-of-pfuze100-bit-d.patch +upstream/novena/0002-arm-imx6-novena-Enable-extfs-support-in-SPL.patch + +upstream/lamobo-r1/0001-sunxi-Add-support-for-the-Lamobo-R1-board.patch + +upstream/mkimage-fix-multi-script/0001-mkimage-Fix-generating-multi-and-script-images.patch +upstream/mkimage-fix-multi-script/0002-mkimage-Fix-warning-from-fix-for-generating-multi-an.patch diff --git a/patches/sh4-fix-linker-name-prefix.patch b/patches/sh4-fix-linker-name-prefix.patch new file mode 100644 index 000000000..943db2466 --- /dev/null +++ b/patches/sh4-fix-linker-name-prefix.patch @@ -0,0 +1,30 @@ +Description: sh4-fix-linker-name-prefix.patch + u-boot currently fails to build from source on sh4 since the + linker name prefix defined in arch/sh/config.mk is outdated. + On current Debian installations, the binaries of the GNU + toolchain are named using the triplett scheme + $arch-$kernel-$toolchain. Thus, on sh4, the proper name + is "sh4-linux-gnu-ld" instead of "sh4-linux-ld". This + patch updates build configuration on sh4 to reflect that. + +--- + +Origin: Debian +Bug: (none yet) +Bug-Debian: https://bugs.debian.org/771747 +Bug-Ubuntu: (none) +Forwarded: (not yet) +Reviewed-By: John Paul Adrian Glaubitz +Last-Update: 2014-12-10 + +--- u-boot-2014.10+dfsg1.orig/arch/sh/config.mk ++++ u-boot-2014.10+dfsg1/arch/sh/config.mk +@@ -6,7 +6,7 @@ + # + + ifeq ($(CROSS_COMPILE),) +-CROSS_COMPILE := sh4-linux- ++CROSS_COMPILE := sh4-linux-gnu- + endif + + CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000 diff --git a/patches/tools-generic-builds.patch b/patches/tools-generic-builds.patch new file mode 100644 index 000000000..e7f9bf9f3 --- /dev/null +++ b/patches/tools-generic-builds.patch @@ -0,0 +1,14 @@ +Description: Enable generic tools build +Author: Hector Oron + +--- u-boot-2014.10~rc2+dfsg1.orig/tools/Makefile ++++ u-boot-2014.10~rc2+dfsg1/tools/Makefile +@@ -52,7 +52,7 @@ HOSTCFLAGS_xway-swap-bytes.o := -pedanti + hostprogs-y += mkenvimage + mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o + +-hostprogs-y += dumpimage mkimage ++hostprogs-y += dumpimage mkimage mksunxiboot kwboot + hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign + + FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o diff --git a/patches/tools-only-in-no-dot-config-targets.diff b/patches/tools-only-in-no-dot-config-targets.diff new file mode 100644 index 000000000..044fafb75 --- /dev/null +++ b/patches/tools-only-in-no-dot-config-targets.diff @@ -0,0 +1,21 @@ +Revert upstream commit c7ad5cbb1ef2c33883f0fa7d0455095004fd306d: + + Makefile: drop "tools-only" from no-dot-config-targets + +This indirectly pulls in a build-dependency on libssl-dev used for FIT +image support, and possibly GPL/OpenSSL licensing incompatibility +issues. + +Index: u-boot/Makefile +=================================================================== +--- u-boot.orig/Makefile ++++ u-boot/Makefile +@@ -411,7 +411,7 @@ timestamp_h := include/generated/timesta + + no-dot-config-targets := clean clobber mrproper distclean \ + help %docs check% coccicheck \ +- ubootversion backup ++ ubootversion backup tools-only + + config-targets := 0 + mixed-targets := 0 diff --git a/patches/udoo/udoo-standardized-variables b/patches/udoo/udoo-standardized-variables new file mode 100644 index 000000000..6947254e9 --- /dev/null +++ b/patches/udoo/udoo-standardized-variables @@ -0,0 +1,28 @@ +Adds standardized variables, fdtfile, fdt_addr_r, ramdisk_addr_r and +kernel_addr_r. + +Index: u-boot/include/configs/udoo.h +=================================================================== +--- u-boot.orig/include/configs/udoo.h ++++ u-boot/include/configs/udoo.h +@@ -74,6 +74,9 @@ + "initrd_high=0xffffffff\0" \ + "fdt_file=undefined\0" \ + "fdt_addr=0x18000000\0" \ ++ "fdt_addr_r=0x18000000\0" \ ++ "ramdisk_addr_r=0x13000000\0" \ ++ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ + "mmcdev=0\0" \ +@@ -146,8 +149,10 @@ + "fi;\0" \ + "findfdt=" \ + "if test $board_rev = MX6Q ; then " \ ++ "setenv fdtfile imx6q-udoo.dtb; " \ + "setenv fdt_file imx6q-udoo.dtb; fi; " \ + "if test $board_rev = MX6DL ; then " \ ++ "setenv fdt_file imx6dl-udoo.dtb; " \ + "setenv fdt_file imx6dl-udoo.dtb; fi; " \ + "if test $fdt_file = undefined; then " \ + "echo WARNING: Could not determine dtb to use; fi; \0" diff --git a/patches/udoo/udoo_quad-support.patch b/patches/udoo/udoo_quad-support.patch new file mode 100644 index 000000000..566b806be --- /dev/null +++ b/patches/udoo/udoo_quad-support.patch @@ -0,0 +1,82 @@ +Description: Features and sane scripts for UDOO board + Enable the following features: + * Ext4 + * Generic FS (load) + * Raw initramfs + Tweak scripts to: + * use generic "load" command to load files from FS. + * provide "loadzimage" macro. + * account for different locations of boot script file. +Author: Michael Fladischer +Last-Update: 2014-07-01 +Forwarded: no + +Index: u-boot/include/configs/udoo.h +=================================================================== +--- u-boot.orig/include/configs/udoo.h ++++ u-boot/include/configs/udoo.h +@@ -95,12 +95,16 @@ + "fi\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "root=${mmcroot}\0" \ ++ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \ ++ "importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \ ++ "env import -t $loadaddr $filesize\0" \ + "loadbootscript=" \ +- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ ++ "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ +- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ ++ "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \ ++ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -149,17 +153,33 @@ + "echo WARNING: Could not determine dtb to use; fi; \0" + + #define CONFIG_BOOTCOMMAND \ +- "run findfdt; " \ +- "mmc dev ${mmcdev}; if mmc rescan; then " \ +- "if run loadbootscript; then " \ +- "run bootscript; " \ +- "else " \ +- "if run loadimage; then " \ +- "run mmcboot; " \ +- "else run netboot; " \ +- "fi; " \ +- "fi; " \ +- "else run netboot; fi" ++ "run findfdt; " \ ++ "mmc dev ${mmcdev};" \ ++ "if mmc rescan; then " \ ++ "echo SD/MMC found on device ${mmcdev};" \ ++ "if run loadbootenv; then " \ ++ "run importbootenv;" \ ++ "fi;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n $uenvcmd; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "if run loadbootscript; then " \ ++ "echo Running boot script ${script} ...;" \ ++ "run bootscript; " \ ++ "fi;" \ ++ "setenv script /boot/${script};" \ ++ "if run loadbootscript; then " \ ++ "echo Running boot script ${script} ...;" \ ++ "run bootscript; " \ ++ "fi;" \ ++ "echo Running default loadzimage ...;" \ ++ "if run loadzimage; then " \ ++ "run loadfdt;" \ ++ "run mmcboot;" \ ++ "fi;" \ ++ "fi;" + + /* Print Buffer Size */ + #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) diff --git a/patches/upstream/am33x_distro_bootcmd/0001-config_distro_bootcmd.h-Use-a-private-variable-for-b.patch b/patches/upstream/am33x_distro_bootcmd/0001-config_distro_bootcmd.h-Use-a-private-variable-for-b.patch new file mode 100644 index 000000000..54c202e32 --- /dev/null +++ b/patches/upstream/am33x_distro_bootcmd/0001-config_distro_bootcmd.h-Use-a-private-variable-for-b.patch @@ -0,0 +1,82 @@ +From 59d03cb37700e2e204451e83b38c326df0435ff8 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Fri, 28 Aug 2015 15:01:54 +0200 +Subject: [PATCH 1/3] config_distro_bootcmd.h: Use a private variable for + bootpart + +Hush has an oddity where using ${var} causes var to resolved in the the global +address space (iotw the environment) first and only afterwards will the local +variable space be searched. + +This causes odd side-effects when iterating over the boot partitions +using ${bootpart} if the environment also has a bootpart variable (e.g. for +the various TI boards). Fix this by using the hopefully more unique +${distro_bootpart} instead of ${bootpart}. + +Signed-off-by: Sjoerd Simons +Acked-by: Stephen Warren +--- + include/config_distro_bootcmd.h | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h +index 3a360ca4..d2f49a1 100644 +--- a/include/config_distro_bootcmd.h ++++ b/include/config_distro_bootcmd.h +@@ -191,11 +191,12 @@ + BOOTENV_BOOT_TARGETS \ + \ + "boot_extlinux=" \ +- "sysboot ${devtype} ${devnum}:${bootpart} any " \ ++ "sysboot ${devtype} ${devnum}:${distro_bootpart} any " \ + "${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \ + \ + "scan_dev_for_extlinux=" \ +- "if test -e ${devtype} ${devnum}:${bootpart} " \ ++ "if test -e ${devtype} " \ ++ "${devnum}:${distro_bootpart} " \ + "${prefix}extlinux/extlinux.conf; then " \ + "echo Found ${prefix}extlinux/extlinux.conf; " \ + "run boot_extlinux; " \ +@@ -203,13 +204,14 @@ + "fi\0" \ + \ + "boot_a_script=" \ +- "load ${devtype} ${devnum}:${bootpart} " \ ++ "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "source ${scriptaddr}\0" \ + \ + "scan_dev_for_scripts=" \ + "for script in ${boot_scripts}; do " \ +- "if test -e ${devtype} ${devnum}:${bootpart} " \ ++ "if test -e ${devtype} " \ ++ "${devnum}:${distro_bootpart} " \ + "${prefix}${script}; then " \ + "echo Found U-Boot script " \ + "${prefix}${script}; " \ +@@ -219,7 +221,8 @@ + "done\0" \ + \ + "scan_dev_for_boot=" \ +- "echo Scanning ${devtype} ${devnum}:${bootpart}...; " \ ++ "echo Scanning ${devtype} " \ ++ "${devnum}:${distro_bootpart}...; " \ + "for prefix in ${boot_prefixes}; do " \ + "run scan_dev_for_extlinux; " \ + "run scan_dev_for_scripts; " \ +@@ -228,8 +231,9 @@ + "scan_dev_for_boot_part=" \ + "part list ${devtype} ${devnum} -bootable devplist; " \ + "env exists devplist || setenv devplist 1; " \ +- "for bootpart in ${devplist}; do " \ +- "if fstype ${devtype} ${devnum}:${bootpart} " \ ++ "for distro_bootpart in ${devplist}; do " \ ++ "if fstype ${devtype} " \ ++ "${devnum}:${distro_bootpart} " \ + "bootfstype; then " \ + "run scan_dev_for_boot; " \ + "fi; " \ +-- +2.1.4 + diff --git a/patches/upstream/am33x_distro_bootcmd/0002-configs-ti_armv7_common.h-Add-default-addresses-for-.patch b/patches/upstream/am33x_distro_bootcmd/0002-configs-ti_armv7_common.h-Add-default-addresses-for-.patch new file mode 100644 index 000000000..95ef105bd --- /dev/null +++ b/patches/upstream/am33x_distro_bootcmd/0002-configs-ti_armv7_common.h-Add-default-addresses-for-.patch @@ -0,0 +1,30 @@ +From 7749b67f6cff3246444051764b5bc62decfb9f58 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Fri, 28 Aug 2015 15:01:55 +0200 +Subject: [PATCH 2/3] configs: ti_armv7_common.h: Add default addresses for pxe + and scripts + +Add mandatory address variables for loading scripts and pxe configuration as +per README.distro + +Signed-off-by: Sjoerd Simons +--- + include/configs/ti_armv7_common.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h +index 6dc6515..586bd2b 100644 +--- a/include/configs/ti_armv7_common.h ++++ b/include/configs/ti_armv7_common.h +@@ -56,6 +56,8 @@ + "fdt_addr_r=0x88000000\0" \ + "rdaddr=0x88080000\0" \ + "ramdisk_addr_r=0x88080000\0" \ ++ "scriptaddr=0x80000000\0" \ ++ "pxefile_addr_r=0x80100000\0" \ + "bootm_size=0x10000000\0" + + #define DEFAULT_MMC_TI_ARGS \ +-- +2.1.4 + diff --git a/patches/upstream/am33x_distro_bootcmd/0003-configs-am335x_evm-Support-distro-bootcmds.patch b/patches/upstream/am33x_distro_bootcmd/0003-configs-am335x_evm-Support-distro-bootcmds.patch new file mode 100644 index 000000000..2d98b4325 --- /dev/null +++ b/patches/upstream/am33x_distro_bootcmd/0003-configs-am335x_evm-Support-distro-bootcmds.patch @@ -0,0 +1,101 @@ +From bc3199fd1875f89e9e1fb2af45665c4a718217b9 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Fri, 28 Aug 2015 15:01:56 +0200 +Subject: [PATCH 3/3] configs: am335x_evm: Support distro bootcmds + +Add support for distro bootcmds and network booting while retaining +backwards compatibility with the current "legacy" setup. With these +changes the default boot sequence becomes: + +* SD card (standard distro boot) +* SD card (legacy boot) +* EMMC (standard distro boot) +* EMMC (legacy boot) +* Nand (legacy boot) +* PXE (standard distro boot) +* DHCP (standard distro boot) + +The older boot scripts have some overlap with what the distro +bootcommands to however i've left them unchanged to prevent introduction +of subtle bugs. + +Signed-off-by: Sjoerd Simons +--- + include/configs/am335x_evm.h | 45 ++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 37 insertions(+), 8 deletions(-) + +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index 3cf768e..b036199 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -18,6 +18,10 @@ + + #include + ++/* Don't override the distro default bootdelay */ ++#undef CONFIG_BOOTDELAY ++#include ++ + #ifndef CONFIG_SPL_BUILD + #ifndef CONFIG_FIT + # define CONFIG_FIT +@@ -67,6 +71,37 @@ + + #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + ++#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ ++ "bootcmd_" #devtypel #instance "=" \ ++ "setenv mmcdev " #instance"; "\ ++ "setenv bootpart " #instance":2 ; "\ ++ "run mmcboot\0" ++ ++#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ ++ #devtypel #instance " " ++ ++#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ ++ "bootcmd_" #devtypel "=" \ ++ "run nandboot\0" ++ ++#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ ++ #devtypel #instance " " ++ ++#define BOOT_TARGET_DEVICES(func) \ ++ func(MMC, mmc, 0) \ ++ func(LEGACY_MMC, legacy_mmc, 0) \ ++ func(MMC, mmc, 1) \ ++ func(LEGACY_MMC, legacy_mmc, 1) \ ++ func(NAND, nand, 0) \ ++ func(PXE, pxe, na) \ ++ func(DHCP, dhcp, na) ++ ++#define CONFIG_BOOTCOMMAND \ ++ "run findfdt; " \ ++ "run distro_bootcmd" ++ ++#include ++ + #ifndef CONFIG_SPL_BUILD + #define CONFIG_EXTRA_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV \ +@@ -160,16 +195,10 @@ + "echo WARNING: Could not determine device tree to use; fi; \0" \ + NANDARGS \ + NETARGS \ +- DFUARGS ++ DFUARGS \ ++ BOOTENV + #endif + +-#define CONFIG_BOOTCOMMAND \ +- "run findfdt; " \ +- "run mmcboot;" \ +- "setenv mmcdev 1; " \ +- "setenv bootpart 1:2; " \ +- "run mmcboot;" \ +- "run nandboot;" + + /* NS16550 Configuration */ + #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ +-- +2.1.4 + diff --git a/patches/upstream/distro-bootcmd-imx/0001-arm-imx-Switch-Wandboard-to-use-config_distro_bootcm.patch b/patches/upstream/distro-bootcmd-imx/0001-arm-imx-Switch-Wandboard-to-use-config_distro_bootcm.patch new file mode 100644 index 000000000..b8c8738cf --- /dev/null +++ b/patches/upstream/distro-bootcmd-imx/0001-arm-imx-Switch-Wandboard-to-use-config_distro_bootcm.patch @@ -0,0 +1,143 @@ +From acc6bb569390f7e51127d76464db67a434a5d379 Mon Sep 17 00:00:00 2001 +From: Vagrant Cascadian +Date: Tue, 27 Oct 2015 12:49:40 -0700 +Subject: [PATCH 1/3] arm: imx: Switch Wandboard to use + config_distro_bootcmd.h. + +This allows for more flexible and standardized boot across multiple +platforms. + +Remove redundant legacy boot environment. + +Signed-off-by: Vagrant Cascadian +--- + include/configs/wandboard.h | 82 +++++++++++---------------------------------- + 1 file changed, 19 insertions(+), 63 deletions(-) + +diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h +index 6e8aec2..6408b5e 100644 +--- a/include/configs/wandboard.h ++++ b/include/configs/wandboard.h +@@ -88,19 +88,15 @@ + + #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "script=boot.scr\0" \ +- "image=zImage\0" \ +- "console=ttymxc0\0" \ ++ "console=ttymxc0,115200\0" \ + "splashpos=m,m\0" \ + "fdtfile=undefined\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ ++ "fdt_addr_r=0x18000000\0" \ + "fdt_addr=0x18000000\0" \ +- "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ +- "mmcpart=1\0" \ +- "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "update_sd_firmware_filename=u-boot.imx\0" \ + "update_sd_firmware=" \ + "if test ${ip_dyn} = yes; then " \ +@@ -115,8 +111,6 @@ + "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ + "fi; " \ + "fi\0" \ +- "mmcargs=setenv bootargs console=${console},${baudrate} " \ +- "root=${mmcroot}; run videoargs\0" \ + "videoargs=" \ + "setenv nextcon 0; " \ + "if hdmidet; then " \ +@@ -143,51 +137,6 @@ + "echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \ + "fi; " \ + "setenv bootargs ${bootargs} ${fbmem}\0" \ +- "loadbootscript=" \ +- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ +- "bootscript=echo Running bootscript from mmc ...; " \ +- "source\0" \ +- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ +- "mmcboot=echo Booting from mmc ...; " \ +- "run mmcargs; " \ +- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if run loadfdt; then " \ +- "bootz ${loadaddr} - ${fdt_addr}; " \ +- "else " \ +- "if test ${boot_fdt} = try; then " \ +- "bootz; " \ +- "else " \ +- "echo WARN: Cannot load the DT; " \ +- "fi; " \ +- "fi; " \ +- "else " \ +- "bootz; " \ +- "fi;\0" \ +- "netargs=setenv bootargs console=${console},${baudrate} " \ +- "root=/dev/nfs " \ +- "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ +- "netboot=echo Booting from net ...; " \ +- "run netargs; " \ +- "if test ${ip_dyn} = yes; then " \ +- "setenv get_cmd dhcp; " \ +- "else " \ +- "setenv get_cmd tftp; " \ +- "fi; " \ +- "${get_cmd} ${image}; " \ +- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ +- "bootz ${loadaddr} - ${fdt_addr}; " \ +- "else " \ +- "if test ${boot_fdt} = try; then " \ +- "bootz; " \ +- "else " \ +- "echo WARN: Cannot load the DT; " \ +- "fi; " \ +- "fi; " \ +- "else " \ +- "bootz; " \ +- "fi;\0" \ + "findfdt="\ + "if test $board_name = C1 && test $board_rev = MX6Q ; then " \ + "setenv fdtfile imx6q-wandboard.dtb; fi; " \ +@@ -199,19 +148,26 @@ + "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \ + "if test $fdtfile = undefined; then " \ + "echo WARNING: Could not determine dtb to use; fi; \0" \ ++ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ ++ "pxe_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ ++ "ramdisk_addr_r=0x13000000\0" \ ++ "ramdiskaddr=0x13000000\0" \ ++ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ ++ BOOTENV ++ ++#define BOOT_TARGET_DEVICES(func) \ ++ func(MMC, mmc, 0) \ ++ func(MMC, mmc, 1) \ ++ func(USB, usb, 0) \ ++ func(PXE, pxe, na) \ ++ func(DHCP, dhcp, na) + + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ +- "mmc dev ${mmcdev}; if mmc rescan; then " \ +- "if run loadbootscript; then " \ +- "run bootscript; " \ +- "else " \ +- "if run loadimage; then " \ +- "run mmcboot; " \ +- "else run netboot; " \ +- "fi; " \ +- "fi; " \ +- "else run netboot; fi" ++ "run distro_bootcmd" ++ ++#include ++#include + + /* Physical Memory Map */ + #define CONFIG_NR_DRAM_BANKS 1 +-- +2.1.4 + diff --git a/patches/upstream/distro-bootcmd-imx/0002-arm-imx-Switch-mx6cuboxi-to-use-config_distro_bootcm.patch b/patches/upstream/distro-bootcmd-imx/0002-arm-imx-Switch-mx6cuboxi-to-use-config_distro_bootcm.patch new file mode 100644 index 000000000..6ed7c4ade --- /dev/null +++ b/patches/upstream/distro-bootcmd-imx/0002-arm-imx-Switch-mx6cuboxi-to-use-config_distro_bootcm.patch @@ -0,0 +1,147 @@ +From 1c5e6b6fbb3835b1170c01844c862c0eaa9bffed Mon Sep 17 00:00:00 2001 +From: Vagrant Cascadian +Date: Tue, 27 Oct 2015 13:18:22 -0700 +Subject: [PATCH 2/3] arm: imx: Switch mx6cuboxi to use + config_distro_bootcmd.h. + +This allows for more flexible and standardized boot across multiple +platforms. + +Remove redundant legacy boot environment. + +Cc: Otavio Salvador +Signed-off-by: Vagrant Cascadian +--- + include/configs/mx6cuboxi.h | 88 +++++++++++++-------------------------------- + 1 file changed, 24 insertions(+), 64 deletions(-) + +diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h +index 6e89dd1..0f3b992 100644 +--- a/include/configs/mx6cuboxi.h ++++ b/include/configs/mx6cuboxi.h +@@ -81,23 +81,26 @@ + + #define CONFIG_MXC_UART_BASE UART1_BASE + #define CONFIG_CONSOLE_DEV "ttymxc0" +-#define CONFIG_MMCROOT "/dev/mmcblk0p2" + #define CONFIG_SYS_FSL_USDHC_NUM 1 + #define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */ + + #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ++#ifndef CONFIG_SPL_BUILD + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "script=boot.scr\0" \ +- "image=zImage\0" \ + "fdtfile=undefined\0" \ + "fdt_addr_r=0x18000000\0" \ +- "boot_fdt=try\0" \ ++ "fdt_addr=0x18000000\0" \ ++ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ ++ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ ++ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ ++ "ramdisk_addr_r=0x13000000\0" \ ++ "ramdiskaddr=0x13000000\0" \ ++ "initrd_high=0xffffffff\0" \ ++ "fdt_high=0xffffffff\0" \ + "ip_dyn=yes\0" \ + "console=" CONFIG_CONSOLE_DEV "\0" \ + "bootm_size=0x10000000\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ +- "mmcpart=1\0" \ +- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "update_sd_firmware=" \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ +@@ -111,53 +114,6 @@ + "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ + "fi; " \ + "fi\0" \ +- "mmcargs=setenv bootargs console=${console},${baudrate} " \ +- "root=${mmcroot}\0" \ +- "loadbootscript=" \ +- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ +- "bootscript=echo Running bootscript from mmc ...; " \ +- "source\0" \ +- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}\0" \ +- "mmcboot=echo Booting from mmc ...; " \ +- "run mmcargs; " \ +- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if run loadfdt; then " \ +- "bootz ${loadaddr} - ${fdt_addr_r}; " \ +- "else " \ +- "if test ${boot_fdt} = try; then " \ +- "bootz; " \ +- "else " \ +- "echo WARN: Cannot load the DT; " \ +- "fi; " \ +- "fi; " \ +- "else " \ +- "bootz; " \ +- "fi;\0" \ +- "netargs=setenv bootargs console=${console},${baudrate} " \ +- "root=/dev/nfs " \ +- "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ +- "netboot=echo Booting from net ...; " \ +- "run netargs; " \ +- "if test ${ip_dyn} = yes; then " \ +- "setenv get_cmd dhcp; " \ +- "else " \ +- "setenv get_cmd tftp; " \ +- "fi; " \ +- "${get_cmd} ${image}; " \ +- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then " \ +- "bootz ${loadaddr} - ${fdt_addr_r}; " \ +- "else " \ +- "if test ${boot_fdt} = try; then " \ +- "bootz; " \ +- "else " \ +- "echo WARN: Cannot load the DT; " \ +- "fi; " \ +- "fi; " \ +- "else " \ +- "bootz; " \ +- "fi;\0" \ + "findfdt="\ + "if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \ + "setenv fdtfile imx6q-hummingboard.dtb; fi; " \ +@@ -169,20 +125,24 @@ + "setenv fdtfile imx6dl-cubox-i.dtb; fi; " \ + "if test $fdtfile = undefined; then " \ + "echo WARNING: Could not determine dtb to use; fi; \0" \ ++ BOOTENV + + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ +- "mmc dev ${mmcdev};" \ +- "if mmc rescan; then " \ +- "if run loadbootscript; then " \ +- "run bootscript; " \ +- "else " \ +- "if run loadimage; then " \ +- "run mmcboot; " \ +- "else run netboot; " \ +- "fi; " \ +- "fi; " \ +- "else run netboot; fi" ++ "run distro_bootcmd" ++ ++#define BOOT_TARGET_DEVICES(func) \ ++ func(MMC, mmc, 0) \ ++ func(USB, usb, 0) \ ++ func(PXE, pxe, na) \ ++ func(DHCP, dhcp, na) ++ ++#include ++#include ++ ++#else ++#define CONFIG_EXTRA_ENV_SETTINGS ++#endif /* CONFIG_SPL_BUILD */ + + /* Physical Memory Map */ + #define CONFIG_NR_DRAM_BANKS 1 +-- +2.1.4 + diff --git a/patches/upstream/distro-bootcmd-imx/0003-imx6-fix-warnings-due-to-switch-to-distro-environmen.patch b/patches/upstream/distro-bootcmd-imx/0003-imx6-fix-warnings-due-to-switch-to-distro-environmen.patch new file mode 100644 index 000000000..c8dcc38ce --- /dev/null +++ b/patches/upstream/distro-bootcmd-imx/0003-imx6-fix-warnings-due-to-switch-to-distro-environmen.patch @@ -0,0 +1,60 @@ +From 3d99e862691bb7053ba9e1537a971971976fde13 Mon Sep 17 00:00:00 2001 +From: Stefano Babic +Date: Fri, 13 Nov 2015 10:49:01 +0100 +Subject: [PATCH 3/3] imx6: fix warnings due to switch to distro environment + +wandboard and mx6cuboxi have warnings because BOOT_DELAY +is defined twice. + +Signed-off-by: Stefano Babic +CC: Vagrant Cascadian +CC: Otavio Salvador +CC: Fabio Estevam +--- + include/configs/mx6cuboxi.h | 2 +- + include/configs/wandboard.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h +index 0f3b992..4feb121 100644 +--- a/include/configs/mx6cuboxi.h ++++ b/include/configs/mx6cuboxi.h +@@ -8,6 +8,7 @@ + #ifndef __MX6CUBOXI_CONFIG_H + #define __MX6CUBOXI_CONFIG_H + ++#include + #include "mx6_common.h" + + #define CONFIG_SPL_LIBCOMMON_SUPPORT +@@ -137,7 +138,6 @@ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +-#include + #include + + #else +diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h +index 6408b5e..4c8e9e9 100644 +--- a/include/configs/wandboard.h ++++ b/include/configs/wandboard.h +@@ -9,6 +9,7 @@ + #ifndef __CONFIG_H + #define __CONFIG_H + ++#include + #include "mx6_common.h" + + #define CONFIG_SPL_LIBCOMMON_SUPPORT +@@ -166,7 +167,6 @@ + "run findfdt; " \ + "run distro_bootcmd" + +-#include + #include + + /* Physical Memory Map */ +-- +2.1.4 + diff --git a/patches/upstream/image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch b/patches/upstream/image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch new file mode 100644 index 000000000..8cdab7705 --- /dev/null +++ b/patches/upstream/image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch @@ -0,0 +1,33 @@ +From c139b5ff0999ec3d44a02ebdb623a92e5782e53e Mon Sep 17 00:00:00 2001 +From: Tom Rini +Date: Tue, 27 Oct 2015 19:04:40 -0400 +Subject: [PATCH 4/4] image.c: Fix non-Android booting with ramdisk and/or + device tree + +In 1fec3c5 I added a check that if we had an Android image we default to +trying the kernel address for a ramdisk. However when we don't have an +Android image buf is NULL and we oops here. Ensure that we have 'buf' +to check first. + +Reported-by: elipe Balbi +Signed-off-by: Tom Rini +--- + common/image.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/image.c b/common/image.c +index e607109..85c4f39 100644 +--- a/common/image.c ++++ b/common/image.c +@@ -913,7 +913,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, + * Look for an Android boot image. + */ + buf = map_sysmem(images->os.start, 0); +- if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) ++ if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) + select = argv[0]; + #endif + +-- +2.1.4 + diff --git a/patches/upstream/lamobo-r1/0001-sunxi-Add-support-for-the-Lamobo-R1-board.patch b/patches/upstream/lamobo-r1/0001-sunxi-Add-support-for-the-Lamobo-R1-board.patch new file mode 100644 index 000000000..0788be0ba --- /dev/null +++ b/patches/upstream/lamobo-r1/0001-sunxi-Add-support-for-the-Lamobo-R1-board.patch @@ -0,0 +1,375 @@ +[ Vagrant Cascadian ] +Modifed to remove usb_power_supply entry. + +From aa56cb374de8ae83f3280fdd6c280724228b86d7 Mon Sep 17 00:00:00 2001 +From: Jelle de Jong +Date: Sun, 18 Oct 2015 16:34:13 +0200 +Subject: [PATCH 1/2] sunxi: Add support for the Lamobo R1 board + +The lamobo-r1 board, sometimes called the BPI-R1 but not labelled as such +on the PCB, is meant as a A20 based router board. As such the board comes +with a built-in switch chip giving it 5 gigabit ethernet ports, and it +has a large empty area on the pcb with mounting holes which will fit a +2.5 inch harddisk. To complete its networking features it has a +Realtek RTL8192CU for WiFi 802.11 b/g/n. + +The dts file is identical to the one submitted upstream. + +Signed-off-by: Jelle de Jong +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +--- + arch/arm/dts/Makefile | 1 + + arch/arm/dts/sun7i-a20-lamobo-r1.dts | 297 +++++++++++++++++++++++++++++++++++ + board/sunxi/MAINTAINERS | 5 + + configs/Lamobo_R1_defconfig | 16 ++ + 4 files changed, 319 insertions(+) + create mode 100644 arch/arm/dts/sun7i-a20-lamobo-r1.dts + create mode 100644 configs/Lamobo_R1_defconfig + +Index: u-boot/arch/arm/dts/Makefile +=================================================================== +--- u-boot.orig/arch/arm/dts/Makefile ++++ u-boot/arch/arm/dts/Makefile +@@ -134,6 +134,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ + sun7i-a20-cubietruck.dtb \ + sun7i-a20-hummingbird.dtb \ + sun7i-a20-i12-tvbox.dtb \ ++ sun7i-a20-lamobo-r1.dtb \ + sun7i-a20-m3.dtb \ + sun7i-a20-m5.dtb \ + sun7i-a20-mk808c.dtb \ +Index: u-boot/arch/arm/dts/sun7i-a20-lamobo-r1.dts +=================================================================== +--- /dev/null ++++ u-boot/arch/arm/dts/sun7i-a20-lamobo-r1.dts +@@ -0,0 +1,292 @@ ++/* ++ * Copyright 2015 Jelle de Jong ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++#include "sun7i-a20.dtsi" ++#include "sunxi-common-regulators.dtsi" ++ ++#include ++#include ++#include ++ ++/ { ++ model = "Lamobo R1"; ++ compatible = "lamobo,lamobo-r1", "allwinner,sun7i-a20"; ++ ++ aliases { ++ serial0 = &uart0; ++ serial1 = &uart3; ++ serial2 = &uart7; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&led_pins_lamobo_r1>; ++ ++ green { ++ label = "lamobo_r1:green:usr"; ++ gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ reg_gmac_3v3: gmac-3v3 { ++ compatible = "regulator-fixed"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&gmac_power_pin_lamobo_r1>; ++ regulator-name = "gmac-3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ startup-delay-us = <100000>; ++ enable-active-high; ++ gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; /* PH23 */ ++ }; ++}; ++ ++&ahci_pwr_pin_a { ++ allwinner,pins = "PB3"; ++}; ++ ++&ahci { ++ target-supply = <®_ahci_5v>; ++ status = "okay"; ++}; ++ ++&cpu0 { ++ cpu-supply = <®_dcdc2>; ++ operating-points = < ++ /* kHz uV */ ++ 960000 1400000 ++ 912000 1400000 ++ 864000 1350000 ++ 720000 1250000 ++ 528000 1150000 ++ 312000 1100000 ++ 144000 1050000 ++ >; ++}; ++ ++&ehci0 { ++ status = "okay"; ++}; ++ ++&ehci1 { ++ status = "okay"; ++}; ++ ++&gmac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&gmac_pins_rgmii_a>; ++ phy = <&phy1>; ++ phy-mode = "rgmii"; ++ phy-supply = <®_gmac_3v3>; ++ status = "okay"; ++ ++ phy1: ethernet-phy@1 { ++ reg = <1>; ++ }; ++}; ++ ++&i2c0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c0_pins_a>; ++ status = "okay"; ++ ++ axp209: pmic@34 { ++ reg = <0x34>; ++ interrupt-parent = <&nmi_intc>; ++ interrupts = <0 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++&i2c2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c2_pins_a>; ++ status = "okay"; ++}; ++ ++&ir0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ir0_rx_pins_a>; ++ status = "okay"; ++}; ++ ++&mmc0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_lamobo_r1>; ++ vmmc-supply = <®_vcc3v3>; ++ bus-width = <4>; ++ cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */ ++ cd-inverted; ++ status = "okay"; ++}; ++ ++&ohci0 { ++ status = "okay"; ++}; ++ ++&ohci1 { ++ status = "okay"; ++}; ++ ++&otg_sram { ++ status = "okay"; ++}; ++ ++&pio { ++ usb0_id_detect_pin: usb0_id_detect_pin@0 { ++ allwinner,pins = "PH4"; ++ allwinner,function = "gpio_in"; ++ allwinner,drive = ; ++ allwinner,pull = ; ++ }; ++ ++ mmc0_cd_pin_lamobo_r1: mmc0_cd_pin@0 { ++ allwinner,pins = "PH10"; ++ allwinner,function = "gpio_in"; ++ allwinner,drive = ; ++ allwinner,pull = ; ++ }; ++ ++ gmac_power_pin_lamobo_r1: gmac_power_pin@0 { ++ allwinner,pins = "PH23"; ++ allwinner,function = "gpio_out"; ++ allwinner,drive = ; ++ allwinner,pull = ; ++ }; ++ ++ led_pins_lamobo_r1: led_pins@0 { ++ allwinner,pins = "PH24"; ++ allwinner,function = "gpio_out"; ++ allwinner,drive = ; ++ allwinner,pull = ; ++ }; ++}; ++ ++#include "axp209.dtsi" ++ ++®_ahci_5v { ++ gpio = <&pio 1 3 0>; /* PB3 */ ++ status = "okay"; ++}; ++ ++®_dcdc2 { ++ regulator-always-on; ++ regulator-min-microvolt = <1000000>; ++ regulator-max-microvolt = <1400000>; ++ regulator-name = "vdd-cpu"; ++}; ++ ++®_dcdc3 { ++ regulator-always-on; ++ regulator-min-microvolt = <1000000>; ++ regulator-max-microvolt = <1400000>; ++ regulator-name = "vdd-int-dll"; ++}; ++ ++®_ldo1 { ++ regulator-name = "vdd-rtc"; ++}; ++ ++®_ldo2 { ++ regulator-always-on; ++ regulator-min-microvolt = <3000000>; ++ regulator-max-microvolt = <3000000>; ++ regulator-name = "avcc"; ++}; ++ ++®_usb0_vbus { ++ status = "okay"; ++}; ++ ++®_usb1_vbus { ++ status = "okay"; ++}; ++ ++®_usb2_vbus { ++ status = "okay"; ++}; ++ ++&spi0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&spi0_pins_a>, ++ <&spi0_cs0_pins_a>, ++ <&spi0_cs1_pins_a>; ++ status = "okay"; ++}; ++ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_pins_a>; ++ status = "okay"; ++}; ++ ++&uart3 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart3_pins_b>; ++ status = "okay"; ++}; ++ ++&uart7 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart7_pins_a>; ++ status = "okay"; ++}; ++ ++&usb_otg { ++ dr_mode = "otg"; ++ status = "okay"; ++}; ++ ++&usbphy { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&usb0_id_detect_pin>; ++ usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ ++ usb0_vbus-supply = <®_usb0_vbus>; ++ usb1_vbus-supply = <®_usb1_vbus>; ++ usb2_vbus-supply = <®_usb2_vbus>; ++ status = "okay"; ++}; +Index: u-boot/board/sunxi/MAINTAINERS +=================================================================== +--- u-boot.orig/board/sunxi/MAINTAINERS ++++ u-boot/board/sunxi/MAINTAINERS +@@ -134,6 +134,11 @@ M: Chen-Yu Tsai + S: Maintained + F: configs/Ippo_q8h_v5_defconfig + ++LAMOBO-R1 BOARD ++M: Jelle de Jong ++S: Maintained ++F: configs/Lamobo_R1_defconfig ++ + LINKSPRITE-PCDUINO BOARD + M: Zoltan Herpai + S: Maintained +Index: u-boot/configs/Lamobo_R1_defconfig +=================================================================== +--- /dev/null ++++ u-boot/configs/Lamobo_R1_defconfig +@@ -0,0 +1,16 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN7I=y ++CONFIG_DRAM_CLK=432 ++CONFIG_MMC0_CD_PIN="PH10" ++CONFIG_GMAC_TX_DELAY=4 ++CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SPL=y ++CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,SATAPWR=SUNXI_GPB(3)" ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++# CONFIG_CMD_FPGA is not set ++CONFIG_CMD_GPIO=y ++CONFIG_ETH_DESIGNWARE=y ++CONFIG_USB_EHCI_HCD=y diff --git a/patches/upstream/mkimage-fix-multi-script/0001-mkimage-Fix-generating-multi-and-script-images.patch b/patches/upstream/mkimage-fix-multi-script/0001-mkimage-Fix-generating-multi-and-script-images.patch new file mode 100644 index 000000000..9fa4d0637 --- /dev/null +++ b/patches/upstream/mkimage-fix-multi-script/0001-mkimage-Fix-generating-multi-and-script-images.patch @@ -0,0 +1,69 @@ +Bug-Debian: https://bugs.debian.org/805434 +From 6ae6e16005252dbca0b4a06beea1be895df48e16 Mon Sep 17 00:00:00 2001 +From: Philippe De Swert +Date: Fri, 4 Dec 2015 00:11:23 +0200 +Subject: [PATCH 1/2] mkimage : Fix generating multi and script images + +Seems 92a655c3 broke creating multi and script type images. +Since the file1:file2:file3 string does not get split up, +it fails on trying to open an non-existing file. + +mkimage -A arm -O linux -T multi -C none -d zImage:splash.bmp:device.dtb uimage +tools/mkimage: Can't open zImage:splash.bmp:device.dtb: No such file or directory + +Since the sizes of the different parts seem to get added in the actual +routine that handles multi and script type images, we can probably skip the +bit of the code that causes the failure for that type of images. + +Signed-off-by: Philippe De Swert +--- + tools/mkimage.c | 31 ++++++++++++++++++------------- + 1 file changed, 18 insertions(+), 13 deletions(-) + +diff --git a/tools/mkimage.c b/tools/mkimage.c +index 8af9d50..ae01cb1 100644 +--- a/tools/mkimage.c ++++ b/tools/mkimage.c +@@ -311,21 +311,26 @@ NXTARG: ; + exit (retval); + } + +- dfd = open(params.datafile, O_RDONLY | O_BINARY); +- if (dfd < 0) { +- fprintf(stderr, "%s: Can't open %s: %s\n", +- params.cmdname, params.datafile, strerror(errno)); +- exit(EXIT_FAILURE); +- } ++ if (!params.type == IH_TYPE_MULTI || ++ !params.type == IH_TYPE_SCRIPT) { ++ dfd = open(params.datafile, O_RDONLY | O_BINARY); ++ if (dfd < 0) { ++ fprintf(stderr, "%s: Can't open %s: %s\n", ++ params.cmdname, params.datafile, ++ strerror(errno)); ++ exit(EXIT_FAILURE); ++ } + +- if (fstat(dfd, &sbuf) < 0) { +- fprintf(stderr, "%s: Can't stat %s: %s\n", +- params.cmdname, params.datafile, strerror(errno)); +- exit(EXIT_FAILURE); +- } ++ if (fstat(dfd, &sbuf) < 0) { ++ fprintf(stderr, "%s: Can't stat %s: %s\n", ++ params.cmdname, params.datafile, ++ strerror(errno)); ++ exit(EXIT_FAILURE); ++ } + +- params.file_size = sbuf.st_size + tparams->header_size; +- close(dfd); ++ params.file_size = sbuf.st_size + tparams->header_size; ++ close(dfd); ++ } + + /* + * In case there an header with a variable +-- +2.1.4 + diff --git a/patches/upstream/mkimage-fix-multi-script/0002-mkimage-Fix-warning-from-fix-for-generating-multi-an.patch b/patches/upstream/mkimage-fix-multi-script/0002-mkimage-Fix-warning-from-fix-for-generating-multi-an.patch new file mode 100644 index 000000000..8de660c81 --- /dev/null +++ b/patches/upstream/mkimage-fix-multi-script/0002-mkimage-Fix-warning-from-fix-for-generating-multi-an.patch @@ -0,0 +1,48 @@ +Bug-Debian: https://bugs.debian.org/805434 +From 34633141259e6af20959e087b1c244c3285a306b Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Mon, 7 Dec 2015 18:01:54 +0100 +Subject: [PATCH 2/2] mkimage: Fix warning from fix for generating multi and + script images again + +Seems 6ae6e160 broke creating images in certain cases, there +are two problems with that patch. + +First is that the expression "!x == 4 || !x == 6" is ambiguous. The +intention here was "!(x == 4) || !(x == 6)" based on reading further in +the file, where this was borrowed from. This however is interpreted by +gcc as "(!x) == 4 || (!x) == 6" and always false. gcc-5.x will warn +about this case. + +The second problem is that we do not want to test for the case of "(NOT x +is 4) OR (NOT x is 6)" but instead "(x is not equal to 4) AND (x is not +equal to 6)". This is because in those two cases we already execute the +code question in another part of the file. Rewrite the expression and +add parenthesis for clarity. + +Signed-off-by: Marek Vasut +Cc: Tom Rini +Cc: Philippe De Swert +Cc: Simon Glass +[trini: Re-word Marek's explanation] +--- + tools/mkimage.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/tools/mkimage.c b/tools/mkimage.c +index ae01cb1..8f8b6df 100644 +--- a/tools/mkimage.c ++++ b/tools/mkimage.c +@@ -311,8 +311,7 @@ NXTARG: ; + exit (retval); + } + +- if (!params.type == IH_TYPE_MULTI || +- !params.type == IH_TYPE_SCRIPT) { ++ if ((params.type != IH_TYPE_MULTI) && (params.type != IH_TYPE_SCRIPT)) { + dfd = open(params.datafile, O_RDONLY | O_BINARY); + if (dfd < 0) { + fprintf(stderr, "%s: Can't open %s: %s\n", +-- +2.1.4 + diff --git a/patches/upstream/novena/0001-arm-imx6-novena-gw_ventana-Fix-use-of-pfuze100-bit-d.patch b/patches/upstream/novena/0001-arm-imx6-novena-gw_ventana-Fix-use-of-pfuze100-bit-d.patch new file mode 100644 index 000000000..2630e911f --- /dev/null +++ b/patches/upstream/novena/0001-arm-imx6-novena-gw_ventana-Fix-use-of-pfuze100-bit-d.patch @@ -0,0 +1,61 @@ +From 18e02ffe5e626fe409ca9427e368c879f6ee450c Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Thu, 26 Nov 2015 14:08:50 +0100 +Subject: [PATCH 1/2] arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit + definitions + +The following patch changed the PFUZE100 swbst register bit definitions +and broke PMIC configuration on multiple boards, at least on the novena +and gw_ventana. This patch fixes it. + +commit 8fa46350a4c7dca7710362f6c871098557b934ad +Author: Peng Fan +Date: Fri Aug 7 16:43:45 2015 +0800 + + power: regulator: add pfuze100 support + +Signed-off-by: Marek Vasut +Cc: Fabio Estevam +Cc: Peng Fan +Cc: Przemyslaw Marczak +Cc: Stefano Babic +Cc: Tim Harvey +Cc: Vagrant Cascadian +Reviewed-by: Przemyslaw Marczak +Tested-by: Vagrant Cascadian +Reviewed-by: Peng Fan +Acked-by: Tim Harvey +--- + board/gateworks/gw_ventana/common.c | 2 +- + board/kosagi/novena/novena.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c +index d406c83..a20190e 100644 +--- a/board/gateworks/gw_ventana/common.c ++++ b/board/gateworks/gw_ventana/common.c +@@ -806,7 +806,7 @@ void setup_pmic(void) + /* Set SWBST to 5.0V and enable */ + pmic_reg_read(p, PFUZE100_SWBSTCON1, ®); + reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK); +- reg |= (SWBST_5_00V | SWBST_MODE_AUTO); ++ reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT)); + pmic_reg_write(p, PFUZE100_SWBSTCON1, reg); + } + } +diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c +index babba85..b3159d3 100644 +--- a/board/kosagi/novena/novena.c ++++ b/board/kosagi/novena/novena.c +@@ -216,7 +216,7 @@ int power_init_board(void) + /* Set SWBST to 5.0V and enable (for USB) */ + pmic_reg_read(p, PFUZE100_SWBSTCON1, ®); + reg &= ~(SWBST_MODE_MASK | SWBST_VOL_MASK); +- reg |= (SWBST_5_00V | SWBST_MODE_AUTO); ++ reg |= (SWBST_5_00V | (SWBST_MODE_AUTO << SWBST_MODE_SHIFT)); + pmic_reg_write(p, PFUZE100_SWBSTCON1, reg); + + return 0; +-- +2.1.4 + diff --git a/patches/upstream/novena/0002-arm-imx6-novena-Enable-extfs-support-in-SPL.patch b/patches/upstream/novena/0002-arm-imx6-novena-Enable-extfs-support-in-SPL.patch new file mode 100644 index 000000000..4f184e71a --- /dev/null +++ b/patches/upstream/novena/0002-arm-imx6-novena-Enable-extfs-support-in-SPL.patch @@ -0,0 +1,29 @@ +From a80a999c9b5c128cad2f67b4b32036bd4d667904 Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Thu, 26 Nov 2015 00:18:45 +0100 +Subject: [PATCH 2/2] arm: imx6: novena: Enable extfs support in SPL + +Simple patch to enable support for extfs filesystem in SPL, +this is useful to those who want to avoid vfat like plague. + +Signed-off-by: Marek Vasut +Cc: Stefano Babic +--- + include/configs/novena.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/configs/novena.h b/include/configs/novena.h +index d88389a..4b4f2d7 100644 +--- a/include/configs/novena.h ++++ b/include/configs/novena.h +@@ -82,6 +82,7 @@ + + /* SPL */ + #define CONFIG_SPL_FAT_SUPPORT ++#define CONFIG_SPL_EXT_SUPPORT + #define CONFIG_SPL_MMC_SUPPORT + #include "imx6_spl.h" /* common IMX6 SPL configuration */ + +-- +2.1.4 + diff --git a/rules b/rules new file mode 100755 index 000000000..9772968ae --- /dev/null +++ b/rules @@ -0,0 +1,99 @@ +#!/usr/bin/make -f + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEBIAN_REVISION ?= $(shell dpkg-parsechangelog --show-field Version | sed -e 's,.*+dfsg,+dfsg,') +export SOURCE_DATE_EPOCH = $(shell date -d "$$(dpkg-parsechangelog --count 1 --show-field Date)" +%s) + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +export CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)- +cross_build_tools ?= y +endif + +# support parallel build using DEB_BUILD_OPTIONS=parallel=N +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_UBOOT_FLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif + +# the upstream build passes LDFLAGS directly to ld instead of calling gcc for +# linking; so instead of passing -Wl,foo in LDFLAGS as in automake builds, one +# should set LDFLAGS to foo directly +comma := , +LDFLAGS := $(patsubst -Wl$(comma)%,%,$(LDFLAGS)) + +%: + dh $@ --parallel + +override_dh_auto_build: TOOLSDIR := debian/build/tools +override_dh_auto_build: + set -e; sed -n 's/^$(DEB_HOST_ARCH)[[:space:]]\+//p' debian/targets \ + | while read subarch platform targets; do \ + builddir=debian/build/$$platform; \ + targets="$$targets uboot.elf" ;\ + mkdir -p $$builddir; \ + $(MAKE) O=$$builddir $${platform}_defconfig; \ + $(MAKE) $(DEB_UBOOT_FLAGS) O=$$builddir all; \ + install -m 644 $$builddir/u-boot $$builddir/uboot.elf; \ + $(CROSS_COMPILE)strip --remove-section=.comment \ + $$builddir/uboot.elf; \ + for target in $$targets; do \ + chmod -x $$builddir/$$target; \ + echo $$builddir/$$target /usr/lib/u-boot/$$platform/ \ + >> debian/build/targets.$$subarch; \ + echo $$platform >> debian/build/platforms.$$subarch; \ + done ; \ + case $${subarch} in \ + sunxi) builddir=$${builddir}_FEL ;\ + targets="u-boot.bin spl/u-boot-spl.bin" ;\ + mkdir -p $$builddir ;\ + $(MAKE) O=$$builddir $${platform}_defconfig; \ + sed -i -e 's/^# \(CONFIG_SPL_FEL\) is not set/\1=y/g' $$builddir/.config ;\ + platform="$${platform}_FEL" ;\ + $(MAKE) $(DEB_UBOOT_FLAGS) O=$$builddir olddefconfig ; \ + $(MAKE) $(DEB_UBOOT_FLAGS) O=$$builddir $$targets ; \ + for target in $$targets ; do \ + chmod -x $$builddir/$$target; \ + echo $$builddir/$$target /usr/lib/u-boot/$$platform/ \ + >> debian/build/targets.$$subarch; \ + done ;; \ + esac; \ + done + + # Avoid requirement for .config + mkdir -p $(TOOLSDIR)/include/config + touch $(TOOLSDIR)/include/config/auto.conf + # Load dummy config + $(MAKE) O=$(TOOLSDIR) CROSS_COMPILE=$(CROSS_COMPILE) sandbox_defconfig + # board-independent tools + $(MAKE) O=$(TOOLSDIR) $(DEB_UBOOT_FLAGS) \ + CROSS_COMPILE=$(CROSS_COMPILE) \ + CROSS_BUILD_TOOLS=$(cross_build_tools) \ + NO_SDL=1 \ + tools-only + $(MAKE) O=$(TOOLSDIR) $(DEB_UBOOT_FLAGS) \ + CROSS_COMPILE=$(CROSS_COMPILE) \ + NO_SDL=1 \ + env + $(CROSS_COMPILE)strip --remove-section=.comment $(TOOLSDIR)/tools/env/fw_printenv + $(CROSS_COMPILE)strip --remove-section=.comment $(TOOLSDIR)/tools/mkimage + $(CROSS_COMPILE)strip --remove-section=.comment $(TOOLSDIR)/tools/kwboot + $(CROSS_COMPILE)strip --remove-section=.comment $(TOOLSDIR)/tools/mksunxiboot + +override_dh_auto_test: + # skip tests. + +override_dh_clean: + rm -rf debian/build/ + dh_clean + +override_dh_gencontrol: + debian/bin/update-substvars + dh_gencontrol + +get-orig-source: + # Use uscan from the devscripts package to download new + # tarball, remove files incompatible with the DFSG (see + # Files-Excluded in debian/copyright), and repack with xz + # compression. + uscan --download --repack --compression=xz diff --git a/source/format b/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/include-binaries b/source/include-binaries new file mode 100644 index 000000000..7f449d558 --- /dev/null +++ b/source/include-binaries @@ -0,0 +1 @@ +tools/logos/solidrun.bmp diff --git a/targets b/targets new file mode 100644 index 000000000..411823046 --- /dev/null +++ b/targets @@ -0,0 +1,24 @@ +# ARCH subarch platform target +# -------------------------------------------- +armel - dockstar u-boot.kwb + +# Ian Campbell +armel - dreamplug u-boot.kwb + +# drEagle +armel - guruplug u-boot.kwb + +# Vagrant Cascadian , rpi B 256M +armel - rpi u-boot.bin +armhf - rpi u-boot.bin + +# drEagle +armel - sheevaplug u-boot.kwb + +avr32 - hammerhead u-boot.img + +mips - qemu_mips u-boot.bin + +sh4 - r2dplus u-boot.bin + +sh4 - sh7785lcr_32bit u-boot.bin diff --git a/u-boot-exynos.install b/u-boot-exynos.install new file mode 100755 index 000000000..ebff56afc --- /dev/null +++ b/u-boot-exynos.install @@ -0,0 +1,2 @@ +#!/bin/sh +debian/bin/u-boot-install-targets exynos "doc/README.odroid" diff --git a/u-boot-exynos.lintian-overrides b/u-boot-exynos.lintian-overrides new file mode 100644 index 000000000..8beaba8f7 --- /dev/null +++ b/u-boot-exynos.lintian-overrides @@ -0,0 +1,13 @@ + +# There are no file conflicts across architectures for u-boot, as each +# target is only installed on a single architecture. In theory, some +# targets could be built on multiple architectures, but could instead install +# the package for the architecture needed. +u-boot-exynos [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/arndale/uboot.elf +u-boot-exynos [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/odroid/uboot.elf + +# These bootloaders need to be statically linked. +u-boot-exynos [armhf]: statically-linked-binary usr/lib/u-boot/arndale/uboot.elf +u-boot-exynos [armhf]: statically-linked-binary usr/lib/u-boot/odroid/uboot.elf + +u-boot-exynos: description-synopsis-starts-with-article diff --git a/u-boot-exynos.substvars b/u-boot-exynos.substvars new file mode 100644 index 000000000..abd3ebebc --- /dev/null +++ b/u-boot-exynos.substvars @@ -0,0 +1 @@ +misc:Depends= diff --git a/u-boot-imx.README.Debian b/u-boot-imx.README.Debian new file mode 100644 index 000000000..2d9587176 --- /dev/null +++ b/u-boot-imx.README.Debian @@ -0,0 +1,21 @@ +== Installation == + +At this point, you must install U-Boot to flash yourself. + +MX53LOCO: + + dd bs=1024 if=u-boot.imx of=/dev/sdX seek=1 + +wandboard (quad, dual-lite and solo): + + dd if=/usr/lib/u-boot/wandboard/SPL of=/dev/mmcblk0 bs=1k seek=1 + dd if=/usr/lib/u-boot/wandboard/u-boot.img of=/dev/mmcblk0 bs=1k seek=69 + +mx6cuboxi (Cubox-i and Hummingboard): + + dd if=/usr/lib/u-boot/mx6cuboxi/SPL of=/dev/mmcblk0 bs=1k seek=1 + dd if=/usr/lib/u-boot/mx6cuboxi/u-boot.img of=/dev/mmcblk0 bs=1k seek=69 + +== U-Boot environment tools == + +fw_printenv / fw_setenv read /etc/fw_env.config for configuration. diff --git a/u-boot-imx.install b/u-boot-imx.install new file mode 100755 index 000000000..cc4eb34ec --- /dev/null +++ b/u-boot-imx.install @@ -0,0 +1,2 @@ +#!/bin/sh +debian/bin/u-boot-install-targets imx diff --git a/u-boot-imx.lintian-overrides b/u-boot-imx.lintian-overrides new file mode 100644 index 000000000..f5b3dd2f7 --- /dev/null +++ b/u-boot-imx.lintian-overrides @@ -0,0 +1,23 @@ + +# There are no file conflicts across architectures for u-boot, as each +# target is only installed on a single architecture. In theory, some +# targets could be built on multiple architectures, but could instead install +# the package for the architecture needed. +u-boot-imx [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/mx53loco/uboot.elf +u-boot-imx [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/mx6cuboxi/uboot.elf +u-boot-imx [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/nitrogen6q/uboot.elf +u-boot-imx [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/novena/uboot.elf +u-boot-imx [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/udoo/uboot.elf +u-boot-imx [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/usbarmory/uboot.elf +u-boot-imx [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/wandboard/uboot.elf + +# These bootloaders need to be statically linked. +u-boot-imx [armhf]: statically-linked-binary usr/lib/u-boot/mx53loco/uboot.elf +u-boot-imx [armhf]: statically-linked-binary usr/lib/u-boot/mx6cuboxi/uboot.elf +u-boot-imx [armhf]: statically-linked-binary usr/lib/u-boot/nitrogen6q/uboot.elf +u-boot-imx [armhf]: statically-linked-binary usr/lib/u-boot/novena/uboot.elf +u-boot-imx [armhf]: statically-linked-binary usr/lib/u-boot/udoo/uboot.elf +u-boot-imx [armhf]: statically-linked-binary usr/lib/u-boot/usbarmory/uboot.elf +u-boot-imx [armhf]: statically-linked-binary usr/lib/u-boot/wandboard/uboot.elf + +u-boot-imx: description-synopsis-starts-with-article diff --git a/u-boot-imx.substvars b/u-boot-imx.substvars new file mode 100644 index 000000000..abd3ebebc --- /dev/null +++ b/u-boot-imx.substvars @@ -0,0 +1 @@ +misc:Depends= diff --git a/u-boot-omap.README.Debian b/u-boot-omap.README.Debian new file mode 100644 index 000000000..0127664c0 --- /dev/null +++ b/u-boot-omap.README.Debian @@ -0,0 +1,13 @@ +== Installation == + +At this point, you must install U-Boot to flash yourself. + +The BeagleBone Black (am335x_boneblack) can be flashed to microSD or eMMC directly: + + dd if=/usr/lib/u-boot/am335x_boneblack/MLO of=/dev/mmcblkX count=1 seek=1 conv=notrunc bs=128k + dd if=/usr/lib/u-boot/am335x_boneblack/u-boot.img of=/dev/mmcblkX count=2 seek=1 conv=notrunc bs=384k + +== U-Boot environment tools == + +fw_printenv / fw_setenv read /etc/fw_env.config for configuration. + diff --git a/u-boot-omap.install b/u-boot-omap.install new file mode 100755 index 000000000..a28a041c5 --- /dev/null +++ b/u-boot-omap.install @@ -0,0 +1,2 @@ +#!/bin/sh +debian/bin/u-boot-install-targets omap "doc/README.nokia_rx51" diff --git a/u-boot-omap.lintian-overrides b/u-boot-omap.lintian-overrides new file mode 100644 index 000000000..0c5f41617 --- /dev/null +++ b/u-boot-omap.lintian-overrides @@ -0,0 +1,19 @@ + +# There are no file conflicts across architectures for u-boot, as each +# target is only installed on a single architecture. In theory, some +# targets could be built on multiple architectures, but could instead install +# the package for the architecture needed. +u-boot-omap [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/am335x_boneblack/uboot.elf +u-boot-omap [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/igep0020/uboot.elf +u-boot-omap [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/nokia_rx51/uboot.elf +u-boot-omap [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/omap3_beagle/uboot.elf +u-boot-omap [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/omap4_panda/uboot.elf + +# These bootloaders need to be statically linked. +u-boot-omap [armhf]: statically-linked-binary usr/lib/u-boot/am335x_boneblack/uboot.elf +u-boot-omap [armhf]: statically-linked-binary usr/lib/u-boot/igep0020/uboot.elf +u-boot-omap [armhf]: statically-linked-binary usr/lib/u-boot/nokia_rx51/uboot.elf +u-boot-omap [armhf]: statically-linked-binary usr/lib/u-boot/omap3_beagle/uboot.elf +u-boot-omap [armhf]: statically-linked-binary usr/lib/u-boot/omap4_panda/uboot.elf + +u-boot-omap: description-synopsis-starts-with-article diff --git a/u-boot-omap.substvars b/u-boot-omap.substvars new file mode 100644 index 000000000..abd3ebebc --- /dev/null +++ b/u-boot-omap.substvars @@ -0,0 +1 @@ +misc:Depends= diff --git a/u-boot-rockchip.docs b/u-boot-rockchip.docs new file mode 100644 index 000000000..d86f757aa --- /dev/null +++ b/u-boot-rockchip.docs @@ -0,0 +1 @@ +doc/README.rockchip diff --git a/u-boot-rockchip.install b/u-boot-rockchip.install new file mode 100755 index 000000000..73ddfc2f3 --- /dev/null +++ b/u-boot-rockchip.install @@ -0,0 +1,2 @@ +#!/bin/sh +debian/bin/u-boot-install-targets rockchip "doc/README.rockchip" diff --git a/u-boot-rockchip.lintian-overrides b/u-boot-rockchip.lintian-overrides new file mode 100644 index 000000000..d0433aeb5 --- /dev/null +++ b/u-boot-rockchip.lintian-overrides @@ -0,0 +1,11 @@ + +# There are no file conflicts across architectures for u-boot, as each +# target is only installed on a single architecture. In theory, some +# targets could be built on multiple architectures, but could instead install +# the package for the architecture needed. +u-boot-rockchip [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/firefly-rk3288/uboot.elf + +# These bootloaders need to be statically linked. +u-boot-rockchip [armhf]: statically-linked-binary usr/lib/u-boot/firefly-rk3288/uboot.elf + +u-boot-rockchip: description-synopsis-starts-with-article diff --git a/u-boot-sunxi.README.Debian b/u-boot-sunxi.README.Debian new file mode 100644 index 000000000..42c8b8b7b --- /dev/null +++ b/u-boot-sunxi.README.Debian @@ -0,0 +1,11 @@ +== Installation == + +At this point, you must install U-Boot to flash yourself. + +Many sunxi boards (Bananapi, Cubieboard) can be written to SD directly: + + dd if=/usr/lib/u-boot/BOARD/u-boot-sunxi-with-spl.bin of=/dev/mmcblkX bs=1024 seek=8 + +== U-Boot environment tools == + +fw_printenv / fw_setenv read /etc/fw_env.config for configuration. diff --git a/u-boot-sunxi.install b/u-boot-sunxi.install new file mode 100755 index 000000000..014df8741 --- /dev/null +++ b/u-boot-sunxi.install @@ -0,0 +1,2 @@ +#!/bin/sh +debian/bin/u-boot-install-targets sunxi diff --git a/u-boot-sunxi.lintian-overrides b/u-boot-sunxi.lintian-overrides new file mode 100644 index 000000000..4d1e6c1c2 --- /dev/null +++ b/u-boot-sunxi.lintian-overrides @@ -0,0 +1,39 @@ + +# There are no file conflicts across architectures for u-boot, as each +# target is only installed on a single architecture. In theory, some +# targets could be built on multiple architectures, but could instead install +# the package for the architecture needed. +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/A10-OLinuXino-Lime/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/A10s-OLinuXino-M/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/A20-Olimex-SOM-EVB/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/A20-OLinuXino-Lime/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/A20-OLinuXino-Lime2/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/A20-OLinuXino_MICRO/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Bananapi/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Bananapro/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Cubieboard/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Cubieboard2/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Cubietruck/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Lamobo_R1/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Linksprite_pcDuino/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Linksprite_pcDuino3/uboot.elf +u-boot-sunxi [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/Mini-X/uboot.elf + +# These bootloaders need to be statically linked. +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/A10-OLinuXino-Lime/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/A10s-OLinuXino-M/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/A20-Olimex-SOM-EVB/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/A20-OLinuXino-Lime/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/A20-OLinuXino-Lime2/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/A20-OLinuXino_MICRO/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Bananapi/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Bananapro/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Cubieboard/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Cubieboard2/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Cubietruck/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Lamobo_R1/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Linksprite_pcDuino/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Linksprite_pcDuino3/uboot.elf +u-boot-sunxi [armhf]: statically-linked-binary usr/lib/u-boot/Mini-X/uboot.elf + +u-boot-sunxi: description-synopsis-starts-with-article diff --git a/u-boot-sunxi.substvars b/u-boot-sunxi.substvars new file mode 100644 index 000000000..abd3ebebc --- /dev/null +++ b/u-boot-sunxi.substvars @@ -0,0 +1 @@ +misc:Depends= diff --git a/u-boot-tegra.README.Debian b/u-boot-tegra.README.Debian new file mode 100644 index 000000000..83cc2228f --- /dev/null +++ b/u-boot-tegra.README.Debian @@ -0,0 +1,16 @@ +== Installation == + +At this point, you must install U-Boot to flash yourself from a host +system using the Linux_For_Tegra tools. + +sudo ./flash.sh -L /usr/lib/u-boot/jetson-tk1/u-boot-dtb-tegra.bin jetson-tk1 mmcblk1p1 + +It seems that L4T R19.3.0 is currently required (image does not boot +if flashed with L4T R21.X). + +TODO: Figure out how to do this with tools within Debian, +e.g. tegracrm and cbootimage. + +== U-Boot environment tools == + +fw_printenv / fw_setenv read /etc/fw_env.config for configuration. diff --git a/u-boot-tegra.install b/u-boot-tegra.install new file mode 100755 index 000000000..15b8ab96d --- /dev/null +++ b/u-boot-tegra.install @@ -0,0 +1,2 @@ +#!/bin/sh +debian/bin/u-boot-install-targets tegra diff --git a/u-boot-tegra.lintian-overrides b/u-boot-tegra.lintian-overrides new file mode 100644 index 000000000..3884f104a --- /dev/null +++ b/u-boot-tegra.lintian-overrides @@ -0,0 +1,11 @@ + +# There are no file conflicts across architectures for u-boot, as each +# target is only installed on a single architecture. In theory, some +# targets could be built on multiple architectures, but could instead install +# the package for the architecture needed. +u-boot-tegra [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/jetson-tk1/uboot.elf + +# These bootloaders need to be statically linked. +u-boot-tegra [armhf]: statically-linked-binary usr/lib/u-boot/jetson-tk1/uboot.elf + +u-boot-tegra: description-synopsis-starts-with-article diff --git a/u-boot-tools.install b/u-boot-tools.install new file mode 100755 index 000000000..775539e6a --- /dev/null +++ b/u-boot-tools.install @@ -0,0 +1,17 @@ +#!/bin/sh + +builddir=debian/build/tools +for tool in mkimage mkenvimage mksunxiboot kwboot env/fw_printenv ; do + echo ${builddir}/tools/${tool} /usr/bin/ +done + +echo doc/mkimage.1 /usr/share/man/man1/ + +# manpages +echo debian/manpages/fw_printenv.8 /usr/share/man/man8/ +echo debian/manpages/fw_setenv.8 /usr/share/man/man8/ + +# example env configs +for env_config in debian/env-configs/*.config ; do + echo ${env_config} /usr/share/doc/u-boot-tools/examples/ +done diff --git a/u-boot-tools.links b/u-boot-tools.links new file mode 100644 index 000000000..92f5a6cbc --- /dev/null +++ b/u-boot-tools.links @@ -0,0 +1 @@ +/usr/bin/fw_printenv /usr/bin/fw_setenv diff --git a/u-boot.README.Debian b/u-boot.README.Debian new file mode 100644 index 000000000..943b53df8 --- /dev/null +++ b/u-boot.README.Debian @@ -0,0 +1,25 @@ +== Installation == + +At this point, you must install U-Boot to flash yourself. + +Some examples using mtd-utils: + +SheevaPlug: + + sudo flash_erase /dev/mtd0 0 0 + sudo nandwrite -p /dev/mtd0 /usr/lib/u-boot/sheevaplug/u-boot.kwb + +GuruPlug: + + sudo flash_erase /dev/mtd0 0 0 + sudo nandwrite -p /dev/mtd0 /usr/lib/u-boot/guruplug/u-boot.kwb + +DreamPlug: + + At this point you cannot write to the SPI/NOR flash from Linux, + so you will need to replace U-Boot from within U-Boot. + +== U-Boot environment tools == + +fw_printenv / fw_setenv read /etc/fw_env.config for configuration. + diff --git a/u-boot.install b/u-boot.install new file mode 100755 index 000000000..aff6d5de5 --- /dev/null +++ b/u-boot.install @@ -0,0 +1,2 @@ +#!/bin/sh +debian/bin/u-boot-install-targets - diff --git a/u-boot.lintian-overrides b/u-boot.lintian-overrides new file mode 100644 index 000000000..9057bb92b --- /dev/null +++ b/u-boot.lintian-overrides @@ -0,0 +1,27 @@ + +# There are no file conflicts across architectures for u-boot, as each +# target is only installed on a single architecture. In theory, some +# targets could be built on multiple architectures, but could instead install +# the package for the architecture needed. +u-boot [armel]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/dockstar/uboot.elf +u-boot [armel]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/dreamplug/uboot.elf +u-boot [armel]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/guruplug/uboot.elf +u-boot [armel]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/rpi/uboot.elf +u-boot [armel]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/sheevaplug/uboot.elf +u-boot [avr32]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/hammerhead/uboot.elf +u-boot [mips]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/qemu_mips/uboot.elf +u-boot [sh4]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/r2dplus/uboot.elf +u-boot [sh4]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/sh7785lcr_32bit/uboot.elf + +# These bootloaders need to be statically linked. +u-boot [armel]: statically-linked-binary usr/lib/u-boot/dockstar/uboot.elf +u-boot [armel]: statically-linked-binary usr/lib/u-boot/dreamplug/uboot.elf +u-boot [armel]: statically-linked-binary usr/lib/u-boot/guruplug/uboot.elf +u-boot [armel]: statically-linked-binary usr/lib/u-boot/rpi/uboot.elf +u-boot [armel]: statically-linked-binary usr/lib/u-boot/sheevaplug/uboot.elf +u-boot [avr32]: statically-linked-binary usr/lib/u-boot/hammerhead/uboot.elf +u-boot [mips]: statically-linked-binary usr/lib/u-boot/qemu_mips/uboot.elf +u-boot [sh4]: statically-linked-binary usr/lib/u-boot/r2dplus/uboot.elf +u-boot [sh4]: statically-linked-binary usr/lib/u-boot/sh7785lcr_32bit/uboot.elf + +u-boot: description-synopsis-starts-with-article diff --git a/watch b/watch new file mode 100644 index 000000000..c082c0e12 --- /dev/null +++ b/watch @@ -0,0 +1,4 @@ +version=3 + +opts=pasv,repacksuffix=+dfsg1,uversionmangle=s/-rc/~rc/g,dversionmangle=s/\+dfsg.*//g \ +ftp://ftp.denx.de/pub/u-boot/u-boot-([\d\.].*)\.tar\.bz2 -- 2.30.2