d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildroot & docker (#25)

Browse Source 
* Update docker & buildroot

* Fix

* fix versions
This commit is contained in:
Pascal Vizeli
2018-05-28 14:58:22 +02:00
committed by GitHub
parent 7db3226a8e
commit b13086072c
1887 changed files with 22062 additions and 18015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
buildroot/boot/uboot/Config.in
View File

@@ -6,19 +6,20 @@ config BR2_TARGET_UBOOT
if BR2_TARGET_UBOOT
choice
prompt "Build system"
default BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG if BR2_TARGET_UBOOT_LATEST_VERSION
default BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
config BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
bool "Legacy"
help
Select this option if you use an old U-Boot (older than 2015.04),
so that we use the old build system.
config BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
bool "Kconfig"
help
Select this option if you use a recent U-Boot version (2015.04 or
newer), so that we use the Kconfig build system.
Select this option if you use a recent U-Boot version (2015.04
or newer), so that we use the Kconfig build system.
config BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
bool "Legacy"
help
Select this option if you use an old U-Boot (older than
2015.04), so that we use the old build system.
endchoice
@@ -27,9 +28,9 @@ config BR2_TARGET_UBOOT_BOARDNAME
string "U-Boot board name"
help
One of U-Boot supported boards to be built.
This will be suffixed with _config to meet U-Boot standard naming.
See boards.cfg in U-Boot source code for the list of available
configurations.
This will be suffixed with _config to meet U-Boot standard
naming. See boards.cfg in U-Boot source code for the list of
available configurations.
endif
choice
@@ -38,7 +39,7 @@ choice
Select the specific U-Boot version you want to use
config BR2_TARGET_UBOOT_LATEST_VERSION
bool "2018.01"
bool "2018.03"
config BR2_TARGET_UBOOT_CUSTOM_VERSION
bool "Custom version"
@@ -79,14 +80,14 @@ config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy
help
Revision to use in the typical format used by Git/Mercurial/Subversion
E.G. a sha id, a tag, branch, ..
Revision to use in the typical format used by
Git/Mercurial/Subversion E.G. a sha id, a tag, branch, ..
endif
config BR2_TARGET_UBOOT_VERSION
string
default "2018.01" if BR2_TARGET_UBOOT_LATEST_VERSION
default "2018.03" if BR2_TARGET_UBOOT_LATEST_VERSION
default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
if BR2_TARGET_UBOOT_CUSTOM_VERSION
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -199,23 +200,19 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
bool "u-boot-nand.bin"
config BR2_TARGET_UBOOT_FORMAT_KWB
depends on BR2_arm
bool "u-boot.kwb (Marvell)"
config BR2_TARGET_UBOOT_FORMAT_LDR
depends on BR2_bfin
bool "u-boot.ldr"
depends on BR2_arm
config BR2_TARGET_UBOOT_FORMAT_ELF
bool "u-boot.elf"
config BR2_TARGET_UBOOT_FORMAT_SB
depends on BR2_arm
bool "u-boot.sb (Freescale i.MX28)"
depends on BR2_arm
config BR2_TARGET_UBOOT_FORMAT_SD
depends on BR2_arm
bool "u-boot.sd (Freescale i.MX28)"
depends on BR2_arm
help
This is Freescale i.MX28 SB format, with a header for booting
from an SD card.
@@ -226,28 +223,28 @@ config BR2_TARGET_UBOOT_FORMAT_SD
See doc/README.mxs (or doc/README.mx28_common before 2013.07)
config BR2_TARGET_UBOOT_FORMAT_NAND
depends on BR2_arm
bool "u-boot.nand (Freescale i.MX28)"
depends on BR2_arm
help
This is Freescale i.MX28 BootStream format (.sb), with a header
for booting from a NAND flash.
This is Freescale i.MX28 BootStream format (.sb), with a
header for booting from a NAND flash.
U-boot includes an mxsboot tool to generate this format,
starting from 2011.12.
There are two possibilities when preparing an image writable to
NAND flash:
1) The NAND was not written at all yet or the BCB (Boot Control
Blocks) is broken. In this case, the NAND image 'u-boot.nand'
needs to written.
There are two possibilities when preparing an image writable
to NAND flash:
1) The NAND was not written at all yet or the BCB (Boot
Control Blocks) is broken. In this case, the NAND image
'u-boot.nand' needs to written.
2) The NAND flash was already written with a good BCB. This
applies after 'u-boot.nand' was correctly written. There is no
need to write the BCB again. In this case, the bootloader can be
upgraded by writing 'u-boot.sb'.
need to write the BCB again. In this case, the bootloader can
be upgraded by writing 'u-boot.sb'.
To satisfy both cases, the 'u-boot.nand' image obtained from
mxsboot as well as the U-Boot make target 'u-boot.sb' are copied
to the binaries directory.
mxsboot as well as the U-Boot make target 'u-boot.sb' are
copied to the binaries directory.
See doc/README.mxs (or doc/README.mx28_common before 2013.07)
@@ -295,7 +292,8 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM
help
In case the U-Boot binary for the target platform is not among
the default names, one or more custom names can be listed here.
the default names, one or more custom names can be listed
here.
Use space to separate multiple names.
Example:
u-boot_magic.bin
@@ -303,10 +301,10 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
endmenu
config BR2_TARGET_UBOOT_OMAP_IFT
bool "produce a .ift signed image (OMAP)"
depends on BR2_TARGET_UBOOT_FORMAT_BIN
depends on BR2_arm || BR2_armeb
select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
bool "produce a .ift signed image (OMAP)"
help
Use gpsign to produce an image of u-boot.bin signed with
a Configuration Header for booting on OMAP processors.

