October 2016 - U-Boot

[U-Boot] [PATCH] imx: iomux-v3: fix pad setup on i.MX6DQP when CONFIG_MX6QDL is defined
by Filip Brozovic 04 Oct '16

04 Oct '16

The CPU detection macro is_mx6dq returns 0 on an i.MX6DQP, so we need to check for it explicitly in order to correctly initialize the pads when CONFIG_MX6QDL is defined. Signed-off-by: Filip Brozovic <fbrozovic(a)gmail.com> --- arch/arm/imx-common/iomux-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index 66137d1..2612e09 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -83,7 +83,7 @@ void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list, #if defined(CONFIG_MX6QDL) stride = 2; - if (!is_mx6dq()) + if (!is_mx6dq() && !is_mx6dqp()) p += 1; #else stride = 1; -- 2.1.4

2 1

[U-Boot] [PATCH] board: tbs2910: Fix BOOTMAPSZ
by Soeren Moch 04 Oct '16

04 Oct '16

The linux kernel imx_v6_v7_defconfig sets the user/kernel memory split to 3G/1G now (was 2G/2G before). We have to adapt the BOOTMAPSZ so that the decompressor finds zImage and dtb in lowmem. Signed-off-by: Soeren Moch <smoch(a)web.de> --- Cc: Stefano Babic <sbabic(a)denx.de> Cc: u-boot(a)lists.denx.de --- include/configs/tbs2910.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 85501bc..facd9cf 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -39,7 +39,7 @@ #define CONFIG_SYS_MEMTEST_END \ (CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024) -#define CONFIG_SYS_BOOTMAPSZ 0x6C000000 +#define CONFIG_SYS_BOOTMAPSZ 0x10000000 /* Serial console */ #define CONFIG_MXC_UART -- 1.9.1

2 1

[U-Boot] [PATCH] imx: mx6: fix USB bmode to use reserved value
by Stefan Agner 04 Oct '16

04 Oct '16

From: Stefan Agner <stefan.agner(a)toradex.com> Currently the bmode "usb" uses BOOT_CFG1 to 0x01, -which means BOOT_CFG1[7:4] is set to b0000. According to Table 8-7 Boot Device Selection this is NOR/OneNAND and not Reserved. Use 0x10 which leads to b0001, which is a Reserved boot device. With that the SoC reliably falls back to the serial loader. Cc: Troy Kisky <troy.kisky(a)boundarydevices.com> Signed-off-by: Stefan Agner <stefan.agner(a)toradex.com> --- arch/arm/cpu/armv7/mx6/soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 88fcfdc..c343c57 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -494,7 +494,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) const struct boot_mode soc_boot_modes[] = { {"normal", MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)}, /* reserved value should start rom usb */ - {"usb", MAKE_CFGVAL(0x01, 0x00, 0x00, 0x00)}, + {"usb", MAKE_CFGVAL(0x10, 0x00, 0x00, 0x00)}, {"sata", MAKE_CFGVAL(0x20, 0x00, 0x00, 0x00)}, {"ecspi1:0", MAKE_CFGVAL(0x30, 0x00, 0x00, 0x08)}, {"ecspi1:1", MAKE_CFGVAL(0x30, 0x00, 0x00, 0x18)}, -- 2.9.3

3 2

[U-Boot] [PATCH] imx: imx6ul: disable POR_B internal pull up
by Peng Fan 04 Oct '16

04 Oct '16

