Re: [U-Boot] [PATCH] omap3: allow slection of NAND GPMC settings based on board config
Any comments on this? Mike Rapoport wrote: > There are several presets for GPMC registers defined in > include/asm-arm/arch-omap3/mem.h. Allow selection between SMNAND and > M_NAND presets based on OMAP34XX_GPMC_NAND_ defines > > Signed-off-by: Mike Rapoport > --- > cpu/arm_cortexa8/omap3/mem.c | 25 - > 1 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c > index 8b8cd6d..2bd7e1c 100644 > --- a/cpu/arm_cortexa8/omap3/mem.c > +++ b/cpu/arm_cortexa8/omap3/mem.c > @@ -44,14 +44,21 @@ volatile unsigned int boot_flash_env_addr; > struct gpmc *gpmc_cfg; > > #if defined(CONFIG_CMD_NAND) > -static const u32 gpmc_m_nand[GPMC_MAX_REG] = { > - M_NAND_GPMC_CONFIG1, > - M_NAND_GPMC_CONFIG2, > - M_NAND_GPMC_CONFIG3, > - M_NAND_GPMC_CONFIG4, > - M_NAND_GPMC_CONFIG5, > - M_NAND_GPMC_CONFIG6, 0 > -}; > +#define GPMC_NAND(PART) \ > + static const u32 gpmc_nand[GPMC_MAX_REG] = {\ > + PART##_GPMC_CONFIG1,\ > + PART##_GPMC_CONFIG2,\ > + PART##_GPMC_CONFIG3,\ > + PART##_GPMC_CONFIG4,\ > + PART##_GPMC_CONFIG5,\ > + PART##_GPMC_CONFIG6, 0 \ > + }; > + > +#ifdef OMAP34XX_GPMC_NAND_SMNAND > +GPMC_NAND(SMNAND) > +#else > +GPMC_NAND(M_NAND) > +#endif > > #if defined(CONFIG_ENV_IS_IN_NAND) > #define GPMC_CS 0 > @@ -246,7 +253,7 @@ void gpmc_init(void) > sdelay(1000); > > #if defined(CONFIG_CMD_NAND) /* CS 0 */ > - gpmc_config = gpmc_m_nand; > + gpmc_config = gpmc_nand; > > base = PISMO1_NAND_BASE; > size = PISMO1_NAND_SIZE; -- Sincerely yours, Mike. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] ppc4xx: Consolidate pci_target_init() function
Hi Stefan, good job. Please see two comments and one question below. > This patch removes the duplicted implementations of the pci_target_init() > function by introducing a weak default function for it. This weak default > has a different implementation for 440EP(x)/GR(x) PPC's. It can be > overridden by a board specific version (e.g. PMC440, korat). > > Signed-off-by: Stefan Roese > --- > diff --git a/cpu/ppc4xx/4xx_pci.c b/cpu/ppc4xx/4xx_pci.c > index 40017f4..28877ce 100644 > --- a/cpu/ppc4xx/4xx_pci.c > +++ b/cpu/ppc4xx/4xx_pci.c > @@ -77,6 +77,7 @@ > #include > #endif > #include > +#include > #include > > #ifdef CONFIG_PCI > @@ -499,6 +500,111 @@ int __is_pci_host(struct pci_controller *hose) > int is_pci_host(struct pci_controller *hose) > __attribute__((weak, alias("__is_pci_host"))); > > +/* > + * pci_target_init > + * > + * The bootstrap configuration provides default settings for the pci > + * inbound map (PIM). But the bootstrap config choices are limited and > + * may not be sufficient for a given board. > + */ > +#if defined(CONFIG_SYS_PCI_TARGET_INIT) > +#if defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \ > +defined(CONFIG_440GR) || defined(CONFIG_440GRX) > +void __pci_target_init(struct pci_controller *hose) > +{ > + /* > + * Set up Direct MMIO registers > + */ > + > + /* > + * PowerPC440 EP PCI Master configuration. > + * Map one 1Gig range of PLB/processor addresses to PCI memory space. > + * PLB address 0xA000-0xDFFF ==> PCI address > 0xA000-0xDFFF > + * Use byte reversed out routines to handle endianess. > + * Make this region non-prefetchable. > + */ > + /* PMM0 Mask/Attribute - disabled b4 setting */ > + out_le32((void *)PCIL0_PMM0MA, 0x); > + /* PMM0 Local Address */ > + out_le32((void *)PCIL0_PMM0LA, CONFIG_SYS_PCI_MEMBASE); > + /* PMM0 PCI Low Address */ > + out_le32((void *)PCIL0_PMM0PCILA, CONFIG_SYS_PCI_MEMBASE); > + /* PMM0 PCI High Address */ > + out_le32((void *)PCIL0_PMM0PCIHA, 0x); > + /* 512M + No prefetching, and enable region */ > + out_le32((void *)PCIL0_PMM0MA, 0xE001); > + > + /* PMM0 Mask/Attribute - disabled b4 setting */ Typo. PMM0<->PMM1 inside comments. 4x. > + out_le32((void *)PCIL0_PMM1MA, 0x); > + /* PMM0 Local Address */ > + out_le32((void *)PCIL0_PMM1LA, CONFIG_SYS_PCI_MEMBASE2); > + /* PMM0 PCI Low Address */ > + out_le32((void *)PCIL0_PMM1PCILA, CONFIG_SYS_PCI_MEMBASE2); > + /* PMM0 PCI High Address */ > + out_le32((void *)PCIL0_PMM1PCIHA, 0x); > + /* 512M + No prefetching, and enable region */ > + out_le32((void *)PCIL0_PMM1MA, 0xE001); BTW, do you know why most 440 boards use PMM0+1 to map 1GB? PMC440 uses PMM0 for this only. I don't see a problem with this when CONFIG_SYS_PCI_MEMBASE is aligned to CONFIG_SYS_PCI_MEMBASE. > + > + out_le32((void *)PCIL0_PTM1MS, 0x0001); /* Memory Size/Attribute */ > + out_le32((void *)PCIL0_PTM1LA, 0); /* Local Addr. Reg */ > + out_le32((void *)PCIL0_PTM2MS, 0); /* Memory Size/Attribute */ > + out_le32((void *)PCIL0_PTM2LA, 0); /* Local Addr. Reg */ > + > + /* > + * Set up Configuration registers > + */ > + > + /* Program the board's subsystem id/vendor id */ > + pci_write_config_word(0, PCI_SUBSYSTEM_VENDOR_ID, > + CONFIG_SYS_PCI_SUBSYS_VENDORID); > + pci_write_config_word(0, PCI_SUBSYSTEM_ID, CONFIG_SYS_PCI_SUBSYS_ID); > + > + /* Configure command register as bus master */ > + pci_write_config_word(0, PCI_COMMAND, PCI_COMMAND_MASTER); > + > + /* 240nS PCI clock */ > + pci_write_config_word(0, PCI_LATENCY_TIMER, 1); > + > + /* No error reporting */ > + pci_write_config_word(0, PCI_ERREN, 0); > + > + pci_write_config_dword(0, PCI_BRDGOPT2, 0x0101); > +} > +#else /* defined(CONFIG_440EP) ... */ > +void __pci_target_init(struct pci_controller * hose) > +{ > + /* > + * Disable everything > + */ > + out_le32((void *)PCIL0_PIM0SA, 0); /* disable */ > + out_le32((void *)PCIL0_PIM1SA, 0); /* disable */ > + out_le32((void *)PCIL0_PIM2SA, 0); /* disable */ > + out_le32((void *)PCIL0_EROMBA, 0); /* disable expansion rom */ > + > + /* > + * Map all of SDRAM to PCI address 0x_. Note that the 440 > + * strapping options do not support sizes such as 128/256 MB. > + */ > + out_le32((void *)PCIL0_PIM0LAL, CONFIG_SYS_SDRAM_BASE); > + out_le32((void *)PCIL0_PIM0LAH, 0); > + out_le32((void *)PCIL0_PIM0SA, ~(gd->ram_size - 1) | 1); > + out_le32((void *)PCIL0_BAR0, 0); > + > + /* > + * Program the board's subsystem id/vendor id > + */ > + out_le16((void *)PCIL0_SBSYSVID, CONFIG_SYS_PCI_SUBSYS_VENDORID); > + out_le16((void *)PCIL0_SBSYSID, CONFIG_SYS_PCI_SUBSYS_DEVICEID); > + > + out_le16((void *)PCIL0_CMD,
Re: [U-Boot] [PATCHi v3] OMAP3: add CM-T35 board
> Add CM-T35 board support > > Signed-off-by: Mike Rapoport > > -- > v2 changes: > - rename board config file from omap3_cm-t35.h to cm-t35.h > - remove SZ_xx references > - add MAKEALL/MAINTEINERS entries > > v3 changes: > - fix whitespace and indentation > - remove eth_init from board_eth_init > - add CM-T35 entry to doc/README.omap3 > - fixed board name in MAINTAINERS > > --- > MAINTAINERS |4 + > MAKEALL |1 + > Makefile |2 + > board/cm-t35/Makefile| 47 > board/cm-t35/cm-t35.c| 190 + > board/cm-t35/cm-t35.h| 173 +++ > board/cm-t35/config.mk | 30 + > doc/README.omap3 | 16 ++- > include/configs/cm-t35.h | 296 > ++ > 9 files changed, 757 insertions(+), 2 deletions(-) > create mode 100644 board/cm-t35/Makefile > create mode 100644 board/cm-t35/cm-t35.c > create mode 100644 board/cm-t35/cm-t35.h > create mode 100644 board/cm-t35/config.mk > create mode 100644 include/configs/cm-t35.h Was this patch made against the current u-boot-ti/next. The reason I say this is because there was a DDR patch that affects all OMAP3 boards. So this support should be added against u-boot-ti/next and tested against it. I believe there is a config option to choose between MICRON and INFINEON DDR's. > diff --git a/MAINTAINERS b/MAINTAINERS > index d70a9d2..49b2164 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -677,6 +677,10 @@ Stelian Pop > at91sam9263ek ARM926EJS (AT91SAM9263 SoC) > at91sam9rlekARM926EJS (AT91SAM9RL SoC) > > +Mike Rapoport > + > + cm-t35 ARM CORTEX-A8 (OMAP3xx SoC) > + > Tom Rix > > omap3_zoom2 ARM CORTEX-A8 (OMAP3xx SoC) > diff --git a/MAKEALL b/MAKEALL > index d63c5c2..6f90ad5 100755 > --- a/MAKEALL > +++ b/MAKEALL > @@ -612,6 +612,7 @@ LIST_ARM11=" \ > ## ARM Cortex-A8 Systems > # > LIST_ARM_CORTEX_A8=" \ > + cm-t35 \ > devkit8000 \ > omap3_beagle\ > omap3_overo \ > diff --git a/Makefile b/Makefile > index bcb3fe9..24c9418 100644 > --- a/Makefile > +++ b/Makefile > @@ -3143,6 +3143,8 @@ SMN42_config: unconfig > # > ## ARM CORTEX Systems > # > +cm-t35_config : unconfig > + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 cm-t35 NULL omap3 > > devkit8000_config : unconfig > @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 devkit8000 timll omap3 > diff --git a/board/cm-t35/Makefile b/board/cm-t35/Makefile > new file mode 100644 > index 000..7b80aaa > --- /dev/null > +++ b/board/cm-t35/Makefile > @@ -0,0 +1,47 @@ > +# > +# (C) Copyright 2000, 2001, 2002 > +# Wolfgang Denk, DENX Software Engineering, w...@denx.de. > +# > +# See file CREDITS for list of people who contributed to this > +# project. > +# > +# This program is free software; you can redistribute it and/or > +# modify it under the terms of the GNU General Public License as > +# published by the Free Software Foundation; either version 2 of > +# the License, or (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program; if not, write to the Free Software > +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, > +# MA 02111-1307 USA > +# > + > +include $(TOPDIR)/config.mk > + > +LIB = $(obj)lib$(BOARD).a > + > +COBJS:= cm-t35.o > + > +SRCS := $(COBJS:.o=.c) > +OBJS := $(addprefix $(obj),$(COBJS)) > + > +$(LIB): $(obj).depend $(OBJS) > + $(AR) $(ARFLAGS) $@ $(OBJS) > + > +clean: > + rm -f $(OBJS) > + > +distclean: clean > + rm -f $(LIB) core *.bak $(obj).depend > + > +# > + > +# defines $(obj).depend target > +include $(SRCTREE)/rules.mk > + > +sinclude $(obj).depend > diff --git a/board/cm-t35/cm-t35.c b/board/cm-t35/cm-t35.c > new file mode 100644 > index 000..40488a2 > --- /dev/null > +++ b/board/cm-t35/cm-t35.c > @@ -0,0 +1,190 @@ > +/* > + * (C) Copyright 2009 > + * CompuLab, Ltd. > + * > + * Authors : > + * Igor Vaisbein > + * Mike Rapoport > + * > + * Derived from omap3evm and Beagle Board by > + * Manikandan Pillai > + * Richard Woodruff > + * Syed Mohammed Khasim > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free so
[U-Boot] [PATCH v4] OMAP3: add CM-T35 board
Add CM-T35 board support Signed-off-by: Mike Rapoport -- v2 changes: - rename board config file from omap3_cm-t35.h to cm-t35.h - remove SZ_xx references - add MAKEALL/MAINTEINERS entries v3 changes: - fix whitespace and indentation - remove eth_init from board_eth_init - add CM-T35 entry to doc/README.omap3 - fixed board name in MAINTAINERS v4 changes: - rebased agains u-boot-ti/next branch --- MAINTAINERS |4 + MAKEALL |1 + Makefile |2 + board/cm-t35/Makefile| 47 +++ board/cm-t35/cm-t35.c| 190 + board/cm-t35/cm-t35.h| 173 ++ board/cm-t35/config.mk | 30 + doc/README.omap3 | 16 ++- include/configs/cm-t35.h | 299 ++ 9 files changed, 760 insertions(+), 2 deletions(-) create mode 100644 board/cm-t35/Makefile create mode 100644 board/cm-t35/cm-t35.c create mode 100644 board/cm-t35/cm-t35.h create mode 100644 board/cm-t35/config.mk create mode 100644 include/configs/cm-t35.h diff --git a/MAINTAINERS b/MAINTAINERS index d70a9d2..49b2164 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -677,6 +677,10 @@ Stelian Pop at91sam9263ek ARM926EJS (AT91SAM9263 SoC) at91sam9rlekARM926EJS (AT91SAM9RL SoC) +Mike Rapoport + + cm-t35 ARM CORTEX-A8 (OMAP3xx SoC) + Tom Rix omap3_zoom2 ARM CORTEX-A8 (OMAP3xx SoC) diff --git a/MAKEALL b/MAKEALL index d63c5c2..6f90ad5 100755 --- a/MAKEALL +++ b/MAKEALL @@ -612,6 +612,7 @@ LIST_ARM11="\ ## ARM Cortex-A8 Systems # LIST_ARM_CORTEX_A8=" \ + cm-t35 \ devkit8000 \ omap3_beagle\ omap3_overo \ diff --git a/Makefile b/Makefile index bcb3fe9..24c9418 100644 --- a/Makefile +++ b/Makefile @@ -3143,6 +3143,8 @@ SMN42_config : unconfig # ## ARM CORTEX Systems # +cm-t35_config :unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 cm-t35 NULL omap3 devkit8000_config :unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 devkit8000 timll omap3 diff --git a/board/cm-t35/Makefile b/board/cm-t35/Makefile new file mode 100644 index 000..7b80aaa --- /dev/null +++ b/board/cm-t35/Makefile @@ -0,0 +1,47 @@ +# +# (C) Copyright 2000, 2001, 2002 +# Wolfgang Denk, DENX Software Engineering, w...@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS := cm-t35.o + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB):$(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend diff --git a/board/cm-t35/cm-t35.c b/board/cm-t35/cm-t35.c new file mode 100644 index 000..40488a2 --- /dev/null +++ b/board/cm-t35/cm-t35.c @@ -0,0 +1,190 @@ +/* + * (C) Copyright 2009 + * CompuLab, Ltd. + * + * Authors : + * Igor Vaisbein + * Mike Rapoport + * + * Derived from omap3evm and Beagle Board by + * Manikandan Pillai + * Richard Woodruff + * Syed Mohammed Khasim + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You s
Re: [U-Boot] [PATCHi v3] OMAP3: add CM-T35 board
Paulraj, Sandeep wrote: > >> Add CM-T35 board support >> >> Signed-off-by: Mike Rapoport >> >> -- >> v2 changes: >> - rename board config file from omap3_cm-t35.h to cm-t35.h >> - remove SZ_xx references >> - add MAKEALL/MAINTEINERS entries >> >> v3 changes: >> - fix whitespace and indentation >> - remove eth_init from board_eth_init >> - add CM-T35 entry to doc/README.omap3 >> - fixed board name in MAINTAINERS >> >> --- >> MAINTAINERS |4 + >> MAKEALL |1 + >> Makefile |2 + >> board/cm-t35/Makefile| 47 >> board/cm-t35/cm-t35.c| 190 + >> board/cm-t35/cm-t35.h| 173 +++ >> board/cm-t35/config.mk | 30 + >> doc/README.omap3 | 16 ++- >> include/configs/cm-t35.h | 296 >> ++ >> 9 files changed, 757 insertions(+), 2 deletions(-) >> create mode 100644 board/cm-t35/Makefile >> create mode 100644 board/cm-t35/cm-t35.c >> create mode 100644 board/cm-t35/cm-t35.h >> create mode 100644 board/cm-t35/config.mk >> create mode 100644 include/configs/cm-t35.h > > Was this patch made against the current u-boot-ti/next. > > The reason I say this is because there was a DDR patch that affects all OMAP3 > boards. So this support should be added against u-boot-ti/next and tested > against it. I believe there is a config option to choose between MICRON and > INFINEON DDR's. > Rebasing, thanks. > -- Sincerely yours, Mike. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] u-boot: How to read file from FAT filesystem on NorFlash MTD partition
Hello, I hope I am not sending mail to the wrong mail list. I am porting u-boot to our Xscale based board, with 32MB Nor Flash on board. And in this board, it is required that, the u-boot should be able to read some files from a FAT file system on one of the Nor Flash partitions. The Nor Flash is managed as MTD device under Linux OS. In current u-boot implementation, I can use fatload to read files from mmc or USB storage device, which is also FAT filesystem. And I can also use fsload command to read files from JFFS2 filesytem on NorFlash or NandFlash. But I found I cann't uses these command to read files from a FAT filesystem on NorFlash. I cann't format this partition to JFFS2 filesystem because it is exported to Windows/Linux host via USB gadget after system boots up. Can someone tell me the best way to solve this problem, or give me some hints of which part of code I need to change? I am creating a new command following fsload, using MTD devices in U-Boot, and try to mount the FAT filesystem, but failed at reading the real file data out, although I can read the file name, the file size and the file start sector number out. -- Best Regards Xianwei ZENG Linux Fans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] smc911x: fix typo in smc911x_handle_mac_address name
Hi Mike, On Sat, Nov 14, 2009 at 10:56 PM, Mike Rapoport wrote: > Ben, > Any chance this one can be merged as well? > > Mike Rapoport wrote: > > Signed-off-by: Mike Rapoport > > --- > > drivers/net/smc911x.c |4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c > > index c50758e..acc2306 100644 > > --- a/drivers/net/smc911x.c > > +++ b/drivers/net/smc911x.c > > @@ -37,7 +37,7 @@ void pkt_data_push(struct eth_device *dev, u32 addr, > u32 val) \ > > > > #define mdelay(n) udelay((n)*1000) > > > > -static void smx911x_handle_mac_address(struct eth_device *dev) > > +static void smc911x_handle_mac_address(struct eth_device *dev) > > { > > unsigned long addrh, addrl; > > uchar *m = dev->enetaddr; > > @@ -155,7 +155,7 @@ static int smc911x_init(struct eth_device *dev, bd_t > * bd) > > /* Configure the PHY, initialize the link state */ > > smc911x_phy_configure(dev); > > > > - smx911x_handle_mac_address(dev); > > + smc911x_handle_mac_address(dev); > > > > /* Turn on Tx + Rx */ > > smc911x_enable(dev); > > Sure, but since it's not fixing something broken (unless I'm missing something), it will wait until the next release. I'll pull it into 'next' soon. > -- > Sincerely yours, > Mike. > > regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] omap3: allow slection of NAND GPMC settings based on board config
Mike Rapoport wrote: > Any comments on this? > This is a good idea but.. These defines are used in the TI codebase but it doesn't look like the samsung nand is used here. As a test I removed the samsung defines and reran MAKEALL arm. No failures. Also grepping the code shows that it isn't used. Do you plan on using the samsung nand ? If not, I think a better patch would be to remove the smnand defines. Also I think the nand and onnand initialization could be generalized. You may want to look at that. Thanks Tom > Mike Rapoport wrote: >> There are several presets for GPMC registers defined in >> include/asm-arm/arch-omap3/mem.h. Allow selection between SMNAND and >> M_NAND presets based on OMAP34XX_GPMC_NAND_ defines >> >> Signed-off-by: Mike Rapoport >> --- >> cpu/arm_cortexa8/omap3/mem.c | 25 - >> 1 files changed, 16 insertions(+), 9 deletions(-) >> >> diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c >> index 8b8cd6d..2bd7e1c 100644 >> --- a/cpu/arm_cortexa8/omap3/mem.c >> +++ b/cpu/arm_cortexa8/omap3/mem.c >> @@ -44,14 +44,21 @@ volatile unsigned int boot_flash_env_addr; >> struct gpmc *gpmc_cfg; >> >> #if defined(CONFIG_CMD_NAND) >> -static const u32 gpmc_m_nand[GPMC_MAX_REG] = { >> -M_NAND_GPMC_CONFIG1, >> -M_NAND_GPMC_CONFIG2, >> -M_NAND_GPMC_CONFIG3, >> -M_NAND_GPMC_CONFIG4, >> -M_NAND_GPMC_CONFIG5, >> -M_NAND_GPMC_CONFIG6, 0 >> -}; >> +#define GPMC_NAND(PART) \ >> +static const u32 gpmc_nand[GPMC_MAX_REG] = {\ >> +PART##_GPMC_CONFIG1,\ >> +PART##_GPMC_CONFIG2,\ >> +PART##_GPMC_CONFIG3,\ >> +PART##_GPMC_CONFIG4,\ >> +PART##_GPMC_CONFIG5,\ >> +PART##_GPMC_CONFIG6, 0 \ >> +}; >> + >> +#ifdef OMAP34XX_GPMC_NAND_SMNAND >> +GPMC_NAND(SMNAND) >> +#else >> +GPMC_NAND(M_NAND) >> +#endif >> >> #if defined(CONFIG_ENV_IS_IN_NAND) >> #define GPMC_CS 0 >> @@ -246,7 +253,7 @@ void gpmc_init(void) >> sdelay(1000); >> >> #if defined(CONFIG_CMD_NAND)/* CS 0 */ >> -gpmc_config = gpmc_m_nand; >> +gpmc_config = gpmc_nand; >> >> base = PISMO1_NAND_BASE; >> size = PISMO1_NAND_SIZE; > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] ARM update mach-types
I have pushed this change to arm/next This is a process change. I am using the latest machine registry. If you were waiting on an update, your machine should now be here. Tom commit 14fa358c9e72131339c8e33ce6a86ed292ef2f46 Author: Tom Rix Date: Sun Nov 15 10:58:06 2009 -0600 ARM Update mach-types Fetched from http://www.arm.linux.org.uk/developer/machines/download.php And built with repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm commit 156171c71a0dc4bce12b4408bb1591f8fe32dc1a Signed-off-by: Tom Rix ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] u-boot: How to read file from FAT filesystem on NorFlash MTD partition
Dear Xianwei Zeng, In message <52c6d4120911150656w2edcf528oad05796e52b13...@mail.gmail.com> you wrote: > > In current u-boot implementation, I can use fatload to read files from > mmc or USB storage device, which is also FAT filesystem. And I can > also use fsload command to read files from JFFS2 filesytem on NorFlash > or NandFlash. > > But I found I cann't uses these command to read files from a FAT filesystem > on NorFlash. I cann't format this partition to JFFS2 filesystem because it > is exported to Windows/Linux host via USB gadget after system boots up. > > Can someone tell me the best way to solve this problem, or give me some > hints of which part of code I need to change? It seems you did not enable mtdparts support in your configuration? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Systems programmers are the high priests of a low cult. -- R.S. Barton ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] OMAP3: add CM-T35 board
> > Add CM-T35 board support > > Signed-off-by: Mike Rapoport > > -- > v2 changes: > - rename board config file from omap3_cm-t35.h to cm-t35.h > - remove SZ_xx references > - add MAKEALL/MAINTEINERS entries > > v3 changes: > - fix whitespace and indentation > - remove eth_init from board_eth_init > - add CM-T35 entry to doc/README.omap3 > - fixed board name in MAINTAINERS > > v4 changes: > - rebased agains u-boot-ti/next branch > > --- > MAINTAINERS |4 + > MAKEALL |1 + > Makefile |2 + > board/cm-t35/Makefile| 47 +++ > board/cm-t35/cm-t35.c| 190 + > board/cm-t35/cm-t35.h| 173 ++ > board/cm-t35/config.mk | 30 + > doc/README.omap3 | 16 ++- > include/configs/cm-t35.h | 299 > ++ > 9 files changed, 760 insertions(+), 2 deletions(-) > create mode 100644 board/cm-t35/Makefile > create mode 100644 board/cm-t35/cm-t35.c > create mode 100644 board/cm-t35/cm-t35.h > create mode 100644 board/cm-t35/config.mk > create mode 100644 include/configs/cm-t35.h Tom, Looks like all outstanding comments have been addressed. If its OK with you I'm going to do 2 things 1) merge my next with my master because the next branch has the OMAP3 DDR patches which created some issue before. 2) apply this patch to my master after the merge because it was made against the u-boot-ti/next branch. Sandeep ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] OMAP3: BeagleBoard: Add expansion board auto detection
At BeagleBoard's expansion header various expansion boards can be attached. To be able to auto detect these boards, it was agreed to put a serial EEPROM at I2C bus 1 which contains some vendor and device specific information in it's first four bytes. Add logic to read the content of this serial EEPROM, set pin mux based on this information and print the info found. See http://elinux.org/BeagleBoardPinMux#Expansion_boards for details. Signed-off-by: Dirk Behme --- Notes: - This patch depends on OMAP3 I2C bus switch patch in I2C next http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=commit;h=5656176c23a91bcc88d020bee2be0d9d0c70ce3e - This patch is intended to be applied in next merge window as soon as I2C next is merged. - This patch is tested on BeagleBoard with and without TinCanTools Zippy expansion board attached. - Could anybody additionally test it on Beagle *without* Zippy attached? It seems that i2c_probe() sometimes returns 0 even without Zippy (??). This results in scan of non-existent devices and some "timed out in xxx" message which can be ignored, but are annoying. board/ti/beagle/beagle.c | 74 +++ board/ti/beagle/beagle.h | 31 +++ 2 files changed, 105 insertions(+) Index: u-boot-main/board/ti/beagle/beagle.c === --- u-boot-main.orig/board/ti/beagle/beagle.c +++ u-boot-main/board/ti/beagle/beagle.c @@ -40,6 +40,12 @@ static int beagle_revision_c; +static struct { + unsigned int device_vendor; + unsigned char revision; + unsigned char content; +} expansion_config; + /* * Routine: board_init * Description: Early hardware init. @@ -57,6 +63,66 @@ int board_init(void) return 0; } +#define EXPANSION_EEPROM_I2C_BUS 1 +#define EXPANSION_EEPROM_I2C_ADDRESS 0x50 + +#define TINCANTOOLS_ZIPPY 0x01000100 +#define TINCANTOOLS_ZIPPY2 0x02000100 +#define TINCANTOOLS_TRAINER0x03000100 +#define TINCANTOOLS_SHOWDOG0x04000100 + +/* + * Routine: print_expansion_config + * Description: Print info about board connected to expansion header. + * It uses the information from scan_expansion(), + */ +void print_expansion_config(void) { + + switch(expansion_config.device_vendor) { + case TINCANTOOLS_ZIPPY: + printf("TinCanTools Zippy "); + break; + case TINCANTOOLS_ZIPPY2: + printf("TinCanTools Zippy2 "); + break; + case TINCANTOOLS_TRAINER: + printf("TinCanTools Trainer "); + break; + case TINCANTOOLS_SHOWDOG: + printf("TinCanTools ShowDog "); + break; + default: + return; + } + printf("board, revision 0x%02x, content code 0x%02x, found\n", + expansion_config.revision, expansion_config.content); +} + + /* + * Routine: scan_expansion + * Description: This function checks for expansion board connected to + * Beagle's expansion header. This done by checking I2C + * bus 1 for the availability of an AT24C01B serial EEPROM. + */ +void scan_expansion(void) +{ + /* Set pin mux and switch to I2C bus 1 */ + MUX_I2C2(); + i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS); + + /* Check if expansion EEPROM is there*/ + if(i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 0) { + /* EEPROM found, read configuration data */ + i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, +(u8 *)&expansion_config, sizeof(expansion_config)); + } + + /* Switch back to default bus and pin mux */ + i2c_set_bus_num(0); + MUX_I2C2_DEFAULT(); +} + + /* * Routine: beagle_get_revision * Description: Return the revision of the BeagleBoard this code is running on. @@ -124,6 +190,14 @@ int misc_init_r(void) dieid_num_r(); + scan_expansion(); + + if (expansion_config.device_vendor == TINCANTOOLS_ZIPPY) { + MUX_ZIPPY(); + } + + print_expansion_config(); + return 0; } Index: u-boot-main/board/ti/beagle/beagle.h === --- u-boot-main.orig/board/ti/beagle/beagle.h +++ u-boot-main/board/ti/beagle/beagle.h @@ -381,4 +381,35 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(UART2_RTS), (IDIS | PTD | DIS | M0)) /*UART2_RTS*/\ MUX_VAL(CP(UART2_TX), (IDIS | PTD | DIS | M0)) /*UART2_TX*/ +#define MUX_I2C2() \ + MUX_VAL(CP(I2C2_SCL), (IEN | PTU | EN | M0)) /*I2C2_SCL*/\ + MUX_VAL(CP(I2C2_SDA), (IEN | PTU | EN | M0)) /*I2C2_SDA*/ + +#define MUX_I2C2_DEFAULT() \ + MUX_VAL(CP(I2C2_SCL), (IEN | PTU | EN | M4)) /*GPIO_168*/\ + MUX_VAL(CP(I2C2_SDA), (IEN | PTU | EN | M4)) /*GPIO_183*/ + +#define MUX_ZIPPY() \ + MUX_V
Re: [U-Boot] [PATCH] omap3: allow slection of NAND GPMC settings based on board config
On Sun, Nov 15, 2009 at 6:36 PM, Tom wrote: > Mike Rapoport wrote: >> Any comments on this? >> > > This is a good idea but.. > > These defines are used in the TI codebase but > it doesn't look like the samsung nand is used here. > > As a test I removed the samsung defines > and reran MAKEALL arm. > No failures. > Also grepping the code shows that it isn't used. > > Do you plan on using the samsung nand ? That's why I enabled the choice between samsung and Micron parts :) The CM-T35 board I'm submitting uses the samsung NAND flashes > If not, I think a better patch would be to remove the smnand defines. > > Also I think the nand and onnand initialization could be generalized. You > may want to look at that. > > Thanks > Tom > >> Mike Rapoport wrote: >>> There are several presets for GPMC registers defined in >>> include/asm-arm/arch-omap3/mem.h. Allow selection between SMNAND and >>> M_NAND presets based on OMAP34XX_GPMC_NAND_ defines >>> >>> Signed-off-by: Mike Rapoport >>> --- >>> cpu/arm_cortexa8/omap3/mem.c | 25 - >>> 1 files changed, 16 insertions(+), 9 deletions(-) >>> >>> diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c >>> index 8b8cd6d..2bd7e1c 100644 >>> --- a/cpu/arm_cortexa8/omap3/mem.c >>> +++ b/cpu/arm_cortexa8/omap3/mem.c >>> @@ -44,14 +44,21 @@ volatile unsigned int boot_flash_env_addr; >>> struct gpmc *gpmc_cfg; >>> >>> #if defined(CONFIG_CMD_NAND) >>> -static const u32 gpmc_m_nand[GPMC_MAX_REG] = { >>> - M_NAND_GPMC_CONFIG1, >>> - M_NAND_GPMC_CONFIG2, >>> - M_NAND_GPMC_CONFIG3, >>> - M_NAND_GPMC_CONFIG4, >>> - M_NAND_GPMC_CONFIG5, >>> - M_NAND_GPMC_CONFIG6, 0 >>> -}; >>> +#define GPMC_NAND(PART) \ >>> + static const u32 gpmc_nand[GPMC_MAX_REG] = { \ >>> + PART##_GPMC_CONFIG1, \ >>> + PART##_GPMC_CONFIG2, \ >>> + PART##_GPMC_CONFIG3, \ >>> + PART##_GPMC_CONFIG4, \ >>> + PART##_GPMC_CONFIG5, \ >>> + PART##_GPMC_CONFIG6, 0 \ >>> + }; >>> + >>> +#ifdef OMAP34XX_GPMC_NAND_SMNAND >>> +GPMC_NAND(SMNAND) >>> +#else >>> +GPMC_NAND(M_NAND) >>> +#endif >>> >>> #if defined(CONFIG_ENV_IS_IN_NAND) >>> #define GPMC_CS 0 >>> @@ -246,7 +253,7 @@ void gpmc_init(void) >>> sdelay(1000); >>> >>> #if defined(CONFIG_CMD_NAND) /* CS 0 */ >>> - gpmc_config = gpmc_m_nand; >>> + gpmc_config = gpmc_nand; >>> >>> base = PISMO1_NAND_BASE; >>> size = PISMO1_NAND_SIZE; >> > > ___ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > -- Sincerely Yours, Mike. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] omap3: allow slection of NAND GPMC settings based on board config
On Sun, Nov 15, 2009 at 10:36 AM, Tom wrote: > Mike Rapoport wrote: >> Any comments on this? >> > > This is a good idea but.. > > These defines are used in the TI codebase but > it doesn't look like the samsung nand is used here. > > As a test I removed the samsung defines > and reran MAKEALL arm. > No failures. > Also grepping the code shows that it isn't used. > > Do you plan on using the samsung nand ? SDP3430 uses Samsung NAND. > > If not, I think a better patch would be to remove the smnand defines. NAK. > > Also I think the nand and onnand initialization could be generalized. You > may want to look at that. > > Thanks > Tom > >> Mike Rapoport wrote: >>> There are several presets for GPMC registers defined in >>> include/asm-arm/arch-omap3/mem.h. Allow selection between SMNAND and >>> M_NAND presets based on OMAP34XX_GPMC_NAND_ defines >>> >>> Signed-off-by: Mike Rapoport >>> --- >>> cpu/arm_cortexa8/omap3/mem.c | 25 - >>> 1 files changed, 16 insertions(+), 9 deletions(-) >>> >>> diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c >>> index 8b8cd6d..2bd7e1c 100644 >>> --- a/cpu/arm_cortexa8/omap3/mem.c >>> +++ b/cpu/arm_cortexa8/omap3/mem.c >>> @@ -44,14 +44,21 @@ volatile unsigned int boot_flash_env_addr; >>> struct gpmc *gpmc_cfg; >>> >>> #if defined(CONFIG_CMD_NAND) >>> -static const u32 gpmc_m_nand[GPMC_MAX_REG] = { >>> - M_NAND_GPMC_CONFIG1, >>> - M_NAND_GPMC_CONFIG2, >>> - M_NAND_GPMC_CONFIG3, >>> - M_NAND_GPMC_CONFIG4, >>> - M_NAND_GPMC_CONFIG5, >>> - M_NAND_GPMC_CONFIG6, 0 >>> -}; >>> +#define GPMC_NAND(PART) \ >>> + static const u32 gpmc_nand[GPMC_MAX_REG] = { \ >>> + PART##_GPMC_CONFIG1, \ >>> + PART##_GPMC_CONFIG2, \ >>> + PART##_GPMC_CONFIG3, \ >>> + PART##_GPMC_CONFIG4, \ >>> + PART##_GPMC_CONFIG5, \ >>> + PART##_GPMC_CONFIG6, 0 \ This is completely unnecessary implementation IMHO, where required, the board files can register their own NAND device timings on a need basis. NOTE: timing values change based on L3 clk -> e..g 3630 means that ALL the above timing values are invalid as L3 is at 200Mhz! >>> + }; >>> + >>> +#ifdef OMAP34XX_GPMC_NAND_SMNAND >>> +GPMC_NAND(SMNAND) >>> +#else >>> +GPMC_NAND(M_NAND) >>> +#endif >>> >>> #if defined(CONFIG_ENV_IS_IN_NAND) >>> #define GPMC_CS 0 >>> @@ -246,7 +253,7 @@ void gpmc_init(void) >>> sdelay(1000); >>> >>> #if defined(CONFIG_CMD_NAND) /* CS 0 */ >>> - gpmc_config = gpmc_m_nand; >>> + gpmc_config = gpmc_nand; >>> >>> base = PISMO1_NAND_BASE; >>> size = PISMO1_NAND_SIZE; >> IMHO, NAK. Regards, Nishanth Menon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] omap3: allow slection of NAND GPMC settings based on board config
Nishanth Menon wrote: > On Sun, Nov 15, 2009 at 10:36 AM, Tom wrote: >> Mike Rapoport wrote: >>> Any comments on this? >>> >> This is a good idea but.. >> >> These defines are used in the TI codebase but >> it doesn't look like the samsung nand is used here. >> >> As a test I removed the samsung defines >> and reran MAKEALL arm. >> No failures. >> Also grepping the code shows that it isn't used. >> >> Do you plan on using the samsung nand ? > SDP3430 uses Samsung NAND. > >> If not, I think a better patch would be to remove the smnand defines. > NAK. > >> Also I think the nand and onnand initialization could be generalized. You >> may want to look at that. >> >> Thanks >> Tom >> >>> Mike Rapoport wrote: There are several presets for GPMC registers defined in include/asm-arm/arch-omap3/mem.h. Allow selection between SMNAND and M_NAND presets based on OMAP34XX_GPMC_NAND_ defines Signed-off-by: Mike Rapoport --- cpu/arm_cortexa8/omap3/mem.c | 25 - 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c index 8b8cd6d..2bd7e1c 100644 --- a/cpu/arm_cortexa8/omap3/mem.c +++ b/cpu/arm_cortexa8/omap3/mem.c @@ -44,14 +44,21 @@ volatile unsigned int boot_flash_env_addr; struct gpmc *gpmc_cfg; #if defined(CONFIG_CMD_NAND) -static const u32 gpmc_m_nand[GPMC_MAX_REG] = { -M_NAND_GPMC_CONFIG1, -M_NAND_GPMC_CONFIG2, -M_NAND_GPMC_CONFIG3, -M_NAND_GPMC_CONFIG4, -M_NAND_GPMC_CONFIG5, -M_NAND_GPMC_CONFIG6, 0 -}; +#define GPMC_NAND(PART) \ +static const u32 gpmc_nand[GPMC_MAX_REG] = {\ +PART##_GPMC_CONFIG1,\ +PART##_GPMC_CONFIG2,\ +PART##_GPMC_CONFIG3,\ +PART##_GPMC_CONFIG4,\ +PART##_GPMC_CONFIG5,\ +PART##_GPMC_CONFIG6, 0 \ > > This is completely unnecessary implementation IMHO, where required, > the board files can register > their own NAND device timings on a need basis. > NOTE: timing values change based on L3 clk -> e..g 3630 means that ALL > the above timing values > are invalid as L3 is at 200Mhz! > You are correct! Not that this is a surprise :P Agreeing with Nishanth.. Tom +}; + +#ifdef OMAP34XX_GPMC_NAND_SMNAND +GPMC_NAND(SMNAND) +#else +GPMC_NAND(M_NAND) +#endif #if defined(CONFIG_ENV_IS_IN_NAND) #define GPMC_CS 0 @@ -246,7 +253,7 @@ void gpmc_init(void) sdelay(1000); #if defined(CONFIG_CMD_NAND)/* CS 0 */ -gpmc_config = gpmc_m_nand; +gpmc_config = gpmc_nand; base = PISMO1_NAND_BASE; size = PISMO1_NAND_SIZE; > > IMHO, NAK. > Regards, > Nishanth Menon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] OMAP3: add CM-T35 board
Paulraj, Sandeep wrote: >> Add CM-T35 board support >> Please add more description of the board. >> Signed-off-by: Mike Rapoport >> >> -- >> v2 changes: >> - rename board config file from omap3_cm-t35.h to cm-t35.h >> - remove SZ_xx references >> - add MAKEALL/MAINTEINERS entries Wolfgang had made this comment on V2 that has not been addressed. > > diff --git a/include/configs/cm-t35.h b/include/configs/cm-t35.h > > new file mode 100755 > > > index 000..b881112 > > > --- /dev/null > > > +++ b/include/configs/cm-t35.h > ... > > > +#ifndef __ASSEMBLY__ > > > +extern struct gpmc *gpmc_cfg; > > > +extern unsigned int boot_flash_base; > > > +extern volatile unsigned int boot_flash_env_addr; > > > +extern unsigned int boot_flash_off; > > > +extern unsigned int boot_flash_sec; > > > +extern unsigned int boot_flash_type; > > > +#endif > > These should not be needed in your board config file. Please move to a > more appropriate header. > > Best regards, > > Wolfgang Denk Please do not push this change. Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] OMAP3: add CM-T35 board
Dear Mike Rapoport, In message <1258296430-19678-1-git-send-email-m...@compulab.co.il> you wrote: > Add CM-T35 board support ... > MAINTAINERS |4 + > MAKEALL |1 + > Makefile |2 + > board/cm-t35/Makefile| 47 +++ > board/cm-t35/cm-t35.c| 190 + > board/cm-t35/cm-t35.h| 173 ++ > board/cm-t35/config.mk | 30 + > doc/README.omap3 | 16 ++- > include/configs/cm-t35.h | 299 > ++ > 9 files changed, 760 insertions(+), 2 deletions(-) > create mode 100644 board/cm-t35/Makefile > create mode 100644 board/cm-t35/cm-t35.c > create mode 100644 board/cm-t35/cm-t35.h > create mode 100644 board/cm-t35/config.mk > create mode 100644 include/configs/cm-t35.h Would it be possible to rename this into cm_t35? I would like to avoid characters in board names (and thus make targets etc. that are not legal in shell/Make/C variable names. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "Everybody is talking about the weather but nobody does anything about it." - Mark Twain ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ARM pull request
Dear Tom, In message <4afb5a23.7030...@windriver.com> you wrote: > > I have cherry picked the weak sym change into arm/master-sync > This is the pull request. > Tom > > > The following changes since commit 0f365273a6c210e0d82f6dca3994be5283e6bf82: >Wolfgang Denk (1): > Merge branch 'master-sync' of git://git.denx.de/u-boot-arm > > are available in the git repository at: > >git://git.denx.de/u-boot-arm master-sync > > Ron Lee (1): >ARM Don't inline weak symbols > > lib_arm/board.c | 18 +- > 1 files changed, 9 insertions(+), 9 deletions(-) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de In the beginning, I was made. I didn't ask to be made. No one consul- ted with me or considered my feelings in this matter. But if it brought some passing fancy to some lowly humans as they haphazardly pranced their way through life's mournful jungle, then so be it. - Marvin the Paranoid Android ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request - mpc85xx (for v2009.11)
Dear Kumar Gala, In message you wrote: > The following changes since commit 4f127980e0d4ba179b4628ebf8e8642210731055: > Wolfgang Denk (1): > Merge branch 'master' of git://git.denx.de/u-boot-net > > are available in the git repository at: > > git://git.denx.de/u-boot-mpc85xx master > > Dave Liu (1): > fsl-ddr: Fix the chip-select interleaving issue > > cpu/mpc8xxx/ddr/options.c |7 +++ > 1 files changed, 3 insertions(+), 4 deletions(-) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Insults are effective only where emotion is present. -- Spock, "Who Mourns for Adonais?" stardate 3468.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request - mpc85xx (for v2009.11)(updated)
Dear Kumar Gala, In message you wrote: > The following changes since commit 4f127980e0d4ba179b4628ebf8e8642210731055: > Wolfgang Denk (1): > Merge branch 'master' of git://git.denx.de/u-boot-net > > are available in the git repository at: > > git://git.denx.de/u-boot-mpc85xx master > > Dave Liu (1): > fsl-ddr: Fix the chip-select interleaving issue > > Kumar Gala (1): > ppc/85xx: Fix how we determine the number of CAM entries > > cpu/mpc85xx/tlb.c |4 ++-- > cpu/mpc8xxx/ddr/options.c |7 +++ > 2 files changed, 5 insertions(+), 6 deletions(-) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "More software projects have gone awry for lack of calendar time than for all other causes combined." - Fred Brooks, Jr., _The Mythical Man Month_ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] OMAP3: add CM-T35 board
Mike Rapoport wrote: > Add CM-T35 board support > > Signed-off-by: Mike Rapoport > > -- > v2 changes: > - rename board config file from omap3_cm-t35.h to cm-t35.h > - remove SZ_xx references > - add MAKEALL/MAINTEINERS entries > > v3 changes: > - fix whitespace and indentation > - remove eth_init from board_eth_init > - add CM-T35 entry to doc/README.omap3 > - fixed board name in MAINTAINERS > > v4 changes: > - rebased agains u-boot-ti/next branch > > +static void setup_net_chip(void) > +{ > + struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE; > + > + enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[5], > + CM_T35_SMC911X_BASE, GPMC_SIZE_16M); > + enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[4], > + SB_T35_SMC911X_BASE, GPMC_SIZE_16M); > + > + /* Enable off mode for NWE in PADCONF_GPMC_NWE register */ > + writew(readw(&ctrl_base->gpmc_nwe) | 0x0E00, &ctrl_base->gpmc_nwe); > + > + /* Enable off mode for NOE in PADCONF_GPMC_NADV_ALE register */ > + writew(readw(&ctrl_base->gpmc_noe) | 0x0E00, &ctrl_base->gpmc_noe); > + > + /* Enable off mode for ALE in PADCONF_GPMC_NADV_ALE register */ > + writew(readw(&ctrl_base->gpmc_nadv_ale) | 0x0E00, > + &ctrl_base->gpmc_nadv_ale); > + > + /* Reset the ethernet controller via TPS65930 GPIO */ > + /* Set GPIO1 of TPS65930 as output */ > + twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, > + TWL4030_BASEADD_GPIO+0x03); > + /* Send a pulse on the GPIO pin */ > + twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, > + TWL4030_BASEADD_GPIO+0x0C); > + udelay(1); > + twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, > + TWL4030_BASEADD_GPIO+0x09); > + udelay(1); > + twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0x02, > + TWL4030_BASEADD_GPIO+0x0C); > +} > + > +/* > + * Routine: board_init > + * Description: Early hardware init. > + */ > +int board_init(void) > +{ > + gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ > + > + /* board id for Linux */ > + gd->bd->bi_arch_number = MACH_TYPE_CM_T35; > + /* boot param addr */ > + gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100); > + > + return 0; > +} > + > +/* > + * Routine: misc_init_r > + * Description: Init ethernet (done here so udelay works) > + */ > +int misc_init_r(void) > +{ > +#ifdef CONFIG_DRIVER_OMAP34XX_I2C > + i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); > +#endif > + > +#if defined(CONFIG_CMD_NET) > + setup_net_chip(); > +#endif Net setup should be dependent on i2c initialization. The setup_net_chip uses i2c read/write > + > + dieid_num_r(); > + > + return 0; > +} Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request - net [for 2009.11]
Dear Ben Warren, In message <4afcef73.1060...@gmail.com> you wrote: > Wolfgang, > > The following changes since commit 4f127980e0d4ba179b4628ebf8e8642210731055: > Wolfgang Denk (1): > Merge branch 'master' of git://git.denx.de/u-boot-net > > are available in the git repository at: > > git://git.denx.de/u-boot-net.git master > > Mike Frysinger (1): > smc911x_eeprom: fix building after smc911x overhaul > > Mike Rapoport (1): > smc911x: make smc911x_initialize return correct value > > drivers/net/smc911x.c|4 +- > examples/standalone/smc911x_eeprom.c | 122 > +- > 2 files changed, 64 insertions(+), 62 deletions(-) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Too many people are ready to carry the stool when the piano needs to be moved. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: nand flash next
Dear Scott Wood, In message <20091113230516.ga1...@loki.buserror.net> you wrote: > The following changes since commit efe12bcec55c3d77b9ead56e62010d26b66781f3: > Stefan Roese (1): > ppc4xx: Katmai: Add chip_config command > > are available in the git repository at: > > git://git.denx.de/u-boot-nand-flash.git next > > Amul Kumar Saha (2): > Flex-OneNAND driver support > ENV Variable support for Flex-OneNAND > > David Brownell (1): > NAND: fix "raw" reads with ECC syndrome layouts > > Mingkai Hu (2): > ppc/85xx: make boot from NAND full relocation to RAM > fsl_elbc_nand: remove the bbt descriptors relocation fixup > > Peter Tyser (2): > cmd_nand: Remove duplicate include > cmd_nand: Move conditional compilation to Makefile > > Sandeep Paulraj (7): > NAND: Update to support 64 bit device size > NAND: Correct the "chip_shift" calculation > NAND: Remove commented out code > NAND: Subpage shift for ecc_steps equal to 16 > NAND: Updating comments/explanations in the NAND driver > NAND: Update check condition for nand_read_page_hwecc API > NAND: Don't walk past end of oobfree[] > > common/Makefile |2 +- > common/cmd_nand.c | 12 - > common/env_onenand.c| 10 + > cpu/mpc85xx/u-boot-nand.lds |1 - > drivers/mtd/nand/fsl_elbc_nand.c|4 - > drivers/mtd/nand/nand_base.c| 145 ++- > drivers/mtd/nand/nand_bbt.c | 41 ++- > drivers/mtd/onenand/onenand_base.c | 742 > ++- > drivers/mtd/onenand/onenand_bbt.c | 14 +- > drivers/mtd/onenand/onenand_uboot.c |4 +- > include/configs/apollon.h |2 + > include/linux/mtd/nand.h|2 +- > include/linux/mtd/onenand.h | 16 +- > include/linux/mtd/onenand_regs.h| 18 +- > include/linux/mtd/partitions.h |4 +- > include/onenand_uboot.h | 10 + > 16 files changed, 866 insertions(+), 161 deletions(-) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "I haven't lost my mind - it's backed up on tape somewhere." ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [STATUS] Release date slippage
Hello everybody, I'm afraid we will have to shift the release of v2009.11 by about two weeks. I'm currently targeting a release date of December 02, 2009. Due to personal reasons I didn;t find much time lately to apply the patches / bug fixes that should go into the upcopming release, and to push out the next release candidate to aollow for broader testing. I'm sorry for that. I hope I will be able to catch up in the next few days. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Remember that Beethoven wrote his first symphony in C ... ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] u-boot: How to read file from FAT filesystem on NorFlash MTD partition
Dear Wolfgang Denk, Thank you for your reply. On Mon, Nov 16, 2009 at 3:48 AM, Wolfgang Denk wrote: > Dear Xianwei Zeng, > > In message <52c6d4120911150656w2edcf528oad05796e52b13...@mail.gmail.com> > you wrote: > > > > But I found I cann't uses these command to read files from a FAT > filesystem > > on NorFlash. I cann't format this partition to JFFS2 filesystem because > it > > is exported to Windows/Linux host via USB gadget after system boots up. > > > > Can someone tell me the best way to solve this problem, or give me some > > hints of which part of code I need to change? > > It seems you did not enable mtdparts support in your configuration? > > Yes. I didn‘t enable the mtdparts support. I will try it. Do I need to write extra driver, for example something I was doing, writing FAT + MTD support? I am reading the u-boot source code, but didn't get any hint about the FAT + MTD usage. -- Best Regards Xianwei ZENG Linux Fans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request - i2c [for next]
Hello Wolfgang, The following changes since commit 06f43286c6354aaab0103615e83893512f86eee7: Wolfgang Denk (1): Merge branch 'master' into next are available in the git repository at: git://git.denx.de/u-boot-i2c.git next Dirk Behme (1): OMAP2/3: I2C: Add support for second and third bus drivers/i2c/omap24xx_i2c.c | 166 +-- include/asm-arm/arch-omap24xx/i2c.h | 53 include/asm-arm/arch-omap3/i2c.h| 49 +++--- 3 files changed, 170 insertions(+), 98 deletions(-) -- 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
Re: [U-Boot] u-boot: How to read file from FAT filesystem on NorFlash MTD partition
Dear Xianwei Zeng, In message <52c6d4120911151729s61a250e0j1b0ec02b43191...@mail.gmail.com> you wrote: > > Yes. I didn't enable the mtdparts support. I will try it. > > Do I need to write extra driver, for example something I was doing, > writing FAT + MTD support? No, you don't need any special drivers. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Overdrawn? But I still have checks left! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] OMAP3: add CM-T35 board
Dear Wolfgang, Wolfgang Denk wrote: > Dear Mike Rapoport, > > In message <1258296430-19678-1-git-send-email-m...@compulab.co.il> you wrote: >> Add CM-T35 board support > ... >> MAINTAINERS |4 + >> MAKEALL |1 + >> Makefile |2 + >> board/cm-t35/Makefile| 47 +++ >> board/cm-t35/cm-t35.c| 190 + >> board/cm-t35/cm-t35.h| 173 ++ >> board/cm-t35/config.mk | 30 + >> doc/README.omap3 | 16 ++- >> include/configs/cm-t35.h | 299 >> ++ >> 9 files changed, 760 insertions(+), 2 deletions(-) >> create mode 100644 board/cm-t35/Makefile >> create mode 100644 board/cm-t35/cm-t35.c >> create mode 100644 board/cm-t35/cm-t35.h >> create mode 100644 board/cm-t35/config.mk >> create mode 100644 include/configs/cm-t35.h > > Would it be possible to rename this into cm_t35? I would like to avoid > characters in board names (and thus make targets etc. that are not > legal in shell/Make/C variable names. No problem. > Best regards, > > Wolfgang Denk > -- Sincerely yours, Mike. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH ARM] Add a unified s3c24x0 header file
Dear Kevin Morifitt, 2009/11/13 kevin.morf...@fearnside-systems.co.uk : > > > Minkyu Kang wrote: >> Dear Kevin Morifitt, >> >> 2009/11/13 kevin.morf...@fearnside-systems.co.uk >> : >>> Hi Minky >>> >>> >>> Minkyu Kang wrote: Dear Kevin Morfitt 2009/11/10 kevin.morf...@fearnside-systems.co.uk : > This patch adds a unified s3c24x0 cpu header file that selects the header > file for the specific s3c24x0 cpu from the SOC and CPU configs defined in > board config file. This removes the current chain of s3c24-type #ifdef's > from the s3c24x0 code. > > Signed-off-by: Kevin Morfitt > > > > #include > #include > -#include > +#include > #include patch failed at s3c2410_nand.c patching file drivers/mtd/nand/s3c2410_nand.c Hunk #1 FAILED at 26. 1 out of 1 hunk FAILED -- saving rejects to file drivers/mtd/nand/s3c2410_nand.c.rej please check it >>> This patch assumes that my previous patch, >>> [U-Boot] [PATCH ARM] Update the s3c2410 nand driver from linux-2.6.31.5 had >>> already been applied. >>> >>> Would you like me to re-base this one to the current u-boot-samsung, or wait >>> until you've looked at [U-Boot] [PATCH ARM] Update the s3c2410 nand driver >>> from linux-2.6.31.5? >> >> applied where? >> I couldn't find :( > > It's not been accepted yet, I submitted it on 5th November, see > http://lists.denx.de/pipermail/u-boot/2009-November/063866.html. please rebase it. > >> >>> Kevin >>> > #if defined(CONFIG_S3C2410_NAND_HWECC) && > defined(CONFIG_SYS_NAND_LARGEPAGE) > diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c > index 2d78f93..04de5ca 100644 > --- a/drivers/rtc/s3c24x0_rtc.c > +++ b/drivers/rtc/s3c24x0_rtc.c > @@ -30,11 +30,7 @@ > >> >> >> > Thanks Minkyu Kang -- from. prom. www.promsoft.net ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot