mirror of
https://github.com/u-boot/u-boot.git
synced 2025-05-09 03:21:51 +00:00
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
commit
cebdfc22da
2483 changed files with 62769 additions and 32768 deletions
|
|
@ -112,8 +112,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg
|
|||
# Prior to Kconfig, it was generated by mkconfig. Now it is created here.
|
||||
define filechk_config_h
|
||||
(echo "/* Automatically generated - do not edit */"; \
|
||||
echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
|
||||
echo \#include \<config_uncmd_spl.h\>; \
|
||||
echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
|
||||
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
|
||||
echo \#include \<asm/config.h\>; \
|
||||
echo \#include \<linux/kconfig.h\>; \
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ subdir-ccflags-y :=
|
|||
# Modified for U-Boot
|
||||
-include include/config/auto.conf
|
||||
-include $(prefix)/include/autoconf.mk
|
||||
include scripts/Makefile.uncmd_spl
|
||||
|
||||
include scripts/Kbuild.include
|
||||
|
||||
|
|
|
|||
|
|
@ -425,9 +425,11 @@ cmd_efi_objcopy = $(OBJCOPY) -j .header -j .text -j .sdata -j .data -j \
|
|||
$(obj)/%.efi: $(obj)/%_efi.so
|
||||
$(call cmd,efi_objcopy)
|
||||
|
||||
KBUILD_EFILDFLAGS = -nostdlib -zexecstack -znocombreloc -znorelro
|
||||
KBUILD_EFILDFLAGS += $(call ld-option,--no-warn-rwx-segments)
|
||||
quiet_cmd_efi_ld = LD $@
|
||||
cmd_efi_ld = $(LD) -nostdlib -zexecstack -znocombreloc -T $(EFI_LDS_PATH) \
|
||||
-shared -Bsymbolic -znorelro -s $^ -o $@
|
||||
cmd_efi_ld = $(LD) $(KBUILD_EFILDFLAGS) -T $(EFI_LDS_PATH) \
|
||||
-shared -Bsymbolic -s $^ -o $@
|
||||
|
||||
EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0+
|
||||
# Makefile version of include/config_uncmd_spl.h
|
||||
# TODO: Invent a better way
|
||||
|
||||
ifdef CONFIG_SPL_BUILD
|
||||
|
||||
ifndef CONFIG_SPL_DM
|
||||
CONFIG_DM_SERIAL=
|
||||
CONFIG_DM_I2C=
|
||||
CONFIG_DM_SPI=
|
||||
CONFIG_DM_SPI_FLASH=
|
||||
endif
|
||||
|
||||
endif
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
#!/bin/sh
|
||||
# Copyright (c) 2016 Google, Inc
|
||||
# Written by Simon Glass <sjg@chromium.org>
|
||||
#
|
||||
|
||||
# This script creates the configuration whitelist file. This file contains
|
||||
# all the config options which are allowed to be used outside Kconfig.
|
||||
# Please do not add things to the whitelist. Instead, add your new option
|
||||
# to Kconfig.
|
||||
#
|
||||
export LC_ALL=C LC_COLLATE=C
|
||||
|
||||
# Looks for the rest of the CONFIG options, but exclude those in Kconfig and
|
||||
# defconfig files.
|
||||
#
|
||||
git grep CONFIG_ | \
|
||||
egrep -vi "(Kconfig:|defconfig:|README|\.py|\.pl:)" \
|
||||
| tr ' \t' '\n\n' \
|
||||
| sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' \
|
||||
|sort |uniq >scripts/config_whitelist.txt.tmp1;
|
||||
|
||||
# Finally, we need a list of the valid Kconfig options to exclude these from
|
||||
# the whitelist.
|
||||
cat `find . -name "Kconfig*"` |sed -n \
|
||||
-e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
|
||||
-e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
|
||||
|sort |uniq >scripts/config_whitelist.txt.tmp2
|
||||
|
||||
# Use only the options that are present in the first file but not the second.
|
||||
comm -23 scripts/config_whitelist.txt.tmp1 scripts/config_whitelist.txt.tmp2 \
|
||||
|sort |uniq >scripts/config_whitelist.txt.tmp3
|
||||
|
||||
# If scripts/config_whitelist.txt already exists, take the intersection of the
|
||||
# current list and the new one. We do not want to increase whitelist options.
|
||||
if [ -r scripts/config_whitelist.txt ]; then
|
||||
comm -12 scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt \
|
||||
> scripts/config_whitelist.txt.tmp4
|
||||
mv scripts/config_whitelist.txt.tmp4 scripts/config_whitelist.txt
|
||||
else
|
||||
mv scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt
|
||||
fi
|
||||
|
||||
rm scripts/config_whitelist.txt.tmp*
|
||||
|
||||
unset LC_ALL LC_COLLATE
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
#!/bin/sh
|
||||
# Copyright (c) 2016 Google, Inc
|
||||
# Written by Simon Glass <sjg@chromium.org>
|
||||
#
|
||||
# Check that the u-boot.cfg file provided does not introduce any new
|
||||
# ad-hoc CONFIG options
|
||||
#
|
||||
# Use scripts/build-whitelist.sh to generate the list of current ad-hoc
|
||||
# CONFIG options (those which are not in Kconfig).
|
||||
|
||||
# Usage
|
||||
# check-config.sh <path to u-boot.cfg> <path to whitelist file> <source dir>
|
||||
#
|
||||
# For example:
|
||||
# scripts/check-config.sh b/chromebook_link/u-boot.cfg kconfig_whitelist.txt .
|
||||
|
||||
set -e
|
||||
set -u
|
||||
|
||||
PROG_NAME="${0##*/}"
|
||||
|
||||
usage() {
|
||||
echo "$PROG_NAME <path to u-boot.cfg> <path to whitelist file> <source dir>"
|
||||
exit 1
|
||||
}
|
||||
|
||||
[ $# -ge 3 ] || usage
|
||||
|
||||
path="$1"
|
||||
whitelist="$2"
|
||||
srctree="$3"
|
||||
|
||||
# Temporary files
|
||||
configs="${path}.configs"
|
||||
suspects="${path}.suspects"
|
||||
ok="${path}.ok"
|
||||
new_adhoc="${path}.adhoc"
|
||||
|
||||
export LC_ALL=C
|
||||
export LC_COLLATE=C
|
||||
|
||||
cat ${path} |sed -nr 's/^#define (CONFIG_[A-Za-z0-9_]*).*/\1/p' |sort |uniq \
|
||||
>${configs}
|
||||
|
||||
comm -23 ${configs} ${whitelist} > ${suspects}
|
||||
|
||||
cat `find ${srctree} -name "Kconfig*"` |sed -nr \
|
||||
-e 's/^[[:blank:]]*config *([A-Za-z0-9_]*).*$/CONFIG_\1/p' \
|
||||
-e 's/^[[:blank:]]*menuconfig ([A-Za-z0-9_]*).*$/CONFIG_\1/p' \
|
||||
|sort |uniq > ${ok}
|
||||
comm -23 ${suspects} ${ok} >${new_adhoc}
|
||||
if [ -s ${new_adhoc} ]; then
|
||||
echo >&2 "Error: You must add new CONFIG options using Kconfig"
|
||||
echo >&2 "The following new ad-hoc CONFIG options were detected:"
|
||||
cat >&2 ${new_adhoc}
|
||||
echo >&2
|
||||
echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig"
|
||||
echo >&2 "file and add a 'config' or 'menuconfig' option."
|
||||
# Don't delete the temporary files in case they are useful
|
||||
exit 1
|
||||
else
|
||||
rm ${suspects} ${ok} ${new_adhoc}
|
||||
fi
|
||||
|
|
@ -2630,10 +2630,10 @@ sub u_boot_line {
|
|||
"strl$1 is preferred over strn$1 because it always produces a nul-terminated string\n" . $herecurr);
|
||||
}
|
||||
|
||||
# use defconfig to manage CONFIG_CMD options
|
||||
if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_CMD\w*)\b/) {
|
||||
ERROR("DEFINE_CONFIG_CMD",
|
||||
"All commands are managed by Kconfig\n" . $herecurr);
|
||||
# use Kconfig for all CONFIG symbols
|
||||
if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_\w*)\b/) {
|
||||
ERROR("DEFINE_CONFIG_SYM",
|
||||
"All CONFIG symbols are managed by Kconfig\n" . $herecurr);
|
||||
}
|
||||
|
||||
# Don't put common.h and dm.h in header files
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue