Marek Vasut [Mon, 7 Dec 2015 17:01:54 +0000 (18:01 +0100)]
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 <marex@denx.de> Cc: Tom Rini <trini@konsulko.com> Cc: Philippe De Swert <philippedeswert@gmail.com> Cc: Simon Glass <sjg@chromium.org>
[trini: Re-word Marek's explanation]
Gbp-Pq: Topic upstream/mkimage-fix-multi-script
Gbp-Pq: Name 0002-mkimage-Fix-warning-from-fix-for-generating-multi-an.patch
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 <philippedeswert@gmail.com>
Gbp-Pq: Topic upstream/mkimage-fix-multi-script
Gbp-Pq: Name 0001-mkimage-Fix-generating-multi-and-script-images.patch
[ Vagrant Cascadian ]
Modifed to remove usb_power_supply entry.
From aa56cb374de8ae83f3280fdd6c280724228b86d7 Mon Sep 17 00:00:00 2001
From: Jelle de Jong <jelledejong@powercraft.nl>
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 <jelledejong@powercraft.nl> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Gbp-Pq: Topic upstream/lamobo-r1
Gbp-Pq: Name 0001-sunxi-Add-support-for-the-Lamobo-R1-board.patch
Marek Vasut [Thu, 26 Nov 2015 13:08:50 +0000 (14:08 +0100)]
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.
Sjoerd Simons [Fri, 28 Aug 2015 13:01:56 +0000 (15:01 +0200)]
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:
Sjoerd Simons [Fri, 28 Aug 2015 13:01:54 +0000 (15:01 +0200)]
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 <sjoerd.simons@collabora.co.uk> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Gbp-Pq: Topic upstream/am33x_distro_bootcmd
Gbp-Pq: Name 0001-config_distro_bootcmd.h-Use-a-private-variable-for-b.patch
Tom Rini [Tue, 27 Oct 2015 23:04:40 +0000 (19:04 -0400)]
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 <balbi@ti.com> Signed-off-by: Tom Rini <trini@konsulko.com>
Gbp-Pq: Topic upstream
Gbp-Pq: Name image.c-Fix-non-Android-booting-with-ramdisk-and-or-.patch
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...
Gbp-Pq: Name ensure-config-sandbox-for-make-env.patch
[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 <skuribay@ruby.dti.ne.jp>
Gbp-Pq: Name mipsel-native-endianness.diff
* 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).
projects / u-boot.git / log