>From TO1.1, SNVS adds internal pull up control for POR_B, the register filed is GPBIT[1:0], after system boot up, it can be set to 2b'01 to disable internal pull up. It can save about 30uA power in SNVS mode. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> --- arch/arm/cpu/armv7/mx6/soc.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index e23d3c6..e219a25 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -362,14 +362,27 @@ int arch_cpu_init(void) set_ahb_rate(132000000); } - if (is_mx6ul() && is_soc_rev(CHIP_REV_1_0) == 0) { - /* - * According to the design team's requirement on i.MX6UL, - * the PMIC_STBY_REQ PAD should be configured as open - * drain 100K (0x0000b8a0). - * Only exists on TO1.0 - */ - writel(0x0000b8a0, IOMUXC_BASE_ADDR + 0x29c); + if (is_mx6ul()) { + if (is_soc_rev(CHIP_REV_1_0) == 0) { + /* + * According to the design team's requirement on + * i.MX6UL,the PMIC_STBY_REQ PAD should be configured + * as open drain 100K (0x0000b8a0). + * Only exists on TO1.0 + */ + writel(0x0000b8a0, IOMUXC_BASE_ADDR + 0x29c); + } else { + /* + * From TO1.1, SNVS adds internal pull up control + * for POR_B, the register filed is GPBIT[1:0], + * after system boot up, it can be set to 2b'01 + * to disable internal pull up.It can save about + * 30uA power in SNVS mode. + */ + writel((readl(MX6UL_SNVS_LP_BASE_ADDR + 0x10) & + (~0x1400)) | 0x400, + MX6UL_SNVS_LP_BASE_ADDR + 0x10); + } } if (is_mx6ull()) { -- 2.6.2

2 1

[U-Boot] [PATCH] imx-common: enlarge mux width to 4
by van.freenix＠gmail.com 04 Oct '16

04 Oct '16

From: Peng Fan <peng.fan(a)nxp.com> For i.MX6, the mux width is 4, not 3. So enlarge the width. IOMUX_CONFIG_LPSR is changed from 0x8 to 0x20 to not use bit 3 of mux. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> --- arch/arm/include/asm/imx-common/iomux-v3.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index e0f8350..b3af696 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -39,10 +39,9 @@ * MUX_CTRL_OFS: 0..11 (12) * PAD_CTRL_OFS: 12..23 (12) * SEL_INPUT_OFS: 24..35 (12) - * MUX_MODE + SION: 36..40 (5) - * PAD_CTRL + NO_PAD_CTRL: 41..58 (18) - * SEL_INP: 59..62 (4) - * reserved: 63 (1) + * MUX_MODE + SION + LPSR: 36..41 (6) + * PAD_CTRL + NO_PAD_CTRL: 42..59 (18) + * SEL_INP: 60..63 (4) */ typedef u64 iomux_v3_cfg_t; @@ -57,10 +56,10 @@ typedef u64 iomux_v3_cfg_t; MUX_SEL_INPUT_OFS_SHIFT) #define MUX_MODE_SHIFT 36 -#define MUX_MODE_MASK ((iomux_v3_cfg_t)0x1f << MUX_MODE_SHIFT) -#define MUX_PAD_CTRL_SHIFT 41 +#define MUX_MODE_MASK ((iomux_v3_cfg_t)0x3f << MUX_MODE_SHIFT) +#define MUX_PAD_CTRL_SHIFT 42 #define MUX_PAD_CTRL_MASK ((iomux_v3_cfg_t)0x3ffff << MUX_PAD_CTRL_SHIFT) -#define MUX_SEL_INPUT_SHIFT 59 +#define MUX_SEL_INPUT_SHIFT 60 #define MUX_SEL_INPUT_MASK ((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT) #define MUX_MODE_SION ((iomux_v3_cfg_t)IOMUX_CONFIG_SION << \ @@ -85,7 +84,7 @@ typedef u64 iomux_v3_cfg_t; #define NO_PAD_CTRL (1 << 17) -#define IOMUX_CONFIG_LPSR 0x8 +#define IOMUX_CONFIG_LPSR 0x20 #define MUX_MODE_LPSR ((iomux_v3_cfg_t)IOMUX_CONFIG_LPSR << \ MUX_MODE_SHIFT) #ifdef CONFIG_MX7 -- 2.6.2

3 2

[U-Boot] [PATCH v2 0/3] ARM: TI: Enable DISPLAY_{CPU/BOARD}INFO
by Lokesh Vutla 04 Oct '16

04 Oct '16

This series adds ID code detection support for AM437x and enables CONFIG_DISPLAY_{CPU/BOARD}INFO on all TI platforms. This series is based on top of Andrew's (Kconfig: Separate AM33XX SOC config from target board config) patch[1] I specifically did not use tools/moveconfig.py as Tom suggested to select these configs from targets instead of enabling it in defconfigs. [1] http://patchwork.ozlabs.org/patch/662954/ Lokesh Vutla (3): ARM: AM437X: Add Silicon ID support ARM: TI: Enable DISPLAY_CPUINFO on all SoCs ARM: TI: Enable DISPLAY_BOARDINFO on all boards arch/arm/Kconfig | 6 ++++++ arch/arm/cpu/armv7/am33xx/Kconfig | 11 +++++++++++ arch/arm/cpu/armv7/am33xx/sys_info.c | 5 ++++- arch/arm/cpu/armv7/omap3/Kconfig | 8 ++++++++ arch/arm/cpu/armv7/omap5/Kconfig | 4 ++++ arch/arm/include/asm/arch-am33xx/cpu.h | 3 ++- arch/arm/mach-keystone/Kconfig | 4 ++++ arch/powerpc/cpu/ppc4xx/Kconfig | 14 ++++++++++++++ board/amcc/acadia/Kconfig | 4 ---- board/amcc/bamboo/Kconfig | 4 ---- board/amcc/bubinga/Kconfig | 4 ---- board/amcc/canyonlands/Kconfig | 4 ---- board/amcc/katmai/Kconfig | 4 ---- board/amcc/kilauea/Kconfig | 4 ---- board/amcc/luan/Kconfig | 4 ---- board/amcc/makalu/Kconfig | 4 ---- board/amcc/redwood/Kconfig | 4 ---- board/amcc/sequoia/Kconfig | 4 ---- board/amcc/walnut/Kconfig | 4 ---- board/amcc/yosemite/Kconfig | 4 ---- board/amcc/yucca/Kconfig | 4 ---- board/liebherr/lwmon5/Kconfig | 4 ---- common/Kconfig | 16 ++++++++++++++++ include/configs/ti_armv7_keystone2.h | 1 - include/configs/ti_omap4_common.h | 2 -- include/configs/ti_omap5_common.h | 3 --- 26 files changed, 69 insertions(+), 64 deletions(-) -- 2.9.3

