Re: [U-Boot] [PATCH] cfi_flash: don't hide write/erase errors
Hi Stefan,
On Thu, Sep 04, 2014 at 12:23:09PM +0300, Baruch Siach wrote:
Partially revert commit 0d01f66d235118 (CFI: cfi_flash write fix for AMD
legacy).
flash_full_status_check() used to skip status register parsing when
flash_status_check() returns OK. This is wrong since flash_status_check()
must return OK for other status bits to be valid.
Cc: Ed Swarthout ed.swarth...@freescale.com
Signed-off-by: Baruch Siach bar...@tkos.co.il
---
drivers/mtd/cfi_flash.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index c4b5bc1de553..9b3175d87fbd 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -593,7 +593,7 @@ static int flash_full_status_check (flash_info_t * info,
flash_sect_t sector,
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_EXTENDED:
case CFI_CMDSET_INTEL_STANDARD:
- if ((retcode != ERR_OK)
+ if ((retcode == ERR_OK)
!flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
retcode = ERR_INVAL;
printf (Flash %s error at address %lx\n, prompt,
Ping?
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}ooO--U--Ooo{=
- bar...@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] imx6: add Bachmann OT1200 board
Hi --- /dev/null +++ b/board/bachmann/ot1200/Kconfig @@ -0,0 +1,23 @@ +if TARGET_OT1200 + +config SYS_CPU + string + default armv7 + +config SYS_BOARD + string + default ot1200 + +config SYS_VENDOR + string + default bachmann + +config SYS_SOC + string + default mx6 + +config SYS_CONFIG_NAME + string + default ot1200 + The type string is not mandatory since commit 461be2f96e4b87e5065208c6659a47dd0ad9e9f8. You can save 5 lines. Nice to know. Since it is not a big deal, I don't think you have to resend it just for fixing this. (I am just pointing out a minor thing I found by chance.) If you like or you have a chance to send v4 for another fix, I recommend you to drop string. I am not sure if the current patch set gets accepted or not. Either way I will send a v4 or a followup patch to correct this. I have some more patches in my queue but I need to wait until this patch hits u-boot-imx. greets -- Christian Gmeiner, MSc https://soundcloud.com/christian-gmeiner ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings
Hi, On 10/04/2014 10:48 AM, Ian Campbell wrote: No need to be so repetitive. Hmm, I also have a version of this in my tree, I thought I had already send that out, but maybe I did not, see: https://github.com/jwrdegoede/u-boot-sunxi/commit/387033b669d72b8621eeb52c4cdc503e0d63b86d Note this needs to be rebased on top current next, as it does not take the SUN6I changes into account. Signed-off-by: Ian Campbell i...@hellion.org.uk --- board/sunxi/Kconfig | 31 --- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 05defac..c4b3167 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -1,31 +1,8 @@ -if TARGET_SUN4I - -config SYS_CONFIG_NAME - default sun4i - -endif - -if TARGET_SUN5I - -config SYS_CONFIG_NAME - default sun5i - -endif - -if TARGET_SUN6I - config SYS_CONFIG_NAME - string - default sun6i - -endif - -if TARGET_SUN7I - -config SYS_CONFIG_NAME - default sun7i - -endif + default sun4i if TARGET_SUN4I + default sun5i if TARGET_SUN5I + default sun6i if TARGET_SUN6I + default sun7i if TARGET_SUN7I if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I You need to move this up to the top of the Kconfig file, as it gets unconditionally sourced from arch/arm/Kconfig, and if this is not at the top, you will be unconditionally adding a SYS_CONFIG_NAME section which may conflict with other targets which also define it. With that fixed this is: Acked-by: Hans de Goede hdego...@redhat.com Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
Hi, On 10/04/2014 10:48 AM, Ian Campbell wrote: And make TARGET_SUN[457]I a choice variable under this. configs updated with: sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n/g' configs/* Signed-off-by: Ian Campbell i...@hellion.org.uk Looks good: Acked-by: Hans de Goede hdego...@redhat.com Regards, Hans --- arch/arm/Kconfig | 13 ++--- board/sunxi/Kconfig | 21 +++-- configs/A10-OLinuXino-Lime_defconfig | 1 + configs/A10s-OLinuXino-M_defconfig| 1 + configs/A13-OLinuXinoM_defconfig | 1 + configs/A13-OLinuXino_defconfig | 1 + configs/A20-OLinuXino-Lime_defconfig | 1 + configs/A20-OLinuXino_MICRO_defconfig | 1 + configs/Auxtek-T004_defconfig | 1 + configs/Bananapi_defconfig| 1 + configs/Cubieboard2_FEL_defconfig | 1 + configs/Cubieboard2_defconfig | 1 + configs/Cubieboard_defconfig | 1 + configs/Cubietruck_FEL_defconfig | 1 + configs/Cubietruck_defconfig | 1 + configs/Linksprite_pcDuino3_defconfig | 1 + configs/Mele_A1000G_defconfig | 1 + configs/Mele_A1000_defconfig | 1 + configs/Mini-X-1Gb_defconfig | 1 + configs/Mini-X_defconfig | 1 + configs/ba10_tv_box_defconfig | 1 + configs/i12-tvbox_defconfig | 1 + configs/qt840a_defconfig | 1 + configs/r7-tv-dongle_defconfig| 1 + 24 files changed, 43 insertions(+), 13 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e3e7e78..54d2fbb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -438,17 +438,8 @@ config TARGET_SMDKC100 config TARGET_SOCFPGA_CYCLONE5 bool Support socfpga_cyclone5 -config TARGET_SUN4I - bool Support sun4i - -config TARGET_SUN5I - bool Support sun5i - -config TARGET_SUN6I - bool Support sun6i - -config TARGET_SUN7I - bool Support sun7i +config TARGET_SUNXI + bool Support sunxi config TARGET_SNOWBALL bool Support snowball diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index c4b3167..6e9308d 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -1,11 +1,28 @@ +if TARGET_SUNXI + +choice + prompt Sunxi SoC + +config TARGET_SUN4I + bool sun4i family + +config TARGET_SUN5I + bool sun5i family + +config TARGET_SUN6I + bool sun6i family + +config TARGET_SUN7I + bool sun7i family + +endchoice + config SYS_CONFIG_NAME default sun4i if TARGET_SUN4I default sun5i if TARGET_SUN5I default sun6i if TARGET_SUN6I default sun7i if TARGET_SUN7I -if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I - config SYS_CPU default armv7 diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig index f992293..35cc2ca 100644 --- a/configs/A10-OLinuXino-Lime_defconfig +++ b/configs/A10-OLinuXino-Lime_defconfig @@ -2,4 +2,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS=A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI CONFIG_FDTFILE=sun4i-a10-olinuxino-lime.dtb +S:CONFIG_ARM=y ++S:CONFIG_TARGET_SUNXI=y +S:CONFIG_TARGET_SUN4I=y diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig index a578c06..2ab8d3e 100644 --- a/configs/A10s-OLinuXino-M_defconfig +++ b/configs/A10s-OLinuXino-M_defconfig @@ -2,4 +2,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS=A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10) CONFIG_FDTFILE=sun5i-a10s-olinuxino-micro.dtb +S:CONFIG_ARM=y ++S:CONFIG_TARGET_SUNXI=y +S:CONFIG_TARGET_SUN5I=y diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig index 9ae7b12..5fb3556 100644 --- a/configs/A13-OLinuXinoM_defconfig +++ b/configs/A13-OLinuXinoM_defconfig @@ -2,4 +2,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS=A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11) CONFIG_FDTFILE=sun5i-a13-olinuxino-micro.dtb +S:CONFIG_ARM=y ++S:CONFIG_TARGET_SUNXI=y +S:CONFIG_TARGET_SUN5I=y diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 2c726f3..3632f95 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -2,4 +2,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS=A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11) CONFIG_FDTFILE=sun5i-a13-olinuxino.dtb +S:CONFIG_ARM=y ++S:CONFIG_TARGET_SUNXI=y +S:CONFIG_TARGET_SUN5I=y diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig index ca79fd5..2317d1f 100644 --- a/configs/A20-OLinuXino-Lime_defconfig +++ b/configs/A20-OLinuXino-Lime_defconfig @@ -2,4 +2,5 @@ CONFIG_SPL=y
Re: [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option
Hi, On 10/04/2014 10:48 AM, Ian Campbell wrote: It's unfortunate that this needs to be present in both .config and spl/.config since it makes it slightly hard to enable FEL mode for a regular defconfig. It can be done with: echo CONFIG_SPL_FEL=y .config echo CONFIG_SPL_FEL=y spl/.config Ideally only one of those would be needed. Signed-off-by: Ian Campbell i...@hellion.org.uk --- board/sunxi/Kconfig | 4 configs/Cubieboard2_FEL_defconfig | 3 ++- configs/Cubietruck_FEL_defconfig | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 6e9308d..f467ade 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -32,6 +32,10 @@ config SYS_BOARD config SYS_SOC default sunxi +config SPL_FEL + bool SPL/FEL mode support + default n + config FDTFILE string Default fdtfile env setting for this board Ack to this bit. diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig index 967be18..8d68275 100644 --- a/configs/Cubieboard2_FEL_defconfig +++ b/configs/Cubieboard2_FEL_defconfig @@ -1,5 +1,6 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS=CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI ++S:CONFIG_SPL_FEL=y +CONFIG_SYS_EXTRA_OPTIONS=CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI CONFIG_FDTFILE=sun7i-a20-cubieboard2.dtb +S:CONFIG_ARM=y +S:CONFIG_TARGET_SUNXI=y diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig index 1cda577..64fbc34 100644 --- a/configs/Cubietruck_FEL_defconfig +++ b/configs/Cubietruck_FEL_defconfig @@ -1,5 +1,6 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS=CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI ++S:CONFIG_SPL_FEL=y +CONFIG_SYS_EXTRA_OPTIONS=CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI CONFIG_FDTFILE=sun7i-a20-cubietruck.dtb +S:CONFIG_ARM=y +S:CONFIG_TARGET_SUNXI=y But not do this but, I don't see how these 2 are so special that they have to get a FEL version of the defconfig, where others do not. I was planning to do a similar patch (but have not gotten around to it), but my plan was to simply remove these 2 defconfigs then. This is: Acked-by: Hans de Goede hdego...@redhat.com With the 2 FEL defconfigs completely removed. If you disagree with removing them, this is going to need some more discussion :) Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] cfi_flash: don't hide write/erase errors
Hi Baruch,
On 06.10.2014 08:19, Baruch Siach wrote:
On Thu, Sep 04, 2014 at 12:23:09PM +0300, Baruch Siach wrote:
Partially revert commit 0d01f66d235118 (CFI: cfi_flash write fix for AMD
legacy).
flash_full_status_check() used to skip status register parsing when
flash_status_check() returns OK. This is wrong since flash_status_check()
must return OK for other status bits to be valid.
Cc: Ed Swarthout ed.swarth...@freescale.com
Signed-off-by: Baruch Siach bar...@tkos.co.il
---
drivers/mtd/cfi_flash.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index c4b5bc1de553..9b3175d87fbd 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -593,7 +593,7 @@ static int flash_full_status_check (flash_info_t * info,
flash_sect_t sector,
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_EXTENDED:
case CFI_CMDSET_INTEL_STANDARD:
- if ((retcode != ERR_OK)
+ if ((retcode == ERR_OK)
!flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
retcode = ERR_INVAL;
printf (Flash %s error at address %lx\n, prompt,
Ping?
Sorry, I forgot about this one.
I have to admit that I'm a bit hesitant here. Since your patch changes
the behavior thats present for about than 6 years. You're the first
encountering some problems here. And I'm not that actively using CFI NOR
flash anymore as well, so my knowledge is a bit rusty here as well.
Could you please summarize again, what the real problem with this
compare is. What is the error exactly in your case (which flash chip is
used and which command was issued?)?
Thanks,
Stefan
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup
On Mon, 2014-10-06 at 11:16 +0900, Masahiro Yamada wrote: Hi Ian, On Sat, 04 Oct 2014 10:32:04 +0100 Ian Campbell i...@hellion.org.uk wrote: On Sat, 2014-10-04 at 09:47 +0100, Ian Campbell wrote: Probably the board [...] selection could be moved out without any dependencies, although the board one in particular will be quite a big patch I think it would be worth it. On the topic of board selection which way round should the SoC vs. board options be arrange? Should we have invisible TARGET_SUN?I options which are selected by each board, or should we have the boards depend on the appropriate TARGET? In the first case a user would need to choose from a pretty long list of boards, in the second case they would need to know which SoC the board has. I'm leaning towards the first. Either would work, but as for Tegra, the second one has been chosen. Thanks. I think global consistency is a worthwhile goal, so sunxi should follow the same pattern. Architecture select (CONFIG_ARCH) - Tegra Platform (CONFIG_TEGRA) - Tegra SoC select (CONFIG_TEGRA20 / 30 / 114 / 124) - Board select I don't think either would be an impediment to an eventually single common binary which I'm imagining would appear as a Generic board option which depends/selects all appropriate SoCs. Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings
On Mon, 2014-10-06 at 09:48 +0200, Hans de Goede wrote: Hi, On 10/04/2014 10:48 AM, Ian Campbell wrote: No need to be so repetitive. Hmm, I also have a version of this in my tree, I thought I had already send that out, but maybe I did not, Ah, it seemed familiar as I was writing it, but I decided it had just been discussed and not implemented. You need to move this up to the top of the Kconfig file, as it gets unconditionally sourced from arch/arm/Kconfig, and if this is not at the top, you will be unconditionally adding a SYS_CONFIG_NAME section which may conflict with other targets which also define it. Makes sense. With that fixed this is: Acked-by: Hans de Goede hdego...@redhat.com Thanks. Ian. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
On Mon, 2014-10-06 at 10:39 +0900, Masahiro Yamada wrote: Hi Ian, On Sat, 4 Oct 2014 09:48:11 +0100 Ian Campbell i...@hellion.org.uk wrote: And make TARGET_SUN[457]I a choice variable under this. configs updated with: sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n/g' configs/* Signed-off-by: Ian Campbell i...@hellion.org.uk Perhaps, is ARCH_SUNXI more familiar? I've no idea ;-) I think this is something which ought to be consistent within u-boot as a whole. Seems we have a mixture of ARCH_FOO (DAVINCI, VERSATILE, EXYNOS) and just FOO (TEGRA, ZYNQ). It does look like TARGET_FOO is all individual boards though, which would make it inappropriate for SUNXI or even SUN[4567]I. Ultimately I'm happy to follow any guidance anyone has to give. Ian. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option
On Mon, 2014-10-06 at 09:58 +0200, Hans de Goede wrote: With the 2 FEL defconfigs completely removed. If you disagree with removing them, this is going to need some more discussion :) I think they should be removed but in a separate patch, rather than mixing two changes in this one. I'll add such a patch to the next version. Ian. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/6] sunxi: Turn MMC_SUNXI_SLOT_EXTRA into a proper Kconfig option
On Sun, 2014-10-05 at 17:00 +0200, Hans de Goede wrote: Hi, On 10/04/2014 10:32 AM, Ian Campbell wrote: On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: Note we also drop the SPL check for initializing the 2nd mmc slot, the SPL check is not necessary with Kconfig, because only options explicitly marked as also being for the SPL get set during SPL builds. Signed-off-by: Hans de Goede hdego...@redhat.com If we come across a system with e.g. 3 slots then this is just going to get more complex, isn't it? Shall we bite the bullet now and got straight to a bool option per potential slot? I think that the current solution is somewhat more KISS then doing a bool per slot. So lets wait with moving to a bool per mmc controller, until such a hypothetical board with 3 mmc slots actually shows up, and keep what we've for now. That's OK so long as we don't try to care about forwards compatibility for .config files. I have a feeling that we don't in general, I expect very few people are using oldconfig as opposed to rerunning defconfig, since there is very little opportunity to tweak things once you have the defconfig for a board. Ian. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 4/6] sunxi: When we've both mmc0 and mmc2, detect from which one we're booting
On Sun, 2014-10-05 at 17:10 +0200, Hans de Goede wrote: On 10/04/2014 10:35 AM, Ian Campbell wrote: On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: sunxi SOCs can boot from both mmc0 and mmc2, detect from which one we're booting, and make that one mmc dev 0 so that a single u-boot binary can be used for both the onboard eMMC and for external sdcards. Where does the dependency on dev 0 being the boot device come from? Is it just the env via CONFIG_SYS_MMC_ENV_DEV? No, the main reason why we need dev 0 to be the mmc we're actually booting from is because that is where the SPL will load the tertiary payload (the actual u-boot binary in our case) from, see: common/spl/spl_mmc.c Which has dev 0 hardcoded everywhere. I see. Could you paste this bit of reasoning into the commit log please? (pretty much s/No, t/T/ on the above would do IMHO) There is no fallback path, if you insert a sdcard with a bad u-boot build, things will just hang, the brom is not smart enough to switch over to an internal boot medium in this case. So I believe that the check which I'm adding should be sufficient to determine whether or not we're booting from mmc0. I really don't expect people to leave a bootable sdcard in slot0, they could have a sdcard there to store data, but in that case I would expect it to not have the magic boot signature. This makes sense too, thanks. Ian ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 6/6] sunxi: Enable second sdcard slot found on some boards
Hi, On 10/04/2014 10:39 AM, Ian Campbell wrote: On Sat, 2014-10-04 at 09:38 +0100, Ian Campbell wrote: On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig index 645b236..50979e2 100644 --- a/configs/Mele_M3_defconfig +++ b/configs/Mele_M3_defconfig @@ -1,5 +1,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS=MELE_M3,AXP209_POWER,SUNXI_GMAC,USB_EHCI CONFIG_FDTFILE=sun7i-a20-m3.dtb ++S:CONFIG_MMC_SUNXI_SLOT_EXTRA=2 This one is +S (regular+SPL) while the other two are just S (regular only). Is that deliberate? Sorry, I should have read the commit message more carefully as you explained it quite clearly there! This patch looks good, except insofar as some of my comments on earlier patches could result in it looking completely different, sorry about that! Heh, no worries. I'll try to do a v2 today addressing all your concerns. Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/6] sunxi: Use PG3 - PG8 as io-pins for mmc1
Hi, On 10/04/2014 10:37 AM, Ian Campbell wrote: On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: None of the known sunxi devices actually use mmc1 routed through PH, where as some devices do actually use mmc1 routed through PG, so change the routing of mmc1 to PG. If in the future we encounter devices with mmc1 routed through PH, we will need to change things to be a bit more flexible. Signed-off-by: Hans de Goede hdego...@redhat.com Acked-by: Ian Campbell ian.campb...@citrix.com Although it seems that adding a Kconfig choice option would only be a dozen or so lines of pretty trivial stuff if we wanted to do it now. This mostly seems to be a sun4i/sun7i vs sun5i thing. mmc1 could be routed through PH on sun4i/sun7i, but actually is never used there, as PH typically is used for gpio purposed on sun4i/sun7i, where as on sun5i (which has way less pins), mmc1 goes out on PG, and actually is used as such there. I have considered keeping the old pinmux settings using #if defined SUN5I for the new ones, but since the old ones are never used just replacing them seems better. Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/6] sunxi: Use PG3 - PG8 as io-pins for mmc1
On Mon, 2014-10-06 at 10:37 +0200, Hans de Goede wrote: Hi, On 10/04/2014 10:37 AM, Ian Campbell wrote: On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: None of the known sunxi devices actually use mmc1 routed through PH, where as some devices do actually use mmc1 routed through PG, so change the routing of mmc1 to PG. If in the future we encounter devices with mmc1 routed through PH, we will need to change things to be a bit more flexible. Signed-off-by: Hans de Goede hdego...@redhat.com Acked-by: Ian Campbell ian.campb...@citrix.com Although it seems that adding a Kconfig choice option would only be a dozen or so lines of pretty trivial stuff if we wanted to do it now. This mostly seems to be a sun4i/sun7i vs sun5i thing. mmc1 could be routed through PH on sun4i/sun7i, but actually is never used there, as PH typically is used for gpio purposed on sun4i/sun7i, where as on sun5i (which has way less pins), mmc1 goes out on PG, and actually is used as such there. I have considered keeping the old pinmux settings using #if defined SUN5I for the new ones, but since the old ones are never used just replacing them seems better. Sure. Ian. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option
Hi, On 10/06/2014 10:28 AM, Ian Campbell wrote: On Mon, 2014-10-06 at 09:58 +0200, Hans de Goede wrote: With the 2 FEL defconfigs completely removed. If you disagree with removing them, this is going to need some more discussion :) I think they should be removed but in a separate patch, rather than mixing two changes in this one. I'll add such a patch to the next version. Ok, that works for me. Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mx6sxsabresd: Fix PCI reset and power GPIO assignments
Hi Fabio, On 05/10/2014 00:45, Fabio Estevam wrote: Hi Stefano, On Tue, Sep 30, 2014 at 2:05 PM, Fabio Estevam fabio.este...@freescale.com wrote: PERST_GPIO and POWER_GPIO are currently swapped. Fix the GPIO assignments as per the board schematics. Signed-off-by: Fabio Estevam fabio.este...@freescale.com Would it be possible to get this one into 2014.10? Yes, I will merge it. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/3] usb: gadget: fastboot miscellaneous patches
Hi Marek, On Wednesday, October 01, 2014 at 10:44:46 PM, Steve Rae wrote: On 14-10-01 05:13 AM, Marek Vasut wrote: On Wednesday, October 01, 2014 at 04:03:21 AM, Eric Nelson wrote: Hi Marek, On 09/30/2014 04:59 PM, Marek Vasut wrote: On Tuesday, September 30, 2014 at 09:47:07 PM, Eric Nelson wrote: Hi Marek, On 09/30/2014 12:37 PM, Marek Vasut wrote: On Tuesday, September 30, 2014 at 09:05:39 PM, Eric Nelson wrote: While trying to configure Nitrogen6X boards to use Android Fastboot, I found a number of places where the implementation doesn't appear to match the latest host tools on AOSP. Eric Nelson (3): usb: gadget: fastboot: add max-download-size variable usb: gadget: fastboot: explicitly set radix of maximum download size usb: gadget: fastboot: terminate commands with NULL Just to make sure, are those fixes for 2014.10 or new stuff for next ? These patches are against master, but should apply against usb/next and dfu/next and next is fine for us. 3/3 looks like a bugfix though. Is that a bugfix ? I wasn't able to get fastboot to do much of anything without all three. -- lack of max-download-size simply stopped downloads -- the missing radix caused my host to think that the 0x0700 size (copied from Beagle) was 1.8 MiB instead of 100+ MiB. -- the lack of termination showed up as a request to download a **huge** image when I tried to send u-boot.imx. I think I got lucky that the next characters in the buffer looked like hex digits. I suspect that others are either holding on to some local patches or are perhaps using old versions of the Fastboot host program. After applying all three, I was able to configure for flashing on an MMC device, but I don't have anything configured to use EFI partitions, so there's no immediate route to usage for us. I'd really like to be able to fastboot flash bootloader u-boot.imx and program SPI-NOR and also be able to boot a kernel and RAM disk using fastboot boot uImage uramdisk.img, but neither of them seems very close. The first needs some more structure, and the latter seemed to decide its' own address for the kernel and simply ignore the RAM disk. I have the sense that this code is pretty much a work in progress, but I'd like to hear otherwise from those who have used it. OK, so let's wait for the others' opinions. Best regards, Marek Vasut I would recommend 1/3 2/3 for 2014.10 (I'm not certain about 3/3 because I don't think that it can actually occur on my boards) Thanks, Steve OK, Lukasz, do you want to send me a PR with those two ? There aren't any pending DFU patches, so I don't plan any PR before our ELCE2014 meeting. Therefore please, if possible, pull 1/3 and 2/3 to u-boot-usb directly. Best regards, Marek Vasut -- Best regards, Lukasz Majewski Samsung RD Institute Poland (SRPOL) | Linux Platform Group ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
Hi Ian
On Mon, 06 Oct 2014 09:27:19 +0100
Ian Campbell i...@hellion.org.uk wrote:
Hi Ian,
On Mon, 2014-10-06 at 10:39 +0900, Masahiro Yamada wrote:
Hi Ian,
On Sat, 4 Oct 2014 09:48:11 +0100
Ian Campbell i...@hellion.org.uk wrote:
And make TARGET_SUN[457]I a choice variable under this.
configs updated with:
sed -i -e
's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n/g' configs/*
Signed-off-by: Ian Campbell i...@hellion.org.uk
Perhaps, is ARCH_SUNXI more familiar?
I've no idea ;-)
I think this is something which ought to be consistent within u-boot as
a whole. Seems we have a mixture of ARCH_FOO (DAVINCI, VERSATILE,
EXYNOS) and just FOO (TEGRA, ZYNQ). It does look like TARGET_FOO is all
individual boards though, which would make it inappropriate for SUNXI or
even SUN[4567]I.
SoC/board select menu clean-up is on the way.
I have to admit the naming convention is inconsistent now.
CONFIG_ARCH_{DAVINCI, VERSATILE, EXYNOS} were added recently.
If Xilinx/NVIDIA developers argree, we can rename
CONFIG_{TEGRA, ZYNQ} - CONFIG_ARCH_{TEGRA, ZYNQ} at some point.
Ultimately I'm happy to follow any guidance anyone has to give.
Ian.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] cfi_flash: don't hide write/erase errors
Hi Stefan,
On Mon, Oct 06, 2014 at 10:20:43AM +0200, Stefan Roese wrote:
On 06.10.2014 08:19, Baruch Siach wrote:
On Thu, Sep 04, 2014 at 12:23:09PM +0300, Baruch Siach wrote:
Partially revert commit 0d01f66d235118 (CFI: cfi_flash write fix for AMD
legacy).
flash_full_status_check() used to skip status register parsing when
flash_status_check() returns OK. This is wrong since flash_status_check()
must return OK for other status bits to be valid.
Cc: Ed Swarthout ed.swarth...@freescale.com
Signed-off-by: Baruch Siach bar...@tkos.co.il
---
drivers/mtd/cfi_flash.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index c4b5bc1de553..9b3175d87fbd 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -593,7 +593,7 @@ static int flash_full_status_check (flash_info_t *
info, flash_sect_t sector,
case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_EXTENDED:
case CFI_CMDSET_INTEL_STANDARD:
- if ((retcode != ERR_OK)
+ if ((retcode == ERR_OK)
!flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
retcode = ERR_INVAL;
printf (Flash %s error at address %lx\n, prompt,
Ping?
Sorry, I forgot about this one.
I have to admit that I'm a bit hesitant here. Since your patch changes the
behavior thats present for about than 6 years. You're the first encountering
some problems here. And I'm not that actively using CFI NOR flash anymore as
well, so my knowledge is a bit rusty here as well.
Could you please summarize again, what the real problem with this compare
is. What is the error exactly in your case (which flash chip is used and
which command was issued?)?
The Micron StrataFlash datasheet says this on Status Register bit 7 (Device
status):
0 = Device is busy; SR[9,8,6:1] are invalid, SR[0] is valid
1 = Device is ready; SR[9:8], SR[6:1] are valid
This is was the original code behaviour, since your commit
79b4cda076069d04122f. This commit log explicitly says:
* Changes/fixes for drivers/cfi_flash.c:
We *should* check if there are any error bits if the previous call
returned ERR_OK (Otherwise we will have output an error message in
flash_status_check() already.) The original code would only check for
error bits if flash_status_check() returns ERR_TIMEOUT.
Patch by Marcus Hall, 23 Aug 2005
Currently U-Boot is just silent about NOR flash write errors.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}ooO--U--Ooo{=
- bar...@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] cfi_flash: don't hide write/erase errors
On 06.10.2014 13:32, Baruch Siach wrote: Could you please summarize again, what the real problem with this compare is. What is the error exactly in your case (which flash chip is used and which command was issued?)? The Micron StrataFlash datasheet says this on Status Register bit 7 (Device status): 0 = Device is busy; SR[9,8,6:1] are invalid, SR[0] is valid 1 = Device is ready; SR[9:8], SR[6:1] are valid This is was the original code behaviour, since your commit 79b4cda076069d04122f. This commit log explicitly says: * Changes/fixes for drivers/cfi_flash.c: We *should* check if there are any error bits if the previous call returned ERR_OK (Otherwise we will have output an error message in flash_status_check() already.) The original code would only check for error bits if flash_status_check() returns ERR_TIMEOUT. Patch by Marcus Hall, 23 Aug 2005 Currently U-Boot is just silent about NOR flash write errors. Okay. Thanks for the summary. I'll prepare a pull request. Thanks, Stefan ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-cfi-flash master
Hi Tom! Please pull the following fix: The following changes since commit b966db0d7259293e2c9c216c7a5dce30dacacfd9: dw_mmc: cleanups (2014-10-03 17:26:50 +0300) are available in the git repository at: git://www.denx.de/git/u-boot-cfi-flash.git for you to fetch changes up to 91693055995733e268874ae75568ae316233e116: cfi_flash: don't hide write/erase errors (2014-10-06 14:12:12 +0200) Baruch Siach (1): cfi_flash: don't hide write/erase errors drivers/mtd/cfi_flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 00/40] ARM: tegra: Add PCIe support
Hello Thierry, Am 29.09.2014 10:11, schrieb Thierry Reding: On Sun, Sep 28, 2014 at 04:48:47PM -0600, Simon Glass wrote: Hi Thierry, On 26 August 2014 09:33, Thierry Redingthierry.red...@gmail.com wrote: From: Thierry Redingtred...@nvidia.com This series adds PCIe support for Tegra20, Tegra30 and Tegra124. The size is mostly due to the large number of infrastructure that's added (libfdt, Tegra specific drivers required by the PCIe driver). In this version I've included all patches that were previously split into three separate series. Spreading them over multiple series is probably not worth it since there might be some dependencies between them and only the end result gives a completely working setup. FYI I have applied this series on top of driver model - it is at u-boot-dm.git branch 'norrin-working'. There were a quite few conflicts which I resolved (mostly with mainline I think). I tested it on beaver, trimslice and jetson-tk1. Are you going to respin it? I started looking at DM for I2C as Heiko suggested but it became too complex and time consuming, so what I'm planning to do is drop the I2C enhancements and use plain i2c_set_bus_num() and friends. If there's any interest I can push a branch with the work-in-progress I2C DM patches, perhaps it could serve as the basis if someone else wanted to continue with that effort. Yes please, maybe its worth to use it as a base ... bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] arm: goni: add i2c_init_board()
Add proper initialization of GPIO pins used by software i2c.
Signed-off-by: Robert Baldyga r.bald...@samsung.com
---
Hi Simon,
This patch is intended for your gpio-working branch. It seems that this
is only thing which is missing to make your changes working on Goni platform
(excepting patches changing cache and memory configuration which doesn't
depend on dm, and will probably be added through samsung tree).
Best regards,
Robert Baldyga
board/samsung/goni/goni.c | 10 ++
include/configs/s5p_goni.h | 2 ++
2 files changed, 12 insertions(+)
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 22f4995..58cf96e 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -33,6 +33,16 @@ int board_init(void)
return 0;
}
+#ifdef CONFIG_SYS_I2C_INIT_BOARD
+void i2c_init_board(void)
+{
+ gpio_request(S5PC110_GPIO_J43, i2c_clk);
+ gpio_request(S5PC110_GPIO_J40, i2c_data);
+ gpio_direction_output(S5PC110_GPIO_J43, 1);
+ gpio_direction_output(S5PC110_GPIO_J40, 1);
+}
+#endif
+
int power_init_board(void)
{
int ret;
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index fb1a7db..76b0503 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -276,6 +276,8 @@
#define CONFIG_SYS_I2C_SOFT_SPEED 5
#define CONFIG_SYS_I2C_SOFT_SLAVE 0x7F
#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C_INIT_BOARD
+
#define CONFIG_SYS_MAX_I2C_BUS 7
#define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_S3C_UDC_OTG
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 42/42] ARM: tegra: colibri_t30: comment style fix
On Fri, Oct 03, 2014 at 10:41:09AM -0700, Tom Warren wrote: -Original Message- From: Stephen Warren [mailto:swar...@wwwdotorg.org swar...@wwwdotorg.org ] Sent: Friday, October 03, 2014 8:56 AM To: Marcel Ziswiler Cc: u-boot@lists.denx.de; Thierry Reding; Stephen Warren; Tom Warren Subject: Re: [U-Boot] [PATCH 42/42] ARM: tegra: colibri_t30: comment style fix On 10/03/2014 09:55 AM, Marcel Ziswiler wrote: On Fri, 2014-10-03 at 09:40 -0600, Stephen Warren wrote: If you want to extract just 1 (or some specific number) of commits rather than everything since upstream, you can always run: git format-patch -1 commit_id where -1 means 1 commit (and could be any number) and commit_id is the most recent commit you want to send. That way, format-patch will generate the correct N/M values in the email subjects without you having to fix them up:-) Thanks mate, I knew there's gotta be a better way to doing this, just never got around to actually fiddle with it. Do you happen to know about the status of Thierry's latest PCIe patch set? I think Tom was going to track down who was going to apply it. [blocked from my work email due to Mime, resend from gmail account] I thought I saw some discussion of Tom (Rini), etc. taking it in, as only about a quarter (9 of 40) of the v2 patches are tagged 'tegra'. But I can try to apply it to u-boot-tegra early next week if no one else wants to take it. It isn't finalized yet. Simon requested that I make some changes. Some of them turned out to be too complicated to do as part of the series (the I2C rewrite/DM conversion), so I'll need to respin part of it to use the old I2C API and move the AS3722 code to the PMIC framework. However given my current workload I'd expect it to take at least another two to three weeks before I have the time to get back to it. Thierry pgpcyojWOTxwP.pgp Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4] ARM: mx6: Add support for Kosagi Novena
Hi Marek, Sean,
Do you have any comments on the PHY signal driving conflict and reset
timing issue (see below)?
On 09/24/2014 05:46 AM, Nikolay Dimitrov wrote:
There's one more issue here - when you get the PHY out of reset, you'll
have to both de-assert the RESET line while keeping the strapping
signals stable so the PHY can read them, but at the same time the PHY RX
pins are becoming outputs and driving the same lines, which is not good.
...
Here's my proposal how to fix both (line driving conflict and reset
timing) issues:
#define ENET_PHY_CFG_PC \
(PAD_CTL_HYS | PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE)
static iomux_v3_cfg_t enet_pads1[] = {
MX6_PAD_ENET_MDIO__ENET_MDIO| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_ENET_MDC__ENET_MDC| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TXC__RGMII_TXC| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TD0__RGMII_TD0| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TD1__RGMII_TD1| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TD2__RGMII_TD2| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TD3__RGMII_TD3| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TX_CTL__RGMII_TX_CTL| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_ENET_REF_CLK__ENET_TX_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL),
/* pin 35, PHY_AD2 */
MX6_PAD_RGMII_RXC__GPIO6_IO30| MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 32, MODE0 */
MX6_PAD_RGMII_RD0__GPIO6_IO25| MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 31, MODE1 */
MX6_PAD_RGMII_RD1__GPIO6_IO27| MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 28, MODE2 */
MX6_PAD_RGMII_RD2__GPIO6_IO28| MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 27, MODE3 */
MX6_PAD_RGMII_RD3__GPIO6_IO29| MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 33, CLK125_EN */
MX6_PAD_RGMII_RX_CTL__GPIO6_IO24| MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* PHY nRST */
MX6_PAD_EIM_D23__GPIO3_IO23| MUX_PAD_CTRL(NO_PAD_CTRL),
};
static void novena_spl_setup_iomux_enet(void)
{
imx_iomux_v3_setup_multiple_pads(enet_pads1, ARRAY_SIZE(enet_pads1));
/* Assert Ethernet PHY nRST */
gpio_direction_output(IMX_GPIO_NR(3, 23), 0);
/* Using imx6 internal pull-ups to drive PHY config pins during PHY
reset */
gpio_direction_input(IMX_GPIO_NR(6, 30)); /* PHY_AD2 = 1 */
gpio_direction_input(IMX_GPIO_NR(6, 25)); /* MODE0 = 1 */
gpio_direction_input(IMX_GPIO_NR(6, 27)); /* MODE1 = 1 */
gpio_direction_input(IMX_GPIO_NR(6, 28)); /* MODE2 = 1 */
gpio_direction_input(IMX_GPIO_NR(6, 29)); /* MODE3 = 1 */
gpio_direction_input(IMX_GPIO_NR(6, 24)); /* CLK125_EN = 1 */
/* Interpreting fig.8 from the PHY datasheet */
mdelay(10);
/* De-assert Ethernet PHY nRST */
gpio_set_value(IMX_GPIO_NR(3, 23), 1);
/* After PHY is configured, we can finally connect our FEC */
imx_iomux_v3_setup_multiple_pads(enet_pads2, ARRAY_SIZE(enet_pads2));
/* PHY datasheet recommends on p.53 to wait at least 100us before
using MII, so we enforce this delay here */
udelay(100);
}
Kind regards,
Nikolay
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-cfi-flash master
On Mon, Oct 06, 2014 at 02:15:04PM +0200, Stefan Roese wrote: Hi Tom! Please pull the following fix: The following changes since commit b966db0d7259293e2c9c216c7a5dce30dacacfd9: dw_mmc: cleanups (2014-10-03 17:26:50 +0300) are available in the git repository at: git://www.denx.de/git/u-boot-cfi-flash.git for you to fetch changes up to 91693055995733e268874ae75568ae316233e116: cfi_flash: don't hide write/erase errors (2014-10-06 14:12:12 +0200) Baruch Siach (1): cfi_flash: don't hide write/erase errors drivers/mtd/cfi_flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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] powerpc/BSC9132QDS: Enable creation of dynamic partition for NAND and NOR
* fdt_fixup_mtdparts is called from ft_board_setup
* run mtdparts default to create NAND, NOR partition on uboot
* Use mtdparts to create partitions dynamically rather
than using static partitions in device tree
Signed-off-by: Ashish Kumar ashish.ku...@freescale.com
---
board/freescale/bsc9132qds/bsc9132qds.c | 12
include/configs/BSC9132QDS.h| 21 +
2 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/board/freescale/bsc9132qds/bsc9132qds.c
b/board/freescale/bsc9132qds/bsc9132qds.c
index 10580bc..c88838b 100644
--- a/board/freescale/bsc9132qds/bsc9132qds.c
+++ b/board/freescale/bsc9132qds/bsc9132qds.c
@@ -21,6 +21,9 @@
#include hwconfig.h
#include i2c.h
#include fsl_ddr_sdram.h
+#include jffs2/load_kernel.h
+#include mtd_node.h
+#include flash.h
#ifdef CONFIG_PCI
#include pci.h
@@ -354,6 +357,12 @@ void fdt_del_node_compat(void *blob, const char
*compatible)
}
#if defined(CONFIG_OF_BOARD_SETUP)
+#ifdef CONFIG_FDT_FIXUP_PARTITIONS
+struct node_info nodes[] = {
+ { cfi-flash, MTD_DEV_TYPE_NOR, },
+ { fsl,ifc-nand, MTD_DEV_TYPE_NAND, },
+};
+#endif
void ft_board_setup(void *blob, bd_t *bd)
{
phys_addr_t base;
@@ -369,6 +378,9 @@ void ft_board_setup(void *blob, bd_t *bd)
#endif
fdt_fixup_memory(blob, (u64)base, (u64)size);
+#ifdef CONFIG_FDT_FIXUP_PARTITIONS
+ fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
+#endif
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
u32 porbmsr = in_be32(gur-porbmsr);
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index aeded6d..da78a19 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -630,6 +630,27 @@ combinations. this should be removed later
#endif
/*
+ * Dynamic MTD Partition support with mtdparts
+ */
+#ifndef CONFIG_SYS_NO_FLASH
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_FLASH_CFI_MTD
+#define MTDIDS_DEFAULT nor0=8800.nor,nand0=ff80.flash,
+#define MTDPARTS_DEFAULT mtdparts=8800.nor:256k(dtb),7m(kernel), \
+ 55m(fs),1m(uboot);ff80.flash:1m(uboot), \
+ 8m(kernel),512k(dtb),-(fs)
+#endif
+/*
+ * Override partitions in device tree using info
+ * in mtdparts environment variable
+ */
+#ifdef CONFIG_CMD_MTDPARTS
+#define CONFIG_FDT_FIXUP_PARTITIONS
+#endif
+
+/*
* Environment Configuration
*/
--
1.7.6.GIT
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] lsxl: convert to generic board and fix typo
-Original Message- From: Michael Walle [mailto:mich...@walle.cc] Sent: 06 October 2014 02:40 To: u-boot@lists.denx.de Cc: Tom Rini; Prafulla Wadaskar Subject: Re: [PATCH] lsxl: convert to generic board and fix typo Am Sonntag, 28. September 2014, 00:05:23 schrieb Michael Walle: Besides converting the LS-XHL and LS-CHLv2 to generic board, fix a typo which accidentally reverted the bootsource to 'hdd' although the default bootsource should be 'legacy'. Cc: Tom Rini tr...@ti.com Cc: Prafulla Wadaskar prafu...@marvell.com Signed-off-by: Michael Walle mich...@walle.cc --- Hi Tom, Hi Prafulla, could this patch be merged before the 2014.10 release? Maybe Tom could pick it directly. If not, it's ok; it is my fault to be so late ;) ping? :) Applied to u-boot-marvell.git master branch Regards... Prafulla . . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request for u-boot-marvell.git
Hi Albert, Please pull The following changes since commit be9f643ae6aa9044c60fe80e3a2c10be8371c692: Merge branch 'for-tom' of git://git.denx.de/u-boot-dm (2014-09-26 20:10:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-marvell.git master DrEagle (5): ARM: sheevaplug: change env location ARM: sheevaplug: add MVSATA driver ARM: sheevaplug: add MTD defaults ARM: sheevaplug: redefine MTDPARTS ARM: sheevaplug: add HUSH parser Michael Walle (1): lsxl: convert to generic board and fix typo include/configs/lsxl.h |4 ++- include/configs/sheevaplug.h | 46 + 2 files changed, 44 insertions(+), 6 deletions(-) Regards... Prafulla . . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/3] usb: gadget: fastboot miscellaneous patches
On Monday, October 06, 2014 at 11:23:53 AM, Lukasz Majewski wrote: Hi Marek, On Wednesday, October 01, 2014 at 10:44:46 PM, Steve Rae wrote: On 14-10-01 05:13 AM, Marek Vasut wrote: On Wednesday, October 01, 2014 at 04:03:21 AM, Eric Nelson wrote: Hi Marek, On 09/30/2014 04:59 PM, Marek Vasut wrote: On Tuesday, September 30, 2014 at 09:47:07 PM, Eric Nelson wrote: Hi Marek, On 09/30/2014 12:37 PM, Marek Vasut wrote: On Tuesday, September 30, 2014 at 09:05:39 PM, Eric Nelson wrote: While trying to configure Nitrogen6X boards to use Android Fastboot, I found a number of places where the implementation doesn't appear to match the latest host tools on AOSP. Eric Nelson (3): usb: gadget: fastboot: add max-download-size variable usb: gadget: fastboot: explicitly set radix of maximum download size usb: gadget: fastboot: terminate commands with NULL Just to make sure, are those fixes for 2014.10 or new stuff for next ? These patches are against master, but should apply against usb/next and dfu/next and next is fine for us. 3/3 looks like a bugfix though. Is that a bugfix ? I wasn't able to get fastboot to do much of anything without all three. -- lack of max-download-size simply stopped downloads -- the missing radix caused my host to think that the 0x0700 size (copied from Beagle) was 1.8 MiB instead of 100+ MiB. -- the lack of termination showed up as a request to download a **huge** image when I tried to send u-boot.imx. I think I got lucky that the next characters in the buffer looked like hex digits. I suspect that others are either holding on to some local patches or are perhaps using old versions of the Fastboot host program. After applying all three, I was able to configure for flashing on an MMC device, but I don't have anything configured to use EFI partitions, so there's no immediate route to usage for us. I'd really like to be able to fastboot flash bootloader u-boot.imx and program SPI-NOR and also be able to boot a kernel and RAM disk using fastboot boot uImage uramdisk.img, but neither of them seems very close. The first needs some more structure, and the latter seemed to decide its' own address for the kernel and simply ignore the RAM disk. I have the sense that this code is pretty much a work in progress, but I'd like to hear otherwise from those who have used it. OK, so let's wait for the others' opinions. Best regards, Marek Vasut I would recommend 1/3 2/3 for 2014.10 (I'm not certain about 3/3 because I don't think that it can actually occur on my boards) Thanks, Steve OK, Lukasz, do you want to send me a PR with those two ? There aren't any pending DFU patches, so I don't plan any PR before our ELCE2014 meeting. Therefore please, if possible, pull 1/3 and 2/3 to u-boot-usb directly. OK, done. Would you please keep an eye on 3/3 for me ? ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4] ARM: mx6: Add support for Kosagi Novena
On Monday, October 06, 2014 at 02:50:17 PM, Nikolay Dimitrov wrote: Hi Marek, Sean, Do you have any comments on the PHY signal driving conflict and reset timing issue (see below)? I don't, I sense expert knowledge from you. Now we need to wait for the authors. I spent this weekend showing Novena board off at a local conference and somehow it became the center of attention without much help ;-) I see Novena is like the epitome of awesomeness :) Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 4/6] sunxi: When we've both mmc0 and mmc2, detect from which one we're booting
Hi, On 10/06/2014 10:33 AM, Ian Campbell wrote: On Sun, 2014-10-05 at 17:10 +0200, Hans de Goede wrote: On 10/04/2014 10:35 AM, Ian Campbell wrote: On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: sunxi SOCs can boot from both mmc0 and mmc2, detect from which one we're booting, and make that one mmc dev 0 so that a single u-boot binary can be used for both the onboard eMMC and for external sdcards. Where does the dependency on dev 0 being the boot device come from? Is it just the env via CONFIG_SYS_MMC_ENV_DEV? No, the main reason why we need dev 0 to be the mmc we're actually booting from is because that is where the SPL will load the tertiary payload (the actual u-boot binary in our case) from, see: common/spl/spl_mmc.c Which has dev 0 hardcoded everywhere. I see. Could you paste this bit of reasoning into the commit log please? (pretty much s/No, t/T/ on the above would do IMHO) Done for v2. Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/6] sunxi: Use PG3 - PG8 as io-pins for mmc1
Hi, On 10/04/2014 10:37 AM, Ian Campbell wrote: On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: None of the known sunxi devices actually use mmc1 routed through PH, where as some devices do actually use mmc1 routed through PG, so change the routing of mmc1 to PG. If in the future we encounter devices with mmc1 routed through PH, we will need to change things to be a bit more flexible. Signed-off-by: Hans de Goede hdego...@redhat.com Acked-by: Ian Campbell ian.campb...@citrix.com Hmm, do you want to use your citrix address for sunxi work from now on (fine by me), or is this a mistake ? Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mx6sxsabresd: Fix PCI reset and power GPIO assignments
On 30/09/2014 19:05, Fabio Estevam wrote: PERST_GPIO and POWER_GPIO are currently swapped. Fix the GPIO assignments as per the board schematics. Signed-off-by: Fabio Estevam fabio.este...@freescale.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] nitrogen6x: Update DDR timings for 2G memory arrangement
On 02/10/2014 03:33, Eric Nelson wrote: Update DDR calibration settings based on a larger test set. The initial values were gathered on a small number of boards, and have been found to fail on some boards under load. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] arm: m28evk: Zap superfluous tab in env
On 25/09/2014 21:14, Marek Vasut wrote: Remove this tab from env, since it's useless, just use spaces. Signed-off-by: Marek Vasut ma...@denx.de Cc: Stefano Babic sba...@denx.de --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] arm: m53evk: Zap superfluous tab in env
On 25/09/2014 21:14, Marek Vasut wrote: Remove this tab from env, since it's useless, just use spaces. Signed-off-by: Marek Vasut ma...@denx.de Cc: Stefano Babic sba...@denx.de --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] imx6: add Bachmann OT1200 board
Hi Christian, On 02/10/2014 13:33, Christian Gmeiner wrote: This patch adds support for the OT1200 series of devices. Following components are used in u-boot: + ethernet + i2c + emmc + gpio For more details see README. Changes v1 v2 - make use of enable_cspi_clock(..) - fix usage of OUTPUT_40OHM define - added README Changes v2 v3 - improve spelling in README - added own copy of mx6q_4x_mt41j128.cfg Signed-off-by: Christian Gmeiner christian.gmei...@gmail.com --- I think you can send a follow-up patch according to Masahiro's suggestion for removing the string tag from Kconfig. I think we agree that it is better mainlining this one first ;-) Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4] ARM: mx6: Add support for Kosagi Novena
Hi Marek, Nikolay,
I thought I responded, but it might have gotten lost. I'm sorry about that.
I've taken a closer look, and responded below.
On 24/9/2014 5:40 PM, Marek Vasut wrote:
On Wednesday, September 24, 2014 at 04:46:42 AM, Nikolay Dimitrov wrote:
Hi Marek,
Following are some comments about FEC Ethernet:
On 09/23/2014 01:18 PM, Marek Vasut wrote:
+#define ENET_PAD_CTRL \
+ (PAD_CTL_PKE | PAD_CTL_PUE |\
+ PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
+ PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
+
PAD_CTL_SPEED_MED falls on reserved bits (7-6).
Special note: PAD_CTL_DSE_40ohm is defined as 0b110, which is documented
as 37/27 ohm @2.5V. I didn't saw any notes on the PHY spec or the
Novena schematic about the routing guidelines of the RGMII data lines,
but I can extrapolate that if the 125 MHz reference clock is routed as
50-ohm line (this one is documented in the datasheet), then the data
lines are probably routed in a similar way. So the DSE value should be
0b100, which is 57/43 ohm @ 2.5V, which in turn is defined in the
headers as PAD_CTL_DSE_60ohm (this is either a bug in the header, or I'm
reading an updated FSL PDF).
Sean, can you comment on this ?
The pads probably don't support setting speed, as they're a high-speed
RG-MII pads are high-speed anyway. PAD_CTL_SPEED_MED can be removed.
In a pre-release version of the FSL PDF I have, 0b110 is indeed
documented as 40 ohm. You're correct in that it should be 50 ohm, which
the same version of the document doesn't have. The closes is 48 ohm,
which is 0b101. The older doc says 0b100 is 60 ohm, and there are no
distinctions about voltages as there are in Rev. 1 of the pdf, which is
probably what you're looking at.
+static void novena_spl_setup_iomux_enet(void)
+{
+ imx_iomux_v3_setup_multiple_pads(enet_pads1, ARRAY_SIZE(enet_pads1));
+ imx_iomux_v3_setup_multiple_pads(enet_pads2, ARRAY_SIZE(enet_pads2));
+
+ gpio_direction_output(IMX_GPIO_NR(3, 23), 0);
+ gpio_direction_output(IMX_GPIO_NR(6, 30), 1);
+ gpio_direction_output(IMX_GPIO_NR(6, 25), 1);
+ gpio_direction_output(IMX_GPIO_NR(6, 27), 1);
+ gpio_direction_output(IMX_GPIO_NR(6, 28), 1);
+ gpio_direction_output(IMX_GPIO_NR(6, 29), 1);
+ gpio_direction_output(IMX_GPIO_NR(6, 24), 1);
+}
I think that setting the iomuxes immediately one after the other doesn't
achieve the intended goal. After the 2nd iomux setup, the pads are
connected to the FEC, not to the GPIOs.
There's one more issue here - when you get the PHY out of reset, you'll
have to both de-assert the RESET line while keeping the strapping
signals stable so the PHY can read them, but at the same time the PHY RX
pins are becoming outputs and driving the same lines, which is not good.
I'm giving a proposal how to fix this in the end.
+int board_early_init_f(void)
+{
+#if defined(CONFIG_VIDEO_IPUV3)
+setup_display();
+#endif
+
+/* Bring Ethernet PHY out of reset. */
+gpio_set_value(IMX_GPIO_NR(3, 23), 1);
+
+return 0;
+}
Getting the PHY out of reset at this point causes unpredictable reset
timing - e.g. you can't guarantee how much time the chip was held in
reset. The PHY datasheet is quite unclear about this reset timing, the
only mentioned time is min. 10ms after power-on, and nothing about RESET
assertion/de-assertion. I can throw a wild guess that the reset pulse
should have similar duration, e.g. 10ms.
Here's my proposal how to fix both (line driving conflict and reset
timing) issues:
#define ENET_PHY_CFG_PC \
(PAD_CTL_HYS | PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE)
static iomux_v3_cfg_t enet_pads1[] = {
MX6_PAD_ENET_MDIO__ENET_MDIO| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TXC__RGMII_TXC| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TD0__RGMII_TD0| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TD1__RGMII_TD1| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TD2__RGMII_TD2| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TD3__RGMII_TD3| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_RGMII_TX_CTL__RGMII_TX_CTL| MUX_PAD_CTRL(ENET_PAD_CTRL),
MX6_PAD_ENET_REF_CLK__ENET_TX_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL),
/* pin 35, PHY_AD2 */
MX6_PAD_RGMII_RXC__GPIO6_IO30 | MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 32, MODE0 */
MX6_PAD_RGMII_RD0__GPIO6_IO25 | MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 31, MODE1 */
MX6_PAD_RGMII_RD1__GPIO6_IO27 | MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 28, MODE2 */
MX6_PAD_RGMII_RD2__GPIO6_IO28 | MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 27, MODE3 */
MX6_PAD_RGMII_RD3__GPIO6_IO29 | MUX_PAD_CTRL(ENET_PHY_CFG_PC),
/* pin 33, CLK125_EN */
Re: [U-Boot] [PATCH 00/32] ARM: i.MX: nitrogen6x clean up
Hi Eric, On 02/10/2014 21:16, Eric Nelson wrote: This collection of patches comprises a set of updates that have been lingering in our Github repository. We're pushing them to main-line in preparation for the addition of a couple of boards that have also been lingering for a while. Patches 1-9 are tweaks to the mx6qsabrelite/nitrogen6x initialization code. Patches 10-18 add support for additional displays supported by the board(s) and tweak the HDMI detection. Patches 19-32 enable and configure various features through changes to include/configs/nitrogen6x.h. Patches are orthogonal and can be applied separetely. I have not seen any comments and I have not comments for most of them. I will start to apply the ones (most of them) are straightforward. Please wait until I end up with first pass - your next version will be much shorter ! Diego Rondini (1): nitrogen6x: config: allow boot to USB stick Eric Nelson (24): nitrogen6x: implement board_cfb_skip() to disable text output nitrogen6x: configure SD2 pads for SDIO on USDHC2 nitrogen6x: power-down miscellanous peripherals nitrogen6x: staticize board file nitrogen6x: Allow U-Boot to be silent on UART2 nitrogen6x: prevent warnings about board_ehci* callbacks nitrogen6x: display: add qvga panel nitrogen6x: display: add support for LG-9.7 LVDS display nitrogen6x: display: add LDB-WXGA-S for SPWG 1280x800 displays nitrogen6x: display: add support for fusion 7 display nitrogen6x: display: add svga display (800x600) nitrogen6x: display: add Ampire 1024x600 panel nitrogen6x: display: add wvga-lvds panel nitrogen6x: display use I2C detect for HDMI nitrogen6x: config: add USB Mass Storage (ums) support nitrogen6x: config: add initrd_high nitrogen6x: config: expose SATA, then MMC over USB nitrogen6x: config: enable USB keyboard support nitrogen6x: config: add CONFIG_CMD_MEMTEST nitrogen6x: config: enable i2c edid nitrogen6x: config: disable logo nitrogen6x: config: configure usb_ether Mainly I have problems with fixed addresses - my comments to the related patch. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] am335x: using GPIO1 pins as input
U-Boot 2014.07 I'm trying to use ping 44..47 as input. I've configured PINMUX and invoked request, direction etc. I always get 0 from gpio_get_value() int val; gpio_request(44, dip_s1): gpio_request(45, dip_s2); gpio_request(46, dip_s3); gpio_request(47, dip_s4); gpio_direction_input(44); gpio_direction_input(45); gpio_direction_input(46); gpio_direction_input(47); val = gpio_get_value(44); printf(DIP value: %d\n, val); val = gpio_get_value(45); printf(DIP value: %d\n, val); val = gpio_get_value(46); printf(DIP value: %d\n, val); val = gpio_get_value(47); printf(DIP value: %d\n, val); After reading http://e2e.ti.com/support/arm/sitara_arm/f/791/t/248181.aspx I've checked clock registers CM_PER_L4LS_CLKSTCTRL (bit 8 L4LS_GCLK is set) and also CM_PER_GPIO1_CLKCTRL has value 2 - enabled. I can also see, that arch/arm/cpu/armv7/am33xx/clock_am33xx.c-enable_basic_clocks() enables clocks for GPIO1. Then I checked GPIO1 specific registers and found out, that GPIO_SYSSTATUS (0x4804C114) shows 0x i.e. GPIO is still in reset. Any idea, what should be activated/setup in order to get the second GPIO bank working? Thanks. Yegor ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/6] sunxi: Use PG3 - PG8 as io-pins for mmc1
On Mon, 2014-10-06 at 16:43 +0200, Hans de Goede wrote: Hi, On 10/04/2014 10:37 AM, Ian Campbell wrote: On Fri, 2014-10-03 at 17:05 +0200, Hans de Goede wrote: None of the known sunxi devices actually use mmc1 routed through PH, where as some devices do actually use mmc1 routed through PG, so change the routing of mmc1 to PG. If in the future we encounter devices with mmc1 routed through PH, we will need to change things to be a bit more flexible. Signed-off-by: Hans de Goede hdego...@redhat.com Acked-by: Ian Campbell ian.campb...@citrix.com Hmm, do you want to use your citrix address for sunxi work from now on (fine by me), or is this a mistake ? Oops, it's muscle memory in my fingers (since I ack an order of magnitude patches at work...). I've always managed to catch myself in the past... Acked-by: Ian Campbell i...@hellion.org.uk Thanks for noticing! Ian. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 07/32] nitrogen6x: Allow U-Boot to be silent on UART2
Hi Eric,
On 02/10/2014 21:16, Eric Nelson wrote:
Several customers are using UART2 (normally the serial console
for U-Boot) as connections to printers or other peripherals
that are not tolerant of stray inputs during reset.
Provide a simple way to eliminate output on the serial port
by conditionally configuring these pads as GPIOs during
U-Boot.
Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com
---
board/boundary/nitrogen6x/nitrogen6x.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c
b/board/boundary/nitrogen6x/nitrogen6x.c
index e795492..621cdbc 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -77,9 +77,15 @@ static iomux_v3_cfg_t const uart1_pads[] = {
MX6_PAD_SD3_DAT7__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
};
+/* #define CONFIG_SILENT_UART */
Theoretically, we have already in U-Boot CONFIG_SILENT_CONSOLE, without
the need to introduce a new CONFIG_.
static iomux_v3_cfg_t const uart2_pads[] = {
+#ifndef CONFIG_SILENT_UART
MX6_PAD_EIM_D26__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
MX6_PAD_EIM_D27__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
+#else
+ MX6_PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(UART_PAD_CTRL),
+ MX6_PAD_EIM_D27__GPIO3_IO27 | MUX_PAD_CTRL(UART_PAD_CTRL),
+#endif
I understand the reason, anyway this looks like a hack (uart is still
configured while iomux is not correctly set). Can you check if your goal
is simply reached with CONFIG_SILENT_CONSOLE ?
Best regards,
Stefano Babic
--
=
DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/3] usb: gadget: fastboot miscellaneous patches
Hi Marek, On 10/06/2014 05:50 AM, Marek Vasut wrote: On Monday, October 06, 2014 at 11:23:53 AM, Lukasz Majewski wrote: Hi Marek, snip There aren't any pending DFU patches, so I don't plan any PR before our ELCE2014 meeting. Therefore please, if possible, pull 1/3 and 2/3 to u-boot-usb directly. OK, done. Would you please keep an eye on 3/3 for me ? Is there an issue with 3/3? It seems to be needed to prevent reading of portions of the buffer that aren't part of the current command (especially strtoul). Please advise, Eric ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 07/32] nitrogen6x: Allow U-Boot to be silent on UART2
Thanks Stefano,
On 10/06/2014 08:42 AM, Stefano Babic wrote:
Hi Eric,
On 02/10/2014 21:16, Eric Nelson wrote:
Several customers are using UART2 (normally the serial console
for U-Boot) as connections to printers or other peripherals
that are not tolerant of stray inputs during reset.
Provide a simple way to eliminate output on the serial port
by conditionally configuring these pads as GPIOs during
U-Boot.
Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com
---
board/boundary/nitrogen6x/nitrogen6x.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c
b/board/boundary/nitrogen6x/nitrogen6x.c
index e795492..621cdbc 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -77,9 +77,15 @@ static iomux_v3_cfg_t const uart1_pads[] = {
MX6_PAD_SD3_DAT7__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
};
+/* #define CONFIG_SILENT_UART */
Theoretically, we have already in U-Boot CONFIG_SILENT_CONSOLE, without
the need to introduce a new CONFIG_.
static iomux_v3_cfg_t const uart2_pads[] = {
+#ifndef CONFIG_SILENT_UART
MX6_PAD_EIM_D26__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
MX6_PAD_EIM_D27__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
+#else
+MX6_PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(UART_PAD_CTRL),
+MX6_PAD_EIM_D27__GPIO3_IO27 | MUX_PAD_CTRL(UART_PAD_CTRL),
+#endif
I understand the reason, anyway this looks like a hack (uart is still
configured while iomux is not correctly set). Can you check if your goal
is simply reached with CONFIG_SILENT_CONSOLE ?
Will do. I wasn't aware of that one.
Regards,
Eric
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 28/32] nitrogen6x: config: disable logo
On 02/10/2014 21:16, Eric Nelson wrote: Some users (QNX and Windows CE users in particular) have asked to disable the Penguin shown on the display at boot time. This is really pity, but I understand :-). Acked-by: Stefano Babic sba...@denx.de Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PULL] u-boot-socfpga/topic/drivers/mmc-20141006
The following changes since commit be9f643ae6aa9044c60fe80e3a2c10be8371c692: Merge branch 'for-tom' of git://git.denx.de/u-boot-dm (2014-09-26 20:10:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git topic/drivers/mmc-20141006 for you to fetch changes up to 1bf29b3d5571bed2b61581e839599337968deb80: mmc: dw_mmc: Fix cache alignment issue (2014-10-06 17:34:40 +0200) Marek Vasut (1): mmc: dw_mmc: Fix cache alignment issue Pavel Machek (1): mmc: dw_mmc: cleanups drivers/mmc/dw_mmc.c | 34 ++ include/dwmmc.h | 2 +- 2 files changed, 23 insertions(+), 13 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PULL] u-boot-usb/master
The following changes since commit b966db0d7259293e2c9c216c7a5dce30dacacfd9: dw_mmc: cleanups (2014-10-03 17:26:50 +0300) are available in the git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to d1fcbae1173f00917f5a71e4c074a61120605021: usb: tegra: ULPI regression on tegra20 (2014-10-06 16:12:48 +0200) Bo Shen (1): usb: gadget: fastboot: improve download progress bar Eric Nelson (4): usb: f_mass_storage: set removable flag in do_inquiry based on LUN usb: ci_udc: respect CONFIG_USB_GADGET_DUALSPEED usb: gadget: fastboot: add max-download-size variable usb: gadget: fastboot: explicitly set radix of maximum download size Hans de Goede (10): usb: ehci: Properly set hub devnum and portnr with usb-1 hubs in the chain usb: ehci: Add missing cache flush to destroy_int_queue usb: ehci: poll_int_queue check real qtd, not the overlay usb: ehci: Make periodic_schedules a per controller variable usb: kbd: Fix unaligned buffer usage in usb_kbd_setled() usb: kbd: Do not treat -ENODEV as an error for usb_kbd_deregister usb: kbd: On a usb reset call usb_kbd_deregister() before calling usb_stop() usb: kbd: Remove check for already being registered stdio: Add force parameter to stdio_deregister usb: kbd: Allow usb reset to continue when an usb kbd is used Heiko Schocher (2): usb: dfu: add fullspeed support for DFU arm: am335x: siemens board use in DFU mode fullspeed only Marcel Ziswiler (1): usb: tegra: ULPI regression on tegra20 Łukasz Majewski (1): usb: dfu: thor: gadget: Remove dead code common/cmd_usb.c | 27 +++ common/stdio.c | 13 ++--- common/usb_kbd.c | 26 +++--- drivers/serial/serial-uclass.c | 2 +- drivers/usb/gadget/ci_udc.c| 5 + drivers/usb/gadget/f_dfu.c | 11 +++ drivers/usb/gadget/f_fastboot.c| 19 --- drivers/usb/gadget/f_mass_storage.c| 1 + drivers/usb/gadget/f_thor.c| 10 -- drivers/usb/host/ehci-hcd.c| 65 - drivers/usb/host/ehci-tegra.c | 4 ++-- drivers/usb/host/ehci.h| 1 + include/configs/siemens-am33x-common.h | 2 +- include/stdio_dev.h| 4 ++-- include/usb.h | 2 +- 15 files changed, 109 insertions(+), 83 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] usb: tegra: ULPI regression on tegra20
On Saturday, October 04, 2014 at 01:46:10 AM, Marcel Ziswiler wrote: Trying to enumerate USB devices connected via ULPI to T20 failed as follows: USB2: ULPI integrity check failed Git bisecting revealed the following commit being at odds: commit 2d34151f7501ddaa599897f0d89ad576126b03eb usb: tegra: refactor PHY type selection Looking at above commit one quickly identifies a copy paste error which this patch fixes. Happy ULPIing again (;-p). Signed-off-by: Marcel Ziswiler mar...@ziswiler.com Applied, thanks! Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PULL] u-boot-socfpga/topic/drivers/net-20141006
The following changes since commit be9f643ae6aa9044c60fe80e3a2c10be8371c692: Merge branch 'for-tom' of git://git.denx.de/u-boot-dm (2014-09-26 20:10:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git topic/drivers/net-20141006 for you to fetch changes up to 96cec17d3cd22ca2251d6f7946409933a231ce6f: net: dwc: Make the cache handling less cryptic (2014-10-06 17:36:40 +0200) Marek Vasut (2): net: dwc: Fix cache alignment issues net: dwc: Make the cache handling less cryptic Pavel Machek (2): net: Remove unused CONFIG_DW_SEARCH_PHY from configs net: phy: Cleanup drivers/net/phy/micrel.c drivers/net/designware.c | 46 +++--- drivers/net/phy/micrel.c | 7 +++ include/configs/axs101.h | 1 - include/configs/socfpga_cyclone5.h | 1 - 4 files changed, 26 insertions(+), 29 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PULL] u-boot-socfpga/topic/drivers/fpga-20141006
The following changes since commit be9f643ae6aa9044c60fe80e3a2c10be8371c692: Merge branch 'for-tom' of git://git.denx.de/u-boot-dm (2014-09-26 20:10:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git topic/drivers/fpga-20141006 for you to fetch changes up to 2012f238bd4383904e898cfc26c9fd433af835aa: fpga: altera: Turn the switches into table lookup (2014-10-06 17:31:42 +0200) Marek Vasut (7): fpga: altera: Clean up the printing and debug fpga: altera: Clean up altera_validate function fpga: altera: More indentation trimdown fpga: altera: Move altera_validate to the top fpga: altera: Make altera_validate return normal values fpga: altera: Clean up enums in altera.h fpga: altera: Turn the switches into table lookup drivers/fpga/altera.c | 305 +++- include/altera.h | 76 ++--- 2 files changed, 173 insertions(+), 208 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PULL] u-boot-socfpga/topic/tools/mkimage-20141006
The following changes since commit be9f643ae6aa9044c60fe80e3a2c10be8371c692: Merge branch 'for-tom' of git://git.denx.de/u-boot-dm (2014-09-26 20:10:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git topic/tools/mkimage-20141006 for you to fetch changes up to 832472a94d1adb4f1f86e491a2387c43c960b4e2: tools: socfpga: Add socfpga preloader signing to mkimage (2014-10-06 17:38:17 +0200) Charles Manning (1): tools: socfpga: Add socfpga preloader signing to mkimage common/image.c | 1 + include/image.h | 1 + tools/Makefile | 1 + tools/imagetool.c| 2 + tools/imagetool.h| 1 + tools/socfpgaimage.c | 259 + 6 files changed, 265 insertions(+) create mode 100644 tools/socfpgaimage.c ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PULL] u-boot-socfpga/topic/arm/cache-20141006
The following changes since commit be9f643ae6aa9044c60fe80e3a2c10be8371c692: Merge branch 'for-tom' of git://git.denx.de/u-boot-dm (2014-09-26 20:10:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git topic/arm/cache-20141006 for you to fetch changes up to ff7e9700eda14ccf8ebe399d3831ef266e743c2d: arm: cache: Add support for write-allocate D-Cache (2014-10-06 17:40:21 +0200) Marek Vasut (1): arm: cache: Add support for write-allocate D-Cache arch/arm/include/asm/system.h | 1 + arch/arm/lib/cache-cp15.c | 2 ++ 2 files changed, 3 insertions(+) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PULL] u-boot-socfpga/topic/arm/socfpga-20141006
Hi Tom, this depends on the previous five pull requests, as can be seen below. I merged the five branches and based this PR on top of the merge, I hope that's OK. The following changes since commit 77fa164839048609e0379f4f2f276a5d6892a0eb: Merge branches 'topic/drivers/fpga-20141006', 'topic/drivers/mmc-20141006', 'topic/drivers/net-20141006', 'topic/tools/mkimage-20141006' and 'topic/arm/cache-20141006' into HEAD (2014-10-06 17:45:55 +0200) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git topic/arm/socfpga-20141006 for you to fetch changes up to 2f210639c4f003b0d5310273979441f1bfc88eae: arm: socfpga: Use CMD_FS_GENERIC (2014-10-06 17:46:51 +0200) Chin Liang See (2): arm: socfpga: Enable DWMMC for SOCFPGA arm: socfpga: Enable SDMMC boot for SOCFPGA U-Boot Marek Vasut (23): arm: socfpga: Clean up base address file arm: socfpga: sysmgr: Clean up system manager arm: socfpga: clock: Implant order into bit definitions arm: socfpga: clock: Drop nonsense inlining from clock manager code arm: socfpga: clock: Add missing stubs into board file arm: socfpga: clock: Trim down code duplication arm: socfpga: clock: Clean up bit definitions arm: socfpga: clock: Sync with reference code arm: socfpga: timer: Pull the timer reload value from config file arm: socfpga: reset: Add EMAC reset functions arm: socfpga: board: Align checkboard() output arm: socfpga: reset: Add function to reset FPGA bridges arm: socfpga: sysmgr: Add FPGA bits into system manager arm: socfpga: cache: Define cacheline size arm: socfpga: cache: Enable D-Cache arm: socfpga: cache: Enable PL310 L2 cache arm: socfpga: scu: Add SCU register file arm: socfpga: nic301: Add NIC-301 GPV register file arm: socfpga: pl310: Map SDRAM to 0x0 arm: socfpga: Move cache_enable to CPU code arm: socfpga: Add command to control HPS-FPGA bridges arm: socfpga: Clean up SoCFPGA configuration arm: socfpga: Use CMD_FS_GENERIC Pavel Machek (11): arm: socfpga: Complete the list of base addresses arm: socfpga: Add watchdog disable for socfpga arm: socfpga: clock: Add code to read clock configuration arm: socfpga: mmc: Pick the clock from clock manager arm: socfpga: misc: Add proper ethernet initialization arm: socfpga: misc: Add SD controller init arm: socfpga: misc: Align print_cpuinfo() output arm: socfpga: board: Correctly set ATAG position arm: socfpga: fpga: Add SoCFPGA FPGA programming interface arm: socfpga: nic301: Add NIC-301 configuration code arm: socfpga: Split SoCFPGA configuration arch/arm/cpu/armv7/socfpga/Makefile| 3 +- arch/arm/cpu/armv7/socfpga/clock_manager.c | 340 --- arch/arm/cpu/armv7/socfpga/fpga_manager.c | 78 +++ arch/arm/cpu/armv7/socfpga/misc.c | 236 ++--- arch/arm/cpu/armv7/socfpga/reset_manager.c | 67 + arch/arm/cpu/armv7/socfpga/spl.c | 174 -- arch/arm/cpu/armv7/socfpga/system_manager.c| 57 -- arch/arm/cpu/armv7/socfpga/timer.c | 2 + arch/arm/include/asm/arch-socfpga/clock_manager.h | 306 -- arch/arm/include/asm/arch-socfpga/fpga_manager.h | 77 +++ arch/arm/include/asm/arch-socfpga/nic301.h | 195 arch/arm/include/asm/arch-socfpga/reset_manager.h | 9 +++ arch/arm/include/asm/arch-socfpga/scu.h| 23 ++ arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h | 62 --- arch/arm/include/asm/arch-socfpga/system_manager.h | 111 --- board/altera/socfpga/pll_config.h | 3 + board/altera/socfpga/socfpga_cyclone5.c| 6 +- drivers/fpga/Makefile | 1 + drivers/fpga/altera.c | 3 + drivers/fpga/socfpga.c | 301 + drivers/mmc/socfpga_dw_mmc.c | 15 +++- include/altera.h | 6 ++ include/configs/socfpga_common.h | 196 include/configs/socfpga_cyclone5.h | 316 - 24 files changed, 2018 insertions(+), 569
Re: [U-Boot] [PATCH 29/32] nitrogen6x: config: configure usb_ether
Hi Eric,
On 02/10/2014 21:16, Eric Nelson wrote:
Provide fixed USB networking mac addresses for host and client to enable
static configuration of host network stacks.
Include a command 'usbrecover' both to illustrate the use of the USB
ethernet gadget and also to allow quick booting of a kernel (uImage)
and ram disk (uramdisk).
Details and commentary are available here:
http://boundarydevices.com/u-boot-2014-01/#usbrecover
Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com
---
include/configs/nitrogen6x.h | 10 ++
1 file changed, 10 insertions(+)
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 60c942f..8afbded 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -314,6 +314,16 @@
source 10008000 ; \
done ; \
done\0 \
+ usbnet_devaddr=00:19:b8:00:00:02\0 \
+ usbnet_hostaddr=00:19:b8:00:00:01\0 \
+ usbrecover=setenv ethact usb_ether; \
+ setenv ipaddr 10.0.0.2; \
+ setenv netmask 255.255.255.0; \
+ setenv serverip 10.0.0.1; \
+ setenv bootargs console=ttymxc1,115200; \
+ tftpboot 1080 10.0.0.1:uImage-${board}-recovery \
+ tftpboot 1280 10.0.0.1:uramdisk-${board}-recovery.img \
+ bootm 1080 1280\0 \
I understand the use case, but it does not always work (I mean, in all
network configurations) and we regret generally having IP addresses hard
coded in the default configuration.
Best regards,
Stefano Babic
--
=
DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/32] nitrogen6x: implement board_cfb_skip() to disable text output
On 02/10/2014 21:16, Eric Nelson wrote: Several customers have asked to leave the display quiet during boot, so allow the user to express this request by the presence of environment variable novideo. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 02/32] nitrogen6x: simplify board_mmc_getcd
On 02/10/2014 21:16, Eric Nelson wrote: From: Troy Kisky troy.ki...@boundarydevices.com The same logic applies to both SD card slots, only with different GPIOs and the code should make that easier to see. Signed-off-by: Troy Kisky troy.ki...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 03/32] nitrogen6x: configure SD2 pads for SDIO on USDHC2
On 02/10/2014 21:16, Eric Nelson wrote: Pads SD2_CLK/CMD/DAT0-3 are connected to an SDIO WiFi device on Nitrogen and unconnected on BD-SL-i.MX6 (sabre lite). Configure them as SDIO pins to prevent them from being in a state that confuses the WiFi part. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 04/32] nitrogen6x: power-down miscellanous peripherals
On 02/10/2014 21:16, Eric Nelson wrote: Ensure that cameras and USB OTG power are in a stable (reset) state at reset by configuring their pads and toggling GPIOs. Signed-off-by: Troy Kisky troy.ki...@boundarydevices.com Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 05/32] nitrogen6x: configure SGTL5000, CSI camera clock outputs
On 02/10/2014 21:16, Eric Nelson wrote: From: Troy Kisky troy.ki...@boundarydevices.com Configure CLKO outputs for SGTL5000, CSI camera. The sys_mclk output for the SGTL500 in particular prevents Windows CE from properly driving audio. Signed-off-by: Troy Kisky troy.ki...@boundarydevices.com Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4] ARM: mx6: Add support for Kosagi Novena
On Monday, October 06, 2014 at 05:35:57 PM, Sean Cross wrote: Hi Marek, Nikolay, I thought I responded, but it might have gotten lost. I'm sorry about that. I've taken a closer look, and responded below. OK, let me first post a V5 of the patch and then base all the changes on that, all right ? Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 08/32] nitrogen6x: phy: add 100 us delay after phy reset
On 02/10/2014 21:16, Eric Nelson wrote: From: Troy Kisky troy.ki...@boundarydevices.com Testing shows that the Micrel PHY may not be completely out of reset if accessed immediately. Signed-off-by: Troy Kisky troy.ki...@boundarydevices.com Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 06/32] nitrogen6x: staticize board file
On 02/10/2014 21:16, Eric Nelson wrote: Declare locally-used data structures and functions as static and pull in header files to prevent compiler warnings of Should it be static? when building with make C=1. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V5] ARM: mx6: Add support for Kosagi Novena
Add support for the Kosagi Novena board. Currently supported are:
- I2C busses
- FEC Ethernet
- MMC0, MMC1, Booting from MMC
- SATA
- USB ports
- USB Ethernet
Signed-off-by: Marek Vasut ma...@denx.de
Cc: Stefano Babic sba...@denx.de
Cc: Sean Cross x...@kosagi.com
Cc: Nikolay Dimitrov picmas...@mail.bg
---
arch/arm/Kconfig | 4 +
board/kosagi/novena/Kconfig | 23 ++
board/kosagi/novena/Makefile | 11 +
board/kosagi/novena/novena.c | 342 +++
board/kosagi/novena/novena_spl.c | 581 +++
board/kosagi/novena/setup.cfg| 47
configs/novena_defconfig | 4 +
include/configs/imx6_spl.h | 2 +-
include/configs/novena.h | 303
9 files changed, 1316 insertions(+), 1 deletion(-)
create mode 100644 board/kosagi/novena/Kconfig
create mode 100644 board/kosagi/novena/Makefile
create mode 100644 board/kosagi/novena/novena.c
create mode 100644 board/kosagi/novena/novena_spl.c
create mode 100644 board/kosagi/novena/setup.cfg
create mode 100644 configs/novena_defconfig
create mode 100644 include/configs/novena.h
V2: - Drop the tegra_keyboard_init() comment altogether
- Immediatelly return from the SD controller probe function on failure
- Rename PFUZE100_PMIC to just PFUZE100
- Fix the IMX OTP support with CMD_FUSE
- Enabling LVDS clock is still in place, since this is coming soon.
V3: - Zap rootpath builtin env
V4: - Zap the checkpatch issues
- Update comments
V5: - Don't configure VGEN1
- Set FPGA into reset in SPL
- Drop ECSPI1 and add ECSPI3 mux
- Drop UART1 and add UART3, UART4 muxes
- Add separate mux option for the RGMII pins which doesn't set SPEED field
- Move the configuration of RGMII after they were configured in GPIO mode
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 106aed9..4da1923 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -411,6 +411,9 @@ config TARGET_GW_VENTANA
config TARGET_HUMMINGBOARD
bool Support hummingboard
+config TARGET_KOSAGI_NOVENA
+ bool Support Kosagi Novena
+
config TARGET_TQMA6
bool TQ Systems TQMa6 board
@@ -637,6 +640,7 @@ source board/imx31_phycore/Kconfig
source board/isee/igep0033/Kconfig
source board/jornada/Kconfig
source board/karo/tx25/Kconfig
+source board/kosagi/novena/Kconfig
source board/logicpd/imx27lite/Kconfig
source board/logicpd/imx31_litekit/Kconfig
source board/mpl/vcma9/Kconfig
diff --git a/board/kosagi/novena/Kconfig b/board/kosagi/novena/Kconfig
new file mode 100644
index 000..4e52be9
--- /dev/null
+++ b/board/kosagi/novena/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_KOSAGI_NOVENA
+
+config SYS_CPU
+ string
+ default armv7
+
+config SYS_BOARD
+ string
+ default novena
+
+config SYS_VENDOR
+ string
+ default kosagi
+
+config SYS_SOC
+ string
+ default mx6
+
+config SYS_CONFIG_NAME
+ string
+ default novena
+
+endif
diff --git a/board/kosagi/novena/Makefile b/board/kosagi/novena/Makefile
new file mode 100644
index 000..6fba177
--- /dev/null
+++ b/board/kosagi/novena/Makefile
@@ -0,0 +1,11 @@
+#
+# Copyright (C) 2014 Marek Vasut ma...@denx.de
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+ifdef CONFIG_SPL_BUILD
+obj-y := novena_spl.o
+else
+obj-y := novena.o
+endif
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
new file mode 100644
index 000..84aee16
--- /dev/null
+++ b/board/kosagi/novena/novena.c
@@ -0,0 +1,342 @@
+/*
+ * Novena board support
+ *
+ * Copyright (C) 2014 Marek Vasut ma...@denx.de
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+
+#include common.h
+#include asm/errno.h
+#include asm/gpio.h
+#include asm/io.h
+#include asm/arch/clock.h
+#include asm/arch/crm_regs.h
+#include asm/arch/imx-regs.h
+#include asm/arch/iomux.h
+#include asm/arch/mxc_hdmi.h
+#include asm/arch/sys_proto.h
+#include asm/imx-common/boot_mode.h
+#include asm/imx-common/iomux-v3.h
+#include asm/imx-common/mxc_i2c.h
+#include asm/imx-common/sata.h
+#include asm/imx-common/video.h
+#include fsl_esdhc.h
+#include i2c.h
+#include input.h
+#include ipu_pixfmt.h
+#include linux/fb.h
+#include linux/input.h
+#include malloc.h
+#include micrel.h
+#include miiphy.h
+#include mmc.h
+#include netdev.h
+#include power/pmic.h
+#include power/pfuze100_pmic.h
+#include stdio_dev.h
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define NOVENA_BUTTON_GPIO IMX_GPIO_NR(4, 14)
+#define NOVENA_SD_CD IMX_GPIO_NR(1, 4)
+#define NOVENA_USB_HUB_RESET IMX_GPIO_NR(7, 12)
+
+/*
+ * GPIO button
+ */
+#ifdef CONFIG_KEYBOARD
+static struct input_config button_input;
+
+static int novena_gpio_button_read_keys(struct input_config *input)
+{
+ int key = KEY_ENTER;
+ if (gpio_get_value(NOVENA_BUTTON_GPIO))
+ return 0;
+ input_send_keycodes(button_input, key, 1);
+ return 1;
+}
+
+static int novena_gpio_button_getc(struct stdio_dev *dev)
+{
+
Re: [U-Boot] [PATCH 09/32] nitrogen6x: prevent warnings about board_ehci* callbacks
On 02/10/2014 21:16, Eric Nelson wrote: Include declarations of board_ehci callbacks to prevent compiler warnings and enforce function prototypes. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 11/32] nitrogen6x: display: add qvga panel
On 02/10/2014 21:16, Eric Nelson wrote: Add support for a 1/4 VGA panel with a 24-bit RGB interface. No auto-detection is enabled, so you must configure the 'panel' environment variable to use this display: U-Boot setenv panel qvga U-Boot saveenv reset Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 10/32] nitrogen6x: display: add support lvds jeida screen
On 02/10/2014 21:16, Eric Nelson wrote: From: Robert Winkler robert.wink...@boundarydevices.com Add support for Boundary Devices 7 and 10.1 1280x800 displays with integrated FocalTech ft5x06 10-point touch controller. Because they share the touch controller with the 1024x600 displays, auto-detection is disabled and you must explicitly set the 'panel' environment variable: U-Boot setenv panel LDB-WXGA U-Boot saveenv reset Signed-off-by: Robert Winkler robert.wink...@boundarydevices.com Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- As the rest of the display's series: Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 12/32] nitrogen6x: display: add support for LG-9.7 LVDS display
On 02/10/2014 21:16, Eric Nelson wrote: Add support for LG 9.7 LVDS panel (1024x768) with integrated eGalax touch screen. Note that this panel differs only slightly from the Hannstar XGA panel (margins). No auto-detection is available because it shares the same touch controller as the Hannstar-XGA display, so you'll need to configure it through the 'panel' environment variable: U-Boot setenv panel LG-9.7 U-Boot saveenv reset Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 13/32] nitrogen6x: display: add LDB-WXGA-S for SPWG 1280x800 displays
On 02/10/2014 21:16, Eric Nelson wrote: This patch adds support for LVDS WXGA displays that use the SPWG encoding standard instead of JEIDA. No auto-detection is enabled and you must explicitly set the 'panel' environment variable: U-Boot setenv panel LDB-WXGA-S U-Boot saveenv reset Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 14/32] nitrogen6x: display: add support for fusion 7 display
On 02/10/2014 21:16, Eric Nelson wrote: Add support for the Touch Revolution Fusion7 display: 800x480 RGB with a custom F0710A resistive touch controller. Auto-detection of this panel is supported so no configuration is required. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 16/32] nitrogen6x: display: add Ampire 1024x600 panel
On 02/10/2014 21:16, Eric Nelson wrote: Add support for an Ampire 1024x600 LVDS panel with integrated Ilitek capacitive touch screen. Auto-detection is enabled, so no explicit configuration is needed. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 15/32] nitrogen6x: display: add svga display (800x600)
On 02/10/2014 21:16, Eric Nelson wrote: Add support for 800x600 18-bit RGB displays using VESA GTF timings. No auto-detection is supported, so you must configure this panel manually through the 'panel' environment variable: U-Boot setenv panel svga U-Boot saveenv reset Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 18/32] nitrogen6x: display use I2C detect for HDMI
On 02/10/2014 21:16, Eric Nelson wrote: The HPD pin and RX_SENSE registers have proven to be less reliable than using I2C on the EDID pins for detection of an HDMI monitor. In particular, when the HDMI output is reset through a reboot cycle, the detect_hdmi() routine often bounces, resulting in a failure to detect a connected monitor. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 17/32] nitrogen6x: display: add wvga-lvds panel
On 02/10/2014 21:16, Eric Nelson wrote: Add support for WVGA (800x480) panels using VESA GTF timings over LVDS. No auto-detection is supported, so you must configure this panel manually through the 'panel' environment variable: U-Boot setenv panel svga U-Boot saveenv reset Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 20/32] nitrogen6x: config: allow boot to USB stick
On 02/10/2014 21:16, Eric Nelson wrote: From: Diego Rondini diego.rond...@kynetics.it This patch enables boot to USB storage devices by expanding on the list of boot devices. Because the USB startup currently takes a long time, it places USB at the end of the list of supported devices. You can over-ride the boot order using the bootdevs environment variable. For instance, this will make USB the first (highest priority) device: U-Boot setenv bootdevs usb mmc sata U-Boot saveenv Signed-off-by: Diego Rondini diego.rond...@kynetics.it Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 22/32] nitrogen6x: config: add initrd_high
On 02/10/2014 21:16, Eric Nelson wrote: Support RAM disks by setting initrd_high. See commit 7e9603e Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 19/32] nitrogen6x: config: add USB Mass Storage (ums) support
On 02/10/2014 21:16, Eric Nelson wrote: Add support for the USB mass storage to enable access to on-board storage (especially eMMC and SATA). Details at: http://boundarydevices.com/u-boot-usb-mass-storage-gadget/ Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 21/32] nitrogen6x: config: use FS_GENERIC load command
On 02/10/2014 21:16, Eric Nelson wrote: From: Kevin Mihelich ke...@archlinuxarm.org Remove the individual attempts to load using ext2 and fat, replace with the generic load command supporting available filesystem types. Signed-off-by: Kevin Mihelich ke...@archlinuxarm.org --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 25/32] nitrogen6x: config: add CONFIG_CMD_MEMTEST
On 02/10/2014 21:16, Eric Nelson wrote: Enable the 'mtest' command on Nitrogen6x and SABRE Lite boards. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 24/32] nitrogen6x: config: enable USB keyboard support
On 02/10/2014 21:16, Eric Nelson wrote: Enable the use of USB keyboards on SABRE Lite and Nitrogen6x boards. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 23/32] nitrogen6x: config: expose SATA, then MMC over USB
On 02/10/2014 21:16, Eric Nelson wrote: If no boot script was found, expose internal storage over the USB mass storage gadget to allow easy programming. This is especially useful when SD cards are inaccessible or when loading SATA drives. More details are available in this blog post: http://boundarydevices.com/u-boot-usb-mass-storage-gadget/ Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 26/32] nitrogen6x: config: enable i2c edid
On 02/10/2014 21:16, Eric Nelson wrote: Enable the i2c edid command to query data from an attached HDMI monitor. Usage is typically this: U-Boot i2c dev 1 U-Boot i2c edid 0x50 ... Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 27/32] nitrogen6x: config: allow more bootargs parameters
On 02/10/2014 21:16, Eric Nelson wrote: From: Troy Kisky troy.ki...@boundarydevices.com Increase the maximum number of arguments allowed by the Hush parser. This prevents errors when users or scripts aren't quoting parameters when setting the bootargs variable et al. Signed-off-by: Troy Kisky troy.ki...@boundarydevices.com Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 30/32] nitrogen6x: config: add gpio command
On 02/10/2014 21:16, Eric Nelson wrote: Enable the 'gpio' command to allow reading and toggling of GPIO pins. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 28/32] nitrogen6x: config: disable logo
On 02/10/2014 21:16, Eric Nelson wrote: Some users (QNX and Windows CE users in particular) have asked to disable the Penguin shown on the display at boot time. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 31/32] nitrogen6x: config: enable Android fastboot
On 02/10/2014 21:16, Eric Nelson wrote: Enable 'fastboot' command. This is currently enabled but not yet functional. Including it in the configuration will ease further testing and development as discussed on the mailing list. Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 32/32] nitrogen6x: config: enable EXT4 filesystem
On 02/10/2014 21:16, Eric Nelson wrote: From: Kevin Mihelich ke...@archlinuxarm.org Support reading/writing ext4 partitions. Signed-off-by: Kevin Mihelich ke...@archlinuxarm.org Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 29/32] nitrogen6x: config: configure usb_ether
Hi Stefano,
On 10/06/2014 08:54 AM, Stefano Babic wrote:
Hi Eric,
On 02/10/2014 21:16, Eric Nelson wrote:
Provide fixed USB networking mac addresses for host and client to enable
static configuration of host network stacks.
Include a command 'usbrecover' both to illustrate the use of the USB
ethernet gadget and also to allow quick booting of a kernel (uImage)
and ram disk (uramdisk).
Details and commentary are available here:
http://boundarydevices.com/u-boot-2014-01/#usbrecover
Signed-off-by: Eric Nelson eric.nel...@boundarydevices.com
---
include/configs/nitrogen6x.h | 10 ++
1 file changed, 10 insertions(+)
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 60c942f..8afbded 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -314,6 +314,16 @@
source 10008000 ; \
done ; \
done\0 \
+usbnet_devaddr=00:19:b8:00:00:02\0 \
+usbnet_hostaddr=00:19:b8:00:00:01\0 \
+usbrecover=setenv ethact usb_ether; \
+setenv ipaddr 10.0.0.2; \
+setenv netmask 255.255.255.0; \
+setenv serverip 10.0.0.1; \
+setenv bootargs console=ttymxc1,115200; \
+tftpboot 1080 10.0.0.1:uImage-${board}-recovery \
+tftpboot 1280 10.0.0.1:uramdisk-${board}-recovery.img \
+ bootm 1080 1280\0 \
I understand the use case, but it does not always work (I mean, in all
network configurations) and we regret generally having IP addresses hard
coded in the default configuration.
Can you clarify which parts (mac/IP address/both) are a problem?
The 'usb_ether' is kind of an odd beast, in that it's a link-local
protocol, which is why the the IP addresses aren't read from or written
to a persistent environment.
Our goal was to only require configuration of one side of the link
(the USB Host). It seems that without implementing a DHCP **server**,
this is the most convenient.
The mac addresses above are ours, and we can confirm that they are
not in use on any other hardware, so they're guaranteed to be unique
unless you happen to hook up multiple of our boards to a Host at the
same time.
Since the configuration of network adapters on most hosts is based
on mac addresses, hard-coding these prevents the need to re-configure
each time a new board is connected to a host.
Please advise,
Eric
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/3] usb: gadget: fastboot miscellaneous patches
Hi Marek, On Monday, October 06, 2014 at 11:23:53 AM, Lukasz Majewski wrote: Hi Marek, On Wednesday, October 01, 2014 at 10:44:46 PM, Steve Rae wrote: On 14-10-01 05:13 AM, Marek Vasut wrote: On Wednesday, October 01, 2014 at 04:03:21 AM, Eric Nelson wrote: Hi Marek, On 09/30/2014 04:59 PM, Marek Vasut wrote: On Tuesday, September 30, 2014 at 09:47:07 PM, Eric Nelson wrote: Hi Marek, On 09/30/2014 12:37 PM, Marek Vasut wrote: On Tuesday, September 30, 2014 at 09:05:39 PM, Eric Nelson wrote: While trying to configure Nitrogen6X boards to use Android Fastboot, I found a number of places where the implementation doesn't appear to match the latest host tools on AOSP. Eric Nelson (3): usb: gadget: fastboot: add max-download-size variable usb: gadget: fastboot: explicitly set radix of maximum download size usb: gadget: fastboot: terminate commands with NULL Just to make sure, are those fixes for 2014.10 or new stuff for next ? These patches are against master, but should apply against usb/next and dfu/next and next is fine for us. 3/3 looks like a bugfix though. Is that a bugfix ? I wasn't able to get fastboot to do much of anything without all three. -- lack of max-download-size simply stopped downloads -- the missing radix caused my host to think that the 0x0700 size (copied from Beagle) was 1.8 MiB instead of 100+ MiB. -- the lack of termination showed up as a request to download a **huge** image when I tried to send u-boot.imx. I think I got lucky that the next characters in the buffer looked like hex digits. I suspect that others are either holding on to some local patches or are perhaps using old versions of the Fastboot host program. After applying all three, I was able to configure for flashing on an MMC device, but I don't have anything configured to use EFI partitions, so there's no immediate route to usage for us. I'd really like to be able to fastboot flash bootloader u-boot.imx and program SPI-NOR and also be able to boot a kernel and RAM disk using fastboot boot uImage uramdisk.img, but neither of them seems very close. The first needs some more structure, and the latter seemed to decide its' own address for the kernel and simply ignore the RAM disk. I have the sense that this code is pretty much a work in progress, but I'd like to hear otherwise from those who have used it. OK, so let's wait for the others' opinions. Best regards, Marek Vasut I would recommend 1/3 2/3 for 2014.10 (I'm not certain about 3/3 because I don't think that it can actually occur on my boards) Thanks, Steve OK, Lukasz, do you want to send me a PR with those two ? There aren't any pending DFU patches, so I don't plan any PR before our ELCE2014 meeting. Therefore please, if possible, pull 1/3 and 2/3 to u-boot-usb directly. OK, done. Would you please keep an eye on 3/3 for me ? Ok. No problem (If I would be added to CC). -- Best regards, Lukasz Majewski Samsung RD Institute Poland (SRPOL) | Linux Platform Group ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] cfi_flash: don't hide write/erase errors
From: Baruch Siach bar...@tkos.co.il Partially revert commit 0d01f66d235118 (CFI: cfi_flash write fix for AMD legacy). flash_full_status_check() used to skip status register parsing when flash_status_check() returns OK. This is wrong since flash_status_check() must return OK for other status bits to be valid. Cc: Ed Swarthout ed.swarth...@freescale.com Signed-off-by: Baruch Siach bar...@tkos.co.il I don't have access to the error case I thought I was fixing with this part and my change does look incorrect, so Acked-by: Ed Swarthout ed.swarth...@freescale.com Ed ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-Boot Sunxi breaks LCD output on Olimex Lime A10
Hi, Thanks for letting me know all this. I wasn't aware that there are some troubles using the sunxi-linux branch with the mainline u-boot. Unfortunately there are many sources of information on the sunxi boards and how to get things up and running but there is only limited information about running mainline stuff. I will try to overwrite the dram settings and see if that changes anything. I did not mention in my first e-mail that I also used the 'machid' setting in the new u-boot that points to sun4i (because in the mainline version it didn't detect my Olinuxino and told me to specify the correct machid), could that also be the cause of troubles because it does not really match the exact board (I did use the 'defconfig' for the A10-Lime). And another thing; I tried a couple of the latest 3.15 mainline kernels a couple of weeks ago with sunxi-uboot to create a home-server with the Olinuxino Line A10. I combined this with the BTRFS filesystem (2 USB sticks in mirror), but that filesystem created corruption out of the blue over and over again. I tried multiple USB sticks and SD cards but maybe there are some other discrepancies between the mainline and sunxi sources that could cause this? That was the opposite of what I am doing now (so sunxi-uboot with mainline kernel instead of now mainline sunxi with sunxi-kernel) Regards, Hendrik On 03-10-14 11:19, Hans de Goede wrote: Hi, On 10/03/2014 10:49 AM, Siarhei Siamashka wrote: On Fri, 03 Oct 2014 10:04:29 +0200 Hans de Goede hdego...@redhat.com wrote: Hi, On 10/01/2014 07:43 PM, Hendrik wrote: I have always been using the sunxi u-boot from 'https://github.com/linux-sunxi/u-boot-sunxi' and that works fine, but now I want to boot the kernel from USB. That is not possible in that u-boot branch. Therefore I switched to the latest U-Boot 'git://git.denx.de/u-boot.git' for the Olimex Allwinner A10 Lime as this one does have a working USB mass storage implementation. But when the kernel and root filesystem is booted and my application (using DirectFB) starts, the LCD screen is flickering between a correct image and an incorrect image as if sometimes random image data is displayed to the screen. Although it looks more like a clock or timing issue because the colors of the faulty screen resemble the colors of the correct screen. Also: when the cpu is inactive the screen is more or less ok but when doing a lot of work the screen starts to flicker. Then it is stable for a while and after some time it starts flickering again. I am using the exact same kernel, root filesystem, U-boot environment, SD-card and 'script.bin' (which defines the hardware layout, I am not using a device tree file). The only difference is the version (and origin) of U-boot. Can anybody shine some light on this? Maybe Hans de Goede? I have seen his name pop-up a lot of times with the Sunxi branch. Hmm, the only thing I can think of which may have caused this are the recent DRAM controller code cleanups which are in upstream u-boot and not in https://github.com/linux-sunxi/u-boot-sunxi Can you try copying these 2 files: arch/arm/cpu/armv7/sunxi/dram.c arch/arm/include/asm/arch-sunxi/dram.h From https://github.com/linux-sunxi/u-boot-sunxi over into upstream u-boot, essentially reverting the DRAM cleanup patches, and see if that fixes things ? It is most definitely the PLL5P clock speed problem and it can be resolved by either reverting the following patch in u-boot http://git.denx.de/?p=u-boot.git;a=commit;h=013f2d746955147439215a4939655c9ed6bdd866 or by fixing a bunch of hardcoded divisors in the sunxi-3.4 kernel (for which I'll send a patch to the linux-sunxi mailing list later today). Thanks, that is good to know. I'm tempted to revert that patch then for now. I say tempted, as I'm not 100% sure on this. I do want mainline u-boot to work eventually with the sunxi-3.4, so that we can stop maintaining https://github.com/linux-sunxi/u-boot-sunxi But this will requires some sunxi-3.4 kernel changes for A20 anyways, so if you've a sunxi-3.4 patch fixing things, then maybe Please note that you can't use the sunxi-3.4 kernel with the unmodified mainline u-boot anyway because of the missing machine id definitions and the new PSCI code (but this is a problem only on Allwinner A20 hardware). A few minor patches are needed here and there. Right, I plan to fix the missing machine ids ASAP, we did not add them because we thought they were not properly registered, but I've checked and they actually are properly registered. I welcome a patch adding them, and unless someone beats me to it I hope to write one myself real soon. With the machine ids added upstream u-boot will work fine for sun4i and sun5i with existing sunxi-3.4 kernels, which is why I'm tempted to revert the commit you mention above if that breaks that (in some scenarios). A feature complete u-boot branch with extra patches on top of u-boot v2014.10 (for example, with HDMI
Re: [U-Boot] U-Boot Sunxi breaks LCD output on Olimex Lime A10
Hi, I now tried to get the latest version from git://git.denx.de/u-boot-sunxi.git and then replaced the dram.c/h files with the ones from https://github.com/linux-sunxi/u-boot-sunxi. That seems to work. The LCD screen no longer flickers! Regards, Hendrik ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/3] usb: eth: add ASIX AX88179 DRIVER
Hello Rene, Subject: [U-Boot] [PATCH V3 2/3] usb: eth: add ASIX AX88179 DRIVER changes in v3: -added all compatible devices from linux driver -fixed issues from review changes in v2: -added usb_ether.h to change list -added 2nd patch to enable driver for arndale board Following the additional comments that came from Marek do you know when you will be submitted a v4 of this patch? Thanks for your effort on this. Regards, Andy. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/5] sunxi: Turn MMC_SUNXI_SLOT_EXTRA into a proper Kconfig option
Note we also drop the SPL check for initializing the 2nd mmc slot, the SPL
check is not necessary with Kconfig, because only options explicitly marked
as also being for the SPL get set during SPL builds.
Signed-off-by: Hans de Goede hdego...@redhat.com
---
board/sunxi/Kconfig | 8
board/sunxi/board.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 497b093..cb4a881 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -32,6 +32,14 @@ config USB_KEYBOARD
Say Y here to add support for using a USB keyboard (typically used
in combination with a graphical console on HDMI).
+config MMC_SUNXI_SLOT_EXTRA
+ int mmc extra slot number
+ default -1
+ ---help---
+ sunxi builds always enable mmc0, some boards also have a sdcard slot
+ or emmc on mmc2 or mmc3. Setting this to 2 or 3 will enable support
+ for this.
+
config MMC0_CD_PIN
string Card detect pin for mmc0
default
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index e819b12..4d602ca 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -110,7 +110,7 @@ int board_mmc_init(bd_t *bis)
{
mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT);
sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT);
-#if !defined (CONFIG_SPL_BUILD) defined (CONFIG_MMC_SUNXI_SLOT_EXTRA)
+#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT_EXTRA);
sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA);
#endif
--
2.1.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 0/5] sunxi: Enable second sdcard slot found on some boards
Hi Ian, et al, Here is v2 of my second sdcard slot support patch-set. Changes since v1: -Drop sunxi: Add sunxi_gpio_get_val function, use gpio_direction_input instead -sunxi: Add mmc card-detect functionality: Instead of using magic integer numbers for the card-detect pin, make it a string and use name_to_gpio -sunxi: When we've both mmc0 and mmc2, detect from which one we're booting: Add some extra info about why we swap the devs to the commit message. -sunxi: Enable second sdcard slot found on some boards Changed defconfig settings for card-detect pins to P?# strings Ian, note I'm travelling for work for the next 2 weeks, so assuming you don't find any issues during review, can you merge this into u-boot-sunxi/next please ? Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 3/5] sunxi: When we've both mmc0 and mmc2, detect from which one we're booting
sunxi SOCs can boot from both mmc0 and mmc2, detect from which one we're
booting, and make that one mmc dev 0 so that a single u-boot binary can
be used for both the onboard eMMC and for external sdcards.
When we're booting from mmc2, we make it dev 0 because that is where the SPL
will load the tertiary payload (the actual u-boot binary in our case) from,
see: common/spl/spl_mmc.c, which has dev 0 hardcoded everywhere.
Signed-off-by: Hans de Goede hdego...@redhat.com
---
arch/arm/include/asm/arch-sunxi/mmc.h | 2 +-
board/sunxi/board.c | 25 +++--
drivers/mmc/sunxi_mmc.c | 7 ++-
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h
b/arch/arm/include/asm/arch-sunxi/mmc.h
index 53196e3..ff2602d 100644
--- a/arch/arm/include/asm/arch-sunxi/mmc.h
+++ b/arch/arm/include/asm/arch-sunxi/mmc.h
@@ -120,5 +120,5 @@ struct sunxi_mmc {
#define SUNXI_MMC_IDIE_TXIRQ (0x1 0)
#define SUNXI_MMC_IDIE_RXIRQ (0x1 1)
-int sunxi_mmc_init(int sdc_no);
+struct mmc *sunxi_mmc_init(int sdc_no);
#endif /* _SUNXI_MMC_H */
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 4d602ca..0a7be31 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -12,6 +12,7 @@
*/
#include common.h
+#include mmc.h
#ifdef CONFIG_AXP152_POWER
#include axp152.h
#endif
@@ -108,11 +109,31 @@ static void mmc_pinmux_setup(int sdc)
int board_mmc_init(bd_t *bis)
{
+ __maybe_unused struct mmc *mmc0, *mmc1;
+ __maybe_unused char buf[512];
+
mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT);
- sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT);
+ mmc0 = sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT);
#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT_EXTRA);
- sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA);
+ mmc1 = sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA);
+#endif
+
+#if CONFIG_MMC_SUNXI_SLOT == 0 CONFIG_MMC_SUNXI_SLOT_EXTRA == 2
+ /*
+* Both mmc0 and mmc2 are bootable, figure out where we're booting
+* from. Try mmc0 first, just like the brom does.
+*/
+ if (mmc_getcd(mmc0) mmc_init(mmc0) == 0
+ mmc0-block_dev.block_read(0, 16, 1, buf) == 1) {
+ buf[12] = 0;
+ if (strcmp(buf[4], eGON.BT0) == 0)
+ return 0;
+ }
+
+ /* no bootable card in mmc0, so we must be booting from mmc2, swap */
+ mmc0-block_dev.dev = 1;
+ mmc1-block_dev.dev = 0;
#endif
return 0;
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 0ea9f4d..7526540 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -370,7 +370,7 @@ static const struct mmc_ops sunxi_mmc_ops = {
.getcd = sunxi_mmc_getcd,
};
-int sunxi_mmc_init(int sdc_no)
+struct mmc *sunxi_mmc_init(int sdc_no)
{
struct mmc_config *cfg = mmc_host[sdc_no].cfg;
@@ -393,8 +393,5 @@ int sunxi_mmc_init(int sdc_no)
mmc_resource_init(sdc_no);
mmc_clk_io_on(sdc_no);
- if (mmc_create(cfg, mmc_host[sdc_no]) == NULL)
- return -1;
-
- return 0;
+ return mmc_create(cfg, mmc_host[sdc_no]);
}
--
2.1.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 5/5] sunxi: Enable second sdcard slot found on some boards
Enable the second sdcard slot found on some boards. Note that we do not set CONFIG_MMC_SUNXI_SLOT_EXTRA for the SPL, as having it there is not useful, Except for on the Mele-M3 where the second sdcard is an eMMC, from which the device can also boot, and there we want to have both in the SPL, so that a single u-boot binary can both from both. So for the M3 we do prefix the defconfig setting with the special +S: syntax so that it applies to the SPL too. Signed-off-by: Hans de Goede hdego...@redhat.com --- configs/A10s-OLinuXino-M_defconfig| 3 +++ configs/A20-OLinuXino_MICRO_defconfig | 3 +++ configs/Mele_M3_defconfig | 2 ++ 3 files changed, 8 insertions(+) diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig index a578c06..2aad834 100644 --- a/configs/A10s-OLinuXino-M_defconfig +++ b/configs/A10s-OLinuXino-M_defconfig @@ -1,5 +1,8 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS=A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10) CONFIG_FDTFILE=sun5i-a10s-olinuxino-micro.dtb +CONFIG_MMC_SUNXI_SLOT_EXTRA=1 ++S:CONFIG_MMC0_CD_PIN=PG1 ++S:CONFIG_MMC1_CD_PIN=PG13 +S:CONFIG_ARM=y +S:CONFIG_TARGET_SUN5I=y diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig index 20a947c..0e0a7de 100644 --- a/configs/A20-OLinuXino_MICRO_defconfig +++ b/configs/A20-OLinuXino_MICRO_defconfig @@ -1,5 +1,8 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS=A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI CONFIG_FDTFILE=sun7i-a20-olinuxino-micro.dtb +CONFIG_MMC_SUNXI_SLOT_EXTRA=3 ++S:CONFIG_MMC0_CD_PIN=PH1 ++S:CONFIG_MMC3_CD_PIN=PH11 +S:CONFIG_ARM=y +S:CONFIG_TARGET_SUN7I=y diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig index 645b236..a043ad2 100644 --- a/configs/Mele_M3_defconfig +++ b/configs/Mele_M3_defconfig @@ -1,5 +1,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS=MELE_M3,AXP209_POWER,SUNXI_GMAC,USB_EHCI CONFIG_FDTFILE=sun7i-a20-m3.dtb ++S:CONFIG_MMC_SUNXI_SLOT_EXTRA=2 ++S:CONFIG_MMC0_CD_PIN=PH1 +S:CONFIG_ARM=y +S:CONFIG_TARGET_SUN7I=y -- 2.1.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 1/5] sunxi: Add mmc card-detect functionality
Signed-off-by: Hans de Goede hdego...@redhat.com
---
board/sunxi/Kconfig| 26 ++
drivers/mmc/sunxi_mmc.c| 21 +
include/configs/sunxi-common.h | 1 +
3 files changed, 48 insertions(+)
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 622f7b4..497b093 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -32,4 +32,30 @@ config USB_KEYBOARD
Say Y here to add support for using a USB keyboard (typically used
in combination with a graphical console on HDMI).
+config MMC0_CD_PIN
+ string Card detect pin for mmc0
+ default
+ ---help---
+ Set the card detect pin for mmc0, leave empty to not use cd. This
+ takes a string in the format understood by sunxi_name_to_gpio, e.g.
+ PH1 for pin 1 of port H.
+
+config MMC1_CD_PIN
+ string Card detect pin for mmc1
+ default
+ ---help---
+ See MMC0_CD_PIN help text.
+
+config MMC2_CD_PIN
+ string Card detect pin for mmc2
+ default
+ ---help---
+ See MMC0_CD_PIN help text.
+
+config MMC3_CD_PIN
+ string Card detect pin for mmc3
+ default
+ ---help---
+ See MMC0_CD_PIN help text.
+
endif
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index bc2c4b3..0ea9f4d 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -14,7 +14,9 @@
#include asm/io.h
#include asm/arch/clock.h
#include asm/arch/cpu.h
+#include asm/arch/gpio.h
#include asm/arch/mmc.h
+#include asm-generic/gpio.h
struct sunxi_mmc_host {
unsigned mmc_no;
@@ -343,10 +345,29 @@ out:
return error;
}
+static int sunxi_mmc_getcd(struct mmc *mmc)
+{
+ struct sunxi_mmc_host *mmchost = mmc-priv;
+ int cd_pin = -1;
+
+ switch (mmchost-mmc_no) {
+ case 0: cd_pin = sunxi_name_to_gpio(CONFIG_MMC0_CD_PIN); break;
+ case 1: cd_pin = sunxi_name_to_gpio(CONFIG_MMC1_CD_PIN); break;
+ case 2: cd_pin = sunxi_name_to_gpio(CONFIG_MMC2_CD_PIN); break;
+ case 3: cd_pin = sunxi_name_to_gpio(CONFIG_MMC3_CD_PIN); break;
+ }
+
+ if (cd_pin == -1)
+ return 1;
+
+ return !gpio_direction_input(cd_pin);
+}
+
static const struct mmc_ops sunxi_mmc_ops = {
.send_cmd = mmc_send_cmd,
.set_ios= mmc_set_ios,
.init = mmc_core_init,
+ .getcd = sunxi_mmc_getcd,
};
int sunxi_mmc_init(int sdc_no)
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index af48c97..0ff67ee 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -183,6 +183,7 @@
/* GPIO */
#define CONFIG_SUNXI_GPIO
+#define CONFIG_SPL_GPIO_SUPPORT
#define CONFIG_CMD_GPIO
#ifdef CONFIG_VIDEO
--
2.1.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 4/5] sunxi: Use PG3 - PG8 as io-pins for mmc1
None of the known sunxi devices actually use mmc1 routed through PH, where
as some devices do actually use mmc1 routed through PG, so change the routing
of mmc1 to PG. If in the future we encounter devices with mmc1 routed through
PH, we will need to change things to be a bit more flexible.
Signed-off-by: Hans de Goede hdego...@redhat.com
---
arch/arm/include/asm/arch-sunxi/gpio.h | 2 ++
board/sunxi/board.c| 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h
b/arch/arm/include/asm/arch-sunxi/gpio.h
index f7f3d8c..3f46f78 100644
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -117,6 +117,8 @@ enum sunxi_gpio_number {
#define SUN5I_GPB19_UART0_TX 2
#define SUN5I_GPB20_UART0_RX 2
+#define SUN5I_GPG3_SDC12
+
#define SUN5I_GPG3_UART1_TX4
#define SUN5I_GPG4_UART1_RX4
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 0a7be31..23f8887 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -75,9 +75,9 @@ static void mmc_pinmux_setup(int sdc)
break;
case 1:
- /* CMD-PH22, CLK-PH23, D0~D3-PH24~27 : 5 */
- for (pin = SUNXI_GPH(22); pin = SUNXI_GPH(27); pin++) {
- sunxi_gpio_set_cfgpin(pin, SUN4I_GPH22_SDC1);
+ /* CMD-PG3, CLK-PG4, D0~D3-PG5-8 */
+ for (pin = SUNXI_GPG(3); pin = SUNXI_GPG(8); pin++) {
+ sunxi_gpio_set_cfgpin(pin, SUN5I_GPG3_SDC1);
sunxi_gpio_set_pull(pin, SUNXI_GPIO_PULL_UP);
sunxi_gpio_set_drv(pin, 2);
}
--
2.1.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
