Skip to content

Commit

Permalink
Merge tag 'v2019.01-rc3' into master
Browse files Browse the repository at this point in the history
Prepare v2019.01-rc3

CONFIG_USB_STORAGE is removed from zc702/zc706_eeprom because it is
selected automatically.

Signed-off-by: Michal Simek <[email protected]>
  • Loading branch information
Michal Simek committed Jan 9, 2019
2 parents 014ab9e + 54707a9 commit 1bbca0e
Show file tree
Hide file tree
Showing 2,052 changed files with 96,462 additions and 17,077 deletions.
16 changes: 12 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ install:
- ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname`
# prepare buildman environment
- echo -e "[toolchain]\nroot = /usr" > ~/.buildman
- echo -e "arc = /tmp/arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman
- echo -e "arc = /tmp/arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman
- echo -e "\n[toolchain-alias]\nsh = sh2\n" >> ~/.buildman
- cat ~/.buildman
- virtualenv /tmp/venv
- . /tmp/venv/bin/activate
- pip install pytest
- pip install pytest==2.8.7
- pip install python-subunit
- grub-mkimage -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd
- grub-mkimage -o ~/grub_x64.efi -O x86_64-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd
Expand Down Expand Up @@ -75,8 +75,8 @@ before_script:
echo -e "\n[toolchain-alias]\nx86 = i386" >> ~/.buildman;
fi
- if [[ "${TOOLCHAIN}" == arc ]]; then
wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2017.09-release/arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install.tar.gz &&
tar -C /tmp -xf arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install.tar.gz;
wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2018.09-release/arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install.tar.gz &&
tar -C /tmp -xf arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install.tar.gz;
fi
- if [[ "${TOOLCHAIN}" == *xtensa* ]]; then
wget https://github.com/foss-xtensa/toolchain/releases/download/2018.02/x86_64-2018.02-${TOOLCHAIN}.tar.gz &&
Expand Down Expand Up @@ -332,6 +332,14 @@ matrix:
- name: "sloccount"
script:
- sloccount .
# ensure all configs have MAINTAINERS entries
- name: "Check for configs without MAINTAINERS entry"
script:
- if [ `./tools/genboardscfg.py -f 2>&1 | wc -l` -ne 0 ]; then exit 1; fi
# Ensure host tools build
- name: "Build tools-only"
script:
- make tools-only_config tools-only -j$(nproc)

# test/py
- name: "test/py sandbox"
Expand Down
19 changes: 19 additions & 0 deletions Documentation/devicetree/bindings/misc/gdsys,iocon_fpga.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
gdsys IHS FPGA for CON devices

The gdsys IHS FPGA is the main FPGA on gdsys CON devices. This driver provides
support for enabling and starting the FPGA, as well as verifying working bus
communication.

Required properties:
- compatible: must be "gdsys,iocon_fpga"
- reset-gpios: List of GPIOs controlling the FPGA's reset
- done-gpios: List of GPIOs notifying whether the FPGA's reconfiguration is
done

Example:

FPGA0 {
compatible = "gdsys,iocon_fpga";
reset-gpios = <&PPCPCA 26 0>;
done-gpios = <&GPIO_VB0 19 0>;
};
19 changes: 19 additions & 0 deletions Documentation/devicetree/bindings/misc/gdsys,iocpu_fpga.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
gdsys IHS FPGA for CPU devices

The gdsys IHS FPGA is the main FPGA on gdsys CPU devices. This driver provides
support for enabling and starting the FPGA, as well as verifying working bus
communication.

Required properties:
- compatible: must be "gdsys,iocpu_fpga"
- reset-gpios: List of GPIOs controlling the FPGA's reset
- done-gpios: List of GPIOs notifying whether the FPGA's reconfiguration is
done

Example:

FPGA0 {
compatible = "gdsys,iocpu_fpga";
reset-gpios = <&PPCPCA 26 0>;
done-gpios = <&GPIO_VB0 19 0>;
};
16 changes: 16 additions & 0 deletions Documentation/devicetree/bindings/misc/gdsys,soc.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
gdsys soc bus driver

This driver provides a simple interface for the busses associated with gdsys
IHS FPGAs. The bus itself contains devices whose register maps are contained
within the FPGA's register space.

Required properties:
- fpga: A phandle to the controlling IHS FPGA

Example:

FPGA0BUS: fpga0bus {
compatible = "gdsys,soc";
ranges = <0x0 0xe0600000 0x00004000>;
fpga = <&FPGA0>;
};
21 changes: 21 additions & 0 deletions Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ config DISTRO_DEFAULTS
select SUPPORT_RAW_INITRD
select SYS_LONGHELP
imply CMD_MII if NET
imply USB_STORAGE
imply USE_BOOTCOMMAND
help
Select this to enable various options and commands which are suitable
Expand Down Expand Up @@ -125,6 +126,7 @@ config SYS_BOOT_GET_KBD
config SYS_MALLOC_F
bool "Enable malloc() pool before relocation"
default y if DM

help
Before relocation, memory is very limited on many platforms. Still,
we can provide a small malloc() pool if needed. Driver model in
Expand All @@ -135,6 +137,7 @@ config SYS_MALLOC_F_LEN
hex "Size of malloc() pool before relocation"
depends on SYS_MALLOC_F
default 0x1000 if AM33XX
default 0x2800 if SANDBOX
default 0x400
help
Before relocation, memory is very limited on many platforms. Still,
Expand Down Expand Up @@ -248,6 +251,16 @@ config FIT

if FIT

config FIT_EXTERNAL_OFFSET
hex "Text Base"
default 0x0
help
This specifies a data offset in fit image.
The offset is from data payload offset to the beginning of
fit image header. When specifies a offset, specific data
could be put in the hole between data payload and fit image
header, such as CSF data on i.MX platform.

config FIT_ENABLE_SHA256_SUPPORT
bool "Support SHA256 checksum of FIT image contents"
default y
Expand Down Expand Up @@ -290,6 +303,14 @@ config FIT_SIGNATURE_MAX_SIZE
device memory. Assure this size does not extend past expected storage
space.

config FIT_ENABLE_RSASSA_PSS_SUPPORT
bool "Support rsassa-pss signature scheme of FIT image contents"
depends on FIT_SIGNATURE
default n
help
Enable this to support the pss padding algorithm as described
in the rfc8017 (https://tools.ietf.org/html/rfc8017).

config FIT_VERBOSE
bool "Show verbose messages when FIT images fail"
help
Expand Down
47 changes: 47 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ Descriptions of section entries:

P: Person (obsolete)
M: Mail patches to: FullName <address@domain>
R: Designated reviewer: FullName <address@domain>
These reviewers should be CCed on patches.
L: Mailing list that is relevant to this area
W: Web-page with status/info
Q: Patchwork web based patch tracking system site
Expand Down Expand Up @@ -158,6 +160,26 @@ T: git git://git.denx.de/u-boot-pxa.git
F: arch/arm/cpu/pxa/
F: arch/arm/include/asm/arch-pxa/

ARM MEDIATEK
M: Ryder Lee <[email protected]>
M: Weijie Gao <[email protected]>
S: Maintained
F: arch/arm/mach-mediatek/
F: arch/arm/include/asm/arch-mediatek/
F: board/mediatek/
F: doc/README.mediatek
F: drivers/clk/mediatek/
F: drivers/mmc/mtk-sd.c
F: drivers/pinctrl/mediatek/
F: drivers/power/domain/mtk-power-domain.c
F: drivers/ram/mediatek/
F: drivers/spi/mtk_qspi.c
F: drivers/timer/mtk_timer.c
F: drivers/watchdog/mtk_wdt.c
F: tools/mtk_image.c
F: tools/mtk_image.h
N: mediatek

ARM OWL
M: Manivannan Sadhasivam <[email protected]>
S: Maintained
Expand Down Expand Up @@ -358,6 +380,11 @@ S: Maintained
T: git git://git.denx.de/u-boot-microblaze.git
F: arch/arm/mach-zynqmp-r5/

BINMAN
M: Simon Glass <[email protected]>
S: Maintained
F: tools/binman/

BUILDMAN
M: Simon Glass <[email protected]>
S: Maintained
Expand Down Expand Up @@ -394,6 +421,7 @@ F: test/dm/

EFI PAYLOAD
M: Alexander Graf <[email protected]>
R: Heinrich Schuchardt <[email protected]>
S: Maintained
T: git git://github.com/agraf/u-boot.git
F: doc/README.uefi
Expand Down Expand Up @@ -484,6 +512,24 @@ S: Maintained
T: git git://git.denx.de/u-boot-mips.git
F: arch/mips/

MIPS MSCC
M: Gregory CLEMENT <[email protected]>
M: Lars Povlsen <[email protected]>
M: Horatiu Vultur <[email protected]>
S: Maintained
F: arch/mips/mach-mscc/
F: arch/mips/dts/luton*
F: arch/mips/dts/mscc*
F: arch/mips/dts/ocelot*
F: board/mscc/
F: configs/mscc*
F: include/configs/vcoreiii.h

MIPS JZ4780
M: Ezequiel Garcia <[email protected]>
S: Maintained
F: arch/mips/mach-jz47xx/

MMC
M: Jaehoon Chung <[email protected]>
S: Maintained
Expand Down Expand Up @@ -691,5 +737,6 @@ L: [email protected]
Q: http://patchwork.ozlabs.org/project/uboot/list/
S: Maintained
T: git git://git.denx.de/u-boot.git
F: configs/tools-only_defconfig
F: *
F: */
Loading

0 comments on commit 1bbca0e

Please sign in to comment.