3 9

[U-Boot] [PATCH 4/5] sandbox/fs: Set correct filetype for unknown filetype
by Stefan Brüns 03 Oct '16

03 Oct '16

Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- arch/sandbox/cpu/os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index 16af3f5..df2bd4c 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -363,6 +363,8 @@ int os_dirent_ls(const char *dirname, struct os_dirent_node **headp) case DT_LNK: next->type = OS_FILET_LNK; break; + default: + next->type = OS_FILET_UNKNOWN; } next->size = 0; snprintf(fname, len, "%s/%s", dirname, next->name); -- 2.10.0

2 1

[U-Boot] [PATCH 1/2] rockchip: use rockchip linux partitions layout
by Jacob Chen 03 Oct '16

03 Oct '16

Unify the partitions of each chip then it will be more easy for us to write scripts, tools or guides for rockchip chips. Those extra partitions mostly are used to be compatible with our internal loaders (such as miniloader which was same as spl, or android loader then we can support dual boot) Signed-off-by: Jacob Chen <jacob2.chen(a)rock-chips.com> --- include/configs/rk3036_common.h | 7 ++++++- include/configs/rk3288_common.h | 7 ++++++- include/configs/rk3399_common.h | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 6ddf0d9..17335f6 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -94,7 +94,12 @@ #define CONFIG_RANDOM_UUID #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ /* First try to boot from SD (index 0), then eMMC (index 1 */ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index e8bf987..4b19e9d 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -111,7 +111,12 @@ #define CONFIG_RANDOM_UUID #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ /* First try to boot from SD (index 0), then eMMC (index 1 */ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 93d5856..5a41c93 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -67,7 +67,12 @@ #define CONFIG_PARTITION_UUIDS #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=16M,size=32M,bootable;" \ + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ /* First try to boot from SD (index 0), then eMMC (index 1) */ -- 1.9.1

2 3

[U-Boot] [RFC PATCH 0/6] Move some config macros to Kconfig
by York Sun 03 Oct '16

03 Oct '16

Guys, I try to move some config macros to Kconfig. This is a beginning. Please review this set and let me know. [RFC PATCH 1/6] arm: Fix Kconfig for proper display menu [RFC PATCH 2/6] arm: Move FSL_LSCH2 FSL_LSCH3 to Kconfig [RFC PATCH 3/6] arm: Move MAX_CPUS to Kconfig [RFC PATCH 4/6] arm: Move SYS_FSL_IFC_BANK_COUNT to Kconfig [RFC PATCH 5/6] arm: Move FSL_HAS_DP_DDR and NUM_DDR_CONTROLLERS to [RFC PATCH 6/6] arm: Move SYS_FSL_SRDS_* and SYS_HAS_SERDES to Kconfig York

2 12

[U-Boot] [[RFC Patch] 1/2] tools: buildmand: Remove duplicated code
by York Sun 03 Oct '16

03 Oct '16

Signed-off-by: York Sun <york.sun(a)nxp.com> CC: Simon Glass <sjg(a)chromium.org> --- The duplicated code seems to exist since the beginning of buildman. tools/buildman/builderthread.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index c512d3b..16e87f3 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -304,10 +304,6 @@ class BuilderThread(threading.Thread): print >>fd, 'arch', result.toolchain.arch fd.write('%s' % result.return_code) - with open(os.path.join(build_dir, 'toolchain'), 'w') as fd: - print >>fd, 'gcc', result.toolchain.gcc - print >>fd, 'path', result.toolchain.path - # Write out the image and function size information and an objdump env = result.toolchain.MakeEnvironment(self.builder.full_path) lines = [] -- 2.7.4

2 3