April 2014 - U-Boot

[U-Boot] [U-boot] Is there generic code to detect nand chip's ecc bits?
by TigerLiu＠via-alliance.com 19 Apr '14

19 Apr '14

Hi, Scott: I have a question about nand chip's ecc bits: Nand chip usually declared its ecc bits for each 512 bytes in its data sheet. Such as: Some nand chips required 4bit ECC for each 512 bytes. Some nand chips required 2bit ECC for each 512 bytes. So, my question is: Could ecc bits be got from nand chip's flash id? Or other generic method to retrieve ECC bits required for every nand chip? Best wishes,

2 1

[U-Boot] [PATCH] buildman: make output dir configurable
by Daniel Schwierzeck 18 Apr '14

18 Apr '14

Add an option to specify the output directory to override the default path '../'. This is useful for building in a ramdisk. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- tools/buildman/buildman.py | 2 ++ tools/buildman/control.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py index 8822efe..0d95246 100755 --- a/tools/buildman/buildman.py +++ b/tools/buildman/buildman.py @@ -101,6 +101,8 @@ parser.add_option('-T', '--threads', type='int', default=None, help='Number of builder threads to use') parser.add_option('-u', '--show_unknown', action='store_true', default=False, help='Show boards with unknown build result') +parser.add_option('-o', '--output-dir', type='string', + dest='output_dir', default='..', help='Output directory') parser.usage = """buildman -b <branch> [options] diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 8e6a08f..d2f4102 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -145,7 +145,7 @@ def DoBuildman(options, args): options.step = len(series.commits) - 1 # Create a new builder with the selected options - output_dir = os.path.join('..', options.branch) + output_dir = os.path.join(options.output_dir, options.branch) builder = Builder(toolchains, output_dir, options.git_dir, options.threads, options.jobs, checkout=True, show_unknown=options.show_unknown, step=options.step) -- 1.8.3.2

3 6

[U-Boot] [PATCH] e1000: remove redundant assignment
by David Müller 18 Apr '14

18 Apr '14

Signed-off-by: David Mueller <d.mueller(a)elsoft.ch> Joe Hershberger <joe.hershberger(a)gmail.com> --- drivers/net/e1000.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 9a66e68..9d9b259 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -4532,7 +4532,6 @@ static int e1000_set_phy_type (struct e1000_hw *hw) hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2) { hw->phy_type = e1000_phy_igp; - hw->phy_type = e1000_phy_igp; break; } case IGP03E1000_E_PHY_ID: -- 1.8.4

4 3

[U-Boot] [PATCH] build: Use filechk rules to create and update u-boot.lds
by Jon Loeliger 18 Apr '14

18 Apr '14

Prior to this patch, the top-level linker script u-boot.lds used a simple $(call if_changed) check when generated. That mechanism misses cases where a possible include file change induces a change in the u-boot.lds too. This patch converts it to a stronger check using ($call filechk) that will also notice differences in file contents and will catch changes due to pre-processing as well. Signed-off-by: Jon Loeliger <jon.loeliger(a)oracle.com> --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b807e5c..dcc42b2 100644 --- a/Makefile +++ b/Makefile @@ -1052,12 +1052,13 @@ depend dep: @echo '*** Warning: make $@ is unnecessary now.' # --------------------------------------------------------------------------- -quiet_cmd_cpp_lds = LDS $@ -cmd_cpp_lds = $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \ - -x assembler-with-cpp -P -o $@ $< +define filechk_ubootlds + ($(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \ + -x assembler-with-cpp -P -o - -) +endef u-boot.lds: $(LDSCRIPT) prepare FORCE - $(call if_changed,cpp_lds) + $(call filechk,ubootlds) PHONY += nand_spl nand_spl: prepare -- 1.9.0

2 1

[U-Boot] [PATCH] bootm: set max decompression size for LZO
by Kees Cook 18 Apr '14

18 Apr '14

The LZO decompressor wasn't initializing the maximum output size, which meant it would fail to decompress most of the time. Reported-by: Matthias Weißer <weisserm(a)arcor.de> Signed-off-by: Kees Cook <keescook(a)chromium.org> Tested-by: Matthias Weißer <weisserm(a)arcor.de> --- common/cmd_bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 9751edc..c243a5b 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -453,7 +453,7 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end, #endif /* CONFIG_LZMA */ #ifdef CONFIG_LZO case IH_COMP_LZO: { - size_t size; + size_t size = unc_len; printf(" Uncompressing %s ... ", type_name); -- 1.7.9.5 -- Kees Cook Chrome OS Security

3 2

[U-Boot] [PATCH] kbuild: add user-supplied CPPFLAGS, AFLAGS and CFLAGS
by Masahiro Yamada 18 Apr '14

18 Apr '14

Like Linux Kernel, this commit provides environment variables KCPPFLAGS, KAFLAGS and KCFLAGS, which are useful to pass additional options. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 970a219..0191869 100644 --- a/Makefile +++ b/Makefile @@ -584,6 +584,11 @@ endif export CONFIG_SYS_TEXT_BASE +# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments +KBUILD_CPPFLAGS += $(KCPPFLAGS) +KBUILD_AFLAGS += $(KAFLAGS) +KBUILD_CFLAGS += $(KCFLAGS) + # Use UBOOTINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option UBOOTINCLUDE := \ -- 1.8.3.2

2 1

[U-Boot] [PATCH] kbuild: docbook: sync with Linux Kernel v3.15-rc1
by Masahiro Yamada 18 Apr '14

18 Apr '14

This commit imports DocBook-related updates from v3.14 to v3.15-rc1. - commit ec3fadd64b9940baa2a369bf978e8561837db3f5 kbuild: docbook: use $(obj) and $(src) rather than specific path - commit 100da4c0150c97ce34d4d3b38bf2f5449b05ae4f kbuild: docbook: specify KERNELDOC dependency correctly - commit 6f89b9c1d6b29eaa600ac4a8ac1314b0d06f15e3 kbuild: docbook: include cmd files more simply - commit ac6d662a95a6989d83b259ccf8ec01dd7903af73 doc: Add "*.svg" to DocBook/.gitignore - commit 832919bfcf0cfd75767c68b0c61f7cf48be860a8 DocBook: Make mandocs parallel-safe - commit c4d79a4799719f2b0cd354ee498aad605730c97e work around xmlto bug in htmldocs Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- doc/DocBook/.gitignore | 1 + doc/DocBook/Makefile | 28 +++++++++------------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/doc/DocBook/.gitignore b/doc/DocBook/.gitignore index 720f245..7ebd546 100644 --- a/doc/DocBook/.gitignore +++ b/doc/DocBook/.gitignore @@ -10,5 +10,6 @@ *.out *.png *.gif +*.svg media-indices.tmpl media-entities.tmpl diff --git a/doc/DocBook/Makefile b/doc/DocBook/Makefile index 9b4a9b6..593237f 100644 --- a/doc/DocBook/Makefile +++ b/doc/DocBook/Makefile @@ -26,6 +26,7 @@ PS_METHOD = $(prefer-db2x) # The targets that may be used. PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs +targets += $(DOCBOOKS) BOOKS := $(addprefix $(obj)/,$(DOCBOOKS)) xmldocs: $(BOOKS) sgmldocs: xmldocs @@ -44,17 +45,18 @@ htmldocs: $(HTML) MAN := $(patsubst %.xml, %.9, $(BOOKS)) mandocs: $(MAN) + $(if $(wildcard $(obj)/man/*.9),gzip -f $(obj)/man/*.9) installmandocs: mandocs mkdir -p /usr/local/man/man9/ - install doc/DocBook/man/*.9.gz /usr/local/man/man9/ + install $(obj)/man/*.9.gz /usr/local/man/man9/ ### #External programs used KERNELDOC = $(srctree)/scripts/kernel-doc DOCPROC = $(objtree)/scripts/docproc -XMLTOFLAGS = -m $(srctree)/doc/DocBook/stylesheet.xsl +XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl XMLTOFLAGS += --skip-validation ### @@ -76,21 +78,9 @@ define rule_docproc ) > $(dir $(a)).$(notdir $(a)).cmd endef -%.xml: %.tmpl FORCE +%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) FORCE $(call if_changed_rule,docproc) -### -#Read in all saved dependency files -cmd_files := $(wildcard $(foreach f,$(BOOKS),$(dir $(f)).$(notdir $(f)).cmd)) - -ifneq ($(cmd_files),) - include $(cmd_files) -endif - -### -# Changes in kernel-doc force a rebuild of all documentation -$(BOOKS): $(KERNELDOC) - # Tell kbuild to always build the programs always := $(hostprogs-y) @@ -128,16 +118,16 @@ quiet_cmd_db2pdf = PDF $@ index = index.html -main_idx = doc/DocBook/$(index) +main_idx = $(obj)/$(index) build_main_index = rm -rf $(main_idx); \ echo '<h1>U-Boot Bootloader HTML Documentation</h1>' >> $(main_idx) && \ echo '<h2>U-Boot Version: $(UBOOTVERSION)</h2>' >> $(main_idx) && \ cat $(HTML) >> $(main_idx) quiet_cmd_db2html = HTML $@ - cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \ + cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \ echo '<a HREF="$(patsubst %.html,%,$(notdir $(a)))/index.html"> \ - $(patsubst %.html,%,$(notdir $@))</a><p>' > $@ + $(patsubst %.html,%,$(notdir $@))</a><p>' > $@ %.html: %.xml @(which xmlto > /dev/null 2>&1) || \ @@ -149,7 +139,7 @@ quiet_cmd_db2html = HTML $@ cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi quiet_cmd_db2man = MAN $@ - cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi + cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; fi %.9 : %.xml @(which xmlto > /dev/null 2>&1) || \ (echo "*** You need to install xmlto ***"; \ -- 1.8.3.2

2 1

[U-Boot] [PATCH] kbuild: sync with Linux Kernel v3.15-rc1
by Masahiro Yamada 18 Apr '14

18 Apr '14

This commit imports Kbuild-related updates from v3.14 to v3.15-rc1. - commit 3d3d6b8474204b6819688c9800774d52d370a538 kbuild: LLVMLinux: Adapt warnings for compilation with clang - commit 61163efae02040f66a95c8ed17f4407951ba58fa kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang - commit 79192ca8ebd9a25c583aa46024a250fef1e7766f scripts: objdiff: detect object code changes between two commits - commit 1c9e70a55b088d97a59241744fe459409d0c3582 kbuild: create a build directory automatically for out-of-tree build - commit a03fcb50e816a69acffb13b5e56db75063aeba8a kbuild: remove redundant '.*.cmd' pattern from make distclean - commit 13338935f1574a2dcd1c891461b0dcc42f8cff42 kbuild: move "quote" to Kbuild.include to be consistent - commit bfdfaeae500a3b194b73b01e92a8034791a58b7f kbuild: specify build_docproc as a phony target - commit f4d4ffc03efc864645b990e1d579bbe1b8e358a4 kbuild: dtbs_install: new make target - commit 1e64ff42ea3d8d2fc8aa71f9717b3c1cb6c2f893 Kbuild, lto: Disable LTO for asm-offsets.c - commit ccbef1674a1579842c7dbdf554efca85d2cd245a Kbuild, lto: add ld-version and ld-ifversion macros - commit ae63b2d7bdd9bd66b88843be0daf8e37d8f0b574 scripts/tags.sh: Ignore *.mod.c - commit e36aaea28972c57a32a3ba5365e61633739719b9 kbuild: Fix silent builds with make-4 Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- Makefile | 49 ++++++++++++++--- scripts/Kbuild.include | 10 ++++ scripts/Makefile | 2 +- scripts/Makefile.build | 14 ++++- scripts/Makefile.lib | 16 ++++-- scripts/ld-version.sh | 8 +++ scripts/objdiff | 141 +++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 227 insertions(+), 13 deletions(-) create mode 100755 scripts/ld-version.sh create mode 100755 scripts/objdiff diff --git a/Makefile b/Makefile index c91c10e..970a219 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ saved-output := $(KBUILD_OUTPUT) KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \ && /bin/pwd) $(if $(KBUILD_OUTPUT),, \ - $(error output directory "$(saved-output)" does not exist)) + $(error failed to create output directory "$(saved-output)")) PHONY += $(MAKECMDGOALS) sub-make @@ -205,7 +205,14 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else echo sh; fi ; fi) HOSTCC = gcc +HOSTCXX = g++ HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer +HOSTCXXFLAGS = -O2 + +ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1) +HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \ + -Wno-missing-field-initializers -fno-delete-null-pointer-checks +endif ifeq ($(HOSTOS),cygwin) HOSTCFLAGS += -ansi @@ -301,12 +308,26 @@ endif # If the user is running make -s (silent mode), suppress echoing of # commands +ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4 +ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),) + quiet=silent_ +endif +else # make-3.8x ifneq ($(filter s% -s%,$(MAKEFLAGS)),) quiet=silent_ endif +endif export quiet Q KBUILD_VERBOSE +ifneq ($(CC),) +ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1) +COMPILER := clang +else +COMPILER := gcc +endif +export COMPILER +endif # Look for make include files relative to root of kernel src MAKEFLAGS += --include-dir=$(srctree) @@ -368,8 +389,9 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve # Files to ignore in find ... statements -RCS_FIND_IGNORE := $ -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ - -o -name .pc -o -name .hg -o -name .git $ -prune -o +export RCS_FIND_IGNORE := $ -name SCCS -o -name BitKeeper -o -name .svn -o \ + -name CVS -o -name .pc -o -name .hg -o -name .git $ \ + -prune -o export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \ --exclude CVS --exclude .pc --exclude .hg --exclude .git @@ -523,6 +545,20 @@ endif KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) +ifeq ($(COMPILER),clang) +KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,) +KBUILD_CPPFLAGS += $(call cc-option,-Wno-unknown-warning-option,) +KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable) +KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier) +KBUILD_CFLAGS += $(call cc-disable-warning, gnu) +# Quiet clang warning: comparison of unsigned expression < 0 is always false +KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) +# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the +# source of a reference will be _MergedGlobals and not on of the whitelisted names. +# See modpost pattern 2 +KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,) +endif + KBUILD_CFLAGS += -g # $(KBUILD_AFLAGS) sets -g, which causes gcc to pass a suitable -g<format> # option to the assembler. @@ -1168,7 +1204,8 @@ CLOBBER_DIRS += $(patsubst %,spl/%, $(filter-out Makefile, \ CLOBBER_FILES += u-boot* MLO* SPL System.map nand_spl/u-boot* # Directories & files removed with 'make mrproper' -MRPROPER_DIRS += include/config include/generated +MRPROPER_DIRS += include/config include/generated \ + .tmp_objdiff MRPROPER_FILES += .config .config.old \ tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ include/config.h include/config.mk @@ -1234,8 +1271,8 @@ distclean: mrproper @find $(srctree) $(RCS_FIND_IGNORE) \ $ -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ - -o -name '.*.rej' -o -name '*.pyc' \ - -o -name '*%' -o -name '.*.cmd' -o -name 'core' $ \ + -o -name '.*.rej' -o -name '*%' -o -name 'core' \ + -o -name '*.pyc' \) \ -type f -print | xargs rm -f backup: diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 6504571..c664e39 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -3,6 +3,7 @@ # Convenient variables comma := , +quote := " squote := ' empty := space := $(empty) $(empty) @@ -161,6 +162,15 @@ ld-option = $(call try-run,\ # Important: no spaces around options ar-option = $(call try-run, $(AR) rc$(1) "$$TMP",$(1),$(2)) +# ld-version +# Usage: $(call ld-version) +# Note this is mainly for HJ Lu's 3 number binutil versions +ld-version = $(shell $(LD) --version | $(srctree)/scripts/ld-version.sh) + +# ld-ifversion +# Usage: $(call ld-ifversion, -ge, 22252, y) +ld-ifversion = $(shell [ $(call ld-version) $(1) $(2) ] && echo $(3)) + ###### ### diff --git a/scripts/Makefile b/scripts/Makefile index 242e3a0..68c998e 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -9,7 +9,7 @@ hostprogs-y += docproc # These targets are used internally to avoid "is up to date" messages PHONY += build_docproc -build_docproc: scripts/docproc +build_docproc: $(obj)/docproc @: # Let clean descend into subdirs diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 36346fd..6416c1a 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -90,12 +90,22 @@ warning- := $(empty) warning-1 := -Wextra -Wunused -Wno-unused-parameter warning-1 += -Wmissing-declarations warning-1 += -Wmissing-format-attribute -warning-1 += -Wmissing-prototypes +warning-1 += $(call cc-option, -Wmissing-prototypes) warning-1 += -Wold-style-definition warning-1 += $(call cc-option, -Wmissing-include-dirs) warning-1 += $(call cc-option, -Wunused-but-set-variable) warning-1 += $(call cc-disable-warning, missing-field-initializers) +# Clang +warning-1 += $(call cc-disable-warning, initializer-overrides) +warning-1 += $(call cc-disable-warning, unused-value) +warning-1 += $(call cc-disable-warning, format) +warning-1 += $(call cc-disable-warning, unknown-warning-option) +warning-1 += $(call cc-disable-warning, sign-compare) +warning-1 += $(call cc-disable-warning, format-zero-length) +warning-1 += $(call cc-disable-warning, uninitialized) +warning-1 += $(call cc-option, -fcatch-undefined-behavior) + warning-2 := -Waggregate-return warning-2 += -Wcast-align warning-2 += -Wdisabled-optimization @@ -225,7 +235,7 @@ $(multi-objs-y:.o=.s) : modname = $(modname-multi) $(multi-objs-y:.o=.lst) : modname = $(modname-multi) quiet_cmd_cc_s_c = CC $(quiet_modtag) $@ -cmd_cc_s_c = $(CC) $(c_flags) -fverbose-asm -S -o $@ $< +cmd_cc_s_c = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $< $(obj)/%.s: $(src)/%.c FORCE $(call if_changed_dep,cc_s_c) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index d568fde..a04439d 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -273,6 +273,18 @@ $(obj)/%.dtb: $(src)/%.dts FORCE dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) +# Helper targets for Installing DTBs into the boot directory +quiet_cmd_dtb_install = INSTALL $< + cmd_dtb_install = cp $< $(2) + +_dtbinst_pre_: + $(Q)if [ -d $(INSTALL_DTBS_PATH).old ]; then rm -rf $(INSTALL_DTBS_PATH).old; fi + $(Q)if [ -d $(INSTALL_DTBS_PATH) ]; then mv $(INSTALL_DTBS_PATH) $(INSTALL_DTBS_PATH).old; fi + $(Q)mkdir -p $(INSTALL_DTBS_PATH) + +%.dtb_dtbinst_: $(obj)/%.dtb _dtbinst_pre_ + $(call cmd,dtb_install,$(INSTALL_DTBS_PATH)) + # Bzip2 # --------------------------------------------------------------------------- @@ -367,7 +379,3 @@ quiet_cmd_xzmisc = XZMISC $@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ xz --check=crc32 --lzma2=dict=1MiB) > $@ || \ (rm -f $@ ; false) - -# misc stuff -# --------------------------------------------------------------------------- -quote:=" diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh new file mode 100755 index 0000000..198580d --- /dev/null +++ b/scripts/ld-version.sh @@ -0,0 +1,8 @@ +#!/usr/bin/awk -f +# extract linker version number from stdin and turn into single number + { + gsub(".*)", ""); + split($1,a, "."); + print a[1]*10000000 + a[2]*100000 + a[3]*10000 + a[4]*100 + a[5]; + exit + } diff --git a/scripts/objdiff b/scripts/objdiff new file mode 100755 index 0000000..b3e4f10 --- /dev/null +++ b/scripts/objdiff @@ -0,0 +1,141 @@ +#!/bin/bash + +# objdiff - a small script for validating that a commit or series of commits +# didn't change object code. +# +# Copyright 2014, Jason Cooper <jason(a)lakedaemon.net> +# +# Licensed under the terms of the GNU GPL version 2 + +# usage example: +# +# $ git checkout COMMIT_A +# $ <your fancy build command here> +# $ ./scripts/objdiff record path/to/*.o +# +# $ git checkout COMMIT_B +# $ <your fancy build command here> +# $ ./scripts/objdiff record path/to/*.o +# +# $ ./scripts/objdiff diff COMMIT_A COMMIT_B +# $ + +# And to clean up (everything is in .tmp_objdiff/*) +# $ ./scripts/objdiff clean all +# +# Note: 'make mrproper' will also remove .tmp_objdiff + +GIT_DIR="`git rev-parse --git-dir`" + +if [ -d "$GIT_DIR" ]; then + TMPD="${GIT_DIR%git}tmp_objdiff" + + [ -d "$TMPD" ] || mkdir "$TMPD" +else + echo "ERROR: git directory not found." + exit 1 +fi + +usage() { + echo "Usage: $0 <command> <args>" + echo " record <list of object files>" + echo " diff <commitA> <commitB>" + echo " clean all | <commit>" + exit 1 +} + +dorecord() { + [ $# -eq 0 ] && usage + + FILES="$*" + + CMT="`git rev-parse --short HEAD`" + + OBJDUMP="${CROSS_COMPILE}objdump" + OBJDIFFD="$TMPD/$CMT" + + [ ! -d "$OBJDIFFD" ] && mkdir -p "$OBJDIFFD" + + for f in $FILES; do + dn="${f%/*}" + bn="${f##*/}" + + [ ! -d "$OBJDIFFD/$dn" ] && mkdir -p "$OBJDIFFD/$dn" + + # remove addresses for a more clear diff + # http://dummdida.tumblr.com/post/60924060451/binary-diff-between-libc-from-s… + $OBJDUMP -D "$f" | sed "s/^[[:space:]]\+[0-9a-f]\+//" \ + >"$OBJDIFFD/$dn/$bn" + done +} + +dodiff() { + [ $# -ne 2 ] && [ $# -ne 0 ] && usage + + if [ $# -eq 0 ]; then + SRC="`git rev-parse --short HEAD^`" + DST="`git rev-parse --short HEAD`" + else + SRC="`git rev-parse --short $1`" + DST="`git rev-parse --short $2`" + fi + + DIFF="`which colordiff`" + + if [ ${#DIFF} -eq 0 ] || [ ! -x "$DIFF" ]; then + DIFF="`which diff`" + fi + + SRCD="$TMPD/$SRC" + DSTD="$TMPD/$DST" + + if [ ! -d "$SRCD" ]; then + echo "ERROR: $SRCD doesn't exist" + exit 1 + fi + + if [ ! -d "$DSTD" ]; then + echo "ERROR: $DSTD doesn't exist" + exit 1 + fi + + $DIFF -Nurd $SRCD $DSTD +} + +doclean() { + [ $# -eq 0 ] && usage + [ $# -gt 1 ] && usage + + if [ "x$1" = "xall" ]; then + rm -rf $TMPD/* + else + CMT="`git rev-parse --short $1`" + + if [ -d "$TMPD/$CMT" ]; then + rm -rf $TMPD/$CMT + else + echo "$CMT not found" + fi + fi +} + +[ $# -eq 0 ] && usage + +case "$1" in + record) + shift + dorecord $* + ;; + diff) + shift + dodiff $* + ;; + clean) + shift + doclean $* + ;; + *) + echo "Unrecognized command '$1'" + exit 1 + ;; +esac -- 1.8.3.2

2 3

[U-Boot] [PATCH v7 00/26] pmic: Redesign PMIC framework to support multiple instances of devices
by Lukasz Majewski 18 Apr '14

18 Apr '14

PMIC framework has been redesigned to support multiple instances of power related devices (e.g. fuel gauge, PMICs, chargers, micro USB IC, battery). Due to that, code at other architectures and boards have been adjusted properly. New power_init_board() method at ./lib/board.c file has been introduced. It is meant to be an architecture dependent function to support advanced power management. Since PMIC framework uses lists internally to link different devices, its initialization must be done just after malloc initialization. Please consider commits from this patch set as the example of advanced power management for a particular HW (Trats board in this case). In the new approach PMICs are selected with their names (e.g. 'pmic dump MAX8997_PMIC') Presented patch set is a first step to change 'pmic' command to more generic (i.e. power) to provide control for multiple devices. Moreover device's battery is treated as an oridinary "power" device (like PMIC). Due to that, framework unification is possible. For even more versalite design, each power device instance can specify its parent. For trats one can build a following scheme (it can de different for other boards): ----------------- --------| BAT |------------ | | | | | ----------------- | | | | \|/ \|/ \|/ ----------- ----------------- --------- |FG | |MUIC | |CHRG | | | | | | | ----------- ----------------- --------- Finally, this patch series also comprises of a "namespace" cleanup - an attempt to rename "pmic" to "power" to better reflect generality of this framework. Test HW: - Exynos4210 Trats development board - Exynos3 (C110) Goni development board Lukasz Majewski (26): pmic:i2c: Handle PMIC I2C transmission comprising of two bytes pmic:i2c: Add I2C sensor byte order (big/little) to PMIC framework pmic:max8997: Switch the MAX8997 PMIC to be used with multibus I2C pmic: Extend PMIC framework to support multiple instances of PMIC devices pmic: Introduce power_init_board() method at ./lib/board.c file pmic: Enable power_board_init() support at TRATS pmic:chrg: Common information about charger and battery (power_chrg.h) pmic: Move pmic related code to ./drivers/power directory pmic: Extend struct pmic to support battery and charger related operations pmic:battery: Support for Trats Battery at PMIC framework pmic:muic: Support for MUIC built into MAX8997 device pmic:fuel-gauge: Support for MAX17042 fuel-gauge pmic:max8997: Function for calculating LDO internal register value arm:trats:pmic: Default PMIC(MAX8997) initialization for Samsung's TRATS board arm:trats:pmic: Enable MUIC (MAX8997) at Samsung's TRATS board arm:trats:pmic: Enable fuel-gauge (MAX17042) at Samsung's TRATS board arm:trats:pmic: Enable battery support at Samsung's TRATS board pmic:max8997: Support for MAX8997 internal charger control arm:trats:pmic: Power consumption reduction state for Samsung's TRATS board arm:trats:pmic: Support for charging battery at Samsung's TRATS board pmic: Extend PMIC framework to support battery related commands power:pmic: Rename ./drivers/power/pmic_* to ./drivers/power/power_* files power:pmic: Rename CONFIG_PMIC* defines to CONFIG_POWER power:pmic: Rename CONFIG_DIALOG_PMIC defines to CONFIG_DIALOG_POWER arm:goni:pmic: Adjust GONI target platform board to new PMIC framework arm:universal_c210:pmic: Adjust C210 Universal target platform board to new PMIC framework Makefile | 5 +- arch/arm/lib/board.c | 8 + board/davedenx/qong/qong.c | 12 +- board/freescale/mx31pdk/mx31pdk.c | 12 +- board/freescale/mx35pdk/mx35pdk.c | 14 +- board/freescale/mx51evk/mx51evk.c | 12 +- board/freescale/mx53evk/mx53evk.c | 12 +- board/freescale/mx53loco/mx53loco.c | 21 +- board/genesi/mx51_efikamx/efikamx.c | 12 +- board/hale/tt01/tt01.c | 14 +- board/samsung/goni/goni.c | 22 +- board/samsung/trats/trats.c | 292 +++++++++++++++++++- board/samsung/universal_c210/universal.c | 27 ++- board/ttcontrol/vision2/vision2.c | 12 +- drivers/misc/Makefile | 7 - drivers/misc/pmic_core.c | 147 ---------- drivers/misc/pmic_i2c.c | 98 ------- drivers/misc/pmic_max8997.c | 43 --- drivers/power/Makefile | 12 +- drivers/power/battery/Makefile | 47 ++++ drivers/power/battery/bat_trats.c | 100 +++++++ drivers/power/fuel_gauge/Makefile | 47 ++++ drivers/power/fuel_gauge/fg_max17042.c | 250 +++++++++++++++++ drivers/power/pmic/Makefile | 49 ++++ drivers/power/pmic/muic_max8997.c | 90 ++++++ drivers/power/pmic/pmic_max8997.c | 123 ++++++++ drivers/{misc => power/pmic}/pmic_max8998.c | 16 +- drivers/power/power_core.c | 232 ++++++++++++++++ .../{misc/pmic_dialog.c => power/power_dialog.c} | 14 +- drivers/{misc/pmic_fsl.c => power/power_fsl.c} | 22 +- drivers/power/power_i2c.c | 125 +++++++++ drivers/{misc/pmic_spi.c => power/power_spi.c} | 4 +- drivers/rtc/mc13xxx-rtc.c | 10 +- include/configs/imx31_litekit.h | 6 +- include/configs/mx31ads.h | 6 +- include/configs/mx31pdk.h | 6 +- include/configs/mx35pdk.h | 6 +- include/configs/mx51_efikamx.h | 6 +- include/configs/mx51evk.h | 6 +- include/configs/mx53evk.h | 6 +- include/configs/mx53loco.h | 8 +- include/configs/qong.h | 6 +- include/configs/s5p_goni.h | 6 +- include/configs/s5pc210_universal.h | 6 +- include/configs/trats.h | 14 +- include/configs/tt01.h | 6 +- include/configs/vision2.h | 6 +- include/pmic.h | 72 ----- include/power/battery.h | 38 +++ include/power/fg_battery_cell_params.h | 90 ++++++ include/power/max17042_fg.h | 74 +++++ include/power/max8997_muic.h | 61 ++++ include/{ => power}/max8997_pmic.h | 26 ++- include/{ => power}/max8998_pmic.h | 0 include/power/pmic.h | 109 ++++++++ include/power/power_chrg.h | 43 +++ 56 files changed, 2027 insertions(+), 491 deletions(-) delete mode 100644 drivers/misc/pmic_core.c delete mode 100644 drivers/misc/pmic_i2c.c delete mode 100644 drivers/misc/pmic_max8997.c create mode 100644 drivers/power/battery/Makefile create mode 100644 drivers/power/battery/bat_trats.c create mode 100644 drivers/power/fuel_gauge/Makefile create mode 100644 drivers/power/fuel_gauge/fg_max17042.c create mode 100644 drivers/power/pmic/Makefile create mode 100644 drivers/power/pmic/muic_max8997.c create mode 100644 drivers/power/pmic/pmic_max8997.c rename drivers/{misc => power/pmic}/pmic_max8998.c (82%) create mode 100644 drivers/power/power_core.c rename drivers/{misc/pmic_dialog.c => power/power_dialog.c} (81%) rename drivers/{misc/pmic_fsl.c => power/power_fsl.c} (81%) create mode 100644 drivers/power/power_i2c.c rename drivers/{misc/pmic_spi.c => power/power_spi.c} (97%) delete mode 100644 include/pmic.h create mode 100644 include/power/battery.h create mode 100644 include/power/fg_battery_cell_params.h create mode 100644 include/power/max17042_fg.h create mode 100644 include/power/max8997_muic.h rename include/{ => power}/max8997_pmic.h (88%) rename include/{ => power}/max8998_pmic.h (100%) create mode 100644 include/power/pmic.h create mode 100644 include/power/power_chrg.h -- 1.7.2.3

4 30

[U-Boot] [PATCH] board_r: return 0 from show_model_r
by Paul Burton 18 Apr '14

18 Apr '14

The show_model_r function should return an int but didn't. Return 0 to indicate inevitable success and avoid the following if it is used: common/board_r.c: In function 'show_model_r': common/board_r.c:531:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ Cc: Simon Glass <sjg(a)chromium.org> Signed-off-by: Paul Burton <paul.burton(a)imgtec.com> --- common/board_r.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/board_r.c b/common/board_r.c index 8629a65..d1f0aa9 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -528,6 +528,7 @@ static int show_model_r(void) # else checkboard(); # endif + return 0; } #endif -- 1.8.5.3

3 2