mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-03 17:51:57 +09:00
Merge "restore the kernel version handling back to 3.10 stocks." into odroidc-3.10.y
This commit is contained in:
Mauro Ribeiro
40
Makefile
40
Makefile
@@ -193,7 +193,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
|
||||
# Default value for CROSS_COMPILE is not to prefix executables
|
||||
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
|
||||
ARCH ?= $(SUBARCH)
|
||||
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
|
||||
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
|
||||
|
||||
# Architecture as present in compile.h
|
||||
UTS_MACHINE := $(ARCH)
|
||||
@@ -373,23 +373,7 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
|
||||
-fno-strict-aliasing -fno-common \
|
||||
-Werror-implicit-function-declaration \
|
||||
-Wno-format-security \
|
||||
-fno-delete-null-pointer-checks
|
||||
|
||||
KBUILD_CFLAGS += -Werror=enum-compare \
|
||||
-Werror=comment \
|
||||
-Werror=implicit-int \
|
||||
-Werror=missing-braces \
|
||||
-Werror=unused-value \
|
||||
-Werror=format \
|
||||
-Werror=switch \
|
||||
-Werror=strict-prototypes \
|
||||
-Werror=unused-label \
|
||||
-Werror=undef \
|
||||
-Werror=unused-result \
|
||||
-Werror=return-type \
|
||||
-Werror=parentheses \
|
||||
-Werror=int-to-pointer-cast \
|
||||
-Wno-error=cpp
|
||||
-fno-delete-null-pointer-checks
|
||||
KBUILD_AFLAGS_KERNEL :=
|
||||
KBUILD_CFLAGS_KERNEL :=
|
||||
KBUILD_AFLAGS := -D__ASSEMBLY__
|
||||
@@ -398,11 +382,9 @@ KBUILD_CFLAGS_MODULE := -DMODULE
|
||||
KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
|
||||
|
||||
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
|
||||
KERNELRELEASE = $(shell head -1 include/config/kernel.release 2> /dev/null)
|
||||
KERNELRELEASE_FULL = $(shell tail -1 include/config/kernel.release 2> /dev/null)
|
||||
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
|
||||
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
|
||||
|
||||
|
||||
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
|
||||
export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
|
||||
export CPP AR NM STRIP OBJCOPY OBJDUMP
|
||||
@@ -591,7 +573,7 @@ all: vmlinux
|
||||
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
|
||||
KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
|
||||
else
|
||||
KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)
|
||||
KBUILD_CFLAGS += -O2
|
||||
endif
|
||||
|
||||
include $(srctree)/arch/$(SRCARCH)/Makefile
|
||||
@@ -815,8 +797,8 @@ $(vmlinux-dirs): prepare scripts
|
||||
# Store (new) KERNELRELASE string in include/config/kernel.release
|
||||
include/config/kernel.release: include/config/auto.conf FORCE
|
||||
$(Q)rm -f $@
|
||||
$(Q)echo "$(KERNELVERSION)" > $@
|
||||
$(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" >> $@
|
||||
$(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@
|
||||
|
||||
|
||||
# Things we need to do before we recursively start building the kernel
|
||||
# or the modules are listed in "prepare".
|
||||
@@ -867,7 +849,7 @@ define filechk_utsrelease.h
|
||||
echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
(echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"; echo \#define UTS_RELEASE_FULL \"$(KERNELRELEASE_FULL)\";)
|
||||
(echo \#define UTS_RELEASE \"$(KERNELRELEASE)\";)
|
||||
endef
|
||||
|
||||
define filechk_version.h
|
||||
@@ -1101,7 +1083,7 @@ rpm: include/config/kernel.release FORCE
|
||||
# Brief documentation of the typical targets used
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/meson*_defconfig) $(wildcard $(srctree)/${CUSTOMER_DIR_NAME}/meson/configs/meson*_defconfig)
|
||||
boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*_defconfig)
|
||||
boards := $(notdir $(boards))
|
||||
board-dirs := $(dir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*/*_defconfig))
|
||||
board-dirs := $(sort $(notdir $(board-dirs:/=)))
|
||||
@@ -1196,12 +1178,6 @@ $(help-board-dirs): help-%:
|
||||
printf " %-24s - Build for %s\\n" $*/$(b) $(subst _defconfig,,$(b));) \
|
||||
echo '')
|
||||
|
||||
#build amlogic device tree file meson.dtd
|
||||
dtd:
|
||||
$(srctree)/scripts/amlogic/aml_dtd.sh $(srctree)
|
||||
|
||||
%.dtd:
|
||||
$(srctree)/scripts/amlogic/aml2dts.sh $(wildcard $(srctree)/arch/arm/boot/dts/amlogic/$@)
|
||||
|
||||
# Documentation targets
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@@ -41,7 +41,7 @@ EXPORT_SYMBOL_GPL(init_uts_ns);
|
||||
|
||||
/* FIXED STRINGS! Don't touch! */
|
||||
const char linux_banner[] =
|
||||
"Linux version " UTS_RELEASE_FULL " (" LINUX_COMPILE_BY "@"
|
||||
"Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
|
||||
LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
|
||||
|
||||
const char linux_proc_banner[] =
|
||||
|
||||
@@ -2910,7 +2910,7 @@ void dump_stack_print_info(const char *log_lvl)
|
||||
{
|
||||
printk("%sCPU: %d PID: %d Comm: %.20s %s %s %.*s\n",
|
||||
log_lvl, raw_smp_processor_id(), current->pid, current->comm,
|
||||
print_tainted(), UTS_RELEASE_FULL /*init_utsname()->release*/,
|
||||
print_tainted(), init_utsname()->release,
|
||||
(int)strcspn(init_utsname()->version, " "),
|
||||
init_utsname()->version);
|
||||
|
||||
|
||||
@@ -273,12 +273,6 @@ $(obj)/%.dtb: $(src)/%.dts FORCE
|
||||
|
||||
dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
|
||||
|
||||
# cat
|
||||
# ---------------------------------------------------------------------------
|
||||
# Concatentate multiple files together
|
||||
quiet_cmd_cat = CAT $@
|
||||
cmd_cat = (cat $(filter-out FORCE,$^) > $@) || (rm -f $@; false)
|
||||
|
||||
# Bzip2
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
#!/bin/bash
|
||||
# This shell script will convert the xxx.dtd file to xxx.dtb.
|
||||
# You should pass two parameters to this shell script, input dtd file path and output dtb file path,
|
||||
# if the second parameter is not set, the default value is the dtd file path.
|
||||
# Written by Cai Yun 2013-09-11
|
||||
|
||||
#debug
|
||||
print=echo
|
||||
#print=test
|
||||
|
||||
process_file(){
|
||||
$print "process file $1 start"
|
||||
echo "processing... please wait..."
|
||||
|
||||
sed -i '/\/\/\$\$ ADD/a\\/\{' "$1" # delete //$$ ADD, add "/{"
|
||||
sed -i '/void/d' "$1" #delete void line
|
||||
sed -i '/\/\/\//d' "$1" #delete "///" line
|
||||
sed -i '/\/\/\$\$/d' "$1" #delete "//$$" line
|
||||
|
||||
$print "process file $1 end"
|
||||
$print ""
|
||||
}
|
||||
|
||||
#DTD_FILE="arch/arm/boot/meson.dtd"
|
||||
if [ -z "$1" ]; then
|
||||
echo "input error: no dtd file, please input a path:"
|
||||
read DTD_FILE
|
||||
echo "your input dtd file is $DTD_FILE"
|
||||
else
|
||||
DTD_FILE="$1"
|
||||
echo "DTD_FILE: $DTD_FILE"
|
||||
fi
|
||||
|
||||
if [ -n "$2" ]; then
|
||||
DTB_FILE="$2"
|
||||
DTS_FILE="${DTB_FILE/.dtb/.dts}"
|
||||
echo "output dtb file: $DTB_FILE"
|
||||
echo "middle dts file: $DTS_FILE"
|
||||
else
|
||||
# DTB_FILE="${DTD_FILE/.dtd/.dtb}"
|
||||
DTS_FILE="${DTD_FILE/.dtd/.dts}"
|
||||
# echo "Do not specify the output dtb file"
|
||||
# echo "use the default dtb file: $DTB_FILE"
|
||||
echo "the middle dts file: $DTS_FILE"
|
||||
fi
|
||||
|
||||
#if [ -f $DTB_FILE ] ; then
|
||||
# rm $DTB_FILE
|
||||
#fi
|
||||
if [ -f $DTS_FILE ] ; then
|
||||
rm $DTS_FILE
|
||||
fi
|
||||
|
||||
touch "$DTS_FILE"
|
||||
chmod 777 "$DTS_FILE"
|
||||
cat "$DTD_FILE" >> "$DTS_FILE"
|
||||
|
||||
process_file $DTS_FILE
|
||||
|
||||
#echo "DTB_FILE is $DTB_FILE"
|
||||
|
||||
#DTB_FILE_NAME=`basename $DTB_FILE`
|
||||
|
||||
#make "$DTB_FILE_NAME" -n
|
||||
#if [ -f $DTB_FILE ]; then
|
||||
# echo "dtc compile over, delte middle file $DTS_FILE"
|
||||
# rm "$DTS_FILE"
|
||||
# echo "$DTB_FILE is OK!"
|
||||
#else
|
||||
# echo "wrong dts file, dtc can not compiler!!!"
|
||||
#fi
|
||||
@@ -1,114 +0,0 @@
|
||||
#!/bin/bash
|
||||
# This shell script will collect all dtd files for amlogic device tree according to the configuration options.
|
||||
# You should pass one parameter representing the path of kernel to this shell script.
|
||||
# meson.dtd file will be created in kernel directory.
|
||||
# Written by Cai Yun 2013-07-04
|
||||
|
||||
#debug
|
||||
#print=echo
|
||||
print=test
|
||||
|
||||
TMP_DTD="./arch/arm/boot/meson.dtd"
|
||||
touch "$TMP_DTD"
|
||||
|
||||
copy_fragment(){
|
||||
if [ -z "$val_1" ]; then # no "#ifdef" or "#ifndef", is "#else" ?
|
||||
local val_2=`sed -n -e "s/^#else/else/p" "$TMP_FILE"`
|
||||
if [ -n "$val_2" ]; then # key word--"#else"
|
||||
$print "key word--#else"
|
||||
noelse=1
|
||||
else # no key word--"#else"
|
||||
val_2=`sed -n -e 's/^#endif/END_CONFIG/p' "$TMP_FILE"`
|
||||
if [ -z "$val_2" ]; then # no key word--"#endif"
|
||||
total=$[$[$invalidconfig+$nodef+$noelse]%2]
|
||||
$print "total is $total"
|
||||
if [ $total -eq 0 ]; then
|
||||
local val_3=`sed -n -e 's/^sub_file.//p' "$TMP_FILE"`
|
||||
if [ -z "$val_3" ]; then
|
||||
local val_4=`sed -n -e '/^#/p' "$TMP_FILE"`
|
||||
if [ -z "$val_4" ]; then
|
||||
cat "$TMP_FILE" >> "$TMP_DTD"
|
||||
#cat "$TMP_FILE"
|
||||
$print "no #ifdef #ifndef #else"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "$val_3" ]; then
|
||||
if [[ IFS != $saveIFS ]] ; then
|
||||
IFS=$saveIFS
|
||||
fi
|
||||
process_file "${path}$val_3"
|
||||
fi
|
||||
|
||||
fi
|
||||
fi
|
||||
if [ -n "$val_2" ] ; then # key word--"#endif"
|
||||
$print "key word-- #endif"
|
||||
invalidconfig=0
|
||||
nodef=0
|
||||
noelse=0
|
||||
fi
|
||||
fi
|
||||
fi # no "#ifdef" or "#ifndef"
|
||||
|
||||
if [ -n "$val_1" ]; then # key word--"#ifdef" or "#ifndef", there is a CONFIG
|
||||
$print "key word--#ifdef or #ifndef, there is a CONFIG: $val_1"
|
||||
local CONFIG=`"$path"/scripts/config -s "$1"`
|
||||
if [[ "$CONFIG" = 'y' ]] || [[ "$CONFIG" = 'm' ]] ; then
|
||||
$print "CONFIG is y or m"
|
||||
invalidconfig=0
|
||||
else
|
||||
$print "CONFIG is not define"
|
||||
invalidconfig=1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
process_file(){
|
||||
echo "process file $1 start"
|
||||
local invalidconfig=0
|
||||
local nodef=0
|
||||
local noelse=0
|
||||
local total=0
|
||||
|
||||
line=`sed -n '$=' $1`
|
||||
|
||||
cat $1 | ( saveIFS="$IFS" ; IFS=$'\\n' ; while read linebuf
|
||||
do
|
||||
echo "$linebuf" > "$TMP_FILE"
|
||||
val_1=`sed -n -e "s/^#ifdef.//p" "$TMP_FILE"`
|
||||
if [ -n "$val_1" ]; then # key word--"#ifdef"
|
||||
nodef=0
|
||||
else
|
||||
val_1=`sed -n -e "s/^#ifndef.//p" "$TMP_FILE"`
|
||||
if [ -n "$val_1" ]; then # key word--"#ifndef"
|
||||
nodef=1
|
||||
fi # key word--ifndef
|
||||
fi # key word--ifdef
|
||||
|
||||
copy_fragment "$val_1"
|
||||
done)
|
||||
|
||||
if [[ -n $saveIFS ]] ; then
|
||||
IFS=$saveIFS
|
||||
fi
|
||||
|
||||
echo "process file $1 end"
|
||||
$print ""
|
||||
}
|
||||
|
||||
for f in `ls $1/arch/arm/boot/dts/amlogic/aml_top.dtd`; do
|
||||
if [ -f $f ] ; then
|
||||
$print "$f is exsit"
|
||||
path=$1
|
||||
TMP_FILE="$1/aml_dtd_tmp"
|
||||
touch $TMP_FILE
|
||||
chmod 777 $TMP_FILE
|
||||
if [ -f $TMP_DTD ] ; then
|
||||
rm $TMP_DTD
|
||||
fi
|
||||
process_file $f
|
||||
rm $TMP_FILE
|
||||
fi
|
||||
done
|
||||
@@ -1,21 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
#make meson6tvc_h15_defconfig
|
||||
#make UIMAGE_COMPRESSION=none uImage -j
|
||||
make uImage -j12
|
||||
#make modules
|
||||
|
||||
make meson6tvc_h15.dtd
|
||||
make meson6tvc_h15.dtb
|
||||
|
||||
#cd ../root/g18
|
||||
#find .| cpio -o -H newc | gzip -9 > ../ramdisk.img
|
||||
|
||||
#rootfs.cpio -- original buildroot rootfs, busybox
|
||||
#m8rootfs.cpio -- build from buildroot
|
||||
ROOTFS="rootfs.cpio"
|
||||
|
||||
#cd ..
|
||||
./mkbootimg --kernel ./arch/arm/boot/uImage --ramdisk ./${ROOTFS} --second ./arch/arm/boot/dts/amlogic/meson6tvc_h15.dtb --output ./m6tvcboot.img
|
||||
ls -l ./m6tvcboot.img
|
||||
echo "m6tvcboot.img for h15 is done"
|
||||
@@ -1,20 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
#make UIMAGE_COMPRESSION=none uImage -j
|
||||
make uImage -j
|
||||
#make modules
|
||||
|
||||
make meson6_skt.dtd
|
||||
make meson6_skt.dtb
|
||||
|
||||
#cd ../root/g18
|
||||
#find .| cpio -o -H newc | gzip -9 > ../ramdisk.img
|
||||
|
||||
#rootfs.cpio -- original buildroot rootfs, busybox
|
||||
#m8rootfs.cpio -- build from buildroot
|
||||
ROOTFS="rootfs.cpio"
|
||||
|
||||
#cd ..
|
||||
./mkbootimg --kernel ./arch/arm/boot/uImage --ramdisk ./${ROOTFS} --second ./arch/arm/boot/dts/amlogic/meson6_skt.dtb --output ./m6boot.img
|
||||
ls -l ./m6boot.img
|
||||
echo "m6boot.img done"
|
||||
@@ -1,21 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
make meson6tv_defconfig
|
||||
#make UIMAGE_COMPRESSION=none uImage -j
|
||||
make uImage -j12
|
||||
#make modules
|
||||
|
||||
make meson6tv_ref.dtd
|
||||
make meson6tv_ref.dtb
|
||||
|
||||
#cd ../root/g18
|
||||
#find .| cpio -o -H newc | gzip -9 > ../ramdisk.img
|
||||
|
||||
#rootfs.cpio -- original buildroot rootfs, busybox
|
||||
#m8rootfs.cpio -- build from buildroot
|
||||
ROOTFS="rootfs.cpio"
|
||||
|
||||
#cd ..
|
||||
./mkbootimg --kernel ./arch/arm/boot/uImage --ramdisk ./${ROOTFS} --second ./arch/arm/boot/dts/amlogic/meson6tv_ref.dtb --output ./m6tvboot.img
|
||||
ls -l ./m6tvboot.img
|
||||
echo "m6tvboot.img done"
|
||||
@@ -1,21 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
#make meson6tvd_defconfig
|
||||
#make UIMAGE_COMPRESSION=none uImage -j
|
||||
make uImage -j12
|
||||
#make modules
|
||||
|
||||
make meson6tvd_ref.dtd
|
||||
make meson6tvd_ref.dtb
|
||||
|
||||
#cd ../root/g18
|
||||
#find .| cpio -o -H newc | gzip -9 > ../ramdisk.img
|
||||
|
||||
#rootfs.cpio -- original buildroot rootfs, busybox
|
||||
#m8rootfs.cpio -- build from buildroot
|
||||
ROOTFS="rootfs.cpio"
|
||||
|
||||
#cd ..
|
||||
./mkbootimg --kernel ./arch/arm/boot/uImage --ramdisk ./${ROOTFS} --second ./arch/arm/boot/dts/amlogic/meson6tvd_ref.dtb --output ./m6tvdboot.img
|
||||
ls -l ./m6tvdboot.img
|
||||
echo "m6tvdboot.img done"
|
||||
@@ -1,20 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
#make UIMAGE_COMPRESSION=none uImage -j
|
||||
make uImage -j
|
||||
#make modules
|
||||
|
||||
make meson8_skt.dtd
|
||||
make meson8_skt.dtb
|
||||
|
||||
#cd ../root/g18
|
||||
#find .| cpio -o -H newc | gzip -9 > ../ramdisk.img
|
||||
|
||||
#rootfs.cpio -- original buildroot rootfs, busybox
|
||||
#m8rootfs.cpio -- build from buildroot
|
||||
ROOTFS="rootfs.cpio"
|
||||
|
||||
#cd ..
|
||||
./mkbootimg --kernel ./arch/arm/boot/uImage --ramdisk ./${ROOTFS} --second ./arch/arm/boot/dts/amlogic/meson8_skt.dtb --output ./m8boot.img
|
||||
ls -l ./m8boot.img
|
||||
echo "m8boot.img done"
|
||||
@@ -1,20 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
#make UIMAGE_COMPRESSION=none uImage -j
|
||||
#make modules
|
||||
make uImage -j
|
||||
|
||||
make meson8b_skt.dtd
|
||||
make meson8b_skt.dtb
|
||||
|
||||
#cd ../root/g18
|
||||
#find .| cpio -o -H newc | gzip -9 > ../ramdisk.img
|
||||
|
||||
#rootfs.cpio -- original buildroot rootfs, busybox
|
||||
#m8rootfs.cpio -- build from buildroot
|
||||
ROOTFS="rootfs.cpio"
|
||||
|
||||
#cd ..
|
||||
./mkbootimg --kernel ./arch/arm/boot/uImage --ramdisk ./${ROOTFS} --second ./arch/arm/boot/dts/amlogic/meson8b_skt.dtb --output ./m8boot.img
|
||||
ls -l ./m8boot.img
|
||||
echo "m8boot.img for m8 baby done"
|
||||
@@ -1,20 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
#make UIMAGE_COMPRESSION=none uImage -j
|
||||
make uImage -j
|
||||
#make modules
|
||||
|
||||
make meson8m2_skt.dtd
|
||||
make meson8m2_skt.dtb
|
||||
|
||||
#cd ../root/g18
|
||||
#find .| cpio -o -H newc | gzip -9 > ../ramdisk.img
|
||||
|
||||
#rootfs.cpio -- original buildroot rootfs, busybox
|
||||
#m8rootfs.cpio -- build from buildroot
|
||||
ROOTFS="rootfs.cpio"
|
||||
|
||||
#cd ..
|
||||
./mkbootimg --kernel ./arch/arm/boot/uImage --ramdisk ./${ROOTFS} --second ./arch/arm/boot/dts/amlogic/meson8m2_skt.dtb --output ./m8boot.img
|
||||
ls -l ./m8boot.img
|
||||
echo "m8boot.img done"
|
||||
@@ -1083,7 +1083,7 @@ static void randomize_choice_values(struct symbol *csym)
|
||||
csym->flags &= ~(SYMBOL_VALID);
|
||||
}
|
||||
|
||||
void set_all_choice_values(struct symbol *csym)
|
||||
static void set_all_choice_values(struct symbol *csym)
|
||||
{
|
||||
struct property *prop;
|
||||
struct symbol *sym;
|
||||
@@ -1100,7 +1100,7 @@ void set_all_choice_values(struct symbol *csym)
|
||||
}
|
||||
csym->flags |= SYMBOL_DEF_USER;
|
||||
/* clear VALID to get value calculated */
|
||||
csym->flags &= ~(SYMBOL_VALID | SYMBOL_NEED_SET_CHOICE_VALUES);
|
||||
csym->flags &= ~(SYMBOL_VALID);
|
||||
}
|
||||
|
||||
void conf_set_all_new_symbols(enum conf_def_mode mode)
|
||||
@@ -1202,14 +1202,6 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
|
||||
* selected in a choice block and we set it to yes,
|
||||
* and the rest to no.
|
||||
*/
|
||||
if (mode != def_random) {
|
||||
for_all_symbols(i, csym) {
|
||||
if ((sym_is_choice(csym) && !sym_has_value(csym)) ||
|
||||
sym_is_choice_value(csym))
|
||||
csym->flags |= SYMBOL_NEED_SET_CHOICE_VALUES;
|
||||
}
|
||||
}
|
||||
|
||||
for_all_symbols(i, csym) {
|
||||
if (sym_has_value(csym) || !sym_is_choice(csym))
|
||||
continue;
|
||||
@@ -1217,5 +1209,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
|
||||
sym_calc_value(csym);
|
||||
if (mode == def_random)
|
||||
randomize_choice_values(csym);
|
||||
else
|
||||
set_all_choice_values(csym);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,9 +106,6 @@ struct symbol {
|
||||
#define SYMBOL_DEF3 0x40000 /* symbol.def[S_DEF_3] is valid */
|
||||
#define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */
|
||||
|
||||
/* choice values need to be set before calculating this symbol value */
|
||||
#define SYMBOL_NEED_SET_CHOICE_VALUES 0x100000
|
||||
|
||||
#define SYMBOL_MAXLENGTH 256
|
||||
#define SYMBOL_HASHSIZE 9973
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ extern "C" {
|
||||
|
||||
#define LOCALEDIR "/usr/share/locale"
|
||||
|
||||
|
||||
#define _(text) gettext(text)
|
||||
#define N_(text) (text)
|
||||
|
||||
@@ -88,7 +87,6 @@ char *conf_get_default_confname(void);
|
||||
void sym_set_change_count(int count);
|
||||
void sym_add_change_count(int count);
|
||||
void conf_set_all_new_symbols(enum conf_def_mode mode);
|
||||
void set_all_choice_values(struct symbol *csym);
|
||||
|
||||
struct conf_printer {
|
||||
void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
|
||||
@@ -123,7 +121,6 @@ void menu_set_type(int type);
|
||||
|
||||
/* util.c */
|
||||
struct file *file_lookup(const char *name);
|
||||
int file_exist(const char *name);
|
||||
int file_write_dep(const char *name);
|
||||
void *xmalloc(size_t size);
|
||||
void *xcalloc(size_t nmemb, size_t size);
|
||||
|
||||
@@ -300,14 +300,6 @@ void sym_calc_value(struct symbol *sym)
|
||||
|
||||
if (sym->flags & SYMBOL_VALID)
|
||||
return;
|
||||
|
||||
if (sym_is_choice_value(sym) &&
|
||||
sym->flags & SYMBOL_NEED_SET_CHOICE_VALUES) {
|
||||
sym->flags &= ~SYMBOL_NEED_SET_CHOICE_VALUES;
|
||||
prop = sym_get_choice_prop(sym);
|
||||
sym_calc_value(prop_get_symbol(prop));
|
||||
}
|
||||
|
||||
sym->flags |= SYMBOL_VALID;
|
||||
|
||||
oldval = sym->curr;
|
||||
@@ -433,9 +425,6 @@ void sym_calc_value(struct symbol *sym)
|
||||
|
||||
if (sym->flags & SYMBOL_AUTO)
|
||||
sym->flags &= ~SYMBOL_WRITE;
|
||||
|
||||
if (sym->flags & SYMBOL_NEED_SET_CHOICE_VALUES)
|
||||
set_all_choice_values(sym);
|
||||
}
|
||||
|
||||
void sym_clear_all_valid(void)
|
||||
|
||||
@@ -4,10 +4,7 @@
|
||||
*
|
||||
* Released under the terms of the GNU GPL v2.0.
|
||||
*/
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -34,37 +31,6 @@ struct file *file_lookup(const char *name)
|
||||
return file;
|
||||
}
|
||||
|
||||
int file_exist(const char *name)
|
||||
{
|
||||
int ret = 1;
|
||||
struct stat buf;
|
||||
const char *file_name = sym_expand_string_value(name);
|
||||
const char * env;
|
||||
char fullname[PATH_MAX + 1];
|
||||
if (stat(file_name, &buf) == -1)
|
||||
{
|
||||
env = getenv(SRCTREE);
|
||||
if (env)
|
||||
{
|
||||
sprintf(fullname, "%s/%s", env, name);
|
||||
if (stat(fullname, &buf) == -1)
|
||||
{
|
||||
ret = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ret = 0;
|
||||
}
|
||||
}
|
||||
if (ret)
|
||||
fprintf(stderr,"%s:%d: note: Open %s\n", zconf_curname(), zconf_lineno(), file_name);
|
||||
else
|
||||
fprintf(stderr,"%s:%d: warning: Skip %s\n", zconf_curname(), zconf_lineno(), file_name);
|
||||
free((void *)file_name);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* write a dependency file as used by kbuild to track dependencies */
|
||||
int file_write_dep(const char *name)
|
||||
{
|
||||
|
||||
@@ -44,5 +44,4 @@ on, T_ON, TF_PARAM
|
||||
modules, T_OPT_MODULES, TF_OPTION
|
||||
defconfig_list, T_OPT_DEFCONFIG_LIST,TF_OPTION
|
||||
env, T_OPT_ENV, TF_OPTION
|
||||
isource, T_ISOURCE, TF_COMMAND
|
||||
%%
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* ANSI-C code produced by gperf version 3.0.3 */
|
||||
/* ANSI-C code produced by gperf version 3.0.4 */
|
||||
/* Command-line: gperf -t --output-file scripts/kconfig/zconf.hash.c_shipped -a -C -E -g -k '1,3,$' -p -t scripts/kconfig/zconf.gperf */
|
||||
|
||||
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
|
||||
@@ -32,7 +32,7 @@
|
||||
struct kconf_id;
|
||||
|
||||
static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
|
||||
/* maximum key range = 76, duplicates = 0 */
|
||||
/* maximum key range = 71, duplicates = 0 */
|
||||
|
||||
#ifdef __GNUC__
|
||||
__inline
|
||||
@@ -46,32 +46,32 @@ kconf_id_hash (register const char *str, register unsigned int len)
|
||||
{
|
||||
static const unsigned char asso_values[] =
|
||||
{
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 25, 30,
|
||||
0, 0, 0, 10, 0, 0, 78, 78, 5, 0,
|
||||
10, 10, 45, 78, 0, 25, 0, 20, 15, 78,
|
||||
20, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
|
||||
78, 78, 78, 78, 78, 78
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 25, 25,
|
||||
0, 0, 0, 5, 0, 0, 73, 73, 5, 0,
|
||||
10, 5, 45, 73, 20, 20, 0, 15, 15, 73,
|
||||
20, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
|
||||
73, 73, 73, 73, 73, 73
|
||||
};
|
||||
register int hval = len;
|
||||
|
||||
@@ -99,30 +99,29 @@ struct kconf_id_strings_t
|
||||
char kconf_id_strings_str12[sizeof("def_tristate")];
|
||||
char kconf_id_strings_str13[sizeof("def_bool")];
|
||||
char kconf_id_strings_str14[sizeof("defconfig_list")];
|
||||
char kconf_id_strings_str15[sizeof("range")];
|
||||
char kconf_id_strings_str17[sizeof("isource")];
|
||||
char kconf_id_strings_str22[sizeof("on")];
|
||||
char kconf_id_strings_str23[sizeof("optional")];
|
||||
char kconf_id_strings_str26[sizeof("option")];
|
||||
char kconf_id_strings_str27[sizeof("endmenu")];
|
||||
char kconf_id_strings_str28[sizeof("mainmenu")];
|
||||
char kconf_id_strings_str30[sizeof("menuconfig")];
|
||||
char kconf_id_strings_str32[sizeof("modules")];
|
||||
char kconf_id_strings_str17[sizeof("on")];
|
||||
char kconf_id_strings_str18[sizeof("optional")];
|
||||
char kconf_id_strings_str21[sizeof("option")];
|
||||
char kconf_id_strings_str22[sizeof("endmenu")];
|
||||
char kconf_id_strings_str23[sizeof("mainmenu")];
|
||||
char kconf_id_strings_str25[sizeof("menuconfig")];
|
||||
char kconf_id_strings_str27[sizeof("modules")];
|
||||
char kconf_id_strings_str29[sizeof("menu")];
|
||||
char kconf_id_strings_str31[sizeof("select")];
|
||||
char kconf_id_strings_str32[sizeof("comment")];
|
||||
char kconf_id_strings_str33[sizeof("env")];
|
||||
char kconf_id_strings_str34[sizeof("menu")];
|
||||
char kconf_id_strings_str36[sizeof("select")];
|
||||
char kconf_id_strings_str37[sizeof("comment")];
|
||||
char kconf_id_strings_str41[sizeof("string")];
|
||||
char kconf_id_strings_str35[sizeof("range")];
|
||||
char kconf_id_strings_str36[sizeof("choice")];
|
||||
char kconf_id_strings_str39[sizeof("bool")];
|
||||
char kconf_id_strings_str41[sizeof("source")];
|
||||
char kconf_id_strings_str42[sizeof("visible")];
|
||||
char kconf_id_strings_str43[sizeof("hex")];
|
||||
char kconf_id_strings_str44[sizeof("bool")];
|
||||
char kconf_id_strings_str46[sizeof("choice")];
|
||||
char kconf_id_strings_str47[sizeof("visible")];
|
||||
char kconf_id_strings_str51[sizeof("source")];
|
||||
char kconf_id_strings_str52[sizeof("boolean")];
|
||||
char kconf_id_strings_str46[sizeof("config")];
|
||||
char kconf_id_strings_str47[sizeof("boolean")];
|
||||
char kconf_id_strings_str51[sizeof("string")];
|
||||
char kconf_id_strings_str54[sizeof("help")];
|
||||
char kconf_id_strings_str56[sizeof("config")];
|
||||
char kconf_id_strings_str61[sizeof("prompt")];
|
||||
char kconf_id_strings_str77[sizeof("depends")];
|
||||
char kconf_id_strings_str56[sizeof("prompt")];
|
||||
char kconf_id_strings_str72[sizeof("depends")];
|
||||
};
|
||||
static const struct kconf_id_strings_t kconf_id_strings_contents =
|
||||
{
|
||||
@@ -135,8 +134,6 @@ static const struct kconf_id_strings_t kconf_id_strings_contents =
|
||||
"def_tristate",
|
||||
"def_bool",
|
||||
"defconfig_list",
|
||||
"range",
|
||||
"isource",
|
||||
"on",
|
||||
"optional",
|
||||
"option",
|
||||
@@ -144,26 +141,27 @@ static const struct kconf_id_strings_t kconf_id_strings_contents =
|
||||
"mainmenu",
|
||||
"menuconfig",
|
||||
"modules",
|
||||
"env",
|
||||
"menu",
|
||||
"select",
|
||||
"comment",
|
||||
"string",
|
||||
"hex",
|
||||
"bool",
|
||||
"env",
|
||||
"range",
|
||||
"choice",
|
||||
"visible",
|
||||
"bool",
|
||||
"source",
|
||||
"boolean",
|
||||
"help",
|
||||
"visible",
|
||||
"hex",
|
||||
"config",
|
||||
"boolean",
|
||||
"string",
|
||||
"help",
|
||||
"prompt",
|
||||
"depends"
|
||||
};
|
||||
#define kconf_id_strings ((const char *) &kconf_id_strings_contents)
|
||||
#ifdef __GNUC__
|
||||
__inline
|
||||
#ifdef __GNUC_STDC_INLINE__
|
||||
#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
|
||||
__attribute__ ((__gnu_inline__))
|
||||
#endif
|
||||
#endif
|
||||
@@ -172,11 +170,11 @@ kconf_id_lookup (register const char *str, register unsigned int len)
|
||||
{
|
||||
enum
|
||||
{
|
||||
TOTAL_KEYWORDS = 33,
|
||||
TOTAL_KEYWORDS = 32,
|
||||
MIN_WORD_LENGTH = 2,
|
||||
MAX_WORD_LENGTH = 14,
|
||||
MIN_HASH_VALUE = 2,
|
||||
MAX_HASH_VALUE = 77
|
||||
MAX_HASH_VALUE = 72
|
||||
};
|
||||
|
||||
static const struct kconf_id wordlist[] =
|
||||
@@ -203,69 +201,67 @@ kconf_id_lookup (register const char *str, register unsigned int len)
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN},
|
||||
#line 45 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_OPT_DEFCONFIG_LIST,TF_OPTION},
|
||||
#line 40 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str15, T_RANGE, TF_COMMAND},
|
||||
{-1},
|
||||
#line 47 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_ISOURCE, TF_COMMAND},
|
||||
{-1}, {-1}, {-1}, {-1},
|
||||
{-1}, {-1},
|
||||
#line 43 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_ON, TF_PARAM},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_ON, TF_PARAM},
|
||||
#line 28 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_OPTIONAL, TF_COMMAND},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_OPTIONAL, TF_COMMAND},
|
||||
{-1}, {-1},
|
||||
#line 42 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26, T_OPTION, TF_COMMAND},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_OPTION, TF_COMMAND},
|
||||
#line 17 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_ENDMENU, TF_COMMAND},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_ENDMENU, TF_COMMAND},
|
||||
#line 15 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28, T_MAINMENU, TF_COMMAND},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_MAINMENU, TF_COMMAND},
|
||||
{-1},
|
||||
#line 23 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str30, T_MENUCONFIG, TF_COMMAND},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str25, T_MENUCONFIG, TF_COMMAND},
|
||||
{-1},
|
||||
#line 44 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_OPT_MODULES, TF_OPTION},
|
||||
#line 46 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_OPT_ENV, TF_OPTION},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_OPT_MODULES, TF_OPTION},
|
||||
{-1},
|
||||
#line 16 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str34, T_MENU, TF_COMMAND},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29, T_MENU, TF_COMMAND},
|
||||
{-1},
|
||||
#line 39 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_SELECT, TF_COMMAND},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SELECT, TF_COMMAND},
|
||||
#line 21 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_COMMENT, TF_COMMAND},
|
||||
{-1}, {-1}, {-1},
|
||||
#line 38 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_TYPE, TF_COMMAND, S_STRING},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND},
|
||||
#line 46 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_OPT_ENV, TF_OPTION},
|
||||
{-1},
|
||||
#line 40 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_RANGE, TF_COMMAND},
|
||||
#line 19 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_CHOICE, TF_COMMAND},
|
||||
{-1}, {-1},
|
||||
#line 33 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39, T_TYPE, TF_COMMAND, S_BOOLEAN},
|
||||
{-1},
|
||||
#line 18 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_SOURCE, TF_COMMAND},
|
||||
#line 41 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42, T_VISIBLE, TF_COMMAND},
|
||||
#line 37 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str43, T_TYPE, TF_COMMAND, S_HEX},
|
||||
#line 33 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str44, T_TYPE, TF_COMMAND, S_BOOLEAN},
|
||||
{-1},
|
||||
#line 19 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46, T_CHOICE, TF_COMMAND},
|
||||
#line 41 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47, T_VISIBLE, TF_COMMAND},
|
||||
{-1}, {-1}, {-1},
|
||||
#line 18 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51, T_SOURCE, TF_COMMAND},
|
||||
{-1}, {-1},
|
||||
#line 22 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46, T_CONFIG, TF_COMMAND},
|
||||
#line 34 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str52, T_TYPE, TF_COMMAND, S_BOOLEAN},
|
||||
{-1},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47, T_TYPE, TF_COMMAND, S_BOOLEAN},
|
||||
{-1}, {-1}, {-1},
|
||||
#line 38 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51, T_TYPE, TF_COMMAND, S_STRING},
|
||||
{-1}, {-1},
|
||||
#line 24 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str54, T_HELP, TF_COMMAND},
|
||||
{-1},
|
||||
#line 22 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str56, T_CONFIG, TF_COMMAND},
|
||||
{-1}, {-1}, {-1}, {-1},
|
||||
#line 30 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str61, T_PROMPT, TF_COMMAND},
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str56, T_PROMPT, TF_COMMAND},
|
||||
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
|
||||
{-1}, {-1}, {-1}, {-1}, {-1}, {-1},
|
||||
#line 27 "scripts/kconfig/zconf.gperf"
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str77, T_DEPENDS, TF_COMMAND}
|
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str72, T_DEPENDS, TF_COMMAND}
|
||||
};
|
||||
|
||||
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
|
||||
@@ -286,5 +282,5 @@ kconf_id_lookup (register const char *str, register unsigned int len)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#line 48 "scripts/kconfig/zconf.gperf"
|
||||
#line 47 "scripts/kconfig/zconf.gperf"
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -47,7 +47,6 @@ static struct menu *current_menu, *current_entry;
|
||||
%token <id>T_MENU
|
||||
%token <id>T_ENDMENU
|
||||
%token <id>T_SOURCE
|
||||
%token <id>T_ISOURCE
|
||||
%token <id>T_CHOICE
|
||||
%token <id>T_ENDCHOICE
|
||||
%token <id>T_COMMENT
|
||||
@@ -130,7 +129,6 @@ common_stmt:
|
||||
| config_stmt
|
||||
| menuconfig_stmt
|
||||
| source_stmt
|
||||
| isource_stmt
|
||||
;
|
||||
|
||||
option_error:
|
||||
@@ -385,12 +383,6 @@ source_stmt: T_SOURCE prompt T_EOL
|
||||
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
|
||||
zconf_nextfile($2);
|
||||
};
|
||||
isource_stmt: T_ISOURCE prompt T_EOL
|
||||
{
|
||||
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
|
||||
if(file_exist($2))
|
||||
zconf_nextfile($2);
|
||||
}
|
||||
|
||||
/* comment entry */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user