2
buildroot/boot/uboot/uboot.hash
View File

@@ -1,2 +1,2 @@
# Locally computed:
sha256 938f597394b33e82e5af8c98bd5ea1a238f61892aabef36384adbf7ca5b52dda u-boot-2018.01.tar.bz2
sha256 7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd u-boot-2018.03.tar.bz2

30
buildroot/boot/uboot/uboot.mk
View File

@@ -61,10 +61,6 @@ UBOOT_BINS += u-boot.ais
UBOOT_MAKE_TARGET += u-boot.ais
endif
ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
UBOOT_BINS += u-boot.ldr
endif
ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
UBOOT_BINS += u-boot-nand.bin
endif
@@ -188,10 +184,22 @@ define UBOOT_APPLY_LOCAL_PATCHES
endef
UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES
# This is equivalent to upstream commit
# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=e0d20dc1521e74b82dbd69be53a048847798a90a. It
# fixes a build failure when libfdt-devel is installed system-wide.
# This only works when scripts/dtc/libfdt exists (E.G. versions containing
# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=c0e032e0090d6541549b19cc47e06ccd1f302893)
define UBOOT_FIXUP_LIBFDT_INCLUDE
if [ -d $(@D)/scripts/dtc/libfdt ]; then \
$(SED) 's%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile; \
fi
endef
UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE
ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y)
define UBOOT_CONFIGURE_CMDS
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
$(UBOOT_BOARD_NAME)_config
endef
else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y)
@@ -218,16 +226,16 @@ define UBOOT_BUILD_CMDS
$(if $(UBOOT_CUSTOM_DTS_PATH),
cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/
)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
$(UBOOT_MAKE_TARGET)
$(if $(BR2_TARGET_UBOOT_FORMAT_SD),
$(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd)
$(if $(BR2_TARGET_UBOOT_FORMAT_NAND),
$(@D)/tools/mxsboot \
-w $(BR2_TARGET_UBOOT_FORMAT_NAND_PAGE_SIZE) \
-o $(BR2_TARGET_UBOOT_FORMAT_NAND_OOB_SIZE) \
-e $(BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE) \
-w $(BR2_TARGET_UBOOT_FORMAT_NAND_PAGE_SIZE) \
-o $(BR2_TARGET_UBOOT_FORMAT_NAND_OOB_SIZE) \
-e $(BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE) \
nand $(@D)/u-boot.sb $(@D)/u-boot.nand)
endef