Skip to content

Commit 168b2e0

Browse files
author
Zhili Yang
authored
Merge pull request #2 from u-boot/master
sync from u-boot 20170506
2 parents 40fc4ed + a63d800 commit 168b2e0

924 files changed

Lines changed: 1698 additions & 1846 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ install:
4040
- echo -e "[toolchain]\nroot = /usr" > ~/.buildman
4141
- echo -e "aarch64 = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu" >> ~/.buildman
4242
- echo -e "arm = /tmp/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf" >> ~/.buildman
43+
- echo -e "arc = /tmp/arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman
4344
- echo -e "\n[toolchain-alias]\nsh = sh4\nopenrisc = or32" >> ~/.buildman
4445
- cat ~/.buildman
4546
- virtualenv /tmp/venv
@@ -69,6 +70,10 @@ before_script:
6970
./tools/buildman/buildman --fetch-arch x86_64;
7071
echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman;
7172
fi
73+
- if [[ "${TOOLCHAIN}" == arc ]]; then
74+
wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2016.09-release/arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install.tar.gz &&
75+
tar -C /tmp -xf arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install.tar.gz;
76+
fi
7277
- if [[ "${TOOLCHAIN}" == *xtensa* ]]; then ./tools/buildman/buildman --fetch-arch xtensa ; fi
7378
# If TOOLCHAIN is unset, we're on some flavour of ARM.
7479
- if [[ "${TOOLCHAIN}" == "" ]]; then
@@ -118,6 +123,9 @@ matrix:
118123
include:
119124
# we need to build by vendor due to 50min time limit for builds
120125
# each env setting here is a dedicated build
126+
- env:
127+
- BUILDMAN="arc"
128+
TOOLCHAIN="arc"
121129
- env:
122130
- BUILDMAN="arm11"
123131
- env:

‎MAINTAINERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,9 @@ F: configs/am335x_hs_evm_defconfig
436436
F: configs/am43xx_hs_evm_defconfig
437437
F: configs/am57xx_hs_evm_defconfig
438438
F: configs/dra7xx_hs_evm_defconfig
439+
F: configs/k2hk_hs_evm_defconfig
440+
F: configs/k2e_hs_evm_defconfig
441+
F: configs/k2g_hs_evm_defconfig
439442

440443
TQ GROUP
441444
#M: Martin Krause <martin.krause@tq-systems.de>

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
VERSION = 2017
66
PATCHLEVEL = 05
77
SUBLEVEL =
8-
EXTRAVERSION = -rc2
8+
EXTRAVERSION = -rc3
99
NAME =
1010

1111
# *DOCUMENTATION*

‎README‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -823,13 +823,9 @@ The following options need to be configured:
823823
CONFIG_CMD_AES AES 128 CBC encrypt/decrypt
824824
CONFIG_CMD_ASKENV * ask for env variable
825825
CONFIG_CMD_BDI bdinfo
826-
CONFIG_CMD_BEDBUG * Include BedBug Debugger
827-
CONFIG_CMD_BMP * BMP support
828-
CONFIG_CMD_BSP * Board specific commands
829826
CONFIG_CMD_BOOTD bootd
830827
CONFIG_CMD_BOOTI * ARM64 Linux kernel Image support
831828
CONFIG_CMD_CACHE * icache, dcache
832-
CONFIG_CMD_CLK * clock command support
833829
CONFIG_CMD_CONSOLE coninfo
834830
CONFIG_CMD_CRC32 * crc32
835831
CONFIG_CMD_DATE * support for RTC, date/time...
@@ -1549,13 +1545,6 @@ The following options need to be configured:
15491545
This will also enable the command "fatwrite" enabling the
15501546
user to write files to FAT.
15511547

1552-
- CBFS (Coreboot Filesystem) support:
1553-
CONFIG_CMD_CBFS
1554-
1555-
Define this to enable support for reading from a Coreboot
1556-
filesystem. Available commands are cbfsinit, cbfsinfo, cbfsls
1557-
and cbfsload.
1558-
15591548
- FAT(File Allocation Table) filesystem cluster size:
15601549
CONFIG_FS_FAT_MAX_CLUSTSIZE
15611550

@@ -1581,7 +1570,6 @@ The following options need to be configured:
15811570

15821571
CONFIG_SYS_DIU_ADDR
15831572
CONFIG_VIDEO
1584-
CONFIG_CMD_BMP
15851573
CONFIG_CFB_CONSOLE
15861574
CONFIG_VIDEO_SW_CURSOR
15871575
CONFIG_VGA_AS_SINGLE_DEVICE
@@ -1642,9 +1630,6 @@ The following options need to be configured:
16421630

16431631
320x240. Black & white.
16441632

1645-
Normally display is black on white background; define
1646-
CONFIG_SYS_WHITE_ON_BLACK to get it inverted.
1647-
16481633
CONFIG_LCD_ALIGNMENT
16491634

16501635
Normally the LCD is page-aligned (typically 4KB). If this is
@@ -2849,16 +2834,6 @@ The following options need to be configured:
28492834
This enables 'hdmidet' command which returns true if an
28502835
HDMI monitor is detected. This command is i.MX 6 specific.
28512836

2852-
CONFIG_CMD_BMODE
2853-
This enables the 'bmode' (bootmode) command for forcing
2854-
a boot from specific media.
2855-
2856-
This is useful for forcing the ROM's usb downloader to
2857-
activate upon a watchdog reset which is nice when iterating
2858-
on U-Boot. Using the reset button or running bmode normal
2859-
will set it back to normal. This command currently
2860-
supports i.MX53 and i.MX6.
2861-
28622837
- bootcount support:
28632838
CONFIG_BOOTCOUNT_LIMIT
28642839

0 commit comments

Comments
 (0)