[U-Boot] [PATCH v2] igep00x0: enable CONFIG_FDT_FIXUP_PARTITIONS
SPL partition size depends on sector size and we want kernel to use the same layout, so let U-Boot modify FDT accordingly. Signed-off-by: Ladislav Michl --- Changes: -v2 rebased against current git as it no longer applies board/isee/igep00x0/igep00x0.c | 17 + configs/igep0020_defconfig | 2 ++ configs/igep0030_defconfig | 2 ++ configs/igep0032_defconfig | 2 ++ 4 files changed, 23 insertions(+) diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index 669f3dde7f..ae7959b1eb 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include "igep00x0.h" DECLARE_GLOBAL_DATA_PTR; @@ -210,6 +212,21 @@ void board_mmc_power_init(void) } #endif +#ifdef CONFIG_OF_BOARD_SETUP +int ft_board_setup(void *blob, bd_t *bd) +{ +#ifdef CONFIG_FDT_FIXUP_PARTITIONS + static struct node_info nodes[] = { + { "ti,omap2-nand", MTD_DEV_TYPE_NAND, }, + { "ti,omap2-onenand", MTD_DEV_TYPE_ONENAND, }, + }; + + fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); +#endif + return 0; +} +#endif + void set_fdt(void) { switch (gd->bd->bi_arch_number) { diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 0dd244efc9..50bb4acf57 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y # CONFIG_SPL_EXT_SUPPORT is not set CONFIG_TARGET_OMAP3_IGEP00X0=y +CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_IS_IN_ENV=y @@ -36,3 +37,4 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y +CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 72fb874b87..42bd6fc3dc 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y # CONFIG_SPL_EXT_SUPPORT is not set CONFIG_TARGET_OMAP3_IGEP00X0=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_IS_IN_ENV=y @@ -28,3 +29,4 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y +CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 1318e5b2d0..01adb2032b 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y # CONFIG_SPL_EXT_SUPPORT is not set CONFIG_TARGET_OMAP3_IGEP00X0=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y @@ -27,3 +28,4 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y +CONFIG_FDT_FIXUP_PARTITIONS=y -- 2.11.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] sunxi: dts: OrangePi Zero: add Ethernet node
On Sat, Jan 14, 2017 at 02:06:09AM +, Andre Przywara wrote: > The OrangePi Zero can happily use the EMAC along with its integrated > PHY to use Ethernet (for TFTP booting, for instance). > Add the emac node to the board .dts by copying it from the OrangePi One > DT. > > Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] sunxi: OrangePi Zero: defconfig: enable SPI flash
On Sat, Jan 14, 2017 at 02:06:10AM +, Andre Przywara wrote: > Newer OrangePi Zero boards all come with 16 Mib SPI flash soldered, from > which the board can actually boot from. > Enable the SPL support for the SPI controller and SPI flash to allow > putting the SPL, the DT and U-Boot proper into there. This will let > a board boot without an SD card inserted. > The flash chip can be written with a version of the sunxi-fel tool. > > Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] mmc: fsl_esdhc: eMMC boot: CMD_ERR (-ECOMM) in u-boot while accessing SD
Hi, I've observed the CMD_ERR in U-Boot while accessing SD with boot from eMMC on i.MX6 board. SPL initializing SD as well eMMC controllers a) On SD bootmode: from u-boot prompt mmc dev 0 and mmc dev 1 is getting probe SD and eMMC b) On eMMC bootmode: from u-boot prompt mmc dev 0 is returning with -ECOMM in esdhc_send_cmd funtion of fsl_esdhc.c (see the below Log) but mmc dev 1 probed eMMC correctly Log: - icorem6qdl-rqs> mmc dev 0 esdhc_send_cmd: MMC=0x0 addr = 0x2198000, CMD0 esdhc_send_cmd: MMC=0x0 addr = 0x2198000, CMD8 ECOMM irqstat=0xc0001 CMD8 esdhc_send_cmd: MMC=0x0 addr = 0x2198000, CMD55 ECOMM CMD55 mmc_init: -70, time 53 With the above log, seems like irqstat has error with BIT19 -CIE-Command Index Error BIT18-CEBE-Command End Bit Error Usually once the CMD8 is executed based on the response the controller will switch to SD or MMC so further communication commands being changes based on that, but here due to controller irqstat error the controller is unable to switch to SD here. The actual working log is [1], this is booting from SD and here is full log[2] for booting from eMMC. [1] https://paste.ubuntu.com/23800820/ [2] https://paste.ubuntu.com/23800833/ Request for any help. Jagan. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] rockchip: rename miniarm to tinker board
Miniarm is the internal project code. Now it is officially named Tinker board. So rename it. Signed-off-by: Eddie Cai --- arch/arm/dts/Makefile | 2 +- arch/arm/dts/rk3288-miniarm.dts| 58 --- arch/arm/dts/rk3288-miniarm.dtsi | 521 - arch/arm/dts/rk3288-tinker.dts | 58 +++ arch/arm/dts/rk3288-tinker.dtsi| 521 + arch/arm/mach-rockchip/rk3288-board.c | 2 +- arch/arm/mach-rockchip/rk3288/Kconfig | 8 +- board/rockchip/miniarm_rk3288/Kconfig | 15 - board/rockchip/miniarm_rk3288/MAINTAINERS | 6 - board/rockchip/miniarm_rk3288/Makefile | 7 - board/rockchip/miniarm_rk3288/miniarm-rk3288.c | 7 - board/rockchip/tinker_rk3288/Kconfig | 15 + board/rockchip/tinker_rk3288/MAINTAINERS | 6 + board/rockchip/tinker_rk3288/Makefile | 7 + board/rockchip/tinker_rk3288/tinker-rk3288.c | 7 + configs/miniarm-rk3288_defconfig | 66 configs/tinker-rk3288_defconfig| 66 doc/README.rockchip| 2 +- include/configs/miniarm_rk3288.h | 37 -- include/configs/tinker_rk3288.h| 37 ++ 20 files changed, 724 insertions(+), 724 deletions(-) delete mode 100644 arch/arm/dts/rk3288-miniarm.dts delete mode 100644 arch/arm/dts/rk3288-miniarm.dtsi create mode 100644 arch/arm/dts/rk3288-tinker.dts create mode 100644 arch/arm/dts/rk3288-tinker.dtsi delete mode 100644 board/rockchip/miniarm_rk3288/Kconfig delete mode 100644 board/rockchip/miniarm_rk3288/MAINTAINERS delete mode 100644 board/rockchip/miniarm_rk3288/Makefile delete mode 100644 board/rockchip/miniarm_rk3288/miniarm-rk3288.c create mode 100644 board/rockchip/tinker_rk3288/Kconfig create mode 100644 board/rockchip/tinker_rk3288/MAINTAINERS create mode 100644 board/rockchip/tinker_rk3288/Makefile create mode 100644 board/rockchip/tinker_rk3288/tinker-rk3288.c delete mode 100644 configs/miniarm-rk3288_defconfig create mode 100644 configs/tinker-rk3288_defconfig delete mode 100644 include/configs/miniarm_rk3288.h create mode 100644 include/configs/tinker_rk3288.h diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 3ee608b..bd3f907 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -36,7 +36,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-rock2-square.dtb \ rk3288-evb.dtb \ rk3288-fennec.dtb \ - rk3288-miniarm.dtb \ + rk3288-tinker.dtb \ rk3288-popmetal.dtb \ rk3399-evb.dtb dtb-$(CONFIG_ARCH_MESON) += \ diff --git a/arch/arm/dts/rk3288-miniarm.dts b/arch/arm/dts/rk3288-miniarm.dts deleted file mode 100644 index 9083028..000 --- a/arch/arm/dts/rk3288-miniarm.dts +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0+ X11 - */ - -/dts-v1/; -#include "rk3288-miniarm.dtsi" - -/ { - model = "Miniarm-RK3288"; - compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288"; - - chosen { - stdout-path = &uart2; - }; -}; - -&dmc { - rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa - 0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7 - 0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0 - 0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0 - 0x5 0x0>; - rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200 - 0xa60 0x40 0x10 0x0>; - rockchip,sdram-params = <0x30B25564 0x627 3 66600 3 9 1>; -}; - - -&pinctrl { - u-boot,dm-pre-reloc; -}; - -&pwm1 { - status = "okay"; -}; - -&uart2 { - u-boot,dm-pre-reloc; - reg-shift = <2>; -}; - -&sdmmc { - u-boot,dm-pre-reloc; -}; - -&emmc { - u-boot,dm-pre-reloc; -}; - -&gpio3 { - u-boot,dm-pre-reloc; -}; - -&gpio8 { - u-boot,dm-pre-reloc; -}; diff --git a/arch/arm/dts/rk3288-miniarm.dtsi b/arch/arm/dts/rk3288-miniarm.dtsi deleted file mode 100644 index ceb4e2b..000 --- a/arch/arm/dts/rk3288-miniarm.dtsi +++ /dev/null @@ -1,521 +0,0 @@ -/* - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b
Re: [U-Boot] [PATCH 06/12] SPI: SPL: sunxi: fix 64-bit build
On Fri, Jan 13, 2017 at 01:29:58AM +, Andre Przywara wrote: > Addresses passed on to readl and writel are expected to be of the same > size as a pointer. Change the parameter types of sunxi_spi0_read_data() > to make the compiler happy and allow a warning-free aarch64 compile. > > Signed-off-by: Andre Przywara How about using intptr_t and uintptr_t from include/compiler.h? It will make it clearer that these parameters should be able to hold a pointer. > --- > drivers/mtd/spi/sunxi_spi_spl.c | 16 > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/mtd/spi/sunxi_spi_spl.c b/drivers/mtd/spi/sunxi_spi_spl.c > index a24c115..852abd4 100644 > --- a/drivers/mtd/spi/sunxi_spi_spl.c > +++ b/drivers/mtd/spi/sunxi_spi_spl.c > @@ -185,14 +185,14 @@ static void spi0_deinit(void) > #define SPI_READ_MAX_SIZE 60 /* FIFO size, minus 4 bytes of the header */ > > static void sunxi_spi0_read_data(u8 *buf, u32 addr, u32 bufsize, > - u32 spi_ctl_reg, > - u32 spi_ctl_xch_bitmask, > - u32 spi_fifo_reg, > - u32 spi_tx_reg, > - u32 spi_rx_reg, > - u32 spi_bc_reg, > - u32 spi_tc_reg, > - u32 spi_bcc_reg) > + ulong spi_ctl_reg, > + ulong spi_ctl_xch_bitmask, > + ulong spi_fifo_reg, > + ulong spi_tx_reg, > + ulong spi_rx_reg, > + ulong spi_bc_reg, > + ulong spi_tc_reg, > + ulong spi_bcc_reg) > { > writel(4 + bufsize, spi_bc_reg); /* Burst counter (total bytes) */ > writel(4, spi_tc_reg); /* Transfer counter (bytes to send) */ > -- -- Rask Ingemann Lambertsen ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] u-boot.git or u-boot-x86.git for x86_64 u-boots?
On Sat, 2017-01-14 at 10:06 -0700, Simon Glass wrote: > Hi Joakim, > > On 14 January 2017 at 04:51, Bin Meng wrote: > > +Simon, > > > > On Fri, Jan 13, 2017 at 4:12 AM, Joakim Tjernlund > > wrote: > > > I found two repos w.r.t x86_64 for u-boot, which one should I use? > > > > > > > U-Boot x86_64 support is not in mainstream yet. > > I'll be sending v3 fairly soon. But even then it is not complete. > Various things need fixing up and polishing - e.g. SDRAM sizing, > graphics ROMs, actually booting Linux! Great, getting closer every day. Any idea for how much is missing in u-boot to bring up a Rangeley(C2758), no graphics required. Need networking, rs232, USB and maybe SATA. Jocke ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] sunxi: dts: OrangePi Zero: add Ethernet node
On Sunday 15 January 2017 05:04 PM, Maxime Ripard wrote: On Sat, Jan 14, 2017 at 02:06:09AM +, Andre Przywara wrote: The OrangePi Zero can happily use the EMAC along with its integrated PHY to use Ethernet (for TFTP booting, for instance). Add the emac node to the board .dts by copying it from the OrangePi One DT. Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Reviewed-by: Jagan Teki Applied to u-boot-sunxi/master thanks! -- Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] sunxi: OrangePi Zero: defconfig: enable SPI flash
On Sunday 15 January 2017 05:04 PM, Maxime Ripard wrote: On Sat, Jan 14, 2017 at 02:06:10AM +, Andre Przywara wrote: Newer OrangePi Zero boards all come with 16 Mib SPI flash soldered, from which the board can actually boot from. Enable the SPL support for the SPI controller and SPI flash to allow putting the SPL, the DT and U-Boot proper into there. This will let a board boot without an SD card inserted. The flash chip can be written with a version of the sunxi-fel tool. Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Reviewed-by: Jagan Teki Applied to u-boot-sunxi/master thanks! -- Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request: u-boot-sunxi/master
Hi Tom, Please take this PR. thanks! Jagan. The following changes since commit 7f73ca484f792a0d2a7ee09860c32f3d02b3030d: Kconfig: CONFIG_OF_PLATDATA doesn't really exist (2017-01-14 12:20:23 -0500) are available in the git repository at: git://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to 7490130c9f8a4e17e858a38c767ad9ed64bd777b: sunxi: OrangePi Zero: defconfig: enable SPI flash (2017-01-15 18:22:27 +0100) Andre Przywara (2): sunxi: dts: OrangePi Zero: add Ethernet node sunxi: OrangePi Zero: defconfig: enable SPI flash Icenowy Zheng (2): sunxi: add proper device tree for Orange Pi Zero boards sunxi: add orangepi zero defconfig Jelle van der Waa (1): sunxi: enable H3 EMAC for the nanopi neo arch/arm/dts/Makefile| 1 + arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts | 154 +++ arch/arm/dts/sun8i-h3-nanopi-neo.dts | 11 ++ board/sunxi/MAINTAINERS | 5 + configs/orangepi_zero_defconfig | 17 +++ 5 files changed, 188 insertions(+) create mode 100644 arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts create mode 100644 configs/orangepi_zero_defconfig ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request: u-boot-spi/master
Hi Tom, Please take this PR. thanks! Jagan. The following changes since commit 70c1e0474a9df2c4493b4e2330cc41d3132b4e90: Merge git://git.denx.de/u-boot-rockchip (2017-01-12 21:20:51 -0500) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 68e7999ba9de0a15dd3dc99e078b70f41eb98c82: spi: Zap cf_qspi driver and related code (2017-01-15 18:29:04 +0100) Jagan Teki (2): spi: Zap ep93xx_spi driver and related code spi: Zap cf_qspi driver and related code arch/m68k/cpu/mcf52x2/cpu_init.c | 12 -- board/cirrus/edb93xx/edb93xx.c | 98 --- drivers/spi/Makefile | 2 - drivers/spi/cf_qspi.c| 354 --- drivers/spi/cf_spi.c | 4 - drivers/spi/ep93xx_spi.c | 272 -- include/configs/edb93xx.h| 10 -- scripts/config_whitelist.txt | 5 - 8 files changed, 757 deletions(-) delete mode 100644 drivers/spi/cf_qspi.c delete mode 100644 drivers/spi/ep93xx_spi.c ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v3, 2/2] spl: move RAM boot support in separate file
On Fri, Dec 23, 2016 at 07:51:53AM +0100, Stefan Agner wrote: > From: Stefan Agner > > Add a new top-level config option so support booting an image stored > in RAM. This allows to move the RAM boot support into a sparate file > and having a single condition to compile that file. > > Signed-off-by: Stefan Agner Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] armv8: fix #if around spin-table code in start.S
On Tue, Dec 27, 2016 at 11:19:43AM +0200, Oded Gabbay wrote: > Using CONFIG_IS_ENABLED() doesn't work in SPL. This patch replaces the only > occurrence of CONFIG_IS_ENABLED() in start.S to a regular #if defined(). > It also adds "&& !defined(CONFIG_SPL_BUILD)" to that #if statement because > the spin-table code can't currently work in SPL, and the spin-table file > isn't even compiled in SPL. > > Signed-off-by: Oded Gabbay Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v3, 1/2] Convert CONFIG_SPL_RAM_DEVICE to defconfig
On Fri, Dec 23, 2016 at 07:51:52AM +0100, Stefan Agner wrote: > From: Stefan Agner > > This converts the following to Kconfig: > CONFIG_SPL_RAM_DEVICE > > Signed-off-by: Stefan Agner Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 2/5] time: move timer APIs to include/time.h
On Wed, Dec 28, 2016 at 12:36:00AM +0900, Masahiro Yamada wrote: > The include/common.h is a collection of unrelated declarations, > macros, etc. > > It is horrible to include such a cluttered header just for some > timer functions. Split out timer functions into include/time.h. > > Signed-off-by: Masahiro Yamada > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 1/5] delay: collect {m, n, u}delay declarations to include/linux/delay.h
On Wed, Dec 28, 2016 at 12:35:59AM +0900, Masahiro Yamada wrote: > Currently, mdelay() and udelay() are declared in include/common.h, > while ndelay() in include/linux/compat.h. It would be nice to > collect them into include/linux/delay.h like Linux. > > While we are here, fix the ndelay() implementation; I used the > DIV_ROUND_UP() instead of (x)/1000 because it must wait *longer* > than the given period of time. > > Signed-off-by: Masahiro Yamada > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 4/5] time: import time_after, time_before and friends from Linux
On Wed, Dec 28, 2016 at 12:36:02AM +0900, Masahiro Yamada wrote: > It is not safe to compare timer values directly. > > On 32-bit systems, for example, timer_get_us() wraps around every > 72 min. (2 ^ 32 / 100 =~ 4295 sec =~ 72 min). Depending on > the get_ticks() implementation, it may wrap more frequently. > The 72 min might be possible on the use of U-Boot. > > Let's borrow time_after, time_before, and friends to solve the > wrap-around problem. > > These macros were copied from include/linux/jiffies.h of Linux 4.9. > > Signed-off-by: Masahiro Yamada > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 5/5] iopoll: import include/linux/iopoll.h from Linux 4.9
On Wed, Dec 28, 2016 at 12:36:03AM +0900, Masahiro Yamada wrote: > This was imported from Linux 4.9 and adjusted for U-Boot. > > - Replace the license block with SPDX > - Drop all *_atomic variants, which make no sense for U-Boot > - Remove the sleep_us argument, which makes no sense for U-Boot > > Signed-off-by: Masahiro Yamada Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] armv8: release slave cores from CPU_RELEASE_ADDR
On Wed, Dec 28, 2016 at 01:38:35PM +0200, Oded Gabbay wrote: > When using ARMv8 with ARMV8_SPIN_TABLE=y, we want the slave cores to > wait on spin_table_cpu_release_addr, until the Linux kernel will "wake" them > by writing to that location. The address of spin_table_cpu_release_addr is > transferred to the kernel using the device tree that is updated by > spin_table_update_dt(). > > However, if we also use SPL, then the slave cores are stuck at > CPU_RELEASE_ADDR instead and as a result, never wake up. > > This patch releases the slave cores by writing spl_image->entry_point to > CPU_RELEASE_ADDR location before the end of the SPL code > (at jump_to_image_no_args()). > > That way, the slave cores will start to execute the u-boot and will get to > the spin-table code and wait on the correct address > (spin_table_cpu_release_addr). > > Signed-off-by: Oded Gabbay > Cc: Simon Glass > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 3/5] typecheck: import include/linux/typecheck.h from Linux 4.9
On Wed, Dec 28, 2016 at 12:36:01AM +0900, Masahiro Yamada wrote: > Copied from Linux 4.9. > > Signed-off-by: Masahiro Yamada Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 2/2] lib: net_utils: enforce '.' as octet separator in string_to_ip
On Wed, Jan 04, 2017 at 01:36:26PM +1300, Chris Packham wrote: > Ensure '.' is used to separate octets. If another character is seen > reject the string outright and return 0.0.0.0. > > Signed-off-by: Chris Packham Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Kconfig: Refactoring of top-level Kconfig file
On Mon, Jan 02, 2017 at 04:32:13PM -0500, Robert P. J. Day wrote: > Some refactoring of the top-level Kconfig file which includes: > > * using "if" to remove numerous identical dependency tests > * reordering config entries to group related ones > * spelling and grammar fixes > > There should be no functional changes, only aesthetic ones. > > Signed-off-by: Robert P. J. Day Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 1/2] lib: net_utils: make string_to_ip stricter
On Wed, Jan 04, 2017 at 01:36:25PM +1300, Chris Packham wrote: > Previously values greater than 255 were implicitly truncated. Add some > stricter checking to reject addresses with components >255. > > With the input "1234192.168.1.1" the old behaviour would truncate the > address to 192.168.1.1. New behaviour rejects the string outright and > returns 0.0.0.0, which for the purposes of IP addresses can be > considered an error. > > Signed-off-by: Chris Packham Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ti: am335x: mmc: Set CONFIG_SYS_MMC_MAX_DEVICE
On Thu, Jan 05, 2017 at 04:16:36AM +0100, Emmanuel Vadot wrote: > Set CONFIG_SYS_MMC_MAX_DEVICE to 2 for am335x SoC. > This define is needed in the API code. > > Signed-off-by: Emmanuel Vadot Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ARM: omap3_logic: Use DEFAULT_LINUX_BOOT_ENV from ti_armv7_common
On Wed, Jan 04, 2017 at 09:26:43AM -0600, Adam Ford wrote: > Since we're including ti_armv7_common, let's pull in DEFAULT_LINUX_BOOT_ENV > and remove unnecessary duplicative definitions. This patch also renames a > few environmental variables to match what is inside ti_armv7_common. This > should help future-proof any subsequent memory or memory location changes. > > Signed-off-by: Adam Ford > > diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h > index b38811e..71ae2be 100644 Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE
On Fri, Jan 06, 2017 at 04:32:12PM -0600, Andrew F. Davis wrote: > The SPL load address changes based on boot type in HS devices, > ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs > for similar reasons. Add this same logic for AM33xx devices. > > Also make the default value for ISW_ENTRY_ADDR correct for GP > devices based on SoC, HS devices already pick the correct > value in their defconfig. > > Signed-off-by: Andrew F. Davis Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] mkimage: Add support for signing with pkcs11
On Fri, Jan 06, 2017 at 01:14:17PM -0600, George McCollister wrote: > Add support for signing with the pkcs11 engine. This allows FIT images > to be signed with keys securely stored on a smartcard, hardware security > module, etc without exposing the keys. > > Support for other engines can be added in the future by modifying > rsa_engine_get_pub_key() and rsa_engine_get_priv_key() to construct > correct key_id strings. > > Signed-off-by: George McCollister Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Makefile: Make EFI build quiet
On Fri, Jan 06, 2017 at 04:23:59PM -0600, Andrew F. Davis wrote: > Make building EFI example less noisy. > > Signed-off-by: Andrew F. Davis > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Avoid non-portable sed construct
On Sun, Jan 08, 2017 at 07:11:27PM +0100, Mark Kettenis wrote: > Using \n in a substitution is a GNU extension. Use the 'G" command instead > to insert the desired line. > > Signed-off-by: Mark Kettenis Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,3/3] omapl138_lcdk: remove empty ifdef block
On Mon, Jan 09, 2017 at 11:06:38AM +0100, Fabien Parent wrote: > Small clean-up. > > Signed-off-by: Fabien Parent > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/3] davinci: spl: use bootcfg to select boot device
On Mon, Jan 09, 2017 at 11:06:36AM +0100, Fabien Parent wrote: > Right now the SPL is trying to load u-boot based on defines, i.e. one > has to define CONFIG_SPL_NAND_SIMPLE to boot from NAND, > or CONFIG_SPL_SPI_LOAD to boot from SPI FLASH, etc... > This prevent us from having a single SPL image that is able to boot from > all media, and one need to build an image for each medium. This > commit is replacing the #ifdef that select the boot medium by reading > the value of the boot pins (via the BOOTCFG register). > > Now a single SPL image will be able to read from the boot pin to know > which device should be used to load u-boot. > > Signed-off-by: Fabien Parent > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,2/3] omapl138_lcdk: enable SPL MMC support
On Mon, Jan 09, 2017 at 11:06:37AM +0100, Fabien Parent wrote: > Enable SPL MMC support in order to allow to build a single u-boot image > that is able to boot from MMC and NAND devices. > > Signed-off-by: Fabien Parent > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] omap-gpmc: use SECTOR_BYTES instead of hardcoded value
On Mon, Jan 09, 2017 at 11:15:14AM +0100, Ladislav Michl wrote: > Replace hardcoded value with defined constant SECTOR_BYTES. > > Signed-off-by: Ladislav Michl > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] igep00x0: Remove IGEP0020_NAND BOARD entry from MAINTAINERS
On Mon, Jan 09, 2017 at 11:31:43AM +0100, Ladislav Michl wrote: > Boards with NAND and OneNAND are supported by single configuration, > thus remove now obsolete IGEP0020_NAND BOARD entry. > > Signed-off-by: Ladislav Michl Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] igep00x0: enable CONFIG_FDT_FIXUP_PARTITIONS
On Mon, Jan 09, 2017 at 11:21:06AM +0100, Ladislav Michl wrote: > SPL partition size depends on sector size and we want kernel to use > the same layout, so let U-Boot modify FDT accordingly. > > Signed-off-by: Ladislav Michl Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] rtc: pcf2127: Update Kconfig and code style
On Mon, Jan 09, 2017 at 11:24:51AM -0700, Simon Glass wrote: > From: Meng Yi > > Unfortunately version 2 of this patch was applied which was missing some > changes. Fix this. > > Signed-off-by: Meng Yi > Acked-by: Simon Glass > Signed-off-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] cmd: sata: fix init command return value
On Wed, Jan 11, 2017 at 04:51:53PM +0100, Gary Bisson wrote: > Since commit aa6ab905b2, sata_initialize returns -1 if init_sata or > scan_sata fails. But this return value becomes the do_sata return > value which is equivalent to CMD_RET_USAGE. > > In case one issues 'sata init' and that the hardware fails to > initialize, there's no need to display the command usage. Instead > the command shoud just return the CMD_RET_FAILURE value. > > Fixes: aa6ab905b2 (sata: fix sata command can not being executed bug) > > Signed-off-by: Gary Bisson > Reviewed-by: Eric Nelson > Reviewed-by: Simon Glass Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] arm: omap-common: add secure ROM signature verify index for AM33xx
On Wed, Jan 11, 2017 at 10:19:52AM -0600, Andrew F. Davis wrote: > On AM33xx devices the secure ROM uses a different call index for > signature verification, the function and arguments are the same. > > Signed-off-by: Andrew F. Davis Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] MAINTAINERS: Add maintainer for TI security related files
On Wed, Jan 11, 2017 at 11:09:27AM -0600, Andrew F. Davis wrote: > Changes involving High-Security boards should be CC'd for additional > assessment of the security implications. > > Signed-off-by: Andrew F. Davis Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ti_armv7_common: env: Use FIT image configs by default
On Wed, Jan 11, 2017 at 10:28:08AM -0600, Andrew F. Davis wrote: > This allows us to specify a FIT configuration that will automatically > use the correct images from the FIT blob. > > Signed-off-by: Andrew F. Davis Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] MAINTAINERS: Add maintainer for TI security related files
On Wed, Jan 11, 2017 at 6:09 PM, Andrew F. Davis wrote: > Changes involving High-Security boards should be CC'd for additional > assessment of the security implications. > > Signed-off-by: Andrew F. Davis > --- > Recently some fastboot additions have been made that may effect security > on our HS boards by letting some boot methods work around our chain-of- > trust. It would be nice to get a CC for changes that directly effect > these HS boards so I have a chance to check for this kind of thing. > > MAINTAINERS | 11 +++ > 1 file changed, 11 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 793ff49f68..1ea7ae013a 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -434,6 +434,17 @@ S: Maintained > F: drivers/spmi/ > F: include/spmi/ > > +TI SYSTEM SECURITY > +M: Andrew F. Davis > +S: Supported > +F: arch/arm/mach-omap2/omap5/sec_entry_cpu1.S > +F: arch/arm/mach-omap2/omap5/sec-fxns.c > +F: arch/arm/mach-omap2/sec-common.c > +F: arch/arm/mach-omap2/config_secure.mk > +F: configs/am43xx_hs_evm_defconfig > +F: configs/am57xx_hs_evm_defconfig > +F: configs/dra7xx_hs_evm_defconfig I thought of commenting this but some how missed, configs/*_defconfig files shouldn't be part of MAINTAINERS it has a separate file in respective boards. thanks! -- Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] odroid-c2: Enable distro boot
Use the generic "distro" boot framework to enable automatic DHCP boot. The fdt and kernel addresses are adopted from downstream; ramdisk and scriptaddr addresses were chosen arbitrarily. Signed-off-by: Andreas Färber --- Kconfig | 1 + configs/odroid-c2_defconfig | 1 - include/configs/meson-gxbb-common.h | 14 ++ include/configs/odroid-c2.h | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 3f79f6f..166fbf8 100644 --- a/Kconfig +++ b/Kconfig @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" default y if ARCH_SUNXI || TEGRA default y if ARCH_LS2080A + default y if ARCH_MESON default y if ARCH_ROCKCHIP default n select CMD_BOOTZ if ARM && !ARM64 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 7d0b2b1..119ab07 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 3bba2e6..75f6dc5 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -40,4 +40,18 @@ #include +#define BOOT_TARGET_DEVICES(func) \ + func(DHCP, dhcp, na) + +#include + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_addr_r=0x0100\0" \ + "scriptaddr=0x1f00\0" \ + "kernel_addr_r=0x0108\0" \ + "pxefile_addr_r=0x0108\0" \ + "ramdisk_addr_r=0x1000\0" \ + MESON_FDTFILE_SETTING \ + BOOTENV + #endif /* __MESON_GXBB_COMMON_CONFIG_H */ diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 1d5b3d5..bf7e1af 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -12,6 +12,8 @@ #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE115200 +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" + #include #endif /* __CONFIG_H */ -- 2.10.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] MAINTAINERS: Add maintainer for TI security related files
On Sun, Jan 15, 2017 at 07:50:35PM +0100, Jagan Teki wrote: > On Wed, Jan 11, 2017 at 6:09 PM, Andrew F. Davis wrote: > > Changes involving High-Security boards should be CC'd for additional > > assessment of the security implications. > > > > Signed-off-by: Andrew F. Davis > > --- > > Recently some fastboot additions have been made that may effect security > > on our HS boards by letting some boot methods work around our chain-of- > > trust. It would be nice to get a CC for changes that directly effect > > these HS boards so I have a chance to check for this kind of thing. > > > > MAINTAINERS | 11 +++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 793ff49f68..1ea7ae013a 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -434,6 +434,17 @@ S: Maintained > > F: drivers/spmi/ > > F: include/spmi/ > > > > +TI SYSTEM SECURITY > > +M: Andrew F. Davis > > +S: Supported > > +F: arch/arm/mach-omap2/omap5/sec_entry_cpu1.S > > +F: arch/arm/mach-omap2/omap5/sec-fxns.c > > +F: arch/arm/mach-omap2/sec-common.c > > +F: arch/arm/mach-omap2/config_secure.mk > > +F: configs/am43xx_hs_evm_defconfig > > +F: configs/am57xx_hs_evm_defconfig > > +F: configs/dra7xx_hs_evm_defconfig > > I thought of commenting this but some how missed, configs/*_defconfig > files shouldn't be part of MAINTAINERS it has a separate file in > respective boards. I'm indifferent in cases like this. For example, dra7xx_hs_evm has two maintainers, Andrew (due to the security side) and Lokesh (who owns the TI ref platforms in general). Making Andrew edit 3 (4 with the am335x_hs_evm_defconfig coming soon) MAINTAINERS files to add 4 lines each won't add to the clarity of things as get_maintainer.pl should do the correct thing and list both, today. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] odroid-c2: Enable distro boot
Use the generic "distro" boot framework to enable automatic DHCP boot. The fdt and kernel addresses are adopted from downstream; ramdisk and scriptaddr addresses were chosen arbitrarily. Signed-off-by: Andreas Färber --- Kconfig | 1 + configs/odroid-c2_defconfig | 1 - include/configs/meson-gxbb-common.h | 14 ++ include/configs/odroid-c2.h | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 3f79f6f..166fbf8 100644 --- a/Kconfig +++ b/Kconfig @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" default y if ARCH_SUNXI || TEGRA default y if ARCH_LS2080A + default y if ARCH_MESON default y if ARCH_ROCKCHIP default n select CMD_BOOTZ if ARM && !ARM64 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 7d0b2b1..119ab07 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 3bba2e6..75f6dc5 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -40,4 +40,18 @@ #include +#define BOOT_TARGET_DEVICES(func) \ + func(DHCP, dhcp, na) + +#include + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_addr_r=0x0100\0" \ + "scriptaddr=0x1f00\0" \ + "kernel_addr_r=0x0108\0" \ + "pxefile_addr_r=0x0108\0" \ + "ramdisk_addr_r=0x1000\0" \ + MESON_FDTFILE_SETTING \ + BOOTENV + #endif /* __MESON_GXBB_COMMON_CONFIG_H */ diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 1d5b3d5..bf7e1af 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -12,6 +12,8 @@ #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE115200 +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" + #include #endif /* __CONFIG_H */ -- 2.10.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] meson: misc_init_r is board-specific
Move it from meson-gxbb-common.h to odroid-c2.h to allow new boards not to implement it. Signed-off-by: Andreas Färber --- include/configs/meson-gxbb-common.h | 1 - include/configs/odroid-c2.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 75f6dc5..17e81b4 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_MAXARGS 32 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_MISC_INIT_R #define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_SYS_TEXT_BASE 0x0100 diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index bf7e1af..48f4a68 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_MISC_INIT_R + /* Serial setup */ #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE115200 -- 2.10.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] odroid-c2: Enable distro boot
On 15/01/2017 19:52, Andreas Färber wrote: Use the generic "distro" boot framework to enable automatic DHCP boot. The fdt and kernel addresses are adopted from downstream; ramdisk and scriptaddr addresses were chosen arbitrarily. Signed-off-by: Andreas Färber --- Kconfig | 1 + configs/odroid-c2_defconfig | 1 - include/configs/meson-gxbb-common.h | 14 ++ include/configs/odroid-c2.h | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 3f79f6f..166fbf8 100644 --- a/Kconfig +++ b/Kconfig @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" default y if ARCH_SUNXI || TEGRA default y if ARCH_LS2080A + default y if ARCH_MESON default y if ARCH_ROCKCHIP default n select CMD_BOOTZ if ARM && !ARM64 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 7d0b2b1..119ab07 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 3bba2e6..75f6dc5 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -40,4 +40,18 @@ #include +#define BOOT_TARGET_DEVICES(func) \ + func(DHCP, dhcp, na) I probably asked this 50 times before already. If so, please forgive me asking a 51st time. Is network the only I/O you have available in U-Boot on that system? No SATA? No MMC? If so, please note it in the patch description, so that it's clear to someone looking at U-Boot's patch history why we're limiting ourselves to DHCP boot. The rest looks perfectly reasonable to me. Alex + +#include + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_addr_r=0x0100\0" \ + "scriptaddr=0x1f00\0" \ + "kernel_addr_r=0x0108\0" \ + "pxefile_addr_r=0x0108\0" \ + "ramdisk_addr_r=0x1000\0" \ + MESON_FDTFILE_SETTING \ + BOOTENV + #endif /* __MESON_GXBB_COMMON_CONFIG_H */ diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 1d5b3d5..bf7e1af 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -12,6 +12,8 @@ #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE115200 +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" + #include #endif /* __CONFIG_H */ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Rockchip RK3288 boot trouble
Hi All, I updated one of my two RK3288 boards (Viewsonic) with newer Android factory firmware (using Windows) and now it won't boot mainline u-boot when I use the same exact recipe that worked previously: sudo ${UPGD} db rkbin/rk32/rk3288_boot.bin sudo ${UPGD} wl 0x40 tftpboot/u-boot-dtb.bin Been trying to figure out what's wrong. My theory is that the newer firmware enabled one of the "boot areas" of the eMMC and the "wl 0x40" command above only writes to the user area of the eMMC. I can still load and run one of the Android u-boots using the boot_merger method: ./tools/boot_merger --subfix ".10.bin" ./tools/rk_tools/RKBOOT/RK3288.ini then flashing via: sudo ${UPGD} ul u-boot-android/RK3288UbootLoader_V2.30.10.bin But these u-boot's are virtually useless since they striped of useful commands (like mmc commands). I tried using the above boot_merger command on mainline u-boot but it only boots this far (I've tried u-boot-dtb.bin and u-boot.bin): -- U-Boot 2016.11-08467-g05b8ba7-dirty (Jan 15 2017 - 10:40:37 -0800) Model: SCT36-RK3288 DRAM: 128 MiB -- Note the incorrect DRAM size. My normal boot looks like: -- U-Boot SPL 2016.11-08467-g05b8ba7-dirty (Dec 18 2016 - 11:00:14) U-Boot 2016.11-08467-g05b8ba7-dirty (Dec 18 2016 - 11:00:14 -0800) Model: SCT36-RK3288 DRAM: 2 GiB MMC: dwmmc@ff0c: 0, dwmmc@ff0f: 1 ... -- Note that this runs SPL, then normal u-boot whereas the previous one didn't run SPL. Any ideas how I can get mainline u-boot running on this board? Thanks much, Rick ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] odroid-c2: Enable distro boot
Am 15.01.2017 um 20:03 schrieb Alexander Graf: > On 15/01/2017 19:52, Andreas Färber wrote: >> Use the generic "distro" boot framework to enable automatic DHCP boot. >> >> The fdt and kernel addresses are adopted from downstream; ramdisk and >> scriptaddr addresses were chosen arbitrarily. >> >> Signed-off-by: Andreas Färber >> --- >> Kconfig | 1 + >> configs/odroid-c2_defconfig | 1 - >> include/configs/meson-gxbb-common.h | 14 ++ >> include/configs/odroid-c2.h | 2 ++ >> 4 files changed, 17 insertions(+), 1 deletion(-) >> >> diff --git a/Kconfig b/Kconfig >> index 3f79f6f..166fbf8 100644 >> --- a/Kconfig >> +++ b/Kconfig >> @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS >> bool "Select defaults suitable for booting general purpose Linux >> distributions" >> default y if ARCH_SUNXI || TEGRA >> default y if ARCH_LS2080A >> +default y if ARCH_MESON >> default y if ARCH_ROCKCHIP >> default n >> select CMD_BOOTZ if ARM && !ARM64 >> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig >> index 7d0b2b1..119ab07 100644 >> --- a/configs/odroid-c2_defconfig >> +++ b/configs/odroid-c2_defconfig >> @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y >> # CONFIG_CMD_IMLS is not set >> # CONFIG_CMD_LOADS is not set >> # CONFIG_CMD_FPGA is not set >> -# CONFIG_CMD_SOURCE is not set >> # CONFIG_CMD_SETEXPR is not set >> CONFIG_OF_CONTROL=y >> CONFIG_NET_RANDOM_ETHADDR=y >> diff --git a/include/configs/meson-gxbb-common.h >> b/include/configs/meson-gxbb-common.h >> index 3bba2e6..75f6dc5 100644 >> --- a/include/configs/meson-gxbb-common.h >> +++ b/include/configs/meson-gxbb-common.h >> @@ -40,4 +40,18 @@ >> >> #include >> >> +#define BOOT_TARGET_DEVICES(func) \ >> +func(DHCP, dhcp, na) > > I probably asked this 50 times before already. If so, please forgive me > asking a 51st time. > > Is network the only I/O you have available in U-Boot on that system? No > SATA? No MMC? Yep, no improvement yet: https://patchwork.ozlabs.org/patch/690146/ I've tried to rebase Carlo's MMC patches and am able to boot into U-Boot, but when accessing SD or eMMC it freezes. Lack of MMC drivers shouldn't hold up obviously missing address and fdtfile definitions here. > If so, please note it in the patch description, so that it's clear to > someone looking at U-Boot's patch history why we're limiting ourselves > to DHCP boot. Honestly, I don't think that's the reason v1 hasn't been applied... ;) > The rest looks perfectly reasonable to me. Thanks, I changed the addresses from v1 to the ones from the vendor as far as possible. Cheers, Andreas -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3] odroid-c2: Enable distro boot
Use the generic "distro" boot framework to enable automatic DHCP boot. MMC and USB are not yet implemented, so this is the only boot option. The fdt and kernel addresses are adopted from downstream; ramdisk and scriptaddr addresses were chosen arbitrarily. Signed-off-by: Andreas Färber --- Kconfig | 1 + configs/odroid-c2_defconfig | 1 - include/configs/meson-gxbb-common.h | 14 ++ include/configs/odroid-c2.h | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 3f79f6f..166fbf8 100644 --- a/Kconfig +++ b/Kconfig @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" default y if ARCH_SUNXI || TEGRA default y if ARCH_LS2080A + default y if ARCH_MESON default y if ARCH_ROCKCHIP default n select CMD_BOOTZ if ARM && !ARM64 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 7d0b2b1..119ab07 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 3bba2e6..75f6dc5 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -40,4 +40,18 @@ #include +#define BOOT_TARGET_DEVICES(func) \ + func(DHCP, dhcp, na) + +#include + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_addr_r=0x0100\0" \ + "scriptaddr=0x1f00\0" \ + "kernel_addr_r=0x0108\0" \ + "pxefile_addr_r=0x0108\0" \ + "ramdisk_addr_r=0x1000\0" \ + MESON_FDTFILE_SETTING \ + BOOTENV + #endif /* __MESON_GXBB_COMMON_CONFIG_H */ diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 1d5b3d5..bf7e1af 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -12,6 +12,8 @@ #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE115200 +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" + #include #endif /* __CONFIG_H */ -- 2.10.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] odroid-c2: Enable distro boot
> Am 15.01.2017 um 20:20 schrieb Andreas Färber : > >> Am 15.01.2017 um 20:03 schrieb Alexander Graf: >>> On 15/01/2017 19:52, Andreas Färber wrote: >>> Use the generic "distro" boot framework to enable automatic DHCP boot. >>> >>> The fdt and kernel addresses are adopted from downstream; ramdisk and >>> scriptaddr addresses were chosen arbitrarily. >>> >>> Signed-off-by: Andreas Färber >>> --- >>> Kconfig | 1 + >>> configs/odroid-c2_defconfig | 1 - >>> include/configs/meson-gxbb-common.h | 14 ++ >>> include/configs/odroid-c2.h | 2 ++ >>> 4 files changed, 17 insertions(+), 1 deletion(-) >>> >>> diff --git a/Kconfig b/Kconfig >>> index 3f79f6f..166fbf8 100644 >>> --- a/Kconfig >>> +++ b/Kconfig >>> @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS >>> bool "Select defaults suitable for booting general purpose Linux >>> distributions" >>> default y if ARCH_SUNXI || TEGRA >>> default y if ARCH_LS2080A >>> +default y if ARCH_MESON >>> default y if ARCH_ROCKCHIP >>> default n >>> select CMD_BOOTZ if ARM && !ARM64 >>> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig >>> index 7d0b2b1..119ab07 100644 >>> --- a/configs/odroid-c2_defconfig >>> +++ b/configs/odroid-c2_defconfig >>> @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y >>> # CONFIG_CMD_IMLS is not set >>> # CONFIG_CMD_LOADS is not set >>> # CONFIG_CMD_FPGA is not set >>> -# CONFIG_CMD_SOURCE is not set >>> # CONFIG_CMD_SETEXPR is not set >>> CONFIG_OF_CONTROL=y >>> CONFIG_NET_RANDOM_ETHADDR=y >>> diff --git a/include/configs/meson-gxbb-common.h >>> b/include/configs/meson-gxbb-common.h >>> index 3bba2e6..75f6dc5 100644 >>> --- a/include/configs/meson-gxbb-common.h >>> +++ b/include/configs/meson-gxbb-common.h >>> @@ -40,4 +40,18 @@ >>> >>> #include >>> >>> +#define BOOT_TARGET_DEVICES(func) \ >>> +func(DHCP, dhcp, na) >> >> I probably asked this 50 times before already. If so, please forgive me >> asking a 51st time. >> >> Is network the only I/O you have available in U-Boot on that system? No >> SATA? No MMC? > > Yep, no improvement yet: https://patchwork.ozlabs.org/patch/690146/ > > I've tried to rebase Carlo's MMC patches and am able to boot into > U-Boot, but when accessing SD or eMMC it freezes. > > Lack of MMC drivers shouldn't hold up obviously missing address and > fdtfile definitions here. > >> If so, please note it in the patch description, so that it's clear to >> someone looking at U-Boot's patch history why we're limiting ourselves >> to DHCP boot. > > Honestly, I don't think that's the reason v1 hasn't been applied... ;) I agree, so what is the holdup? The merge window is open. Alex ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] igep00x0: enable CONFIG_FDT_FIXUP_PARTITIONS
On Sun, Jan 15, 2017 at 01:04:31PM +0100, Ladislav Michl wrote: > SPL partition size depends on sector size and we want kernel to use > the same layout, so let U-Boot modify FDT accordingly. > > Signed-off-by: Ladislav Michl > --- > Changes: > -v2 rebased against current git as it no longer applies I ended up rebasing myself when applying as it was an easy fixup, JFYI. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] odroid-c2: Enable distro boot
> Am 15.01.2017 um 20:22 schrieb Andreas Färber : > > Use the generic "distro" boot framework to enable automatic DHCP boot. > MMC and USB are not yet implemented, so this is the only boot option. > > The fdt and kernel addresses are adopted from downstream; ramdisk and > scriptaddr addresses were chosen arbitrarily. > > Signed-off-by: Andreas Färber Reviewed-by: Alexander Graf Tom, if this doesn't get picked up in time for the merge window by the maintainer, please take it directly :). Alex ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 05/10] arm: dts: imx6ul-isiot: Add FEC node
From: Jagan Teki Add FEC node for Engicam Is.IoT MX6UL module. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - none arch/arm/dts/imx6ul-isiot.dts | 22 ++ 1 file changed, 22 insertions(+) diff --git a/arch/arm/dts/imx6ul-isiot.dts b/arch/arm/dts/imx6ul-isiot.dts index 4b1cc59..c46759a 100644 --- a/arch/arm/dts/imx6ul-isiot.dts +++ b/arch/arm/dts/imx6ul-isiot.dts @@ -59,6 +59,13 @@ }; }; +&fec1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet1>; + phy-mode = "rmii"; + status = "okay"; +}; + &i2c1 { clock-frequency = <10>; pinctrl-names = "default"; @@ -89,6 +96,21 @@ }; &iomuxc { + pinctrl_enet1: enet1grp { + fsl,pins = < + MX6UL_PAD_ENET2_RX_DATA0__ENET1_MDIO0x1b0b0 + MX6UL_PAD_ENET2_RX_DATA1__ENET1_MDC 0x1b0b0 + MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x1b0b0 + MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0 + MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0 + MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0 + MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0 + MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0 + MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031 + MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10 0x1b0b0 + >; + }; + pinctrl_i2c1: i2c1grp { fsl,pins = < MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0 -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 00/10] imx6ul: Add Engicam Is.IoT MX6UL support
From: Jagan Teki This patch set support Engicam Is.IoT MX6UL board support. Jagan Teki (10): configs: imx6: Don't define USDHC2_BASE_ADDR arm: imx6ul: Add Engicam Is.IoT MX6UL Starter Kit initial support arm: dts: imx6ul-isiot: Add I2C nodes imx6: isiotmx6ul: Add I2C support arm: dts: imx6ul-isiot: Add FEC node imx6: isiotmx6ul: Add FEC support arm: dts: imx6ul-isiot: Add eMMC node imx6: isiotmx6ul: Add NAND support imx6: isiotmx6ul: Add nandboot env support imx6ul: isiotmx6ul: Enable I2C support arch/arm/cpu/armv7/mx6/Kconfig| 13 ++ arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx6ul-isiot.dts | 170 ++ board/engicam/isiotmx6ul/Kconfig | 12 ++ board/engicam/isiotmx6ul/MAINTAINERS | 7 + board/engicam/isiotmx6ul/Makefile | 6 + board/engicam/isiotmx6ul/README | 28 +++ board/engicam/isiotmx6ul/isiotmx6ul.c | 316 ++ configs/imx6ul_isiot_mmc_defconfig| 47 + configs/imx6ul_isiot_nand_defconfig | 49 ++ include/configs/imx6qdl_icore.h | 2 +- include/configs/imx6ul_geam.h | 2 +- include/configs/imx6ul_isiot.h| 205 ++ 13 files changed, 857 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/imx6ul-isiot.dts create mode 100644 board/engicam/isiotmx6ul/Kconfig create mode 100644 board/engicam/isiotmx6ul/MAINTAINERS create mode 100644 board/engicam/isiotmx6ul/Makefile create mode 100644 board/engicam/isiotmx6ul/README create mode 100644 board/engicam/isiotmx6ul/isiotmx6ul.c create mode 100644 configs/imx6ul_isiot_mmc_defconfig create mode 100644 configs/imx6ul_isiot_nand_defconfig create mode 100644 include/configs/imx6ul_isiot.h -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 01/10] configs: imx6: Don't define USDHC2_BASE_ADDR
From: Jagan Teki USDHC base address will assigned by SPL using fsl_esdhc_initialize and u-boot with devicetree, hence no remove base address assignment in config files. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - none include/configs/imx6qdl_icore.h | 2 +- include/configs/imx6ul_geam.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h index eb83d23..5a28b15 100644 --- a/include/configs/imx6qdl_icore.h +++ b/include/configs/imx6qdl_icore.h @@ -147,7 +147,7 @@ #ifdef CONFIG_FSL_USDHC # define CONFIG_SYS_MMC_ENV_DEV0 # define CONFIG_SYS_FSL_USDHC_NUM 1 -# define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR +# define CONFIG_SYS_FSL_ESDHC_ADDR 0 #endif /* NAND */ diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h index 23fa3ee..8bffacd 100644 --- a/include/configs/imx6ul_geam.h +++ b/include/configs/imx6ul_geam.h @@ -145,7 +145,7 @@ #ifdef CONFIG_FSL_USDHC # define CONFIG_SYS_MMC_ENV_DEV0 # define CONFIG_SYS_FSL_USDHC_NUM 1 -# define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR +# define CONFIG_SYS_FSL_ESDHC_ADDR 0 #endif /* NAND */ -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 03/10] arm: dts: imx6ul-isiot: Add I2C nodes
From: Jagan Teki Add I2C nodes for Engicam Is.IoT MX6UL module. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - none arch/arm/dts/imx6ul-isiot.dts | 28 1 file changed, 28 insertions(+) diff --git a/arch/arm/dts/imx6ul-isiot.dts b/arch/arm/dts/imx6ul-isiot.dts index 2b96a11..4b1cc59 100644 --- a/arch/arm/dts/imx6ul-isiot.dts +++ b/arch/arm/dts/imx6ul-isiot.dts @@ -59,6 +59,20 @@ }; }; +&i2c1 { + clock-frequency = <10>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; +}; + +&i2c2 { + clock_frequency = <10>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; +}; + &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; @@ -75,6 +89,20 @@ }; &iomuxc { + pinctrl_i2c1: i2c1grp { + fsl,pins = < + MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0 + MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0 + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0 + MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1 -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 02/10] arm: imx6ul: Add Engicam Is.IoT MX6UL Starter Kit initial support
From: Jagan Teki Boot from MMC: - U-Boot SPL 2017.01-rc2-gba3c151-dirty (Jan 02 2017 - 16:59:33) Trying to boot from MMC1 U-Boot 2017.01-rc2-gba3c151-dirty (Jan 02 2017 - 16:59:33 +0100) CPU: Freescale i.MX6UL rev1.1 528 MHz (running at 396 MHz) CPU: Industrial temperature grade (-40C to 105C) at 33C Reset cause: POR Model: Engicam Is.IoT MX6UL Starterkit DRAM: 512 MiB MMC: FSL_SDHC: 0 *** Warning - bad CRC, using default environment In:serial Out: serial Err: serial Net: CPU Net Initialization Failed No ethernet found. Hit any key to stop autoboot: 0 isiotmx6ul> Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - none arch/arm/cpu/armv7/mx6/Kconfig| 11 ++ arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx6ul-isiot.dts | 95 + board/engicam/isiotmx6ul/Kconfig | 12 ++ board/engicam/isiotmx6ul/MAINTAINERS | 6 + board/engicam/isiotmx6ul/Makefile | 6 + board/engicam/isiotmx6ul/README | 28 board/engicam/isiotmx6ul/isiotmx6ul.c | 247 ++ configs/imx6ul_isiot_mmc_defconfig| 42 ++ include/configs/imx6ul_isiot.h| 142 +++ 10 files changed, 591 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx6ul-isiot.dts create mode 100644 board/engicam/isiotmx6ul/Kconfig create mode 100644 board/engicam/isiotmx6ul/MAINTAINERS create mode 100644 board/engicam/isiotmx6ul/Makefile create mode 100644 board/engicam/isiotmx6ul/README create mode 100644 board/engicam/isiotmx6ul/isiotmx6ul.c create mode 100644 configs/imx6ul_isiot_mmc_defconfig create mode 100644 include/configs/imx6ul_isiot.h diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index c646966..72780d7 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -205,6 +205,16 @@ config TARGET_MX6UL_GEAM select DM_THERMAL select SUPPORT_SPL +config TARGET_MX6UL_ISIOT + bool "Support Engicam Is.IoT MX6UL" + select MX6UL + select OF_CONTROL + select DM + select DM_GPIO + select DM_MMC + select DM_THERMAL + select SUPPORT_SPL + config TARGET_MX6ULL_14X14_EVK bool "Support mx6ull_14x14_evk" select MX6ULL @@ -313,6 +323,7 @@ source "board/embest/mx6boards/Kconfig" source "board/engicam/geam6ul/Kconfig" source "board/engicam/icorem6/Kconfig" source "board/engicam/icorem6_rqs/Kconfig" +source "board/engicam/isiotmx6ul/Kconfig" source "board/freescale/mx6qarm2/Kconfig" source "board/freescale/mx6qsabreauto/Kconfig" source "board/freescale/mx6sabresd/Kconfig" diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 3ee608b..322cbd2 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -301,7 +301,8 @@ dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \ imx6dl-icore-rqs.dtb \ imx6q-icore.dtb \ imx6q-icore-rqs.dtb \ - imx6ul-geam-kit.dtb + imx6ul-geam-kit.dtb \ + imx6ul-isiot.dtb dtb-$(CONFIG_MX7) += imx7-colibri.dtb diff --git a/arch/arm/dts/imx6ul-isiot.dts b/arch/arm/dts/imx6ul-isiot.dts new file mode 100644 index 000..2b96a11 --- /dev/null +++ b/arch/arm/dts/imx6ul-isiot.dts @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2016 Amarula Solutions B.V. + * Copyright (C) 2016 Engicam S.r.l. + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NO
[U-Boot] [PATCH v2 06/10] imx6: isiotmx6ul: Add FEC support
From: Jagan Teki Add FEC support for Engicam Is.IoT MX6UL module. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - none arch/arm/cpu/armv7/mx6/Kconfig | 1 + configs/imx6ul_isiot_mmc_defconfig | 3 +++ include/configs/imx6ul_isiot.h | 10 ++ 3 files changed, 14 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index b81e18c..46b2b59 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -210,6 +210,7 @@ config TARGET_MX6UL_ISIOT select MX6UL select OF_CONTROL select DM + select DM_ETH select DM_GPIO select DM_I2C select DM_MMC diff --git a/configs/imx6ul_isiot_mmc_defconfig b/configs/imx6ul_isiot_mmc_defconfig index f85970b..6ce771c 100644 --- a/configs/imx6ul_isiot_mmc_defconfig +++ b/configs/imx6ul_isiot_mmc_defconfig @@ -20,6 +20,8 @@ CONFIG_FIT_SIGNATURE=y # CONFIG_DM_MMC_OPS is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y CONFIG_CMD_MMC=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y @@ -29,6 +31,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_I2C=y CONFIG_OF_LIBFDT=y +CONFIG_FEC_MXC=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_PINCTRL=y diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h index aba43fc..5a3e05a 100644 --- a/include/configs/imx6ul_isiot.h +++ b/include/configs/imx6ul_isiot.h @@ -128,6 +128,16 @@ # define CONFIG_SYS_FSL_ESDHC_ADDR 0 #endif +/* Ethernet */ +#ifdef CONFIG_FEC_MXC +# define CONFIG_FEC_MXC_PHYADDR0 +# define CONFIG_FEC_XCV_TYPE RMII + +# define CONFIG_MII +# define CONFIG_PHYLIB +# define CONFIG_PHY_SMSC +#endif + /* SPL */ #ifdef CONFIG_SPL # define CONFIG_SPL_MMC_SUPPORT -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 07/10] arm: dts: imx6ul-isiot: Add eMMC node
From: Jagan Teki Add usdhc2 node, which is eMMC for Engicam Is.IoT MX6UL modules. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - new patch arch/arm/dts/imx6ul-isiot.dts | 25 + 1 file changed, 25 insertions(+) diff --git a/arch/arm/dts/imx6ul-isiot.dts b/arch/arm/dts/imx6ul-isiot.dts index c46759a..a0e112f 100644 --- a/arch/arm/dts/imx6ul-isiot.dts +++ b/arch/arm/dts/imx6ul-isiot.dts @@ -95,6 +95,15 @@ status = "okay"; }; +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + cd-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; + bus-width = <8>; + no-1-8-v; + status = "okay"; +}; + &iomuxc { pinctrl_enet1: enet1grp { fsl,pins = < @@ -142,4 +151,20 @@ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 >; }; + + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < + MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x17070 + MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x10070 + MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17070 + MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17070 + MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17070 + MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17070 + MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17070 + MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17070 + MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17070 + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17070 + MX6UL_PAD_NAND_ALE__USDHC2_RESET_B 0x17070 + >; + }; }; -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 09/10] imx6: isiotmx6ul: Add nandboot env support
From: Jagan Teki Add config options for booting Linux from NAND in UBI format. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - none configs/imx6ul_isiot_nand_defconfig | 1 + include/configs/imx6ul_isiot.h | 32 +++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig index 473064d..662bc9a 100644 --- a/configs/imx6ul_isiot_nand_defconfig +++ b/configs/imx6ul_isiot_nand_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_UBI=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h index b137848..10311d0 100644 --- a/include/configs/imx6ul_isiot.h +++ b/include/configs/imx6ul_isiot.h @@ -48,9 +48,12 @@ "mmcdev=0\0" \ "mmcpart=1\0" \ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "nandroot=ubi0:rootfs rootfstype=ubifs\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ + "ubiargs=setenv bootargs console=${console},${baudrate} " \ + "ubi.mtd=5 root=${nandroot} ${mtdparts}\0" \ "loadbootscript=" \ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ @@ -75,8 +78,21 @@ "fi; " \ "else " \ "bootm; " \ - "fi\0" + "fi\0" \ + "nandboot=echo Booting from nand ...; " \ + "if mtdparts; then " \ + "echo Starting nand boot ...; " \ + "else " \ + "mtdparts default; " \ + "fi; " \ + "run ubiargs; " \ + "nand read ${loadaddr} kernel 0x80; " \ + "nand read ${fdt_addr} dtb 0x10; " \ + "bootm ${loadaddr} - ${fdt_addr}\0" +#ifdef CONFIG_NAND_MXS +# define CONFIG_BOOTCOMMAND"run nandboot" +#else # define CONFIG_BOOTCOMMAND \ "if mmc rescan; then " \ "if run loadbootscript; then " \ @@ -91,6 +107,7 @@ "fi; " \ "fi; " \ "fi" +#endif /* Miscellaneous configurable options */ #define CONFIG_SYS_MEMTEST_START 0x8000 @@ -141,6 +158,19 @@ # define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE # define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20 +/* MTD device */ +# define CONFIG_MTD_DEVICE +# define CONFIG_CMD_MTDPARTS +# define CONFIG_MTD_PARTITIONS +# define MTDIDS_DEFAULT"nand0=gpmi-nand" +# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \ + "1m(env),8m(kernel),1m(dtb),-(rootfs)" + +/* UBI */ +# define CONFIG_CMD_UBIFS +# define CONFIG_RBTREE +# define CONFIG_LZO + /* APBH DMA */ # define CONFIG_APBH_DMA # define CONFIG_APBH_DMA_BURST -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 10/10] imx6ul: isiotmx6ul: Enable I2C support
From: Jagan Teki Enable I2C support for Engicam Is.IoT NAND module. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - none configs/imx6ul_isiot_nand_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig index 662bc9a..13294a9 100644 --- a/configs/imx6ul_isiot_nand_defconfig +++ b/configs/imx6ul_isiot_nand_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_I2C=y CONFIG_OF_LIBFDT=y CONFIG_FEC_MXC=y CONFIG_MXC_UART=y @@ -38,6 +39,7 @@ CONFIG_NAND_MXS=y CONFIG_IMX_THERMAL=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_SYS_I2C_MXC=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 04/10] imx6: isiotmx6ul: Add I2C support
From: Jagan Teki Add I2C support for Engicam Is.IoT MX6UL module. isiotmx6ul> i2c bus Bus 0: i2c@021a Bus 1: i2c@021a4000 isiotmx6ul> i2c dev 0 Setting bus to 0 isiotmx6ul> i2c dev Current bus is 0 isiotmx6ul> i2c speed 10 Setting bus speed to 10 Hz isiotmx6ul> i2c probe Valid chip addresses: 00 2C 44 78 isiotmx6ul> i2c md 2C 0xff 00ff: 00 00 00 00 0f f0 01 64 ff ff 00 00 00 00 00 00...d Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - none arch/arm/cpu/armv7/mx6/Kconfig | 1 + configs/imx6ul_isiot_mmc_defconfig | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index 72780d7..b81e18c 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -211,6 +211,7 @@ config TARGET_MX6UL_ISIOT select OF_CONTROL select DM select DM_GPIO + select DM_I2C select DM_MMC select DM_THERMAL select SUPPORT_SPL diff --git a/configs/imx6ul_isiot_mmc_defconfig b/configs/imx6ul_isiot_mmc_defconfig index cfbaf29..f85970b 100644 --- a/configs/imx6ul_isiot_mmc_defconfig +++ b/configs/imx6ul_isiot_mmc_defconfig @@ -27,11 +27,13 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_I2C=y CONFIG_OF_LIBFDT=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_SYS_I2C_MXC=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 08/10] imx6: isiotmx6ul: Add NAND support
From: Jagan Teki Add NAND support for Engicam Is.IoT MX6UL board. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v2: - Fix to enable DM_ETH board/engicam/isiotmx6ul/MAINTAINERS | 1 + board/engicam/isiotmx6ul/isiotmx6ul.c | 69 +++ configs/imx6ul_isiot_nand_defconfig | 46 +++ include/configs/imx6ul_isiot.h| 25 - 4 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 configs/imx6ul_isiot_nand_defconfig diff --git a/board/engicam/isiotmx6ul/MAINTAINERS b/board/engicam/isiotmx6ul/MAINTAINERS index 0258531..e99e02e 100644 --- a/board/engicam/isiotmx6ul/MAINTAINERS +++ b/board/engicam/isiotmx6ul/MAINTAINERS @@ -4,3 +4,4 @@ S: Maintained F: board/engicam/isiotmx6ul F: include/configs/imx6ul_isiot.h F: configs/imx6ul_isiot_mmc_defconfig +F: configs/imx6ul_isiot_nand_defconfig diff --git a/board/engicam/isiotmx6ul/isiotmx6ul.c b/board/engicam/isiotmx6ul/isiotmx6ul.c index c0b18c3..ae3465f 100644 --- a/board/engicam/isiotmx6ul/isiotmx6ul.c +++ b/board/engicam/isiotmx6ul/isiotmx6ul.c @@ -37,11 +37,80 @@ int board_early_init_f(void) return 0; } +#ifdef CONFIG_NAND_MXS + +#define GPMI_PAD_CTRL0 (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP) +#define GPMI_PAD_CTRL1 (PAD_CTL_DSE_40ohm | PAD_CTL_SPEED_MED | \ + PAD_CTL_SRE_FAST) +#define GPMI_PAD_CTRL2 (GPMI_PAD_CTRL0 | GPMI_PAD_CTRL1) + +static iomux_v3_cfg_t const nand_pads[] = { + MX6_PAD_NAND_DATA00__RAWNAND_DATA00 | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_DATA01__RAWNAND_DATA01 | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_DATA02__RAWNAND_DATA02 | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_DATA03__RAWNAND_DATA03 | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_DATA04__RAWNAND_DATA04 | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_DATA05__RAWNAND_DATA05 | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_DATA06__RAWNAND_DATA06 | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_DATA07__RAWNAND_DATA07 | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_CLE__RAWNAND_CLE | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_ALE__RAWNAND_ALE | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_CE0_B__RAWNAND_CE0_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_RE_B__RAWNAND_RE_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_WE_B__RAWNAND_WE_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_WP_B__RAWNAND_WP_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2), + MX6_PAD_NAND_READY_B__RAWNAND_READY_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2), +}; + +static void setup_gpmi_nand(void) +{ + struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + + /* config gpmi nand iomux */ + imx_iomux_v3_setup_multiple_pads(nand_pads, ARRAY_SIZE(nand_pads)); + + clrbits_le32(&mxc_ccm->CCGR4, +MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK | +MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK | +MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK | +MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK | +MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK); + + /* +* config gpmi and bch clock to 100 MHz +* bch/gpmi select PLL2 PFD2 400M +* 100M = 400M / 4 +*/ + clrbits_le32(&mxc_ccm->cscmr1, +MXC_CCM_CSCMR1_BCH_CLK_SEL | +MXC_CCM_CSCMR1_GPMI_CLK_SEL); + clrsetbits_le32(&mxc_ccm->cscdr1, + MXC_CCM_CSCDR1_BCH_PODF_MASK | + MXC_CCM_CSCDR1_GPMI_PODF_MASK, + (3 << MXC_CCM_CSCDR1_BCH_PODF_OFFSET) | + (3 << MXC_CCM_CSCDR1_GPMI_PODF_OFFSET)); + + /* enable gpmi and bch clock gating */ + setbits_le32(&mxc_ccm->CCGR4, +MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK | +MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK | +MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK | +MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK | +MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK); + + /* enable apbh clock gating */ + setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK); +} +#endif /* CONFIG_NAND_MXS */ + int board_init(void) { /* Address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; +#ifdef CONFIG_NAND_MXS + setup_gpmi_nand(); +#endif return 0; } diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig new file mode 100644 index 000..473064d --- /dev/null +++ b/configs/imx6ul_isiot_nand_defconfig @@ -0,0 +1,46 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_MX6UL_ISIOT=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_I
[U-Boot] [PATCH 2/3] CLK: OMAP: PCIE: Provide support for PCIE DPLL configuration
New function - configure_pcie_dpll() - has been added to allow setting up the PCIe DPLL clock (1500 MHz). Signed-off-by: Lukasz Majewski --- arch/arm/cpu/armv7/omap-common/clocks-common.c | 22 ++ arch/arm/include/asm/omap_common.h | 2 ++ 2 files changed, 24 insertions(+) diff --git a/arch/arm/cpu/armv7/omap-common/clocks-common.c b/arch/arm/cpu/armv7/omap-common/clocks-common.c index 9b97583..56476bf 100644 --- a/arch/arm/cpu/armv7/omap-common/clocks-common.c +++ b/arch/arm/cpu/armv7/omap-common/clocks-common.c @@ -208,6 +208,17 @@ static const struct dpll_params *get_gmac_dpll_params } #endif +static const struct dpll_params *get_pcie_dpll_params + (struct dplls const *dpll_data) +{ + u32 sysclk_ind = get_sys_clk_index(); + + if (!dpll_data->pcie) + return NULL; + + return &dpll_data->pcie[sysclk_ind]; +} + static void do_setup_dpll(u32 const base, const struct dpll_params *params, u8 lock, char *dpll) { @@ -302,6 +313,17 @@ u32 omap_ddr_clk(void) return ddr_clk; } +void configure_pcie_dpll(void) +{ + const struct dpll_params *params; + + params = get_pcie_dpll_params(*dplls_data); + + do_setup_dpll((*prcm)->cm_clkmode_dpll_pcie_ref, params, DPLL_LOCK, + "pcie"); + debug("PCIE DPLL locked\n"); +} + /* * Lock MPU dpll * diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index cc40ee9..bb74321 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -612,6 +612,8 @@ void enable_basic_uboot_clocks(void); void enable_usb_clocks(int index); void disable_usb_clocks(int index); +void configure_pcie_dpll(void); + void scale_vcores(struct vcores_data const *); u32 get_offset_code(u32 volt_offset, struct pmic_data *pmic); void do_scale_vcore(u32 vcore_reg, u32 volt_mv, struct pmic_data *pmic); -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3] CLK: OMAP: PCIE: Registers definitions necessary for PCIe clock generation
Those registers are necessary to generate and output the PCIe clock. Signed-off-by: Lukasz Majewski --- arch/arm/cpu/armv7/omap5/prcm-regs.c | 2 ++ arch/arm/include/asm/omap_common.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c b/arch/arm/cpu/armv7/omap5/prcm-regs.c index b5f1d70..5a0c872 100644 --- a/arch/arm/cpu/armv7/omap5/prcm-regs.c +++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c @@ -385,6 +385,7 @@ struct omap_sys_ctrl_regs const dra7xx_ctrl = { .control_phy_power_sata = 0x4A002374, .ctrl_core_sma_sw_0 = 0x4A0023FC, .ctrl_core_sma_sw_1 = 0x4A002534, + .ctrl_core_sma_sw_6 = 0x4A003C14, .control_core_mac_id_0_lo = 0x4A002514, .control_core_mac_id_0_hi = 0x4A002518, .control_core_mac_id_1_lo = 0x4A00251C, @@ -396,6 +397,7 @@ struct omap_sys_ctrl_regs const dra7xx_ctrl = { .control_core_mmr_lock5 = 0x4A002550, .control_core_control_io1 = 0x4A002554, .control_core_control_io2 = 0x4A002558, + .control_core_pcie_power_state = 0x4A0026C0, .control_paconf_global = 0x4A002DA0, .control_paconf_mode= 0x4A002DA4, .control_smart1io_padconf_0 = 0x4A002DA8, diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index bb74321..2d8dbbd 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -393,6 +393,7 @@ struct omap_sys_ctrl_regs { u32 control_usbotghs_ctrl; u32 control_phy_power_sata; u32 control_padconf_core_base; + u32 control_core_pcie_power_state; u32 control_paconf_global; u32 control_paconf_mode; u32 control_smart1io_padconf_0; @@ -482,6 +483,7 @@ struct omap_sys_ctrl_regs { u32 iodelay_config_base; u32 ctrl_core_sma_sw_0; u32 ctrl_core_sma_sw_1; + u32 ctrl_core_sma_sw_6; }; struct dpll_params { -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] DRA7XX: HW_DATA: Provide dpll_params definitions for PCIe DPLL
With this code only 19.2 HMz SYSCLK (input) frequency is supported on dra7xx based SoCs. Signed-off-by: Lukasz Majewski --- arch/arm/cpu/armv7/omap5/hw_data.c | 12 arch/arm/include/asm/omap_common.h | 1 + 2 files changed, 13 insertions(+) diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c b/arch/arm/cpu/armv7/omap5/hw_data.c index 2192090..e16bd2c 100644 --- a/arch/arm/cpu/armv7/omap5/hw_data.c +++ b/arch/arm/cpu/armv7/omap5/hw_data.c @@ -257,6 +257,17 @@ static const struct dpll_params gmac_dpll_params_2000mhz[NUM_SYS_CLKS] = { {625, 23, 4, 10, 40, 8, 10, -1, -1, -1, -1, -1},/* 38.4 MHz */ }; +static const struct dpll_params pcie_dpll_params_1500mhz[NUM_SYS_CLKS] = { + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 12 MHz */ + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 20 MHz */ + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 16.8 MHz */ + {625, 7, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 19.2 MHz */ + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 26 MHz */ + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 27 MHz */ + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 38.4 MHz */ +}; + + struct dplls omap5_dplls_es1 = { .mpu = mpu_dpll_params_800mhz, .core = core_dpll_params_2128mhz_ddr532, @@ -294,6 +305,7 @@ struct dplls dra7xx_dplls = { .usb = usb_dpll_params_1920mhz, .ddr = ddr_dpll_params_2128mhz, .gmac = gmac_dpll_params_2000mhz, + .pcie = pcie_dpll_params_1500mhz, }; struct dplls dra72x_dplls = { diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 605c549..cc40ee9 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -526,6 +526,7 @@ struct dplls { const struct dpll_params *usb; const struct dpll_params *ddr; const struct dpll_params *gmac; + const struct dpll_params *pcie; }; struct pmic_data { -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] SPL: Add spl_early_board_init() generic function
Some boards do require early adjustments (due to e.g. HW fix) in SPL code. In this particular case such operations must be performed just before ANY external IC is accessed (good example here is the I2C early bus access). Signed-off-by: Lukasz Majewski --- common/spl/Kconfig | 8 common/spl/spl.c | 6 ++ include/spl.h | 4 3 files changed, 18 insertions(+) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index bb99f1f..7e6f9c4 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -185,6 +185,14 @@ config SPL_SAVEENV "reboot_image" and act accordingly and change the reboot_image to default mode using setenv and save the environemnt. +config SPL_EARLY_BOARD_INIT + bool "Support early board init code" + depends on SPL + help + Enable support for very early SPL board code adjustments. + Some boards require having adjustements done before any + peripherals being operational (e.g. I2C, SPI, UART). + config SPL_ETH_SUPPORT bool "Support Ethernet" depends on SPL_ENV_SUPPORT diff --git a/common/spl/spl.c b/common/spl/spl.c index bdb165a..a15647b 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -393,6 +393,12 @@ void board_init_r(gd_t *dummy1, ulong dummy2) struct spl_image_info spl_image; int i; +#ifdef CONFIG_SPL_EARLY_BOARD_INIT + debug(">>spl:early_board_init()\n"); + + spl_early_board_init(); +#endif + debug(">>spl:board_init_r()\n"); #if defined(CONFIG_SYS_SPL_MALLOC_START) diff --git a/include/spl.h b/include/spl.h index e080a82..00a2058 100644 --- a/include/spl.h +++ b/include/spl.h @@ -215,6 +215,10 @@ int spl_init(void); void spl_board_init(void); #endif +#ifdef CONFIG_SPL_EARLY_BOARD_INIT +void spl_early_board_init(void); +#endif + /** * spl_was_boot_source() - check if U-Boot booted from SPL * -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] SPL: Add spl_early_board_init() generic function
On 01/15/2017 11:46 PM, Lukasz Majewski wrote: > Some boards do require early adjustments (due to e.g. HW fix) in SPL code. > In this particular case such operations must be performed just before ANY > external IC is accessed (good example here is the I2C early bus access). Shouldn't such stuff be done in board_init_f or so then ? board_init_r is pretty late ... btw I'm not a big fan of adding more and more callbacks, what is the usecase here ? > Signed-off-by: Lukasz Majewski > --- > common/spl/Kconfig | 8 > common/spl/spl.c | 6 ++ > include/spl.h | 4 > 3 files changed, 18 insertions(+) > > diff --git a/common/spl/Kconfig b/common/spl/Kconfig > index bb99f1f..7e6f9c4 100644 > --- a/common/spl/Kconfig > +++ b/common/spl/Kconfig > @@ -185,6 +185,14 @@ config SPL_SAVEENV > "reboot_image" and act accordingly and change the reboot_image > to default mode using setenv and save the environemnt. > > +config SPL_EARLY_BOARD_INIT > + bool "Support early board init code" > + depends on SPL > + help > + Enable support for very early SPL board code adjustments. > + Some boards require having adjustements done before any > + peripherals being operational (e.g. I2C, SPI, UART). > + > config SPL_ETH_SUPPORT > bool "Support Ethernet" > depends on SPL_ENV_SUPPORT > diff --git a/common/spl/spl.c b/common/spl/spl.c > index bdb165a..a15647b 100644 > --- a/common/spl/spl.c > +++ b/common/spl/spl.c > @@ -393,6 +393,12 @@ void board_init_r(gd_t *dummy1, ulong dummy2) > struct spl_image_info spl_image; > int i; > > +#ifdef CONFIG_SPL_EARLY_BOARD_INIT > + debug(">>spl:early_board_init()\n"); > + > + spl_early_board_init(); > +#endif > + > debug(">>spl:board_init_r()\n"); > > #if defined(CONFIG_SYS_SPL_MALLOC_START) > diff --git a/include/spl.h b/include/spl.h > index e080a82..00a2058 100644 > --- a/include/spl.h > +++ b/include/spl.h > @@ -215,6 +215,10 @@ int spl_init(void); > void spl_board_init(void); > #endif > > +#ifdef CONFIG_SPL_EARLY_BOARD_INIT > +void spl_early_board_init(void); > +#endif > + > /** > * spl_was_boot_source() - check if U-Boot booted from SPL > * > -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] MAINTAINERS: DFU: Change e-mail address of DFU maintanier
Signed-off-by: Lukasz Majewski --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1ea7ae0..0e05c0e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -242,7 +242,7 @@ T: git git://git.denx.de/u-boot-coldfire.git F: arch/m68k/ DFU -M: Lukasz Majewski +M: Lukasz Majewski S: Maintained T: git git://git.denx.de/u-boot-dfu.git F: drivers/dfu/ -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] SPL: Add spl_early_board_init() generic function
Dear All, > On 01/15/2017 11:46 PM, Lukasz Majewski wrote: > > Some boards do require early adjustments (due to e.g. HW fix) in > > SPL code. In this particular case such operations must be performed > > just before ANY external IC is accessed (good example here is the > > I2C early bus access). > > Shouldn't such stuff be done in board_init_f or so then ? > board_init_r is pretty late ... > > btw I'm not a big fan of adding more and more callbacks, what is the > usecase here ? We had some discussion with Marek and we have found better (and more important already existing) place for this code. Please regard this patch as not needed and hence dropped. > > > Signed-off-by: Lukasz Majewski > > --- > > common/spl/Kconfig | 8 > > common/spl/spl.c | 6 ++ > > include/spl.h | 4 > > 3 files changed, 18 insertions(+) > > > > diff --git a/common/spl/Kconfig b/common/spl/Kconfig > > index bb99f1f..7e6f9c4 100644 > > --- a/common/spl/Kconfig > > +++ b/common/spl/Kconfig > > @@ -185,6 +185,14 @@ config SPL_SAVEENV > > "reboot_image" and act accordingly and change the > > reboot_image to default mode using setenv and save the environemnt. > > > > +config SPL_EARLY_BOARD_INIT > > + bool "Support early board init code" > > + depends on SPL > > + help > > + Enable support for very early SPL board code adjustments. > > + Some boards require having adjustements done before any > > + peripherals being operational (e.g. I2C, SPI, UART). > > + > > config SPL_ETH_SUPPORT > > bool "Support Ethernet" > > depends on SPL_ENV_SUPPORT > > diff --git a/common/spl/spl.c b/common/spl/spl.c > > index bdb165a..a15647b 100644 > > --- a/common/spl/spl.c > > +++ b/common/spl/spl.c > > @@ -393,6 +393,12 @@ void board_init_r(gd_t *dummy1, ulong dummy2) > > struct spl_image_info spl_image; > > int i; > > > > +#ifdef CONFIG_SPL_EARLY_BOARD_INIT > > + debug(">>spl:early_board_init()\n"); > > + > > + spl_early_board_init(); > > +#endif > > + > > debug(">>spl:board_init_r()\n"); > > > > #if defined(CONFIG_SYS_SPL_MALLOC_START) > > diff --git a/include/spl.h b/include/spl.h > > index e080a82..00a2058 100644 > > --- a/include/spl.h > > +++ b/include/spl.h > > @@ -215,6 +215,10 @@ int spl_init(void); > > void spl_board_init(void); > > #endif > > > > +#ifdef CONFIG_SPL_EARLY_BOARD_INIT > > +void spl_early_board_init(void); > > +#endif > > + > > /** > > * spl_was_boot_source() - check if U-Boot booted from SPL > > * > > > > Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] armv8: fix #if around spin-table code in start.S
Hi Tom. 2017-01-16 3:29 GMT+09:00 Tom Rini : > On Tue, Dec 27, 2016 at 11:19:43AM +0200, Oded Gabbay wrote: > >> Using CONFIG_IS_ENABLED() doesn't work in SPL. This patch replaces the only >> occurrence of CONFIG_IS_ENABLED() in start.S to a regular #if defined(). >> It also adds "&& !defined(CONFIG_SPL_BUILD)" to that #if statement because >> the spin-table code can't currently work in SPL, and the spin-table file >> isn't even compiled in SPL. >> >> Signed-off-by: Oded Gabbay > > Applied to u-boot/master, thanks! > > -- > Tom > I had not noticed this patch until it was applied. At least, the statement in the git-log "Using CONFIG_IS_ENABLED() doesn't work in SPL" is wrong. So, when I saw the git history today, I wondered what was going on. Then, I found this discussion in the ML. It does not matter to either apply or discard this patch because it is a matter of taste. If you decide to apply it, the git-log should have been replaced with Oded's comment: You need to go to kconfig.h, read the comments there to understand how CONFIG_IS_ENABLED is working with SPL, which is more tiresome than just doing straight #ifdef. It is definitely more confusing for a newbee. In addition, this patch makes the code more consistent, because all other configuration checks in start.S use a straight #ifdef and not CONFIG_IS_ENABLED. -- It is too late this time, but please take care of it next time. -- Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] u-boot.git or u-boot-x86.git for x86_64 u-boots?
Hi Joakim, On Mon, Jan 16, 2017 at 12:49 AM, Joakim Tjernlund wrote: > On Sat, 2017-01-14 at 10:06 -0700, Simon Glass wrote: >> Hi Joakim, >> >> On 14 January 2017 at 04:51, Bin Meng wrote: >> > +Simon, >> > >> > On Fri, Jan 13, 2017 at 4:12 AM, Joakim Tjernlund >> > wrote: >> > > I found two repos w.r.t x86_64 for u-boot, which one should I use? >> > > >> > >> > U-Boot x86_64 support is not in mainstream yet. >> >> I'll be sending v3 fairly soon. But even then it is not complete. >> Various things need fixing up and polishing - e.g. SDRAM sizing, >> graphics ROMs, actually booting Linux! > > Great, getting closer every day. > Any idea for how much is missing in u-boot to bring up a > Rangeley(C2758), no graphics required. Need networking, rs232, USB and maybe > SATA. The effort won't be too much as Intel has an FSP for Rangeley. Regards, Bin ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] U-Boot of-platdata issue
Hi Simon, I met two issue when using of-platdata 1. compitable name with '.' I get compile error as below: In file included from include/dt-structs.h:16:0, from spl/dts/dt-platdata.c:3: include/generated/dt-structs.h:26:35: error: expected identifier or ‘(’ before numeric constant struct dtd_rockchip_rk3399_sdhci_5.1 { ^ spl/dts/dt-platdata.c:41:42: error: expected identifier or ‘(’ before numeric constant static struct dtd_rockchip_rk3399_sdhci_5.1 dtv_sdhci_at_fe33 = { ^ spl/dts/dt-platdata.c:55:15: error: ‘dtv_sdhci_at_fe33’ undeclared here (not in a function) .platdata = &dtv_sdhci_at_fe33, ^ make[2]: *** [spl/dts/dt-platdata.o] Error 1 make[1]: *** [spl/u-boot-spl] Error 2 make: *** [__build_one_by_one] Error 2 The dts node starts like this: sdhci: sdhci@fe33 { u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; ... 2. multi compatible name When a dts node have more than one compatible name, which is prefer to use? for example, we have two dwmmc compatible name in rk3399, the tool is using the first one, while the source code using the last one. "drivers/mmc/rockchip_dw_mmc.c" 23 struct rockchip_mmc_plat { 24 #if CONFIG_IS_ENABLED(OF_PLATDATA) 25 struct dtd_rockchip_rk3288_dw_mshc dtplat; 26 #endif 27 struct mmc_config cfg; 28 struct mmc mmc; 29 }; ... dts node sdmmc: dwmmc@fe32 { compatible = "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc"; ... Thanks, - Kever ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] u-boot.git or u-boot-x86.git for x86_64 u-boots?
Hi Joakim, On 15 January 2017 at 09:49, Joakim Tjernlund wrote: > On Sat, 2017-01-14 at 10:06 -0700, Simon Glass wrote: >> Hi Joakim, >> >> On 14 January 2017 at 04:51, Bin Meng wrote: >> > +Simon, >> > >> > On Fri, Jan 13, 2017 at 4:12 AM, Joakim Tjernlund >> > wrote: >> > > I found two repos w.r.t x86_64 for u-boot, which one should I use? >> > > >> > >> > U-Boot x86_64 support is not in mainstream yet. >> >> I'll be sending v3 fairly soon. But even then it is not complete. >> Various things need fixing up and polishing - e.g. SDRAM sizing, >> graphics ROMs, actually booting Linux! > > Great, getting closer every day. > Any idea for how much is missing in u-boot to bring up a > Rangeley(C2758), no graphics required. Need networking, rs232, USB and maybe > SATA. If it uses an FSP then it probably isn't much work to get it running with 32-bit U-Boot. Bin is the expert here. For 64-bit, we have quite a few things to do. But note that 32-bit U-Boot can directly boot both 32-bit and 64-bit kernels. It does not have the 'UEFI' restriction of having to select your boot loader based on your kernel. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Kconfig: CONFIG_OF_PLATDATA doesn't really exist
On 14 January 2017 at 10:21, Tom Rini wrote: > There is no CONFIG_OF_PLATDATA, only CONFIG_SPL_OF_PLATDATA, so rename > the two references to CONFIG_OF_PLATDATA to CONFIG_SPL_OF_PLATDATA. > > Signed-off-by: Tom Rini > --- > common/spl/spl.c | 2 +- > drivers/serial/Kconfig | 2 +- > scripts/config_whitelist.txt | 1 - > 3 files changed, 2 insertions(+), 3 deletions(-) Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Rockchip RK3288 boot trouble
+Kever Hi Rick, On 15 January 2017 at 12:05, Rick Bronson wrote: > Hi All, > > I updated one of my two RK3288 boards (Viewsonic) with newer Android > factory firmware (using Windows) and now it won't boot mainline u-boot > when I use the same exact recipe that worked previously: > > sudo ${UPGD} db rkbin/rk32/rk3288_boot.bin > sudo ${UPGD} wl 0x40 tftpboot/u-boot-dtb.bin > > Been trying to figure out what's wrong. My theory is that the newer > firmware enabled one of the "boot areas" of the eMMC and the "wl 0x40" > command above only writes to the user area of the eMMC. > > I can still load and run one of the Android u-boots using the > boot_merger method: > > ./tools/boot_merger --subfix ".10.bin" ./tools/rk_tools/RKBOOT/RK3288.ini > > then flashing via: > > sudo ${UPGD} ul u-boot-android/RK3288UbootLoader_V2.30.10.bin > > But these u-boot's are virtually useless since they striped of > useful commands (like mmc commands). > > I tried using the above boot_merger command on mainline u-boot but > it only boots this far (I've tried u-boot-dtb.bin and u-boot.bin): > > -- > U-Boot 2016.11-08467-g05b8ba7-dirty (Jan 15 2017 - 10:40:37 -0800) > > Model: SCT36-RK3288 > DRAM: 128 MiB > -- > > Note the incorrect DRAM size. My normal boot looks like: > > -- > U-Boot SPL 2016.11-08467-g05b8ba7-dirty (Dec 18 2016 - 11:00:14) > > U-Boot 2016.11-08467-g05b8ba7-dirty (Dec 18 2016 - 11:00:14 -0800) > > Model: SCT36-RK3288 > DRAM: 2 GiB > MMC: dwmmc@ff0c: 0, dwmmc@ff0f: 1 > ... > -- > > Note that this runs SPL, then normal u-boot whereas the previous one > didn't run SPL. > > Any ideas how I can get mainline u-boot running on this board? You might try a git bisect. We moved to auto-detected the RAM size recently, so perhaps that changed something? 7d6c78f rk3288: sdram: auto-detect the capacity > > Thanks much, > > Rick > > > Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] DRA7XX: HW_DATA: Provide dpll_params definitions for PCIe DPLL
On Monday 16 January 2017 04:09 AM, Lukasz Majewski wrote: > With this code only 19.2 HMz SYSCLK (input) frequency is supported on > dra7xx based SoCs. This wold be breaking dra74x-evm which has 20MHz sysclk. May I know what is intention for configuring PCIE dpll in u-boot?(you want to use PCIE at u-boot or for kernel to depend on this configuration?) Thanks and regards, Lokesh > > Signed-off-by: Lukasz Majewski > --- > arch/arm/cpu/armv7/omap5/hw_data.c | 12 > arch/arm/include/asm/omap_common.h | 1 + > 2 files changed, 13 insertions(+) > > diff --git a/arch/arm/cpu/armv7/omap5/hw_data.c > b/arch/arm/cpu/armv7/omap5/hw_data.c > index 2192090..e16bd2c 100644 > --- a/arch/arm/cpu/armv7/omap5/hw_data.c > +++ b/arch/arm/cpu/armv7/omap5/hw_data.c > @@ -257,6 +257,17 @@ static const struct dpll_params > gmac_dpll_params_2000mhz[NUM_SYS_CLKS] = { > {625, 23, 4, 10, 40, 8, 10, -1, -1, -1, -1, -1},/* 38.4 MHz */ > }; > > +static const struct dpll_params pcie_dpll_params_1500mhz[NUM_SYS_CLKS] = { > + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 12 MHz */ > + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 20 MHz */ > + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 16.8 MHz */ > + {625, 7, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 19.2 MHz */ > + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 26 MHz */ > + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 27 MHz */ > + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 38.4 MHz */ > +}; > + > + > struct dplls omap5_dplls_es1 = { > .mpu = mpu_dpll_params_800mhz, > .core = core_dpll_params_2128mhz_ddr532, > @@ -294,6 +305,7 @@ struct dplls dra7xx_dplls = { > .usb = usb_dpll_params_1920mhz, > .ddr = ddr_dpll_params_2128mhz, > .gmac = gmac_dpll_params_2000mhz, > + .pcie = pcie_dpll_params_1500mhz, > }; > > struct dplls dra72x_dplls = { > diff --git a/arch/arm/include/asm/omap_common.h > b/arch/arm/include/asm/omap_common.h > index 605c549..cc40ee9 100644 > --- a/arch/arm/include/asm/omap_common.h > +++ b/arch/arm/include/asm/omap_common.h > @@ -526,6 +526,7 @@ struct dplls { > const struct dpll_params *usb; > const struct dpll_params *ddr; > const struct dpll_params *gmac; > + const struct dpll_params *pcie; > }; > > struct pmic_data { > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: u-boot-sunxi/master
On Sun, Jan 15, 2017 at 06:27:14PM +0100, Jagan Teki wrote: > Hi Tom, > > Please take this PR. > > thanks! > Jagan. > > The following changes since commit 7f73ca484f792a0d2a7ee09860c32f3d02b3030d: > > Kconfig: CONFIG_OF_PLATDATA doesn't really exist (2017-01-14 12:20:23 -0500) > > are available in the git repository at: > > git://git.denx.de/u-boot-sunxi.git master > > for you to fetch changes up to 7490130c9f8a4e17e858a38c767ad9ed64bd777b: > > sunxi: OrangePi Zero: defconfig: enable SPI flash (2017-01-15 18:22:27 > +0100) > Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: u-boot-spi/master
On Sun, Jan 15, 2017 at 06:32:14PM +0100, Jagan Teki wrote: > Hi Tom, > > Please take this PR. > > thanks! > Jagan. > > The following changes since commit 70c1e0474a9df2c4493b4e2330cc41d3132b4e90: > > Merge git://git.denx.de/u-boot-rockchip (2017-01-12 21:20:51 -0500) > > are available in the git repository at: > > > git://git.denx.de/u-boot-spi.git master > > for you to fetch changes up to 68e7999ba9de0a15dd3dc99e078b70f41eb98c82: > > spi: Zap cf_qspi driver and related code (2017-01-15 18:29:04 +0100) > Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] dtoc: Replace dot with underscore to avoid compiler errors
If there is a '.' in a compatible string, then dtoc will produce a struct with a name containing a '.'. This won't work, so replace it with '_'. Also add a suitable test to the sandbox device tree to catch this. Signed-off-by: Simon Glass --- arch/sandbox/dts/sandbox.dts | 5 + tools/dtoc/dtoc.py | 1 + 2 files changed, 6 insertions(+) diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index e6d336f16ab..20614646f7f 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -203,6 +203,11 @@ stringarray = "one"; }; + spl-test4 { + u-boot,dm-pre-reloc; + compatible = "sandbox,spl-test.2"; + }; + square { compatible = "demo-shape"; colour = "blue"; diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py index 11050b66f71..6df7b0da13a 100755 --- a/tools/dtoc/dtoc.py +++ b/tools/dtoc/dtoc.py @@ -54,6 +54,7 @@ def Conv_name_to_c(name): str = name.replace('@', '_at_') str = str.replace('-', '_') str = str.replace(',', '_') +str = str.replace('.', '_') str = str.replace('/', '__') return str -- 2.11.0.483.g087da7b7c-goog ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-Boot of-platdata issue
Hi Kever, On 15 January 2017 at 18:28, Kever Yang wrote: > Hi Simon, > > I met two issue when using of-platdata > > 1. compitable name with '.' > I get compile error as below: > In file included from include/dt-structs.h:16:0, > from spl/dts/dt-platdata.c:3: > include/generated/dt-structs.h:26:35: error: expected identifier or ‘(’ > before numeric constant > struct dtd_rockchip_rk3399_sdhci_5.1 { >^ > spl/dts/dt-platdata.c:41:42: error: expected identifier or ‘(’ before > numeric constant > static struct dtd_rockchip_rk3399_sdhci_5.1 dtv_sdhci_at_fe33 = { > ^ > spl/dts/dt-platdata.c:55:15: error: ‘dtv_sdhci_at_fe33’ undeclared here > (not in a function) > .platdata = &dtv_sdhci_at_fe33, >^ > make[2]: *** [spl/dts/dt-platdata.o] Error 1 > make[1]: *** [spl/u-boot-spl] Error 2 > make: *** [__build_one_by_one] Error 2 > > The dts node starts like this: > sdhci: sdhci@fe33 { > u-boot,dm-pre-reloc; > compatible = "rockchip,rk3399-sdhci-5.1", > "arasan,sdhci-5.1"; > ... That just involves replacing '.' with '_'. I sent a patch. > > 2. multi compatible name > When a dts node have more than one compatible name, which is prefer to use? > for example, we have two dwmmc compatible name in rk3399, the tool is using > the first one, > while the source code using the last one. > > "drivers/mmc/rockchip_dw_mmc.c" > 23 struct rockchip_mmc_plat { > 24 #if CONFIG_IS_ENABLED(OF_PLATDATA) > 25 struct dtd_rockchip_rk3288_dw_mshc dtplat; > 26 #endif > 27 struct mmc_config cfg; > 28 struct mmc mmc; > 29 }; > ... > dts node > sdmmc: dwmmc@fe32 { >compatible = "rockchip,rk3399-dw-mshc", > "rockchip,rk3288-dw-mshc"; I'm not sure of the best solution here (other than putting more on-chip SRAM in your devices hint hint :-) One option is something like: struct rockchip_mmc_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) #ifdef CONFIG_ROCKCHIP_RK3288 struct dtd_rockchip_rk3288_dw_mshc dtplat; #elif defined(CONFIG_ROCKCHIP_RK399) struct dtd_rockchip_rk399_dw_mshc dtplat; #endif #endif Obviously we don't want that as it is putting SoC-specific stuff in the driver. IMO the compatible strings are being misused a bit. Can there not be a compatible string which is common to all rockchip devices which use this IP? Something like "rockchip,dw-mshc-v1"? Then you can avoid adding a new compatible string every time you use the same IP in a device. Another option would be for dtoc to #define each compatible string to the first one. If you think that would work, I could do a patch. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Enabling Watchdog Service on Variscite VAR-SOM-MX6 Solo
Hello, I am looking to enable the Watchdog Timer on my Freescale iMX6 board and I am following the documentation supplied by NXP which states as follows: --- The following sequence should be performed for WDOG initialization. • PDE bit of Watchdog Miscellaneous Control Register (WDOG_WMCR) should be cleared to disable the power down counter. • WT field of Watchdog Control Register (WDOG_WCR) should be programmed for sufficient timeout value. • WDOG should be enabled by setting WDE bit of Watchdog Control Register (WDOG_WCR) so that the timeout counter loads the WT field value of Watchdog Control Register (WDOG_WCR) and starts counting --- I've noticed that in /drivers/watchdog/imx_watchdog.c there is no support for the WDOG_WMCR. Is there another way to initialise and enable the Watchdog Timer on an iMX board? I am new to this and just following the reference manual as supplied by NXP (http://www.nxp.com/assets/documents/data/en/reference-manuals/IMX6SDLRM.pdf) Any help would be greatly appreciated. Regards, Brendan ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Rockchip RK3288 boot trouble
Hi Rick, On 01/16/2017 10:50 AM, Simon Glass wrote: +Kever Hi Rick, On 15 January 2017 at 12:05, Rick Bronson wrote: Hi All, I updated one of my two RK3288 boards (Viewsonic) with newer Android factory firmware (using Windows) and now it won't boot mainline u-boot when I use the same exact recipe that worked previously: sudo ${UPGD} db rkbin/rk32/rk3288_boot.bin sudo ${UPGD} wl 0x40 tftpboot/u-boot-dtb.bin I didn't see your detail steps for getting u-boot-dtb.bin, does it include SPL here? We have two way to boot the RK3288 on upstream U-Boot SPL(pls reference to doc/README.rockchip): 1. without "CONFIG_ROCKCHIP_SPL_BACK_TO_BROM", which is previous version, To write an image that boots from an SD card (assumed to be /dev/sdc): ./firefly-rk3288/tools/mkimage -n rk3288 -T rksd -d \ firefly-rk3288/spl/u-boot-spl-dtb.bin out && \ sudo dd if=out of=/dev/sdc seek=64 && \ sudo dd if=firefly-rk3288/u-boot-dtb.img of=/dev/sdc seek=256 This puts the Rockchip header and SPL image first and then places the U-Boot image at block 256. 2. with "CONFIG_ROCKCHIP_SPL_BACK_TO_BROM", which is default setting recently, The rockchip bootrom can load and boot an initial spl, then continue to load a second-level bootloader(ie. U-BOOT) as soon as it returns to bootrom. Therefore RK3288 has another loading sequence like RK3036. You can create the image via the following operations: ./firefly-rk3288/tools/mkimage -n rk3288 -T rksd -d \ firefly-rk3288/spl/u-boot-spl-dtb.bin out && \ cat firefly-rk3288/u-boot-dtb.bin >> out && \ sudo dd if=out of=/dev/sdc seek=64 both way using upstream SPL + upstream u-boot.bin. Been trying to figure out what's wrong. My theory is that the newer firmware enabled one of the "boot areas" of the eMMC and the "wl 0x40" command above only writes to the user area of the eMMC. I can still load and run one of the Android u-boots using the boot_merger method: ./tools/boot_merger --subfix ".10.bin" ./tools/rk_tools/RKBOOT/RK3288.ini boot_merger is a tool from Rockchip, which create image for Rockchip bootrom, you may need to modify RK3288.ini and keep everything else but replace the FlashBoot with mainline U-Boot bin. In this way, you are using Rockchip SPL(ddr init) and upstream U-Boot. then flashing via: sudo ${UPGD} ul u-boot-android/RK3288UbootLoader_V2.30.10.bin But these u-boot's are virtually useless since they striped of useful commands (like mmc commands). I tried using the above boot_merger command on mainline u-boot but it only boots this far (I've tried u-boot-dtb.bin and u-boot.bin): -- U-Boot 2016.11-08467-g05b8ba7-dirty (Jan 15 2017 - 10:40:37 -0800) Model: SCT36-RK3288 DRAM: 128 MiB -- Note the incorrect DRAM size. I'm confusing with this incorrect DRAM size, could you share the console output during you flash the image, there should have correct DRAM size info. I'm not sure if the DRAM on your board is symmetric or not, or any else special. If you are using the upstream SPL, could you pls enable the DEBUG option and dump a log, we may able to see what happen on your board. My normal boot looks like: -- U-Boot SPL 2016.11-08467-g05b8ba7-dirty (Dec 18 2016 - 11:00:14) U-Boot 2016.11-08467-g05b8ba7-dirty (Dec 18 2016 - 11:00:14 -0800) Model: SCT36-RK3288 DRAM: 2 GiB MMC: dwmmc@ff0c: 0, dwmmc@ff0f: 1 ... -- Note that this runs SPL, then normal u-boot whereas the previous one didn't run SPL. When you are using Rockchip SPL(DRAM INIT), there is no message with 'SPL', but there do have some print about DRAM info, could you dump that message? Thanks, - Kever Any ideas how I can get mainline u-boot running on this board? You might try a git bisect. We moved to auto-detected the RAM size recently, so perhaps that changed something? 7d6c78f rk3288: sdram: auto-detect the capacity Thanks much, Rick Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] build: Always build the libfdt python module
Do not rely on CONFIG_SPL_OF_PLATDATA to build the libfdt python module. If swig is present, this will be build Signed-off-by: Emmanuel Vadot --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 5b81dde4b0..a609d05859 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -111,7 +111,7 @@ fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o # Build a libfdt Python module if swig is available # Use 'sudo apt-get install swig libpython-dev' to enable this -hostprogs-$(CONFIG_SPL_OF_PLATDATA) += \ +hostprogs-y += \ $(if $(shell which swig 2> /dev/null),_libfdt.so) _libfdt.so-sharedobjs += $(LIBFDT_OBJS) libfdt: -- 2.11.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] binman: add tools directory to the python path
The built _libfdt.so is placed in the /tools dir and need to say here as it contains relative paths. Add the directory to the python path so binman can use this module. Signed-off-by: Emmanuel Vadot --- tools/binman/binman.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/binman/binman.py b/tools/binman/binman.py index 4cc431fbbe..e1cb2fbb6f 100755 --- a/tools/binman/binman.py +++ b/tools/binman/binman.py @@ -19,6 +19,7 @@ import unittest our_path = os.path.dirname(os.path.realpath(__file__)) sys.path.append(os.path.join(our_path, '../patman')) sys.path.append(os.path.join(our_path, '../dtoc')) +sys.path.append(os.path.join(our_path, '../')) # Also allow entry-type modules to be brought in from the etype directory. sys.path.append(os.path.join(our_path, 'etype')) -- 2.11.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/12] sunxi: fix ACTLR.SMP assembly routine
On Fri, Jan 13, 2017 at 01:29:53AM +, Andre Przywara wrote: > If we take the liberty to use register r0 to perform our bit set, we > should be nice enough to tell the compiler about it. > Add r0 to the clobber list to avoid potential mayhem. > > Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [linux-sunxi] Re: [PATCH 02/12] sunxi: simplify ACTLR.SMP bit set #ifdef
On Fri, Jan 13, 2017 at 08:28:07AM +, André Przywara wrote: > On 13/01/17 08:09, Vishnu Patekar wrote: > Hi Vishnu, > > > Even for the single core cortex-a7, SMP bit should be set before > > enabling MMU and cache. > > > > Reference: Cortex A7 r0p5 TRM. section 4.3.31. > > Ah, good point, thanks for the heads up. I was misled by the SMP name > when answering Icenowy. > So it's about coherency in general and we need the bit for TLBs and > caches to work as well. > Let me check what that means for the other SoCs and whether we need to > rename the config symbol then. If we still needs it, x86 has a CONFIG_SMP symbol, that would be better to just leverage that. Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 03/12] sunxi: configs: merge sun9i and sun50i SPL memory definitions
On Fri, Jan 13, 2017 at 01:29:55AM +, Andre Przywara wrote: > For some reason we were pretty conservative when defining the maximum > SPL size for the Allwinner A80(sun9i) SoC. > According to the manual the SRAM A1 is even 40KB, but the BROM > probably still has the 32 KiB load limit. For the sake of simplicity, > merge the SPL memory definitions for the A64 and A80 SoCs, since both > SoC share the BROM/SRAM A1 memory layout. > This helps to further simplify this in the next patch. > > Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 04/12] sunxi: Kconfig: introduce CONFIG_SUNXI_HIGH_SRAM
On Fri, Jan 13, 2017 at 01:29:56AM +, Andre Przywara wrote: > Traditionally Allwinner SoCs have their boot ROM mapped just below 4GB, > while the first SRAM region is mapped at address 0. > With the extended physical memory support of the A80 this was changed, > so the BROM is now at address 0 and the SRAM region starts right behind > this at 64KB. This configuration seems to be called "high SRAM". > Instead of enumerating the SoCs which have copied this configuration, > let's call a spade a spade and introduce a Kconfig option for this setup. > SoCs implementing this (A80, A64 and H5, so far), can then select this > configuration. > Simplify the config header definition on the way. > > Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 05/12] sunxi: provide ARMv8 mem_map for every ARM64 board
On Fri, Jan 13, 2017 at 01:29:57AM +, Andre Przywara wrote: > Every armv8 board needs the memory map, so change the #ifdef to > ARM64 to avoid enumerating every single board or SoC. > > Signed-off-by: Andre Przywara Acked-by: Maxime Ripard Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 07/12] sunxi: DRAM: add Allwinner H5 support
On Fri, Jan 13, 2017 at 01:29:59AM +, Andre Przywara wrote: > The DRAM controller in the Allwinner H5 SoC is again very similar to > the one in the H3 and A64. > Based on the existing socid parameter, add support for this controller > by reusing the bulk of the code and only deviating where needed. > Also add the delay line parameters taken from the boot0 and libdram > disassembly. > Register setup differences between H5 and H3 are courtesy of Jens Kuske. > > Signed-off-by: Andre Przywara There's a number of issues with checkpatch here, please fix them. And there's way too many magics here, again... Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot