August 2017 - U-Boot

[U-Boot] [PATCH 1/1] arm: bcm235xx: avoid possible NULL dereference
by Heinrich Schuchardt 14 Aug '17

14 Aug '17

It does not make sense to first dereference c and then check if it is NULL. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/arm/cpu/armv7/bcm235xx/clk-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c index 79fafa08ed..ee4b34574a 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c @@ -479,9 +479,9 @@ unsigned long clk_get_rate(struct clk *c) { unsigned long rate; - debug("%s: %s\n", __func__, c->name); if (!c || !c->ops || !c->ops->get_rate) return 0; + debug("%s: %s\n", __func__, c->name); rate = c->ops->get_rate(c); debug("%s: rate = %ld\n", __func__, rate); -- 2.13.2

2 1

[U-Boot] [PATCH 1/1] arm: spear: do not return random value from stack
by Heinrich Schuchardt 14 Aug '17

14 Aug '17

If the NOR device is not available do not return a random value from the stack. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/arm/cpu/arm926ejs/spear/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c index a60f5838de..ba1e559157 100644 --- a/arch/arm/cpu/arm926ejs/spear/spl.c +++ b/arch/arm/cpu/arm926ejs/spear/spl.c @@ -222,7 +222,7 @@ static void snor_init(void) u32 spl_boot_device(void) { - u32 mode; + u32 mode = 0; /* Currently only SNOR is supported as the only */ if (snor_boot_selected()) { -- 2.13.2

2 1

[U-Boot] [PATCH 1/1] api: remove superfluous assignment
by Heinrich Schuchardt 14 Aug '17

14 Aug '17

No need to assign a value to sig if the next statement using sig is itself an assignment of a value to sig. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- api/api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/api.c b/api/api.c index c368511704..4fae95d280 100644 --- a/api/api.c +++ b/api/api.c @@ -625,7 +625,7 @@ int syscall(int call, int *retval, ...) void api_init(void) { - struct api_signature *sig = NULL; + struct api_signature *sig; /* TODO put this into linker set one day... */ calls_table[API_RSVD] = NULL; -- 2.13.2

3 2

[U-Boot] [PATCH 0/2] Convert CONFIG_OMAP3_SPI to Kconfig
by Adam Ford 14 Aug '17

14 Aug '17

2 4

[U-Boot] [RFC 1/1] omap3: incorrect logical check in do_emif4_init
by Heinrich Schuchardt 14 Aug '17

14 Aug '17

((readl(&emif4_base->sdram_iodft_tlgc) & (1<<10)) == 0x01) is always false. This does not match the comment /*Wait till that bit clears*/ The problem was indicated by cppcheck. I do not have the hardware to test if the code change below leads to a correct system behavior. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/arm/mach-omap2/omap3/emif4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c index d540cf08d2..8197e7b032 100644 --- a/arch/arm/mach-omap2/omap3/emif4.c +++ b/arch/arm/mach-omap2/omap3/emif4.c @@ -76,7 +76,7 @@ static void do_emif4_init(void) regval |= (1<<10); writel(regval, &emif4_base->sdram_iodft_tlgc); /*Wait till that bit clears*/ - while ((readl(&emif4_base->sdram_iodft_tlgc) & (1<<10)) == 0x1); + while ((readl(&emif4_base->sdram_iodft_tlgc) & (1<<10)) != 0x0); /*Re-verify the DDR PHY status*/ while ((readl(&emif4_base->sdram_sts) & (1<<2)) == 0x0); -- 2.11.0

3 5

Re: [U-Boot] [PATCH 5/6] moveconfig: Support building a simple config database
by Chris Packham 14 Aug '17

14 Aug '17

On 15/05/2017 11:47 PM, "Simon Glass" <sjg(a)chromium.org> wrote: Add a -b option which scans all the defconfigs and builds a database of all the CONFIG options used by each. This is useful for querying later. At present this only works with the separate -b option, which does not move any configs. It would be possible to adjust the script to build the database automatically when moving configs, but this might not be useful as the database does not change that often. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/moveconfig.py | 81 ++++++++++++++++++++++++++++++ ++++++++++++++++++----- 1 file changed, 74 insertions(+), 7 deletions(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index ba40c33521..ed576f4b83 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -199,11 +199,13 @@ import glob import multiprocessing import optparse import os +import Queue import re import shutil import subprocess import sys import tempfile +import threading import time SHOW_GNU_MAKE = 'scripts/show-gnu-make' @@ -260,6 +262,7 @@ COLOR_LIGHT_CYAN = '1;36' COLOR_WHITE = '1;37' AUTO_CONF_PATH = 'include/config/auto.conf' +CONFIG_DATABASE = 'moveconfig.db' ### helper functions ### @@ -937,6 +940,34 @@ class KconfigParser: return log + +class DatabaseThread(threading.Thread): + """This thread processes results from Slot threads. + + It collects the data in the master config directary. There is only one + result thread, and this helps to serialise the build output. + """ + def __init__(self, config_db, db_queue): + """Set up a new result thread + + Args: + builder: Builder which will be sent each result + """ + threading.Thread.__init__(self) + self.config_db = config_db + self.db_queue= db_queue + + def run(self): + """Called to start up the result thread. + + We collect the next result job and pass it on to the build. + """ + while True: + defconfig, configs = self.db_queue.get() + self.config_db[defconfig] = configs + self.db_queue.task_done() + + class Slot: """A slot to store a subprocess. @@ -946,7 +977,8 @@ class Slot: for faster processing. """ - def __init__(self, configs, options, progress, devnull, make_cmd, reference_src_dir): + def __init__(self, configs, options, progress, devnull, make_cmd, + reference_src_dir, db_queue): """Create a new process slot. Arguments: @@ -957,6 +989,7 @@ class Slot: make_cmd: command name of GNU Make. reference_src_dir: Determine the true starting config state from this source tree. + db_queue: output queue to write config info for the database """ self.options = options self.progress = progress @@ -964,6 +997,7 @@ class Slot: self.devnull = devnull self.make_cmd = (make_cmd, 'O=' + self.build_dir) self.reference_src_dir = reference_src_dir + self.db_queue = db_queue self.parser = KconfigParser(configs, options, self.build_dir) self.state = STATE_IDLE self.failed_boards = set() @@ -1039,6 +1073,8 @@ class Slot: if self.current_src_dir: self.current_src_dir = None self.do_defconfig() + elif self.options.build_db: + self.do_build_db() else: self.do_savedefconfig() elif self.state == STATE_SAVEDEFCONFIG: @@ -1088,6 +1124,17 @@ class Slot: cwd=self.current_src_dir) self.state = STATE_AUTOCONF + def do_build_db(self): + """Add the board to the database""" + configs = {} + with open(os.path.join(self.build_dir, AUTO_CONF_PATH)) as fd: + for line in fd.readlines(): + if line.startswith('CONFIG'): + config, value = line.split('=', 1) + configs[config] = value.rstrip() + self.db_queue.put([self.defconfig, configs]) + self.finish(True) + def do_savedefconfig(self): """Update the .config and run 'make savedefconfig'.""" @@ -1170,7 +1217,7 @@ class Slots: """Controller of the array of subprocess slots.""" - def __init__(self, configs, options, progress, reference_src_dir): + def __init__(self, configs, options, progress, reference_src_dir, db_queue): """Create a new slots controller. Arguments: @@ -1179,6 +1226,7 @@ class Slots: progress: A progress indicator. reference_src_dir: Determine the true starting config state from this source tree. + db_queue: output queue to write config info for the database """ self.options = options self.slots = [] @@ -1186,7 +1234,7 @@ class Slots: make_cmd = get_make_cmd() for i in range(options.jobs): self.slots.append(Slot(configs, options, progress, devnull, - make_cmd, reference_src_dir)) + make_cmd, reference_src_dir, db_queue)) def add(self, defconfig): """Add a new subprocess if a vacant slot is found. @@ -1298,7 +1346,7 @@ class ReferenceSource: return self.src_dir -def move_config(configs, options): +def move_config(configs, options, db_queue): """Move config options to defconfig files. Arguments: @@ -1308,6 +1356,8 @@ def move_config(configs, options): if len(configs) == 0: if options.force_sync: print 'No CONFIG is specified. You are probably syncing defconfigs.', + elif options.build_db: + print 'Building %s database' % CONFIG_DATABASE else: print 'Neither CONFIG nor --force-sync is specified. Nothing will happen.', else: @@ -1326,7 +1376,7 @@ def move_config(configs, options): defconfigs = get_all_defconfigs() progress = Progress(len(defconfigs)) - slots = Slots(configs, options, progress, reference_src_dir) + slots = Slots(configs, options, progress, reference_src_dir, db_queue) # Main loop to process defconfig files: # Add a new subprocess into a vacant slot. @@ -1353,6 +1403,8 @@ def main(): parser = optparse.OptionParser() # Add options here + parser.add_option('-b', '--build-db', action='store_true', default=False, + help='build a CONFIG database') parser.add_option('-c', '--color', action='store_true', default=False, help='display the log in color') parser.add_option('-C', '--commit', action='store_true', default=False, @@ -1385,7 +1437,7 @@ def main(): (options, configs) = parser.parse_args() - if len(configs) == 0 and not options.force_sync: + if len(configs) == 0 and not any((options.force_sync, options.build_db)): parser.print_usage() sys.exit(1) @@ -1395,10 +1447,17 @@ def main(): check_top_directory() + config_db = {} + db_queue = Queue.Queue() + t = DatabaseThread(config_db, db_queue) + t.setDaemon(True) + t.start() + if not options.cleanup_headers_only: check_clean_directory() update_cross_compile(options.color) - move_config(configs, options) + move_config(configs, options, db_queue) + db_queue.join() if configs: cleanup_headers(configs, options) @@ -1418,5 +1477,13 @@ def main(): msg += '\n\nRsync all defconfig files using moveconfig.py' subprocess.call(['git', 'commit', '-s', '-m', msg]) + if options.build_db: + with open(CONFIG_DATABASE, 'w') as fd: + for defconfig, configs in config_db.iteritems(): + print >>fd, '%s' % defconfig Not sure how much we care but the python folks would say fd.write("%s\n" % defconfig) is more natural and will work for python 2 and 3. + for config in sorted(configs.keys()): + print >>fd, ' %s=%s' % (config, configs[config]) + print >>fd + if __name__ == '__main__': main() -- 2.13.0.rc2.291.g57267f2277-goog

2 1

[U-Boot] [PATCH] usb: kbd: don't fail with iomux (v3)
by Rob Clark 13 Aug '17

13 Aug '17

stdin might not be set, which would cause iomux_doenv() to fail therefore causing probe_usb_keyboard() to fail. Furthermore if we do have iomux enabled, the sensible thing (in terms of user experience) would be to simply add ourselves to the list of stdin devices. This fixes an issue with usbkbd on dragonboard410c with distro- bootcmd, where stdin is not set (so stdinname is null). Signed-off-by: Rob Clark <robdclark(a)gmail.com> --- v2: address Bin's review comments v3: fix fail with free()ing if usbkbd is already in stdin env variable pointed out by Simon (the real v3 this time) common/usb_kbd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index d2d29cc98f..d71eae61ec 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -517,7 +517,22 @@ static int probe_usb_keyboard(struct usb_device *dev) stdinname = getenv("stdin"); #if CONFIG_IS_ENABLED(CONSOLE_MUX) + char *devname = DEVNAME; + char *newstdin = NULL; + /* + * stdin might not be set yet.. either way, with console-mux the + * sensible thing to do is add ourselves to the list of stdio + * devices: + */ + if (stdinname && !strstr(stdinname, DEVNAME)) { + newstdin = malloc(strlen(stdinname) + strlen(","DEVNAME) + 1); + sprintf(newstdin, "%s,"DEVNAME, stdinname); + stdinname = newstdin; + } else if (!stdinname) { + stdinname = devname; + } error = iomux_doenv(stdin, stdinname); + free(newstdin); if (error) return error; #else -- 2.13.0

3 8

[U-Boot] [patch v2 00/13] imx: mx6sabresd: support SPL FIT
by Peng Fan 13 Aug '17

13 Aug '17

This patch set is to support SPL FIT for mx6sabresd board. Patchset tested on 6qsabresd and 6qpsabresd board, works well. The mkimage_fit.sh is modified from sunxi code to generate u-boot.its. V2: Rebased to latest master branch Include patch https://patchwork.ozlabs.org/patch/798992/ to make this patchset could be applied together. Peng Fan (13): scripts: spl: fix typo arm: dts: include dts for imx6sabresd power: pmic/regulator allow dm be omited by SPL Makefile: build FIT image if CONFIG_SPL_FIT_GENERATOR defined imx: introduce mkimage_fit.sh imx: mx6sabresd: implement board_fit_config_name_match imx: mx6sabresd: enable SPL FIT scripts: spl: Disable DM MMC when SPL DM not enabled mmc: fsl_esdhc: switch to use CONFIG_IS_ENABLED power: pmic.h: include dm/ofnode.h board: freescale: common: add pfuze dm code imx: mx6sabresd: enable dm drivers imx: mx6sabresd: update README Makefile | 4 + arch/arm/dts/Makefile | 3 + arch/arm/dts/imx6dl-sabresd.dts | 22 + arch/arm/dts/imx6dl.dtsi | 242 +++++++++++ arch/arm/dts/imx6q-sabresd.dts | 30 ++ arch/arm/dts/imx6q.dtsi | 164 ++++++- arch/arm/dts/imx6qdl-sabresd.dtsi | 738 ++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl.dtsi | 100 +++-- arch/arm/dts/imx6qp-sabresd.dts | 93 ++++ arch/arm/dts/imx6qp.dtsi | 153 +++++++ arch/arm/mach-imx/mkimage_fit.sh | 63 +++ board/freescale/common/Makefile | 1 + board/freescale/common/pfuze.h | 5 + board/freescale/common/pfuze_dm.c | 89 ++++ board/freescale/mx6sabresd/README | 18 +- board/freescale/mx6sabresd/mx6sabresd.c | 339 ++++++--------- configs/mx6sabresd_defconfig | 22 +- drivers/mmc/fsl_esdhc.c | 14 +- drivers/power/pmic/Makefile | 4 +- drivers/power/regulator/Makefile | 2 +- include/configs/mx6sabresd.h | 15 +- include/power/pmic.h | 1 + scripts/Makefile.uncmd_spl | 3 +- 23 files changed, 1869 insertions(+), 256 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabresd.dts create mode 100644 arch/arm/dts/imx6q-sabresd.dts create mode 100644 arch/arm/dts/imx6qdl-sabresd.dtsi create mode 100644 arch/arm/dts/imx6qp-sabresd.dts create mode 100644 arch/arm/dts/imx6qp.dtsi create mode 100755 arch/arm/mach-imx/mkimage_fit.sh create mode 100644 board/freescale/common/pfuze_dm.c -- 2.6.2

2 14

[U-Boot] [PATCH] common:usb_kbd:Add key values of F1~F12
by Leo Wen 13 Aug '17

13 Aug '17

When you press the F1~F12 button from the USB keyboard, the reference Fn key table(usb_kbd_fn_key[]),the key value(0xf0~0xfb) will be returned, and you can use it to do more things. Signed-off-by: Leo Wen <leo.wen(a)rock-chips.com> --- common/usb_kbd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index d2d29cc..7c96c78 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -73,6 +73,10 @@ static const unsigned char usb_kbd_num_keypad[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '.', 0, 0, 0, '=' }; +static const unsigned char usb_kbd_fn_key[] = { + 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, + 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb +}; /* * map arrow keys to ^F/^B ^N/^P, can't really use the proper @@ -206,6 +210,9 @@ static int usb_kbd_translate(struct usb_kbd_pdata *data, unsigned char scancode, else keycode = usb_kbd_numkey[scancode - 0x1e]; } + /* Fn keys pressed */ + if ((scancode >= 0x3a) && (scancode <= 0x45)) + keycode = usb_kbd_fn_key[scancode - 0x3a]; /* Arrow keys */ if ((scancode >= 0x4f) && (scancode <= 0x52)) -- 2.7.4

3 2

[U-Boot] [RFC PATCH v1 1/2] ARM: mvebu: Add SoC IDs for Marvell's integrated CPUs
by Chris Packham 13 Aug '17

13 Aug '17

These SoCs are network packet processors (switch chips) with integrated ARMv7 cores. They share a great deal of commonality with the Armada-XP CPUs. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- There are actually a number of IDs for these chips, probably a dozen in total. I haven't enumerated them all in this patch, the 98DX4251, 98DX3336 and 98DX3236 are the base versions in their respective ranges. These 3 IDs also happen to suit my immediate need but I can add the additional ones in an follow up patch or a re-roll of this one. arch/arm/mach-mvebu/cpu.c | 14 ++++++++++++++ arch/arm/mach-mvebu/include/mach/cpu.h | 1 + arch/arm/mach-mvebu/include/mach/soc.h | 3 +++ 3 files changed, 18 insertions(+) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 14457317ce76..f7f83bfa3655 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -62,6 +62,11 @@ int mvebu_soc_family(void) case SOC_88F6820_ID: case SOC_88F6828_ID: return MVEBU_SOC_A38X; + + case SOC_98DX3236_ID: + case SOC_98DX3336_ID: + case SOC_98DX4251_ID: + return MVEBU_SOC_MSYS; } return MVEBU_SOC_UNKNOWN; @@ -208,6 +213,15 @@ int print_cpuinfo(void) case SOC_88F6828_ID: puts("MV88F6828-"); break; + case SOC_98DX3236_ID: + puts("98DX3236-"); + break; + case SOC_98DX3336_ID: + puts("98DX3336-"); + break; + case SOC_98DX4251_ID: + puts("98DX4251-"); + break; default: puts("Unknown-"); break; diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h index d241eea9568d..b67b77ae0df4 100644 --- a/arch/arm/mach-mvebu/include/mach/cpu.h +++ b/arch/arm/mach-mvebu/include/mach/cpu.h @@ -65,6 +65,7 @@ enum { MVEBU_SOC_AXP, MVEBU_SOC_A375, MVEBU_SOC_A38X, + MVEBU_SOC_MSYS, MVEBU_SOC_UNKNOWN, }; diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 0900e4008c12..cdd64fb28527 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -18,6 +18,9 @@ #define SOC_88F6810_ID 0x6810 #define SOC_88F6820_ID 0x6820 #define SOC_88F6828_ID 0x6828 +#define SOC_98DX3236_ID 0xf410 +#define SOC_98DX3336_ID 0xf400 +#define SOC_98DX4251_ID 0xfc00 /* A375 revisions */ #define MV_88F67XX_A0_ID 0x3 -- 2.13.0

2 2