November 2018 - U-Boot

[U-Boot] [PATCH v1 0/3] ARM: pinctrl: Provide pinctrl driver for Vybrid (vf610)
by Lukasz Majewski 19 Nov '18

19 Nov '18

This series enables pinctrl driver for the vybrid NXP SoC. Changes in v1: - None Lukasz Majewski (3): ARM: vybrid: Provide pinctrl driver for Vybrid (vf610) ARM: DTS: Add iomux node to vf.dtsi for Vybrid devices ARM: DTS: Provide pinfunc definitions for vybrid vf610 from Linux kernel arch/arm/dts/vf.dtsi | 5 + arch/arm/dts/vf610-pinfunc.h | 810 ++++++++++++++++++++++++++++++++++++ drivers/pinctrl/nxp/Kconfig | 14 + drivers/pinctrl/nxp/Makefile | 1 + drivers/pinctrl/nxp/pinctrl-vf610.c | 41 ++ 5 files changed, 871 insertions(+) create mode 100644 arch/arm/dts/vf610-pinfunc.h create mode 100644 drivers/pinctrl/nxp/pinctrl-vf610.c -- 2.11.0

1 3

[U-Boot] [PATCH v4 00/18] Add U-Boot support for MediaTek SoCs - MT7623n & MT7629
by Ryder Lee 19 Nov '18

19 Nov '18

Hello, This is the new round to add U-Boot support for MediaTek SoCs - MT7623n & MT7629, and the most of the drivers are based on mainline Linux, such as clock, timer, mmc, pinctrl, watchdog, power domain and device tree. Thanks, Ryder Ryder Lee (16): tools: MediaTek: add MTK boot header generation to mkimage arm: dts: MediaTek: add device tree for MT7629 arm: dts: MediaTek: add device tree for MT7623 arm: MediaTek: add basic support for MT7629 boards clk: MediaTek: add clock driver for MT7629 SoC. clk: MediaTek: add clock driver for MT7623 SoC. timer: MediaTek: add timer driver for MediaTek SoCs watchdog: MediaTek: add watchdog driver for MediaTek SoCs pinctrl: MediaTek: add pinctrl driver for MT7629 SoC pinctrl: MediaTek: add pinctrl driver for MT7623 SoC power domain: MediaTek: add power domain driver for MT7629 SoC power domain: MediaTek: add power domain driver for MT7623 SoC serial: 16550: allow the driver to support MediaTek serial ram: MediaTek: add DDR3 driver for MT7629 SoC doc: README.mediatek: Add a simple README for MediaTek MAINTAINERS: add an entry for MediaTek Weijie Gao (2): arm: MediaTek: add basic support for MT7623 boards mmc: mtk-sd: add SD/MMC host controller driver for MT7623 SoC MAINTAINERS | 20 + Makefile | 20 + arch/arm/Kconfig | 16 + arch/arm/Makefile | 1 + arch/arm/dts/Makefile | 4 + arch/arm/dts/mt7623.dtsi | 255 +++++ arch/arm/dts/mt7623n-bananapi-bpi-r2.dts | 207 ++++ arch/arm/dts/mt7629-rfb-u-boot.dtsi | 24 + arch/arm/dts/mt7629-rfb.dts | 70 ++ arch/arm/dts/mt7629.dtsi | 244 +++++ arch/arm/include/asm/arch-mediatek/gpio.h | 9 + arch/arm/include/asm/arch-mediatek/misc.h | 17 + arch/arm/mach-mediatek/Kconfig | 39 + arch/arm/mach-mediatek/Makefile | 7 + arch/arm/mach-mediatek/cpu.c | 34 + arch/arm/mach-mediatek/init.h | 11 + arch/arm/mach-mediatek/mt7623/Makefile | 4 + arch/arm/mach-mediatek/mt7623/init.c | 54 + arch/arm/mach-mediatek/mt7623/lowlevel_init.S | 22 + arch/arm/mach-mediatek/mt7623/preloader.h | 99 ++ arch/arm/mach-mediatek/mt7629/Makefile | 4 + arch/arm/mach-mediatek/mt7629/init.c | 128 +++ arch/arm/mach-mediatek/mt7629/lowlevel_init.S | 50 + arch/arm/mach-mediatek/spl.c | 43 + board/mediatek/mt7623/Kconfig | 13 + board/mediatek/mt7623/MAINTAINERS | 7 + board/mediatek/mt7623/Makefile | 3 + board/mediatek/mt7623/mt7623_rfb.c | 16 + board/mediatek/mt7629/Kconfig | 17 + board/mediatek/mt7629/MAINTAINERS | 7 + board/mediatek/mt7629/Makefile | 3 + board/mediatek/mt7629/mt7629_rfb.c | 16 + common/image.c | 1 + configs/mt7623n_bpir2_defconfig | 54 + configs/mt7629_rfb_defconfig | 73 ++ doc/README.mediatek | 221 ++++ drivers/clk/Makefile | 1 + drivers/clk/mediatek/Makefile | 7 + drivers/clk/mediatek/clk-mt7623.c | 870 +++++++++++++++ drivers/clk/mediatek/clk-mt7629.c | 709 +++++++++++++ drivers/clk/mediatek/clk-mtk.c | 493 +++++++++ drivers/clk/mediatek/clk-mtk.h | 194 ++++ drivers/mmc/Kconfig | 11 + drivers/mmc/Makefile | 1 + drivers/mmc/mtk-sd.c | 1394 +++++++++++++++++++++++++ drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/mediatek/Kconfig | 15 + drivers/pinctrl/mediatek/Makefile | 7 + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 1284 +++++++++++++++++++++++ drivers/pinctrl/mediatek/pinctrl-mt7629.c | 471 +++++++++ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 553 ++++++++++ drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 184 ++++ drivers/power/domain/Kconfig | 7 + drivers/power/domain/Makefile | 1 + drivers/power/domain/mtk-power-domain.c | 406 +++++++ drivers/ram/Makefile | 1 + drivers/ram/mediatek/Makefile | 7 + drivers/ram/mediatek/ddr3-mt7629.c | 766 ++++++++++++++ drivers/serial/ns16550.c | 10 + drivers/timer/Kconfig | 7 + drivers/timer/Makefile | 1 + drivers/timer/mtk_timer.c | 85 ++ drivers/watchdog/Kconfig | 8 + drivers/watchdog/Makefile | 1 + drivers/watchdog/mtk_wdt.c | 135 +++ include/configs/mt7623.h | 56 + include/configs/mt7629.h | 57 + include/dt-bindings/clock/mt7623-clk.h | 413 ++++++++ include/dt-bindings/clock/mt7629-clk.h | 206 ++++ include/dt-bindings/power/mt7623-power.h | 19 + include/dt-bindings/power/mt7629-power.h | 13 + include/image.h | 1 + scripts/Makefile.spl | 11 + tools/Makefile | 1 + tools/mtk_image.c | 749 +++++++++++++ tools/mtk_image.h | 199 ++++ 77 files changed, 11169 insertions(+) create mode 100644 arch/arm/dts/mt7623.dtsi create mode 100644 arch/arm/dts/mt7623n-bananapi-bpi-r2.dts create mode 100644 arch/arm/dts/mt7629-rfb-u-boot.dtsi create mode 100644 arch/arm/dts/mt7629-rfb.dts create mode 100644 arch/arm/dts/mt7629.dtsi create mode 100644 arch/arm/include/asm/arch-mediatek/gpio.h create mode 100644 arch/arm/include/asm/arch-mediatek/misc.h create mode 100644 arch/arm/mach-mediatek/Kconfig create mode 100644 arch/arm/mach-mediatek/Makefile create mode 100644 arch/arm/mach-mediatek/cpu.c create mode 100644 arch/arm/mach-mediatek/init.h create mode 100644 arch/arm/mach-mediatek/mt7623/Makefile create mode 100644 arch/arm/mach-mediatek/mt7623/init.c create mode 100644 arch/arm/mach-mediatek/mt7623/lowlevel_init.S create mode 100644 arch/arm/mach-mediatek/mt7623/preloader.h create mode 100644 arch/arm/mach-mediatek/mt7629/Makefile create mode 100644 arch/arm/mach-mediatek/mt7629/init.c create mode 100644 arch/arm/mach-mediatek/mt7629/lowlevel_init.S create mode 100644 arch/arm/mach-mediatek/spl.c create mode 100644 board/mediatek/mt7623/Kconfig create mode 100644 board/mediatek/mt7623/MAINTAINERS create mode 100644 board/mediatek/mt7623/Makefile create mode 100644 board/mediatek/mt7623/mt7623_rfb.c create mode 100644 board/mediatek/mt7629/Kconfig create mode 100644 board/mediatek/mt7629/MAINTAINERS create mode 100644 board/mediatek/mt7629/Makefile create mode 100644 board/mediatek/mt7629/mt7629_rfb.c create mode 100644 configs/mt7623n_bpir2_defconfig create mode 100644 configs/mt7629_rfb_defconfig create mode 100644 doc/README.mediatek create mode 100644 drivers/clk/mediatek/Makefile create mode 100644 drivers/clk/mediatek/clk-mt7623.c create mode 100644 drivers/clk/mediatek/clk-mt7629.c create mode 100644 drivers/clk/mediatek/clk-mtk.c create mode 100644 drivers/clk/mediatek/clk-mtk.h create mode 100644 drivers/mmc/mtk-sd.c create mode 100644 drivers/pinctrl/mediatek/Kconfig create mode 100644 drivers/pinctrl/mediatek/Makefile create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7623.c create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7629.c create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common.c create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common.h create mode 100644 drivers/power/domain/mtk-power-domain.c create mode 100644 drivers/ram/mediatek/Makefile create mode 100644 drivers/ram/mediatek/ddr3-mt7629.c create mode 100644 drivers/timer/mtk_timer.c create mode 100644 drivers/watchdog/mtk_wdt.c create mode 100644 include/configs/mt7623.h create mode 100644 include/configs/mt7629.h create mode 100644 include/dt-bindings/clock/mt7623-clk.h create mode 100644 include/dt-bindings/clock/mt7629-clk.h create mode 100644 include/dt-bindings/power/mt7623-power.h create mode 100644 include/dt-bindings/power/mt7629-power.h create mode 100644 tools/mtk_image.c create mode 100644 tools/mtk_image.h -- 1.9.1

6 25

[U-Boot] [RFC PATCH 0/4] cmd: Simplify support for sub-commands
by Boris Brezillon 18 Nov '18

18 Nov '18

Hello, This patch series aims at simplifying the command parsing logic done in pretty much all the cmd/foo.c files by adding a few macros that help defining sub-commands attach to the main entry point. When you use those macros you also get sub-command auto-completion for free (the rest of the auto-completion still has to be done manually). Support for several levels of sub commands is not supported but can easily be added if needed. Some details about the patches: - Patch 1 is a fix for the auto-completion code that I had to do have auto-completion in the mtd command working correctly (I can submit it separately if needed) - Patch 2 is exposing a function to ease support of auto-completion of sub-commands - Patch 3 is adding a set of macros to easily declare the sub-commands attached to the main command - Patch 4 is making use of this new infrastructure in cmd/mtd.c. Regards, Boris Boris Brezillon (4): common: command: Fix command auto-completion common: command: Expose a generic helper to auto-complete sub commands command: commands: Add macros to declare commands with subcmds cmd: mtd: Use the subcmd infrastructure to declare mtd sub-commands cmd/mtd.c | 475 +++++++++++++++++++++++++++------------------- common/command.c | 32 +++- include/command.h | 54 ++++++ 3 files changed, 360 insertions(+), 201 deletions(-) -- 2.17.1

1 5

[U-Boot] [PATCH 0/2] Remove MTD sub-directories from the root Makefile
by Miquel Raynal 18 Nov '18

18 Nov '18

Hello, Two patches to do what we discussed with jagan a few weeks back: remove MTD sub-directories from the root Makefile. The first patch has already been sent but as I could not see it in mainline (I can't remember when I sent this one) I decided to put it back here. The second one does simple moves, proof that everything looks ok is in Travis's report [1]. [1] https://travis-ci.org/miquelraynal/u-boot/builds/456683592 Thanks, Miquèl Miquel Raynal (2): mtd: nand: let the raw NAND devices be compiled upon selection Makefile: move MTD-related lines in coherent Makefiles Makefile | 5 ----- drivers/Makefile | 1 + drivers/mtd/Makefile | 3 +++ drivers/mtd/nand/Makefile | 3 +++ 4 files changed, 7 insertions(+), 5 deletions(-) -- 2.17.1

2 4

[U-Boot] [PATCH v3] ARM: rpi_*_defconfig: Add support to find UUID for filesystem
by Otavio Salvador 18 Nov '18

18 Nov '18

The most generic way of having a stable boot behavior is to rely on UUID instead of device names for root partition, so the order of probing does not cause issues with booting. This enables the `CMD_FS_UUID` for following defconfig files: - rpi_0_w_defconfig - rpi_2_defconfig - rpi_3_32b_defconfig - rpi_3_defconfig - rpi_defconfig Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> Signed-off-by: Fabio Berton <fabio.berton(a)ossystems.com.br> --- Changes in v3: - resend Changes in v2: - rework commit configs/rpi_0_w_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_defconfig | 1 + 5 files changed, 5 insertions(+) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig index d5bf01b76e..66b0de31b6 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w" CONFIG_ENV_FAT_INTERFACE="mmc" diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index a50a815759..ba75e52dda 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" CONFIG_ENV_FAT_INTERFACE="mmc" diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index ec395d29ed..bbcdd91e90 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" CONFIG_ENV_FAT_INTERFACE="mmc" diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index ac99f2000a..54b6303c2d 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" CONFIG_ENV_FAT_INTERFACE="mmc" diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index db42ffd135..e7820cb147 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b" CONFIG_ENV_FAT_INTERFACE="mmc" -- 2.19.1

1 0

[U-Boot] [PATCH] sandbox: Improve debugging in initcall_run_list()
by Simon Glass 18 Nov '18

18 Nov '18

At present if one of the initcalls fails on sandbox the address printing is not help, e.g.: initcall sequence 0000557678967c80 failed at call 00005576709dfe1f (err=-96) This is because U-Boot gets relocated high into memory and the relocation offset (gd->reloc_off) does not work correctly for sandbox. Add support for finding the base address of the text region (at least on Linux) and use that to set the relocation offset. This makes the output better: initcall sequence 0000560775957c80 failed at call 0000000000048134 (err=-96) Then you use can use grep to see which init call failed, e.g.: $ grep 0000000000048134 u-boot.map stdio_add_devices Of course another option is to run it with a debugger such as gdb: $ gdb u-boot ... (gdb) br initcall.c:32 Breakpoint 1 at 0x5555555e388f: file lib/initcall.c, line 32. (gdb) r Starting program: /tmp/b/sandbox/u-boot [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". U-Boot 2018.09-00264-ge0c2ba9814-dirty (Sep 22 2018 - 12:21:46 -0600) DRAM: 128 MiB MMC: Breakpoint 1, initcall_run_list (init_sequence=init_sequence@entry=0x5555558b5c80 <init_sequence_r>) at lib/initcall.c:32 32 printf("initcall sequence %p failed at call %p (err=%d)\n", (gdb) print *init_fnc_ptr $1 = (const init_fnc_t) 0x55555559c114 <stdio_add_devices> (gdb) Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/sandbox/cpu/os.c | 37 ++++++++++++++++++++++++++ arch/sandbox/cpu/start.c | 1 + arch/sandbox/include/asm/global_data.h | 1 + common/board_f.c | 2 ++ include/os.h | 11 ++++++++ 5 files changed, 52 insertions(+) diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index 325ded51d8a..8f6c5dbb2cd 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -706,3 +706,40 @@ int os_mprotect_allow(void *start, size_t len) return mprotect(start, len, PROT_READ | PROT_WRITE); } + +void *os_find_text_base(struct sandbox_state *state) +{ + char line[500]; + void *base = NULL; + int len; + int fd; + + /* + * This code assumes that the first line of /proc/self/maps holds + * information about the text, for example: + * + * 5622d9907000-5622d9a55000 r-xp 00000000 08:01 15067168 u-boot + * + * The first hex value is assumed to be the address. + * + * This is tested in Linux 4.15. + */ + fd = open("/proc/self/maps", O_RDONLY); + if (fd == -1) + return NULL; + len = read(fd, line, sizeof(line)); + if (len > 0) { + char *end = memchr(line, '-', len); + + if (end) { + unsigned long long addr; + + *end = '\0'; + if (sscanf(line, "%llx", &addr) == 1) + base = (void *)addr; + } + } + close(fd); + + return base; +} diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 2ee3b485657..17c95f89352 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -323,6 +323,7 @@ int main(int argc, char *argv[]) gd->default_log_level = state->default_log_level; #endif setup_ram_buf(state); + gd->arch.text_base = os_find_text_base(state); /* Do pre- and post-relocation init */ board_init_f(0); diff --git a/arch/sandbox/include/asm/global_data.h b/arch/sandbox/include/asm/global_data.h index f6a6a343d25..f4ce72d5660 100644 --- a/arch/sandbox/include/asm/global_data.h +++ b/arch/sandbox/include/asm/global_data.h @@ -12,6 +12,7 @@ /* Architecture-specific global data */ struct arch_global_data { uint8_t *ram_buf; /* emulated RAM buffer */ + void *text_base; /* pointer to base of text region */ }; #include <asm-generic/global_data.h> diff --git a/common/board_f.c b/common/board_f.c index f1a1432d869..4600a73db1b 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -682,6 +682,8 @@ static int setup_reloc(void) * just after the default vector table location, so at 0x400 */ gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400); +#elif defined(CONFIG_SANDBOX) + gd->reloc_off = gd->arch.text_base; #else gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE; #endif diff --git a/include/os.h b/include/os.h index 28eb6252849..9224c743d1a 100644 --- a/include/os.h +++ b/include/os.h @@ -350,4 +350,15 @@ int os_mprotect_allow(void *start, size_t len); */ int os_write_file(const char *name, const void *buf, int size); +/** + * os_find_text_base() - Find the text section in this running process + * + * This tries to find the address of the text section in this running process. + * It can be useful to map the address of functions to the address listed in + * the u-boot.map file. + * + * @return address if found, else NULL + */ +void *os_find_text_base(struct sandbox_state *state); + #endif -- 2.19.1.1215.g8438c0b245-goog

1 0

[U-Boot] [PATCH] mtd: Use get_mtdids() instead of env_get("mtdids") in mtd_search_alternate_name()
by Boris Brezillon 18 Nov '18

18 Nov '18

The environment is not guaranteed to contain a valid mtdids variable when called from mtd_search_alternate_name(). Call get_mtdids() instead of env_get("mtdids"). Fixes: ff4afa8a981e ("mtd: uboot: search for an equivalent MTD name with the mtdids") Signed-off-by: Boris Brezillon <boris.brezillon(a)bootlin.com> --- drivers/mtd/mtd_uboot.c | 45 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c index 6a3e64395de2..b38771d0497f 100644 --- a/drivers/mtd/mtd_uboot.c +++ b/drivers/mtd/mtd_uboot.c @@ -13,6 +13,27 @@ #define MTD_NAME_MAX_LEN 20 +static const char *get_mtdids(void) +{ + __maybe_unused const char *mtdparts = NULL; + const char *mtdids = env_get("mtdids"); + + if (mtdids) + return mtdids; + +#if defined(CONFIG_SYS_MTDPARTS_RUNTIME) + board_mtdparts_default(&mtdids, &mtdparts); +#elif defined(MTDIDS_DEFAULT) + mtdids = MTDIDS_DEFAULT; +#elif defined(CONFIG_MTDIDS_DEFAULT) + mtdids = CONFIG_MTDIDS_DEFAULT; +#endif + + if (mtdids) + env_set("mtdids", mtdids); + + return mtdids; +} /** * mtd_search_alternate_name - Search an alternate name for @mtdname thanks to @@ -34,7 +55,7 @@ int mtd_search_alternate_name(const char *mtdname, char *altname, const char *mtdids, *equal, *comma, *dev_id, *mtd_id; int dev_id_len, mtd_id_len; - mtdids = env_get("mtdids"); + mtdids = get_mtdids(); if (!mtdids) return -EINVAL; @@ -95,28 +116,6 @@ static void mtd_probe_uclass_mtd_devs(void) { } extern void board_mtdparts_default(const char **mtdids, const char **mtdparts); -static const char *get_mtdids(void) -{ - __maybe_unused const char *mtdparts = NULL; - const char *mtdids = env_get("mtdids"); - - if (mtdids) - return mtdids; - -#if defined(CONFIG_SYS_MTDPARTS_RUNTIME) - board_mtdparts_default(&mtdids, &mtdparts); -#elif defined(MTDIDS_DEFAULT) - mtdids = MTDIDS_DEFAULT; -#elif defined(CONFIG_MTDIDS_DEFAULT) - mtdids = CONFIG_MTDIDS_DEFAULT; -#endif - - if (mtdids) - env_set("mtdids", mtdids); - - return mtdids; -} - #define MTDPARTS_MAXLEN 512 static const char *get_mtdparts(void) -- 2.17.1

2 2

[U-Boot] [PATCH] x86: make the LAPIC / IOAPIC construct switchable with Kconfig
by Hannes Schmelzer 18 Nov '18

18 Nov '18

There are still systems running which do not have any LAPIC or even IOAPIC, furthermore the MSRs for that aren't existing and the systems are crashing on trying setup LAPIC. So this commit makes the APIC stuff able to switch off for those boards which dont' have a LAPIC / IOAPIC. Signed-off-by: Hannes Schmelzer <oe5hpm(a)oevsv.at> --- arch/x86/Kconfig | 9 +++++++++ arch/x86/cpu/Makefile | 2 +- arch/x86/cpu/i386/interrupt.c | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a1c18d2..00b69c6 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -736,6 +736,15 @@ config I8259_PIC slave) interrupt controllers. Include this to have U-Boot set up the interrupt correctly. +config APIC + bool + default y + help + The (A)dvanced (P)rogrammable (I)nterrupt (C)ontroller is responsible + for catching interrupts and distributing them to one one more CPU + cores. In most cases there is some LAPIC (local) for each core and one + I/O APIC. This conjunction is found on most modern x86 systems. + config PINCTRL_ICH6 bool help diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index f862d8c..54668aa 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -35,7 +35,7 @@ obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/ obj-$(CONFIG_INTEL_QUARK) += quark/ obj-$(CONFIG_INTEL_QUEENSBAY) += queensbay/ obj-$(CONFIG_INTEL_TANGIER) += tangier/ -obj-y += lapic.o ioapic.o +obj-$(CONFIG_APIC) += lapic.o ioapic.o obj-y += irq.o ifndef CONFIG_$(SPL_)X86_64 obj-$(CONFIG_SMP) += mp_init.o diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index ed8423e..2744e2e 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -264,8 +264,9 @@ int interrupt_init(void) i8259_init(); #endif +#ifdef CONFIG_APIC lapic_setup(); - +#endif /* Initialize core interrupt and exception functionality of CPU */ cpu_init_interrupts(); -- 2.7.4

2 1

[U-Boot] [PATCH v1 1/2] x86: acpi: Enable RTC for Intel Tangier
by Andy Shevchenko 18 Nov '18

18 Nov '18

Intel Tangier SoC has RTC inside. So, enable it in ACPI. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- arch/x86/include/asm/arch-tangier/acpi/platform.asl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/x86/include/asm/arch-tangier/acpi/platform.asl b/arch/x86/include/asm/arch-tangier/acpi/platform.asl index 7abea4bb96..353b879918 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/platform.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/platform.asl @@ -21,6 +21,19 @@ Method(_WAK, 1) Return (Package() {0, 0}) } +Scope (_SB) +{ + /* Real Time Clock */ + Device (RTC0) + { + Name (_HID, EisaId ("PNP0B00")) + Name (_CRS, ResourceTemplate() + { + IO(Decode16, 0x70, 0x70, 0x01, 0x08) + }) + } +} + /* ACPI global NVS */ #include "global_nvs.asl" -- 2.19.1

2 5

[U-Boot] [PATCH] tools: env: support skip leading zero of env
by zqb-all 18 Nov '18

18 Nov '18

Signed-off-by: zqb-all <zhuangqiubin(a)gmail.com> --- tools/env/fw_env.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index a5d7595..4f4cd54 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -398,7 +398,14 @@ char *fw_getenv(char *name) { char *env, *nxt; - for (env = environment.data; *env; env = nxt + 1) { + for (nxt = env = environment.data; !(*nxt); ++nxt) { + if (nxt >= &environment.data[ENV_SIZE]) { + fprintf(stderr, "## Error: environment is empty\n"); + return NULL; + } + } + + for (env = nxt; *env; env = nxt + 1) { char *val; for (nxt = env; *nxt; ++nxt) { @@ -423,8 +430,15 @@ char *fw_getenv(char *name) char *fw_getdefenv(char *name) { char *env, *nxt; + for (nxt = env = default_environment; !(*nxt); ++nxt) { + if (nxt >= &default_environment[ENV_SIZE]) { + fprintf(stderr, + "## Error: default environment is empty\n"); + return NULL; + } + } - for (env = default_environment; *env; env = nxt + 1) { + for (env = nxt; *env; env = nxt + 1) { char *val; for (nxt = env; *nxt; ++nxt) { @@ -464,7 +478,16 @@ int fw_printenv(int argc, char *argv[], int value_only, struct env_opts *opts) if (argc == 0) { /* Print all env variables */ char *env, *nxt; - for (env = environment.data; *env; env = nxt + 1) { + + for (nxt = env = environment.data; !(*nxt); ++nxt) { + if (nxt >= &environment.data[ENV_SIZE]) { + fprintf(stderr, + "## Error: environment is empty\n"); + return -1; + } + } + + for (env = nxt; *env; env = nxt + 1) { for (nxt = env; *nxt; ++nxt) { if (nxt >= &environment.data[ENV_SIZE]) { fprintf(stderr, "## Error: " @@ -537,7 +560,14 @@ int fw_env_write(char *name, char *value) /* * search if variable with this name already exists */ - for (nxt = env = environment.data; *env; env = nxt + 1) { + for (nxt = env = environment.data; !(*nxt); ++nxt) { + if (nxt >= &environment.data[ENV_SIZE]) { + fprintf(stderr, "## Error: environment is empty\n"); + errno = EINVAL; + return -1; + } + } + for (env = nxt; *env; env = nxt + 1) { for (nxt = env; *nxt; ++nxt) { if (nxt >= &environment.data[ENV_SIZE]) { fprintf(stderr, "## Error: " -- 1.9.1

1 0