June 2012 - U-Boot

[U-Boot] ARM CONFIG_OF_CONTROL status
by Michal Simek 09 Jul '12

09 Jul '12

Hi, can you please update me about current state of CONFIG_OF_CONTROL for ARM? Are there any other archs/boards which will use this option? Or any other git repo out of mainline u-boot? Has someone tried to look for devices based on compatible property? I see that in usb driver it is based on aliases which is not the best solution. Thanks, Michal -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian

4 25

[U-Boot] [PATCH] fdt: send all dtc output to stderr
by Stephen Warren 09 Jul '12

09 Jul '12

From: Stephen Warren <swarren(a)nvidia.com> Commit 896bbb5 "fdt: avoid bad MAKEALL status" added logic to capture the result code from dtc by echoing $? to stdout and capturing it using $(). However, dtc emits some diagnostics to stderr and some to stdout. The diagnostics send to stdout ended up getting captured via $() rather than being echo'd to the user. This caused those diagnostics to be passed to the exit command, which would then fail with the following cryptic error message: /bin/sh: line 1: exit: too many arguments Solve this by redirecting all dtc output to stderr so that $() does not capture it. This allows the user to see the actual error message from dtc. Cc: Wolfgang Denk <wd(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: albert.u.boot(a)aribaud.net Cc: Tom Warren <twarren(a)nvidia.com> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- dts/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dts/Makefile b/dts/Makefile index 914e479..402dfe1 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -51,7 +51,7 @@ $(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts { { $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} - 2>&1 ; \ echo $$? >&3 ; } | \ grep -v '^DTC: dts->dtb on file' ; \ - } 3>&1 ) ; \ + } 3>&1 1>&2 ) ; \ exit $$rc process_lds = \ -- 1.7.0.4

3 2

[U-Boot] [PATCH v9 0/4] Kirkwood: add lschlv2 and lsxhl board support
by Michael Walle 08 Jul '12

08 Jul '12

Changes: v9: - rebase to marvell custodian tree, merged with wolfgangs master v8: - revert CONFIG_RAND to old CONFIG_RANDOM_MACADDR - the features CONFIG_BOOTP_RANDOM_DELAY and CONFIG_CMD_LINK_LOCAL pulls rand.o implicitly now as suggested by Joe Hershberger - remove reset_phy() from board code. Thanks Luka Perkov for pointing this out - dont derive the seed from the timer in seed_mac() v7: - rebase to new master - new function rand_r() - lib/rand.c is now selected by CONFIG_RAND, because it is used by three features (CONFIG_BOOTP_RANDOM_DELAY, CONFIG_RANDOM_MACADDR and CONFIG_CMD_LINK_LOCAL) - new patch: use the common rand() functions as a replacement for net_rand.c. This will fix the confliction function declarations, too. v6: - remove dead code in Makefile - use eth_{g,s}etenv_enetaddr() instead of eth_{g,s}etenv_enetaddr_by_index() since index is always 0 v5: - combine patchset again. the "net: *" patches should be individually acked by net custodian - make features configurable at compile time (CONFIG_RANDOM_MACADDR and CONFIG_SETENV_ENETADDR_BY_INDEX) - remove unused variable in boards/buffalo/lsxl.c - fix potential compiler warning "too many arguments for format" - new patch which fixes eth_getenv_enetaddr_by_index() and eth_mac_skip() - change initial seed of rand() to 1 - enable CONFIG_API and CONFIG_CMD_ELF for lsxl boards v4: - typo fixes (thanks Mike) - seed all 46bits of the generated ethernet address (suggested by Mike) - split patchset (generic net helpers and lsxl support) - fix typo in bootcmd_hdd - removed board/buffalo/lsxl/config.mk patch from patchset v3: - add "Kirkwood:" prefix to patch subject - moved board/buffalo/lsxl/config.mk to an own patch, so it can be separately acked/naked ;) - removed any hardcoding, that is the mac address is now automatically generated (random, locally administered) and the IP settings are fetched with DHCP/BOOTP. - add detailed comments to every configuration line in kwbimage.cfg - add comments in MPP configuration about GPIO usage - removed lschlv2 ramboot - use short board ident string - small cleanups v2: - add to buffalo vendor directory instead of Marvell - add both boards to MAINTAINERS - don't define values for feature macros - use tab for vertical alignment - remove static network configuration, instead introduce a rescue mode - add some convenience scripts - small cleanups Michael Walle (4): lib: add rand() function net: use common rand()/srand() functions net: add helper to generate random mac address Kirkwood: add lschlv2 and lsxhl board support MAINTAINERS | 5 + board/buffalo/lsxl/Makefile | 44 +++++ board/buffalo/lsxl/kwbimage-lschl.cfg | 229 ++++++++++++++++++++++++++ board/buffalo/lsxl/kwbimage-lsxhl.cfg | 229 ++++++++++++++++++++++++++ board/buffalo/lsxl/lsxl.c | 283 +++++++++++++++++++++++++++++++++ board/buffalo/lsxl/lsxl.h | 75 +++++++++ boards.cfg | 2 + include/common.h | 10 ++ include/configs/lsxl.h | 182 +++++++++++++++++++++ include/net.h | 17 ++ lib/Makefile | 5 +- lib/rand.c | 48 ++++++ net/Makefile | 2 - net/eth.c | 22 +++ net/link_local.c | 7 +- net/net_rand.c | 68 -------- net/net_rand.h | 31 +++- 17 files changed, 1178 insertions(+), 81 deletions(-) create mode 100644 board/buffalo/lsxl/Makefile create mode 100644 board/buffalo/lsxl/kwbimage-lschl.cfg create mode 100644 board/buffalo/lsxl/kwbimage-lsxhl.cfg create mode 100644 board/buffalo/lsxl/lsxl.c create mode 100644 board/buffalo/lsxl/lsxl.h create mode 100644 include/configs/lsxl.h create mode 100644 lib/rand.c delete mode 100644 net/net_rand.c -- 1.7.2.5

4 15

[U-Boot] [PATCH v8 0/4] Kirkwood: add lschlv2 and lsxhl board support
by Michael Walle 08 Jul '12

08 Jul '12

Changes: v8: - revert CONFIG_RAND to old CONFIG_RANDOM_MACADDR - the features CONFIG_BOOTP_RANDOM_DELAY and CONFIG_CMD_LINK_LOCAL pulls rand.o implicitly now as suggested by Joe Hershberger - remove reset_phy() from board code. Thanks Luka Perkov for pointing this out - dont derive the seed from the timer in seed_mac() v7: - rebase to new master - new function rand_r() - lib/rand.c is now selected by CONFIG_RAND, because it is used by three features (CONFIG_BOOTP_RANDOM_DELAY, CONFIG_RANDOM_MACADDR and CONFIG_CMD_LINK_LOCAL) - new patch: use the common rand() functions as a replacement for net_rand.c. This will fix the confliction function declarations, too. v6: - remove dead code in Makefile - use eth_{g,s}etenv_enetaddr() instead of eth_{g,s}etenv_enetaddr_by_index() since index is always 0 v5: - combine patchset again. the "net: *" patches should be individually acked by net custodian - make features configurable at compile time (CONFIG_RANDOM_MACADDR and CONFIG_SETENV_ENETADDR_BY_INDEX) - remove unused variable in boards/buffalo/lsxl.c - fix potential compiler warning "too many arguments for format" - new patch which fixes eth_getenv_enetaddr_by_index() and eth_mac_skip() - change initial seed of rand() to 1 - enable CONFIG_API and CONFIG_CMD_ELF for lsxl boards v4: - typo fixes (thanks Mike) - seed all 46bits of the generated ethernet address (suggested by Mike) - split patchset (generic net helpers and lsxl support) - fix typo in bootcmd_hdd - removed board/buffalo/lsxl/config.mk patch from patchset v3: - add "Kirkwood:" prefix to patch subject - moved board/buffalo/lsxl/config.mk to an own patch, so it can be separately acked/naked ;) - removed any hardcoding, that is the mac address is now automatically generated (random, locally administered) and the IP settings are fetched with DHCP/BOOTP. - add detailed comments to every configuration line in kwbimage.cfg - add comments in MPP configuration about GPIO usage - removed lschlv2 ramboot - use short board ident string - small cleanups v2: - add to buffalo vendor directory instead of Marvell - add both boards to MAINTAINERS - don't define values for feature macros - use tab for vertical alignment - remove static network configuration, instead introduce a rescue mode - add some convenience scripts - small cleanups Michael Walle (4): lib: add rand() function net: use common rand()/srand() functions net: add helper to generate random mac address Kirkwood: add lschlv2 and lsxhl board support MAINTAINERS | 5 + board/buffalo/lsxl/Makefile | 44 +++++ board/buffalo/lsxl/kwbimage-lschl.cfg | 229 ++++++++++++++++++++++++++ board/buffalo/lsxl/kwbimage-lsxhl.cfg | 229 ++++++++++++++++++++++++++ board/buffalo/lsxl/lsxl.c | 283 +++++++++++++++++++++++++++++++++ board/buffalo/lsxl/lsxl.h | 75 +++++++++ boards.cfg | 2 + include/common.h | 10 ++ include/configs/lsxl.h | 182 +++++++++++++++++++++ include/net.h | 17 ++ lib/Makefile | 5 +- lib/rand.c | 48 ++++++ net/Makefile | 2 - net/eth.c | 22 +++ net/link_local.c | 7 +- net/net_rand.c | 68 -------- net/net_rand.h | 31 +++- 17 files changed, 1178 insertions(+), 81 deletions(-) create mode 100644 board/buffalo/lsxl/Makefile create mode 100644 board/buffalo/lsxl/kwbimage-lschl.cfg create mode 100644 board/buffalo/lsxl/kwbimage-lsxhl.cfg create mode 100644 board/buffalo/lsxl/lsxl.c create mode 100644 board/buffalo/lsxl/lsxl.h create mode 100644 include/configs/lsxl.h create mode 100644 lib/rand.c delete mode 100644 net/net_rand.c -- 1.7.2.5

5 14

[U-Boot] [PATCH] Remove remaining mdelay() macros
by Anatolij Gustschin 08 Jul '12

08 Jul '12

Drop mdelay() macros since we already have a common mdelay() func. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- drivers/block/sata_sil.c | 1 - drivers/video/da8xx-fb.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/block/sata_sil.c b/drivers/block/sata_sil.c index 5e7ef5e..fb7cd2a 100644 --- a/drivers/block/sata_sil.c +++ b/drivers/block/sata_sil.c @@ -30,7 +30,6 @@ /* Convert sectorsize to wordsize */ #define ATA_SECTOR_WORDS (ATA_SECT_SIZE/2) -#define mdelay(n) udelay((n)*1000) #define virt_to_bus(devno, v) pci_virt_to_mem(devno, (void *) (v)) static struct sata_info sata_info; diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index a2981b1..30c19b3 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -121,7 +121,6 @@ struct da8xx_lcd_regs { #define LOWER_MARGIN 32 #define calc_fbsize() (panel.plnSizeX * panel.plnSizeY * panel.gdfBytesPP) -#define mdelay(n) ({unsigned long msec = (n); while (msec--) udelay(1000); }) static struct da8xx_lcd_regs *da8xx_fb_reg_base; -- 1.7.7.6

3 3

[U-Boot] [PATCH 1/5] [PATCH 1/5] Add missing constant to mx27
by Philippe Reynes 07 Jul '12

07 Jul '12

Signed-off-by: Philippe Reynes <tremyfr(a)yahoo.fr> Signed-off-by: Eric Jarrige <eric.jarrige(a)armadeus.org> --- arch/arm/cpu/arm926ejs/mx27/asm-offsets.c | 34 ++++++++++++ arch/arm/include/asm/arch-mx27/imx-regs.h | 11 ++++- arch/arm/include/asm/arch-mx27/mxc_nand.h | 83 +++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 1 deletions(-) create mode 100644 arch/arm/include/asm/arch-mx27/mxc_nand.h diff --git a/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c b/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c index f3a8d7b..b95c58c 100644 --- a/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c +++ b/arch/arm/cpu/arm926ejs/mx27/asm-offsets.c @@ -34,6 +34,7 @@ int main(void) DEFINE(PCDR1, IMX_PLL_BASE + offsetof(struct pll_regs, pcdr1)); DEFINE(PCCR0, IMX_PLL_BASE + offsetof(struct pll_regs, pccr0)); DEFINE(PCCR1, IMX_PLL_BASE + offsetof(struct pll_regs, pccr1)); + DEFINE(CCSR, IMX_PLL_BASE + offsetof(struct pll_regs, ccsr)); DEFINE(ESDCTL0_ROF, offsetof(struct esdramc_regs, esdctl0)); DEFINE(ESDCFG0_ROF, offsetof(struct esdramc_regs, esdcfg0)); @@ -41,5 +42,38 @@ int main(void) DEFINE(ESDCFG1_ROF, offsetof(struct esdramc_regs, esdcfg1)); DEFINE(ESDMISC_ROF, offsetof(struct esdramc_regs, esdmisc)); + DEFINE(GPCR, IMX_SYSTEM_CTL_BASE + + offsetof(struct system_control_regs, gpcr)); + DEFINE(FMCR, IMX_SYSTEM_CTL_BASE + + offsetof(struct system_control_regs, fmcr)); + DEFINE(DSCR2, IMX_SYSTEM_CTL_BASE + + offsetof(struct system_control_regs, dscr2)); + DEFINE(DSCR3, IMX_SYSTEM_CTL_BASE + + offsetof(struct system_control_regs, dscr3)); + DEFINE(DSCR7, IMX_SYSTEM_CTL_BASE + + offsetof(struct system_control_regs, dscr7)); + DEFINE(DSCR10, IMX_SYSTEM_CTL_BASE + + offsetof(struct system_control_regs, dscr10)); + + DEFINE(CS0U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs0u)); + DEFINE(CS0L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs0l)); + DEFINE(CS0A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs0a)); + DEFINE(CS1U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs1u)); + DEFINE(CS1L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs1l)); + DEFINE(CS1A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs1a)); + DEFINE(CS2U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs2u)); + DEFINE(CS2L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs2l)); + DEFINE(CS2A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs2a)); + DEFINE(CS3U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs3u)); + DEFINE(CS3L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs3l)); + DEFINE(CS3A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs3a)); + DEFINE(CS4U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs4u)); + DEFINE(CS4L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs4l)); + DEFINE(CS4A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs4a)); + DEFINE(CS5U, IMX_WEIM_BASE + offsetof(struct weim_regs, cs5u)); + DEFINE(CS5L, IMX_WEIM_BASE + offsetof(struct weim_regs, cs5l)); + DEFINE(CS5A, IMX_WEIM_BASE + offsetof(struct weim_regs, cs5a)); + DEFINE(EIM, IMX_WEIM_BASE + offsetof(struct weim_regs, eim)); + return 0; } diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h index ced5b2a..fe2861e 100644 --- a/arch/arm/include/asm/arch-mx27/imx-regs.h +++ b/arch/arm/include/asm/arch-mx27/imx-regs.h @@ -206,7 +206,7 @@ struct iim_regs { struct fuse_bank { u32 fuse_regs[0x20]; u32 fuse_rsvd[0xe0]; - } bank[1]; + } bank[2]; }; struct fuse_bank0_regs { @@ -522,4 +522,13 @@ struct fuse_bank0_regs { #define IIM_ERR_SNSE (1 << 2) #define IIM_ERR_PARITYE (1 << 1) +/* + * Memory areas of the NFC + */ +#define IMX_NFC_BASE (0xD8000000) +#define IMX_NFC_MAIN_AREA0 (0xD8000000) +#define IMX_NFC_MAIN_AREA1 (0xD8000200) +#define IMX_NFC_SPARE_AREA0 (0xD8000800) +#define IMX_NFC_REGS (0xD8000E00) + #endif /* _IMX_REGS_H */ diff --git a/arch/arm/include/asm/arch-mx27/mxc_nand.h b/arch/arm/include/asm/arch-mx27/mxc_nand.h new file mode 100644 index 0000000..3429601 --- /dev/null +++ b/arch/arm/include/asm/arch-mx27/mxc_nand.h @@ -0,0 +1,83 @@ +/* + * (c) 2012 Philippe Reynes <tremyfr(a)yahoo.fr> + * + * 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 + */ + +#ifndef __MXC_NAND_H +#define __MXC_NAND_H + +/* + * NFC registers address offest + */ +#define NFC_OFFSET_BUFSIZE (0x00) /* Internal SRAM Size */ +#define NFC_OFFSET_BLCK_ADD_LOCK (0x02) /* NAND Flash Block Address for + Lock Check */ +#define NFC_OFFSET_BUF_ADDR (0x04) /* Buffer Number for Page Data + Transfer To/From Flash Mem */ +#define NFC_OFFSET_FLASH_ADDR (0x06) /* NAND Flash Address */ +#define NFC_OFFSET_FLASH_CMD (0x08) /* NAND Flash Command */ +#define NFC_OFFSET_CONFIG (0x0A) /* NFC Internal Buffer Lock + Control */ +#define NFC_OFFSET_ECC_STATUS_RESULT (0x0C) /* Controller Status/Result of + Flash Operation */ +#define NFC_OFFSET_ECC_RSLT_MAIN_AREA (0x0E) /* ECC Error Position of Main + Area Data Error */ +#define NFC_OFFSET_ECC_RSLT_SPARE_AREA (0x10) /* ECC Error Position of Spare + Area Data Error */ +#define NFC_OFFSET_WRPROT (0x12) /* Nand Flash Write Protection */ +#define NFC_OFFSET_UNLOCKSTART_BLKADDR (0x14) /* Start Address for Write + Protection Unlock */ +#define NFC_OFFSET_UNLOCKEND_BLKADDR (0x16) /* End Address for Write + Protection Unlock */ +#define NFC_OFFSET_WRPR_STAT (0x18) /* Current Nand Flash Write + Protection Status */ +#define NFC_OFFSET_CONFIG1 (0x1A) /* Nand Flash Operation + Configuration 1 */ +#define NFC_OFFSET_CONFIG2 (0x1C) /* Nand Flash Operation + Configuration 2 */ + +/* NFC_ECC_STATUS_RESULT Status Register Bit Fields */ +#define NFC_ECC_STAT_ERM_SHFT (2) /* ERM shift */ +#define NFC_ECC_STAT_ERS_MASK (0x03) /* ERS mask */ +#define NFC_ECC_STAT_ERROR1 (1<<0) /* correctable error */ +#define NFC_ECC_STAT_ERROR2 (1<<1) /* non correctable error */ + +/* NFC_CONFIG Control Register Bit Fields */ +#define NFC_CONFIG_UNLOCKED (1<<1) /* unlocked */ +#define NFC_CONFIG_LOCKED (1<<0) /* locked */ + +/* NFC_CONFIG1 Control Register Bit Fields */ +#define NFC_CONFIG1_CEn (1<<7) /* Flash force CE */ +#define NFC_CONFIG1_RST (1<<6) /* Reset */ +#define NFC_CONFIG1_BIG (1<<5) /* Big Endian Mode */ +#define NFC_CONFIG1_INT_MSK (1<<4) /* Mask Interrupt Bit */ +#define NFC_CONFIG1_ECC_EN (1<<3) /* ECC operation enable */ +#define NFC_CONFIG1_SP_EN (1<<2) /* Flash spare enable */ + +/* NFC_CONFIG2 Control Register Bit Fields */ +#define NFC_CONFIG2_INT (1<<15) /* Interrupt */ +#define NFC_CONFIG2_FDO_STATUS (4<<3) /* Flash status output */ +#define NFC_CONFIG2_FDO_ID (2<<3) /* Flash ID output */ +#define NFC_CONFIG2_FDO_PAGE (1<<3) /* Flash data output */ +#define NFC_CONFIG2_FDI (1<<2) /* Flash data input */ +#define NFC_CONFIG2_FADD (1<<1) /* Flash address input */ +#define NFC_CONFIG2_FCMD (1<<0) /* Flash command input */ + +#endif -- 1.7.4.4

5 11

[U-Boot] [PATCH] mx28: Fix elftosb source link in README.mx28_common
by Anatolij Gustschin 07 Jul '12

07 Jul '12

The documented link to elftosb package tarball is not accessible, change to another working link. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> Cc: Otavio Salvador <otavio(a)ossystems.com.br> Cc: Marek Vasut <marek.vasut(a)gmail.com> Cc: Fabio Estevam <festevam(a)gmail.com> --- doc/README.mx28_common | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/README.mx28_common b/doc/README.mx28_common index 448d221..fab0e32 100644 --- a/doc/README.mx28_common +++ b/doc/README.mx28_common @@ -29,14 +29,14 @@ is the "mxsboot" tool found in U-Boot source tree. Firstly, obtain the elftosb archive from the following location: - http://foss.doredevelopment.dk/mirrors/imx/elftosb-10.12.01.tar.gz + http://repository.timesys.com/buildsources/e/elftosb/elftosb-10.12.01/elfto… We use a $VER variable here to denote the current version. At the time of writing of this document, that is "10.12.01". To obtain the file from command line, use: $ VER="10.12.01" - $ wget http://foss.doredevelopment.dk/mirrors/imx/elftosb-${VER}.tar.gz + $ wget http://repository.timesys.com/buildsources/e/elftosb/elftosb-${VER}/elftosb… Extract the file: -- 1.7.1

6 10

[U-Boot] [PATCH v3] doc: README.mx28_common: Add missing entry into Contents
by Fabio Estevam 07 Jul '12

07 Jul '12

commit 419ea2d84 (mx28: Split the README into a common part and a m28 specific part) missed an entry in the Contents section that was part of the original file. Add the missing entry for completeness. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v2: - Use 'into NAND' also in the middle of text rather than only in the Content section Change since v1: - Fix completion->completeness , for->into doc/README.mx28_common | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/README.mx28_common b/doc/README.mx28_common index 448d221..f73978d 100644 --- a/doc/README.mx28_common +++ b/doc/README.mx28_common @@ -19,6 +19,7 @@ Contents 1) Prerequisites 2) Compiling U-Boot for a MX28 based board 3) Installation of U-Boot for a MX28 based board to SD card +4) Installation of U-Boot into NAND flash 1) Prerequisites ---------------- @@ -146,8 +147,8 @@ NOTE: If the user needs to adjust the start sector, the "mxsboot" tool contains a "-p" switch for that purpose. The "-p" switch takes the sector number as an argument. -4) Installation of U-Boot for NAND flash ------------------------------------------------ +4) Installation of U-Boot into NAND flash +----------------------------------------- To boot a MX28 based board from NAND, set the boot mode DIP switches according to i.MX28 manual chapter 12.2.1 (Table 12-2), PORT=GPMI, NAND 1.8 V. -- 1.7.1

4 3

[U-Boot] [PATCH 1/5] ARM: cache: Move the cp15 CR register read before flushing the cache.
by R Sricharan 07 Jul '12

07 Jul '12

The following is the cleanup sequence in arch/arm/cpu/armv7/cpu.c int cleanup_before_linux(void) { ... ... dcache_disable(); v7_outer_cache_disable(); invalidate_dcache_all(); } 1) invalidate_dcache_all call expects that all the caches has been flushed, invalidated and there are no dirty entries prior to its execution. In the above sequence dcache_disable() flushes, invalidates the caches and turns off the mmu. But after it cleanups the cache and before the mmu is disabled there is a cp_delay() function which has STR instruction. On certain cores like the cortex-a15, cache hit and a write can happen to a cache line even when the dcache is disabled. So the above mentioned STR instruction creates a dirty entry after cleaning. The mmu gets disabled after this. 2) invalidate_dcache_all invalidates the cache lines. Again on cores like cortex-a15, invalidate instruction flushes the dirty line as well. So some times the dirty line from sequence 1 can corrupt the memory resulting in a crash. Fixing this by moving the get_cr() and cp_delay() calls before cleaning up the cache, thus avoiding the dirty entry. Signed-off-by: R Sricharan <r.sricharan(a)ti.com> --- arch/arm/lib/cache-cp15.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index e6c3eae..939de10 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -115,17 +115,17 @@ static void cache_disable(uint32_t cache_bit) { uint32_t reg; + reg = get_cr(); + cp_delay(); + if (cache_bit == CR_C) { /* if cache isn;t enabled no need to disable */ - reg = get_cr(); if ((reg & CR_C) != CR_C) return; /* if disabling data cache, disable mmu too */ cache_bit |= CR_M; flush_dcache_all(); } - reg = get_cr(); - cp_delay(); set_cr(reg & ~cache_bit); } #endif -- 1.7.1

5 5

[U-Boot] [PATCH 1/2] ARM: introduce arch_early_init_r()
by Fabio Estevam 07 Jul '12

07 Jul '12

Introduce arch_early_init_r() function, which can be useful for doing early initialization after relocation has happened. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- arch/arm/include/asm/u-boot-arm.h | 1 + arch/arm/lib/board.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index 4ca75f9..9f3cae5 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -52,6 +52,7 @@ void cpu_init_cp15(void); /* cpu/.../arch/cpu.c */ int arch_cpu_init(void); int arch_misc_init(void); +int arch_early_init_r(void); /* board/.../... */ int board_init(void); diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 5270c11..025d6ca 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -500,6 +500,10 @@ void board_init_r(gd_t *id, ulong dest_addr) malloc_start = dest_addr - TOTAL_MALLOC_LEN; mem_malloc_init (malloc_start, TOTAL_MALLOC_LEN); +#ifdef CONFIG_ARCH_EARLY_INIT_R + arch_early_init_r(); +#endif + #if !defined(CONFIG_SYS_NO_FLASH) puts("Flash: "); -- 1.7.1

7 12