Re: [U-Boot] [PATCH v1 2/2] fsl_sata: Move the snoop bit to another place
On Apr 10, 2010, at 4:12 PM, Wolfgang Denk wrote: Dear Kumar Gala, In message 8eed58c1-227e-441b-8b2e-7bfee809c...@kernel.crashing.org you wrote: On Apr 8, 2010, at 6:32 PM, Dave Liu wrote: For P1022 SATA host controller, the data snoop bit of DW3 in PRDT is moved to bit28. Signed-off-by: Dave Liu dave...@freescale.com --- * address Kumar's comments drivers/block/fsl_sata.h |4 1 files changed, 4 insertions(+), 0 deletions(-) applied to 85xx NAK. Please allow at least for a few days of reviewing. Best regards, Wolfgang Denk dropped, Dave please fix up. - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Moving i2c_board_init to after i2c_init operations
Hello Richard, Richard Retanubun wrote: I am trying to do something similar to what you did in this commit: http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=commit;h=39df00d9aecfb465b9eec9af593f9b763fb5209a and I have a question, must i2c_board_init for fsl_i2c.c be called before the actual controller initialization? (i.e. setting the bus speed and the controller's slave address) if we call it at the end of i2c_init, we can take advantage of the setups done before, no? Yes, you are right. Most of the other implementation does it in the beginning because they can change the i2c pins to GPIO and 'bit-bang' the reset pattern, and then change it back to i2c pins. Yep. The alternative is of course to assume nothing in i2c_board_init, and configure everything (I kinda liked to use set_i2c_bus_speed, rather than hardcoding something). Since the kmeter1 board is the only user of i2c_board_init in fsl_i2c.c, would you be opposed if I submit a patch that moves the call for i2c_board_init to the end of i2c_init? No, this is OK, and looks cleaner to me. Thanks! 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
Re: [U-Boot] [PATCH V5 1/3] Initial support for Marvell Orion5x SoC
-Original Message- From: Wolfgang Denk [mailto:w...@denx.de] Sent: Sunday, April 11, 2010 2:40 AM To: Albert ARIBAUD Cc: Prafulla Wadaskar; U-Boot@lists.denx.de Subject: Re: [U-Boot] [PATCH V5 1/3] Initial support for Marvell Orion5x SoC Dear Albert ARIBAUD, In message 4bbeba42.7070...@free.fr you wrote: Also pls remove Marvell GPL statement I'd kept the notice as this file is a split from, and major part of, the original single lowlevel_init.S which is indeed (c) Marvell; if you feel I can remove the reference to Marvell, that's fine with me. But then, I should remove it also from board/LaCie/edminiv2/board_lowlevel_init.S, should I not? This is not a question if we feel that you can remove this note. These are legal terms, and _you_ must verify if you are permitted to change the licensing terms in any way. I am not a lawyer, but in the curent case you probably have to check with Marvell's legal department if they give permission to re-license this code under GPLv2 and later. Dear Wolfgang I have already raised fresh/new request for legal permission to re-license this code, I am expecting reply soon. Once I get feedback I will flag it. Regards.. Prafulla . . 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 Don't you know anything? I should have thought anyone knows that who knows anything about anything... - Terry Pratchett, _Soul Music_ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 2/2] fsl_sata: Move the snoop bit to another place
For P1022 SATA host controller, the data snoop bit of DW3 in PRDT
is moved to bit28.
Signed-off-by: Dave Liu dave...@freescale.com
---
* address Wolfgang's comments
drivers/block/fsl_sata.h |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/block/fsl_sata.h b/drivers/block/fsl_sata.h
index 18e88fa..576efaf 100644
--- a/drivers/block/fsl_sata.h
+++ b/drivers/block/fsl_sata.h
@@ -243,8 +243,12 @@ typedef struct prd_entry {
/* ext_c_ddc
*/
-#define PRD_ENTRY_EXT 0x8000 /* extension flag or called indirect
descriptor flag */
-#define PRD_ENTRY_DATA_SNOOP 0x0040 /* Snoop enable for all data
associated with the PRD entry */
+#define PRD_ENTRY_EXT 0x8000 /* extension flag */
+#ifdef CONFIG_FSL_SATA_V2
+#define PRD_ENTRY_DATA_SNOOP 0x1000 /* Data snoop enable */
+#else
+#define PRD_ENTRY_DATA_SNOOP 0x0040 /* Data snoop enable */
+#endif
#define PRD_ENTRY_LEN_MASK 0x003f /* Data word count */
#define PRD_ENTRY_MAX_XFER_SZ (PRD_ENTRY_LEN_MASK + 1)
--
1.6.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 1/2] fsl_sata: Add the workaround for errata SATA-A001
After power on, the SATA host controller of P1022 Rev1 is configured
in legacy mode instead of the expected enterprise mode.
Software needs to clear bit[28] of HControl register to change to
enterprise mode after bringing the host offline.
Signed-off-by: Dave Liu dave...@freescale.com
---
* address Wolfgang's comments
drivers/block/fsl_sata.c | 22 ++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c
index abcda6f..8878560 100644
--- a/drivers/block/fsl_sata.c
+++ b/drivers/block/fsl_sata.c
@@ -21,6 +21,7 @@
#include common.h
#include command.h
#include asm/io.h
+#include asm/processor.h
#include malloc.h
#include libata.h
#include fis.h
@@ -191,6 +192,27 @@ int init_sata(int dev)
/* Wait the controller offline */
ata_wait_register(reg-hstatus, HSTATUS_ONOFF, 0, 1000);
+#if defined(CONFIG_FSL_SATA_V2) defined(CONFIG_FSL_SATA_ERRATUM_A001)
+ /*
+* For P1022/1013 Rev1.0 silicon, after power on SATA host
+* controller is configured in legacy mode instead of the
+* expected enterprise mode. software needs to clear bit[28]
+* of HControl register to change to enterprise mode from
+* legacy mode.
+*/
+ {
+ u32 svr = get_svr();
+ if (IS_SVR_REV(svr, 1, 0)
+ ((SVR_SOC_VER(svr) == SVR_P1022) ||
+(SVR_SOC_VER(svr) == SVR_P1022_E) ||
+(SVR_SOC_VER(svr) == SVR_P1013) ||
+(SVR_SOC_VER(svr) == SVR_P1013_E))) {
+ out_le32(reg-hstatus, 0x2000);
+ out_le32(reg-hcontrol, 0x0100);
+ }
+ }
+#endif
+
/* Set the command header base address to CHBA register to tell DMA */
out_le32(reg-chba, (u32)cmd_hdr ~0x3);
--
1.6.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/4] Keymile rework headerfiles and support for 3 new 83xx based boards
This series reorganizes the headerfiles for the boards
manufactured by keymile, and based on this reorganization
3 new 83xx boards from keymile.
The following changes since commit fd4e49c18901a50b1648235f26da1e8caa0f8764:
Wolfgang Denk (1):
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Heiko Schocher (4):
keymile: rework headerfiles for keymile boards
mpc832x: add support for the mpc8321 based suvd3 board
mpc832x: add support for mpc8321 based tuxa1 board
mpc832x: add support for mpc8321 based tuda1 board
MAINTAINERS|3 +
MAKEALL|3 +
Makefile |9 +-
board/keymile/common/common.c |4 +-
board/keymile/{kmeter1 = km83xx}/Makefile |0
board/keymile/{kmeter1 = km83xx}/config.mk|0
.../keymile/{kmeter1/kmeter1.c = km83xx/km83xx.c} | 86 +++-
cpu/mpc83xx/cpu.c |2 +-
cpu/mpc83xx/fdt.c |3 +-
include/configs/keymile-common.h | 577
include/configs/km83xx-common.h| 348
include/configs/km8xx.h| 35 +-
include/configs/km_arm.h |2 -
include/configs/kmeter1.h | 342 +---
include/configs/mgcoge.h | 35 +-
include/configs/suvd3.h| 216
include/configs/tuda1.h| 250 +
include/configs/tuxa1.h| 235
18 files changed, 1655 insertions(+), 495 deletions(-)
rename board/keymile/{kmeter1 = km83xx}/Makefile (100%)
rename board/keymile/{kmeter1 = km83xx}/config.mk (100%)
rename board/keymile/{kmeter1/kmeter1.c = km83xx/km83xx.c} (67%)
create mode 100644 include/configs/km83xx-common.h
create mode 100644 include/configs/suvd3.h
create mode 100644 include/configs/tuda1.h
create mode 100644 include/configs/tuxa1.h
--
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 1/4] keymile: rework headerfiles for keymile boards
- This patch reworks all headerfiles for keymile boards (coge, supx4,
eter1, suen3).
Furthermore, a refactoring on the whole environment variables has been
acomplished.
- Environment variables:
- grouped into logical blocks (#defines) based on the functionality/purpose
- short description for most of the variables
- as much as possible is moved into the common headerfile
- Keep the kernel command line clean from KM 'specialities'.
The boardId and hwKey is no longer needed as kernel arguments.
They are stored in the U-Boot environment and read out from userspace
later with the help of fw_printenv or equivalent tools.
- km8xx: default environment partitioning corrected
- Check the board id and the HW key stored in the environment with the values
stored in IVM. Board id and hardware key are patched into the environment
when building a keymile bootpackage.
- introduces the variable initial_boot_bank to the default
environment. The actual_bank is set to this value on first
startup.
It is normally set to 0. So the behaviour is as before.
If set to != 0, the first actual_bank is set to this
value as well. Thus a bootpackage can define a boot
bank other than 0.
Signed-off-by: Andreas Huber andreas.hu...@keymile.com
Signed-off-by: Holger Brunck holger.bru...@keymile.com
Signed-off-by: Heiko Schocher h...@denx.de
---
include/configs/keymile-common.h | 577 ++
include/configs/km8xx.h | 35 ++--
include/configs/km_arm.h |2 -
include/configs/kmeter1.h| 40 ++--
include/configs/mgcoge.h | 35 ++--
5 files changed, 512 insertions(+), 177 deletions(-)
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index 729d1c0..e3585fc 100644
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -25,7 +25,7 @@
#define __CONFIG_KEYMILE_H
/* Do boardspecific init for all boards */
-#define CONFIG_BOARD_EARLY_INIT_R 1
+#define CONFIG_BOARD_EARLY_INIT_R 1
#define CONFIG_BOOTCOUNT_LIMIT
@@ -34,22 +34,115 @@
*/
#include config_cmd_default.h
+#ifndef CONFIG_MACH_SUEN3
+/**/
+/** PowerPC
***/
+/**/
+#define CONFIG_CMD_DTT
+#define CONFIG_JFFS2_CMDLINE
+
+#define CONFIG_ENV_SIZE0x04000 /* Size of Environment
*/
+#define CONFIG_FLASH_CFI_MTD
+
+#define CONFIG_SYS_MEMTEST_START 0x0010/* memtest works on */
+
+#define CONFIG_SYS_MEMTEST_END 0x00f0 /* 1 ... 15 MB in DRAM */
+
+#define CONFIG_SYS_LOAD_ADDR 0x10/* default load address */
+
+/* protected RAM */
+#define CONFIG_PRAM0 /* enable PRAM */
+/* pseudo-non volatile RAM [hex] */
+#define CONFIG_KM_PNVRAM 0x8
+/* physical RAM MTD size [hex] */
+#define CONFIG_KM_PHRAM0x10
+/* resereved pram area at the end of memroy [hex] */
+#define CONFIG_KM_RESERVED_PRAM0x0
+
+#define CONFIG_KM_CRAMFS_ADDR 0x80
+#define CONFIG_KM_KERNEL_ADDR 0x40/* 3968Kbytes */
+#define CONFIG_KM_FDT_ADDR 0x7E/* 128Kbytes */
+
+#define CONFIG_KM_DEF_ENV_CPU \
+ addbootcount=echo c\0 \
+ addmtdparts=echo c\0 \
+ boot=bootm ${actual_kernel_addr} - ${actual_fdt_addr}\0 \
+ cramfsloadfdt=\
+ cramfsload ${fdt_addr_r} \
+ fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb \
+ setenv actual_fdt_addr ${fdt_addr_r}\0\
+ fdt_addr_r= xstr(CONFIG_KM_FDT_ADDR) \0 \
+ fdt_file= \
+ xstr(CONFIG_HOSTNAME) / \
+ xstr(CONFIG_HOSTNAME) .dtb\0 \
+ tftpfdt= \
+ tftpboot ${fdt_addr_r} ${fdt_file} \
+ setenv actual_fdt_addr ${fdt_addr_r} \0 \
+ update= \
+ protect off xstr(BOOTFLASH_START) +${filesize} \
+ erase xstr(BOOTFLASH_START) +${filesize} \
+ cp.b ${u-boot_addr_r} xstr(BOOTFLASH_START) \
+ ${filesize} \
+ protect on xstr(BOOTFLASH_START) +${filesize}\0 \
+
+#else
+/**/
+/ ARM
[U-Boot] [PATCH 2/4] mpc832x: add support for the mpc8321 based suvd3 board
- serial console on UART1
- Ethernet RMII over UCC4
- PHY SMSC LAN8700
- 64MB Flash
- 128 MB DDR2 RAM
- I2C
- bootcount
This board is similiar to the kmeter1 (8360) board,
so common config options are extracted into the
include/configs/km83xx-common.h file.
Signed-off-by: Heiko Schocher h...@denx.de
---
MAINTAINERS|1 +
MAKEALL|1 +
Makefile |5 +-
board/keymile/common/common.c |4 +-
board/keymile/{kmeter1 = km83xx}/Makefile |0
board/keymile/{kmeter1 = km83xx}/config.mk|0
.../keymile/{kmeter1/kmeter1.c = km83xx/km83xx.c} | 86 -
cpu/mpc83xx/cpu.c |2 +-
cpu/mpc83xx/fdt.c |3 +-
include/configs/km83xx-common.h| 348
include/configs/kmeter1.h | 334 +--
include/configs/suvd3.h| 216
12 files changed, 666 insertions(+), 334 deletions(-)
rename board/keymile/{kmeter1 = km83xx}/Makefile (100%)
rename board/keymile/{kmeter1 = km83xx}/config.mk (100%)
rename board/keymile/{kmeter1/kmeter1.c = km83xx/km83xx.c} (67%)
create mode 100644 include/configs/km83xx-common.h
create mode 100644 include/configs/suvd3.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 04c8730..47ff4c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -412,6 +412,7 @@ Heiko Schocher h...@denx.de
municse MPC5200
sc3 PPC405GP
suen3 ARM926EJS (Kirkwood SoC)
+ suvd3 MPC8321
uc101 MPC5200
Peter De Schrijver p...@mind.be
diff --git a/MAKEALL b/MAKEALL
index fb1f7a3..9ae17c3 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -375,6 +375,7 @@ LIST_83xx= \
MVBLM7 \
sbc8349 \
SIMPC8313_LP\
+ suvd3 \
TQM834x \
vme8349 \
diff --git a/Makefile b/Makefile
index 5d314c6..38b0488 100644
--- a/Makefile
+++ b/Makefile
@@ -2229,7 +2229,7 @@ TASREG_config : unconfig
#
kmeter1_config: unconfig
- @$(MKCONFIG) kmeter1 ppc mpc83xx kmeter1 keymile
+ @$(MKCONFIG) kmeter1 ppc mpc83xx km83xx keymile
MPC8313ERDB_33_config \
MPC8313ERDB_66_config \
@@ -2388,6 +2388,9 @@ SIMPC8313_SP_config: unconfig
@$(MKCONFIG) -a SIMPC8313 ppc mpc83xx simpc8313 sheldon
@echo CONFIG_NAND_U_BOOT = y $(obj)include/config.mk
+suvd3_config: unconfig
+ @$(MKCONFIG) suvd3 ppc mpc83xx km83xx keymile
+
TQM834x_config:unconfig
@$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x tqc
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 7b4eefd..9325eee 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -424,7 +424,7 @@ static int get_scl (void)
}
#endif
-#if !defined(CONFIG_KMETER1)
+#if !defined(CONFIG_MPC83xx)
static void writeStartSeq (void)
{
set_sda (1);
@@ -483,7 +483,7 @@ static int i2c_make_abort (void)
*/
void i2c_init_board(void)
{
-#if defined(CONFIG_KMETER1)
+#if defined(CONFIG_MPC83xx)
struct fsl_i2c *dev;
dev = (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C_OFFSET);
uchar dummy;
diff --git a/board/keymile/kmeter1/Makefile b/board/keymile/km83xx/Makefile
similarity index 100%
rename from board/keymile/kmeter1/Makefile
rename to board/keymile/km83xx/Makefile
diff --git a/board/keymile/kmeter1/config.mk b/board/keymile/km83xx/config.mk
similarity index 100%
rename from board/keymile/kmeter1/config.mk
rename to board/keymile/km83xx/config.mk
diff --git a/board/keymile/kmeter1/kmeter1.c b/board/keymile/km83xx/km83xx.c
similarity index 67%
rename from board/keymile/kmeter1/kmeter1.c
rename to board/keymile/km83xx/km83xx.c
index bbcaf5d..d7e4f82 100644
--- a/board/keymile/kmeter1/kmeter1.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -11,6 +11,9 @@
* (C) Copyright 2008
* Heiko Schocher, DENX Software Engineering, h...@denx.de.
*
+ * (C) Copyright 2009
+ * Heiko Schocher, DENX Software Engineering, h...@denx.de.
+ *
* 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
@@ -34,7 +37,7 @@ extern void disable_addr_trans (void);
extern void enable_addr_trans (void);
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* port pin dir open_drain assign */
-
+#if defined(CONFIG_KMETER1)
/* MDIO */
{0, 1, 3, 0, 2}, /* MDIO */
{0, 2, 1, 0, 1}, /* MDC */
@@ -57,6 +60,40 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
{5, 2, 1, 0, 1}, /* UART2_RTS */
{5, 3, 2, 0, 2}, /* UART2_SIN */
{5, 1, 2, 0, 3}, /*
[U-Boot] [PATCH 3/4] mpc832x: add support for mpc8321 based tuxa1 board
This board is similar to suvd3 board. So most initialisation topics are taken from suvd3 (UART1, Ethernet, piggy PHY, flash, ram) only the application specific chip selects differ. Signed-off-by: Lukas Roggli lukas.rog...@keymile.com Signed-off-by: Holger Brunck holger.bru...@keymile.com Signed-off-by: Heiko Schocher h...@denx.de --- MAINTAINERS |1 + MAKEALL |1 + Makefile|3 + include/configs/tuxa1.h | 235 +++ 4 files changed, 240 insertions(+), 0 deletions(-) create mode 100644 include/configs/tuxa1.h diff --git a/MAINTAINERS b/MAINTAINERS index 47ff4c1..e2f2eb6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -413,6 +413,7 @@ Heiko Schocher h...@denx.de sc3 PPC405GP suen3 ARM926EJS (Kirkwood SoC) suvd3 MPC8321 + tuxa1 MPC8321 uc101 MPC5200 Peter De Schrijver p...@mind.be diff --git a/MAKEALL b/MAKEALL index 9ae17c3..db47b41 100755 --- a/MAKEALL +++ b/MAKEALL @@ -377,6 +377,7 @@ LIST_83xx= \ SIMPC8313_LP\ suvd3 \ TQM834x \ + tuxa1 \ vme8349 \ diff --git a/Makefile b/Makefile index 38b0488..40f411f 100644 --- a/Makefile +++ b/Makefile @@ -2394,6 +2394,9 @@ suvd3_config: unconfig TQM834x_config:unconfig @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x tqc +tuxa1_config: unconfig + @$(MKCONFIG) tuxa1 ppc mpc83xx km83xx keymile + caddy2_config \ vme8349_config:unconfig @$(MKCONFIG) -t $(@:_config=) vme8349 ppc mpc83xx vme8349 esd diff --git a/include/configs/tuxa1.h b/include/configs/tuxa1.h new file mode 100644 index 000..5d52496 --- /dev/null +++ b/include/configs/tuxa1.h @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2006 Freescale Semiconductor, Inc. + *Dave Liu dave...@freescale.com + * + * Copyright (C) 2007 Logic Product Development, Inc. + *Peter Barada pet...@logicpd.com + * + * Copyright (C) 2007 MontaVista Software, Inc. + *Anton Vorontsov avoront...@ru.mvista.com + * + * (C) Copyright 2008 + * Heiko Schocher, DENX Software Engineering, h...@denx.de. + * + * (C) Copyright 2010 + * Yan Bin, Lukas Roggli, KEYMILE Ltd, lukas.rog...@keymile.com + * + * 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. + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* + * High Level Configuration Options + */ +#define CONFIG_E3001 /* E300 family */ +#define CONFIG_QE 1 /* Has QE */ +#define CONFIG_MPC83xx 1 /* MPC83xx family */ +#define CONFIG_MPC832x 1 /* MPC832x CPU specific */ +#define CONFIG_TUXA1 1 /* TUXA1 board specific */ +#define CONFIG_HOSTNAMEtuxa1 +#define CONFIG_KM_BOARD_NAME tuxa1 + +#define CONFIG_KM_DEF_NETDEV \ + netdev=eth0\0 + +#define CONFIG_KM_DEF_ROOTPATH \ + rootpath=/opt/eldk/ppc_8xx\0 + +/* include common defines/options for all 83xx Keymile boards */ +#include km83xx-common.h + +#define CONFIG_MISC_INIT_R 1 + +/* + * System IO Config + */ +#define CONFIG_SYS_SICRH 0x0006 +#define CONFIG_SYS_SICRL SICRL_IRQ_CKS + +/* + * Hardware Reset Configuration Word + */ +#define CONFIG_SYS_HRCW_LOW (\ + HRCWL_LCL_BUS_TO_SCB_CLK_1X1 | \ + HRCWL_DDR_TO_SCB_CLK_2X1 | \ + HRCWL_CSB_TO_CLKIN_2X1 | \ + HRCWL_CORE_TO_CSB_2_5X1 | \ + HRCWL_CE_PLL_VCO_DIV_2 | \ + HRCWL_CE_TO_PLL_1X3 ) + +#define CONFIG_SYS_HRCW_HIGH (\ + HRCWH_PCI_AGENT | \ + HRCWH_PCI_ARBITER_DISABLE | \ + HRCWH_CORE_ENABLE | \ + HRCWH_FROM_0X0100 | \ + HRCWH_BOOTSEQ_DISABLE | \ + HRCWH_SW_WATCHDOG_DISABLE | \ + HRCWH_ROM_LOC_LOCAL_16BIT | \ + HRCWH_BIG_ENDIAN | \ + HRCWH_LALE_NORMAL ) + +#define CONFIG_SYS_DDR_CS0_BNDS0x007f +#define CONFIG_SYS_DDR_SDRAM_CFG (SDRAM_CFG_SDRAM_TYPE_DDR2 | \ + SDRAM_CFG_32_BE | \ + SDRAM_CFG_2T_EN | \ + SDRAM_CFG_SREN) +#define CONFIG_SYS_DDR_SDRAM_CFG2 0x00401000 +#define CONFIG_SYS_DDR_CLK_CNTL(DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05) +#define CONFIG_SYS_DDR_INTERVAL((0x064 SDRAM_INTERVAL_BSTOPRE_SHIFT) | \ +(0x200 SDRAM_INTERVAL_REFINT_SHIFT)) + +#define CONFIG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN | CSCONFIG_AP | \ + CSCONFIG_ODT_WR_CFG | \ + CSCONFIG_ROW_BIT_13 | \ + CSCONFIG_COL_BIT_10) + +#define CONFIG_SYS_DDR_MODE
[U-Boot] [PATCH 4/4] mpc832x: add support for mpc8321 based tuda1 board
This board is similar to suvd3 board. So most initialisation topics are taken from suvd3 (UART1, Ethernet, piggy PHY, flash, ram) only the application specific chip selects differ. Signed-off-by: Lukas Roggli lukas.rog...@keymile.com Signed-off-by: Holger Brunck holger.bru...@keymile.com Signed-off-by: Heiko Schocher h...@denx.de --- MAINTAINERS |1 + MAKEALL |1 + Makefile|3 +- include/configs/tuda1.h | 250 +++ 4 files changed, 254 insertions(+), 1 deletions(-) create mode 100644 include/configs/tuda1.h diff --git a/MAINTAINERS b/MAINTAINERS index e2f2eb6..91b79b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -413,6 +413,7 @@ Heiko Schocher h...@denx.de sc3 PPC405GP suen3 ARM926EJS (Kirkwood SoC) suvd3 MPC8321 + tuda1 MPC8321 tuxa1 MPC8321 uc101 MPC5200 diff --git a/MAKEALL b/MAKEALL index db47b41..19b67b2 100755 --- a/MAKEALL +++ b/MAKEALL @@ -377,6 +377,7 @@ LIST_83xx= \ SIMPC8313_LP\ suvd3 \ TQM834x \ + tuda1 \ tuxa1 \ vme8349 \ diff --git a/Makefile b/Makefile index 40f411f..af19b64 100644 --- a/Makefile +++ b/Makefile @@ -2394,8 +2394,9 @@ suvd3_config: unconfig TQM834x_config:unconfig @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x tqc +tuda1_config \ tuxa1_config: unconfig - @$(MKCONFIG) tuxa1 ppc mpc83xx km83xx keymile + @$(MKCONFIG) $(@:_config=) ppc mpc83xx km83xx keymile caddy2_config \ vme8349_config:unconfig diff --git a/include/configs/tuda1.h b/include/configs/tuda1.h new file mode 100644 index 000..49aa98a --- /dev/null +++ b/include/configs/tuda1.h @@ -0,0 +1,250 @@ +/* + * Copyright (C) 2006 Freescale Semiconductor, Inc. + *Dave Liu dave...@freescale.com + * + * Copyright (C) 2007 Logic Product Development, Inc. + *Peter Barada pet...@logicpd.com + * + * Copyright (C) 2007 MontaVista Software, Inc. + *Anton Vorontsov avoront...@ru.mvista.com + * + * (C) Copyright 2008 + * Heiko Schocher, DENX Software Engineering, h...@denx.de. + * + * (C) Copyright 2010 + * Lukas Roggli, KEYMILE Ltd, lukas.rog...@keymile.com + * + * 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. + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* + * High Level Configuration Options + */ +#define CONFIG_E3001 /* E300 family */ +#define CONFIG_QE 1 /* Has QE */ +#define CONFIG_MPC83xx 1 /* MPC83xx family */ +#define CONFIG_MPC832x 1 /* MPC832x CPU specific */ +#define CONFIG_TUDA1 1 /* TUDA1 board specific */ +#define CONFIG_HOSTNAMEtuda1 +#define CONFIG_KM_BOARD_NAME tuda1 + +#define CONFIG_KM_DEF_NETDEV \ + netdev=eth0\0 + +#define CONFIG_KM_DEF_ROOTPATH \ + rootpath=/opt/eldk/ppc_8xx\0 + +/* include common defines/options for all 83xx Keymile boards */ +#include km83xx-common.h + +#define CONFIG_MISC_INIT_R 1 + +/* + * System IO Config + */ +#define CONFIG_SYS_SICRH 0x0006 +#define CONFIG_SYS_SICRL SICRL_IRQ_CKS + +/* + * Hardware Reset Configuration Word + */ +#define CONFIG_SYS_HRCW_LOW (\ + HRCWL_LCL_BUS_TO_SCB_CLK_1X1 | \ + HRCWL_DDR_TO_SCB_CLK_2X1 | \ + HRCWL_CSB_TO_CLKIN_2X1 | \ + HRCWL_CORE_TO_CSB_2_5X1 | \ + HRCWL_CE_PLL_VCO_DIV_2 | \ + HRCWL_CE_TO_PLL_1X3) + +#define CONFIG_SYS_HRCW_HIGH (\ + HRCWH_PCI_AGENT | \ + HRCWH_PCI_ARBITER_DISABLE | \ + HRCWH_CORE_ENABLE | \ + HRCWH_FROM_0X0100 | \ + HRCWH_BOOTSEQ_DISABLE | \ + HRCWH_SW_WATCHDOG_DISABLE | \ + HRCWH_ROM_LOC_LOCAL_16BIT | \ + HRCWH_BIG_ENDIAN | \ + HRCWH_LALE_NORMAL) + +#define CONFIG_SYS_DDR_CS0_BNDS0x007f +#define CONFIG_SYS_DDR_SDRAM_CFG (SDRAM_CFG_SDRAM_TYPE_DDR2 | \ + SDRAM_CFG_32_BE | \ + SDRAM_CFG_2T_EN | \ + SDRAM_CFG_SREN) + +#define CONFIG_SYS_DDR_SDRAM_CFG2 0x00401000 +#define CONFIG_SYS_DDR_CLK_CNTL (DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05) +#define CONFIG_SYS_DDR_INTERVAL((0x064 SDRAM_INTERVAL_BSTOPRE_SHIFT) | \ +(0x200 SDRAM_INTERVAL_REFINT_SHIFT)) + +#define CONFIG_SYS_DDR_CS0_CONFIG (CSCONFIG_EN | CSCONFIG_AP | \ + CSCONFIG_ODT_WR_CFG | \ + CSCONFIG_ROW_BIT_13 | \ + CSCONFIG_COL_BIT_10) +
Re: [U-Boot] Does U-boot supports Spansion S29GL512P NOR Flash?
On Monday 12 April 2010 06:18:12 prakash bedge wrote: Right. Most likely you just need to tune the chip select timing registers And of course the size of the CS. What mean by size of CS? Which file I should check for timing register for S29GL512P? IIRC, then you have a custom PPC440 SoC. I have no idea which external bus controller (EBC) is used on your SoC. Is it the one also used on the AppliedMicro (AMCC) PPC4xx? Then you need to change the CONFIG_SYS_EBC_PBxCR / CONFIG_SYS_EBC_PBxAP defines. Take a look at the users manual for details. If you have a different EBC then I can't really help you here. Your SoC documentation should have all details you need. BTW: You might also need to configure a bigger TLB entry for the FLASH now that you use a bigger FLASH chip. Does uboot support one single TLB entry for 64MB size. At pesent I have configured 4 TLB entries, each 16MB. Looking into the PPC440 users manual makes it clear. 64MByte as TLB size is not available. You need to define 4 16MB entries for this. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC
-Original Message- From: Albert ARIBAUD [mailto:albert.arib...@free.fr] Sent: Sunday, April 11, 2010 1:12 PM To: Albert ARIBAUD Cc: Wolfgang Denk; U-Boot@lists.denx.de; Prafulla Wadaskar Subject: Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC Albert ARIBAUD a écrit : Wi Wolfgang, Wolfgang Denk a écrit : Dear Albert Aribaud, In message 1270801745-18852-1-git-send-email-albert.arib...@free.fr you wrote: This patch adds support for the Marvell Orion5x SoC. It has no use alone, and must be followed by a patch to add Orion5x support for serial, then support for the ED Mini V2, an Orion5x-based product from LaCie. --- Patchset history V1: Initial monolithic patch. V2: split in three patches : orion, serial, edmini; checkpatch'ed, with only 6 errors, in patch 1/3, all 6 errors being false positives. V3: useless GPIO and MPP programming support removed; low level init added/CONFIG_SKIP_LOW_LEVEL_INIT removed. V4: all files licensed GPLv2-only removed; RAM bank size detection now uses get_ram_size(). V5: Replaced macros by C structs in dram code. Removed compilation warnings in dram code. Added comments to legacy flash definitions. Split low level init code into SoC- and Chip-specifics. V6: Set copyright dates to 2010, and put standard GPL notice mentioning Marvell's copyright on *_lowlevel_init.S files. Just to be sure: do you have Marvell's permission to change the licensing terms? Actually this was checked by Prafulla in december: http://lists.denx.de/pipermail/u-boot/2009-December/065797.html My mistake--this was for the linux-imported files only. As for the Marvell-created files, Prafulla (added to To:) should be in position to get us the needed permission. After re-confirmation with internal teams. Yes, all the code that is going out from Marvell for U-boot + LSP by any means is meant to be GPL, if something is missing that can/should be corrected. Hi Albert, you can modify the headers accordingly. Regards.. Prafulla . . Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC
Prafulla Wadaskar a écrit : -Original Message- From: Albert ARIBAUD [mailto:albert.arib...@free.fr] Sent: Sunday, April 11, 2010 1:12 PM To: Albert ARIBAUD Cc: Wolfgang Denk; U-Boot@lists.denx.de; Prafulla Wadaskar Subject: Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC Albert ARIBAUD a écrit : Wi Wolfgang, Wolfgang Denk a écrit : Dear Albert Aribaud, In message 1270801745-18852-1-git-send-email-albert.arib...@free.fr you wrote: This patch adds support for the Marvell Orion5x SoC. It has no use alone, and must be followed by a patch to add Orion5x support for serial, then support for the ED Mini V2, an Orion5x-based product from LaCie. --- Patchset history V1: Initial monolithic patch. V2: split in three patches : orion, serial, edmini; checkpatch'ed, with only 6 errors, in patch 1/3, all 6 errors being false positives. V3: useless GPIO and MPP programming support removed; low level init added/CONFIG_SKIP_LOW_LEVEL_INIT removed. V4: all files licensed GPLv2-only removed; RAM bank size detection now uses get_ram_size(). V5: Replaced macros by C structs in dram code. Removed compilation warnings in dram code. Added comments to legacy flash definitions. Split low level init code into SoC- and Chip-specifics. V6: Set copyright dates to 2010, and put standard GPL notice mentioning Marvell's copyright on *_lowlevel_init.S files. Just to be sure: do you have Marvell's permission to change the licensing terms? Actually this was checked by Prafulla in december: http://lists.denx.de/pipermail/u-boot/2009-December/065797.html My mistake--this was for the linux-imported files only. As for the Marvell-created files, Prafulla (added to To:) should be in position to get us the needed permission. After re-confirmation with internal teams. Yes, all the code that is going out from Marvell for U-boot + LSP by any means is meant to be GPL, if something is missing that can/should be corrected. Hi Albert, you can modify the headers accordingly. Regards.. Prafulla . . Actually, in V6 of the patch the notices are already GPL v2 or later for all files. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC
Dear Prafulla, In message f766e4f80769bd478052fb6533fa745d1878702...@sc-vexch4.marvell.com you wrote: After re-confirmation with internal teams. Yes, all the code that is going out from Marvell for U-boot + LSP by any means is meant to be GPL, if something is missing that can/should be corrected. GPL alone is not precise enough - it could mean GPL v2 or GPL v3 or GPL v2 or later (which is what we need). 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 The software required `Windows 95 or better', so I installed Linux. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC
-Original Message- From: Wolfgang Denk [mailto:w...@denx.de] Sent: Monday, April 12, 2010 4:16 PM To: Prafulla Wadaskar Cc: Albert ARIBAUD; U-Boot@lists.denx.de Subject: Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC Dear Prafulla, In message f766e4f80769bd478052fb6533fa745d1878702...@sc-vexch4.marvell. com you wrote: After re-confirmation with internal teams. Yes, all the code that is going out from Marvell for U-boot + LSP by any means is meant to be GPL, if something is missing that can/should be corrected. GPL alone is not precise enough - it could mean GPL v2 or GPL v3 or GPL v2 or later (which is what we need). Hi Wolfgang Sorry for typing small word GPL in the earlier email. My re-confirmation discussion was w.r.to GPL v2 or later Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V6 3/3] Add support for the LaCie ED Mini V2 board
-Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Prafulla Wadaskar Sent: Friday, April 09, 2010 3:08 PM To: Albert Aribaud; U-Boot@lists.denx.de Subject: Re: [U-Boot] [PATCH V6 3/3] Add support for the LaCie ED Mini V2 board -Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Albert Aribaud Sent: Friday, April 09, 2010 1:59 PM To: U-Boot@lists.denx.de Subject: [U-Boot] [PATCH V6 3/3] Add support for the LaCie ED Mini V2 board This patch adds support for the LaCie ED Mini V2 product which is based on the Marvell Orion5x SoC. --- MAINTAINERS|4 + MAKEALL|1 + Makefile |3 + board/LaCie/edminiv2/Makefile | 58 +++ board/LaCie/edminiv2/board_lowlevel_init.S | 59 +++ board/LaCie/edminiv2/config.mk | 27 + board/LaCie/edminiv2/edminiv2.c| 93 ++ board/LaCie/edminiv2/edminiv2.h| 54 ++ include/configs/edminiv2.h | 147 9 files changed, 446 insertions(+), 0 deletions(-) create mode 100644 board/LaCie/edminiv2/Makefile create mode 100644 board/LaCie/edminiv2/board_lowlevel_init.S create mode 100644 board/LaCie/edminiv2/config.mk create mode 100644 board/LaCie/edminiv2/edminiv2.c create mode 100644 board/LaCie/edminiv2/edminiv2.h create mode 100644 include/configs/edminiv2.h ..snip.. diff --git a/board/LaCie/edminiv2/board_lowlevel_init.S b/board/LaCie/edminiv2/board_lowlevel_init.S new file mode 100644 index 000..00e68e9 --- /dev/null +++ b/board/LaCie/edminiv2/board_lowlevel_init.S @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2010 Albert ARIBAUD albert.arib...@free.fr + * + * (C) Copyright 2009 + * Marvell Semiconductor www.marvell.com + * Written-by: Prafulla Wadaskar prafu...@marvell.com + * + * 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., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include edminiv2.h + +/* + * Low-level init happens right after start.S has switched to SVC32, + * flushed and disabled caches and disabled MMU. We're still running + * from the boot chip select, so the first thing we should do is set + * up RAM for us to relocate into. + * + * board_low_level_init is called by the Orion5x lowlevel_init code, + * and sets up board-specifics such as MPPs and GPIOs. + */ + +.globl board_lowlevel_init + +board_lowlevel_init: + + /* Use R3 as the base for Device Bus registers */ + add r3, r4, #0x1 + + /* init MPPs */ + ldr r6, =EDMINIV2_MPP0_7 + str r6, [r3, #0x000] + ldr r6, =EDMINIV2_MPP8_15 + str r6, [r3, #0x004] + ldr r6, =EDMINIV2_MPP16_23 + str r6, [r3, #0x050] + + /* init GPIOs */ + ldr r6, =EDMINIV2_GPIO_OUT_ENABLE + str r6, [r3, #0x104] + + /* Return to lowlevel_init via saved link register */ + mov pc, lr Dear Albert You are just doing mpp and gpio settings here, those are IO specific only you can have mpp and gpio configs as in case of Kirkwood (c functions) and call them from your bard_init. Please remove this file. and dependency of this code with lowlevel_init.S in patch 1/2 That's it. Dear Albert Can you pls do the needfull for above and post V7 for this patch? Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC
Prafulla Wadaskar a écrit : -Original Message- From: Wolfgang Denk [mailto:w...@denx.de] Sent: Monday, April 12, 2010 4:16 PM To: Prafulla Wadaskar Cc: Albert ARIBAUD; U-Boot@lists.denx.de Subject: Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC Dear Prafulla, In message f766e4f80769bd478052fb6533fa745d1878702...@sc-vexch4.marvell. com you wrote: After re-confirmation with internal teams. Yes, all the code that is going out from Marvell for U-boot + LSP by any means is meant to be GPL, if something is missing that can/should be corrected. GPL alone is not precise enough - it could mean GPL v2 or GPL v3 or GPL v2 or later (which is what we need). Hi Wolfgang Sorry for typing small word GPL in the earlier email. My re-confirmation discussion was w.r.to GPL v2 or later Regards.. Prafulla . . Good, then: V6 of my patch is thus fine as regards GPLv2 or later. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC
Dear Prafulla, In message f766e4f80769bd478052fb6533fa745d1878702...@sc-vexch4.marvell.com you wrote: My re-confirmation discussion was w.r.to GPL v2 or later Thanks a lot for this confirmation. 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 The software required `Windows 95 or better', so I installed Linux. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Serial port initialization and multiplexing
Hi All, I have MPC8379 board. It has 2 serial ports. 1 is connected to the console, while the 2nd serial port is connected to another micro-controller. I would like to use both the serial port, how do I achieve this? As far as serial port configuration is concerned What should go in include/configs/MPC837XRDB.H ? Where else in the source code I need to make changes to initialize both the serial ports? I don't want to use to environment variable every time I want to use either of the serial ports. I want to use both serial port as and when required without changing environment variable. In the README file I could locate the following, but it has left me with more confusions. Environment / Console: CONFIG_SYS_CONSOLE_IS_IN_ENVif defined, stdin, stdout and stderr used from the values stored in the evironment. CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINEif defined, console_overwrite() decides if the values stored in the environment or the standard serial in/out put should be assigned to the console. CONFIG_SYS_CONSOLE_ENV_OVERWRITEif defined, the start-up console switching are stored in the environment. I would appreciate your inputs. -- Thanks Regards Harsh ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] at91sam9g45ekes SDHC/MMC
Hi Ulf, Thanks for the reply. I applied your patches but I still can't get it to read the SD card Without the SD card: U-Boot mmc init 0 mmc: command 55 failed (status: 0x0c100025) mmc: command 1 failed (status: 0x0c100025) No MMC card found With the SD card: U-Boot mmc init 0 mmc: command 1 failed (status: 0x0c100025) No MMC card found I'm not sure what's going on. On Tue, Apr 6, 2010 at 5:57 AM, Ulf Samuelsson ulf.samuels...@atmel.comwrote: Henry Súcart skrev: Hi, I've been trying to get an SD card working with an at91sam9g45ek-es board. I read a couple of threads in the archive and ended up doing this: I have booted the AT91SAM9G45EKES (Actually the AT91SAM9M10EKES, but it is almost the same) from SD-Card for the last month. The patchset for 2009.11 is available for testing in my private git branch on www.openembedded.org: origin/ulf/linux-2.6.30-20100317 I came to the conclusion that the atmel MCI driver (written for the big endian AVR32) has significant byte sex problems. BR Ulf Samuelsson. I applied these patches: http://lists.denx.de/pipermail/u-boot/2009-August/059595.html http://lists.denx.de/pipermail/u-boot/2009-September/060053.html http://lists.denx.de/pipermail/u-boot/2009-September/060243.html Added these #define's to include/configs/at91sam9m10g45ek.h: #define CONFIG_CMD_EXT2 1 #define CONFIG_CMD_FAT 1 #define CONFIG_CMD_MMC 1 #define CONFIG_MMC1 #define CONFIG_ATMEL_MCI 1 Finally, I added this to the board init function: #ifdef CONFIG_ATMEL_MCI at91_mci0_hw_init(0, 4); #endif When I try it out this is what I get: U-Boot mmc init 0 mmc: clock 15 too low; setting CLKDIV to 255 mmc: command 1 failed (status: 0x0c100025) No MMC card found Am I doing something wrong? Any help is appreciated, Henry ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 1/3] ARM1176: Coexist with other ARM1176 platforms
The current ARM1176 CPU specific code is too specific to the SMDK6400 architecture. The following changes were necessary prerequisites for the addition of other SoCs based on ARM1176. Existing board's (SMDK6400) configuration has been modified to keep behavior unchanged despite these changes. 1. Peripheral port remap configurability The earlier code had hardcoded remap values specific to s3c64xx in start.S. This change makes the peripheral port remap addresses and sizes configurable. 2. Skip low level initialization Ability to skip low level initialization if necessary. Many other platforms have a similar capability, and this is quite useful during debug/bring-up. 3. U-Boot code relocation support Most architectures allow u-boot code to run initially at a different address (possibly in NOR) and then get relocated to its final resting place in RAM. Added support for this capability in ARM1176 architecture. 4. Disable TCM if necessary If a ROM based bootloader happened to have initialized TCM, we disable it here to keep things sane. 5. Remove unnecessary SoC specific includes ARM1176 code does not really need this SoC specific include. The presence of this include prevents builds on other ARM1176 archs. 6. ARM926 style MMU disable when !CONFIG_ENABLE_MMU The original MMU disable code masks out too many bits from the load address when it tries to figure out the physical address of the jump target label. Consequently, it ends up branching to the wrong address after disabling the MMU. Signed-off-by: Cyril Chemparathy cy...@ti.com --- v4: rebased on next in u-boot-arm.git v3: unchanged from v2 v2: unchanged from v1 cpu/arm1176/cpu.c |3 -- cpu/arm1176/start.S| 62 include/configs/smdk6400.h |6 3 files changed, 57 insertions(+), 14 deletions(-) diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c index befa0cd..c0fd114 100644 --- a/cpu/arm1176/cpu.c +++ b/cpu/arm1176/cpu.c @@ -33,9 +33,6 @@ #include common.h #include command.h -#ifdef CONFIG_S3C64XX -#include asm/arch/s3c6400.h -#endif #include asm/system.h static void cache_flush (void); diff --git a/cpu/arm1176/start.S b/cpu/arm1176/start.S index e2b6c9b..beec574 100644 --- a/cpu/arm1176/start.S +++ b/cpu/arm1176/start.S @@ -1,5 +1,5 @@ /* - * armboot - Startup Code for S3C6400/ARM1176 CPU-core + * armboot - Startup Code for ARM1176 CPU-core * * Copyright (c) 2007 Samsung Electronics * @@ -35,9 +35,6 @@ #ifdef CONFIG_ENABLE_MMU #include asm/proc/domain.h #endif -#ifdef CONFIG_S3C64XX -#include asm/arch/s3c6400.h -#endif #if !defined(CONFIG_ENABLE_MMU) !defined(CONFIG_SYS_PHY_UBOOT_BASE) #define CONFIG_SYS_PHY_UBOOT_BASE CONFIG_SYS_UBOOT_BASE @@ -147,6 +144,7 @@ reset: * * */ +#ifndef CONFIG_SKIP_LOWLEVEL_INIT /* * we do sys-critical inits only at reboot, * not when booting from ram! @@ -172,6 +170,8 @@ cpu_init_crit: bic r0, r0, #0x0087 @ clear bits 7, 2:0 (B--- -CAM) orr r0, r0, #0x0002 @ set bit 2 (A) Align orr r0, r0, #0x1000 @ set bit 12 (I) I-Cache + +#ifdef CONFIG_ENABLE_MMU /* Prepare to disable the MMU */ adr r1, mmu_disable_phys /* We presume we're within the first 1024 bytes */ @@ -189,13 +189,32 @@ mmu_disable: nop nop mov pc, r2 +mmu_disable_phys: +#else + mcr p15, 0, r0, c1, c0, 0 #endif -mmu_disable_phys: -#ifdef CONFIG_S3C64XX +#ifdef CONFIG_DISABLE_TCM + /* +* Disable the TCMs +*/ + mrc p15, 0, r0, c0, c0, 2 /* Return TCM details */ + cmp r0, #0 + beq skip_tcmdisable + mov r1, #0 + mov r2, #1 + tst r0, r2 + mcrne p15, 0, r1, c9, c1, 1 /* Disable Instruction TCM if present*/ + tst r0, r2, LSL #16 + mcrne p15, 0, r1, c9, c1, 0 /* Disable Data TCM if present*/ +skip_tcmdisable: +#endif +#endif + +#ifdef CONFIG_PERIPORT_REMAP /* Peri port setup */ - ldr r0, =0x7000 - orr r0, r0, #0x13 + ldr r0, =CONFIG_PERIPORT_BASE + orr r0, r0, #CONFIG_PERIPORT_SIZE mcr p15,0,r0,c15,c2,4 @ 256M (0x7000 - 0x7fff) #endif @@ -203,8 +222,27 @@ mmu_disable_phys: * Go setup Memory and board specific bits prior to relocation. */ bl lowlevel_init /* go setup pll,mux,memory */ +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ + +#ifndef CONFIG_SKIP_RELOCATE_UBOOT +relocate: /* relocate U-Boot to RAM */ + adr r0, _start /* r0 - current position of code */ + ldr r1, _TEXT_BASE /* test if we run from flash or RAM */ + cmp r0, r1 /* don't reloc during debug */ + beq stack_setup +
[U-Boot] [PATCH v4 0/3] TI: tnetv107x patch series
TNETV107X is a Texas Instruments SoC based on an ARM1176 core, and with a bunch on on-chip integrated peripherals. This patch series generalizes current ARM1176 code to allow for the addition of new ARM1176 SOCs. The remaining patches in this series add arch and board support. The contents of this series are identical to the v2 patch series posted earlier, with the exception of an added comment in tnetv107x_evm.h indicating the reasoning behind reusing the davinci_nand MTDID. Cyril Chemparathy (3): ARM1176: Coexist with other ARM1176 platforms ARM1176: TI: TNETV107X soc initial support TI: TNETV107X EVM initial support MAINTAINERS|4 + MAKEALL|1 + Makefile |3 + board/ti/tnetv107xevm/Makefile | 49 +++ board/ti/tnetv107xevm/config.mk| 20 + board/ti/tnetv107xevm/sdb_board.c | 66 cpu/arm1176/cpu.c |3 - cpu/arm1176/start.S| 62 +++- cpu/arm1176/tnetv107x/Makefile | 44 +++ cpu/arm1176/tnetv107x/aemif.c | 151 cpu/arm1176/tnetv107x/clock.c | 542 cpu/arm1176/tnetv107x/init.c | 41 ++ cpu/arm1176/tnetv107x/lowlevel_init.S | 25 ++ cpu/arm1176/tnetv107x/mux.c| 463 cpu/arm1176/tnetv107x/timer.c | 125 +++ cpu/arm1176/tnetv107x/wdt.c| 172 + include/asm-arm/arch-tnetv107x/clock.h | 50 +++ include/asm-arm/arch-tnetv107x/emif_defs.h |1 + include/asm-arm/arch-tnetv107x/hardware.h | 184 ++ include/asm-arm/arch-tnetv107x/mux.h | 307 include/asm-arm/arch-tnetv107x/nand_defs.h | 38 ++ include/configs/smdk6400.h |6 + include/configs/tnetv107x_evm.h| 214 +++ 23 files changed, 2557 insertions(+), 14 deletions(-) create mode 100644 board/ti/tnetv107xevm/Makefile create mode 100644 board/ti/tnetv107xevm/config.mk create mode 100644 board/ti/tnetv107xevm/sdb_board.c create mode 100644 cpu/arm1176/tnetv107x/Makefile create mode 100644 cpu/arm1176/tnetv107x/aemif.c create mode 100644 cpu/arm1176/tnetv107x/clock.c create mode 100644 cpu/arm1176/tnetv107x/init.c create mode 100644 cpu/arm1176/tnetv107x/lowlevel_init.S create mode 100644 cpu/arm1176/tnetv107x/mux.c create mode 100644 cpu/arm1176/tnetv107x/timer.c create mode 100644 cpu/arm1176/tnetv107x/wdt.c create mode 100644 include/asm-arm/arch-tnetv107x/clock.h create mode 100644 include/asm-arm/arch-tnetv107x/emif_defs.h create mode 100644 include/asm-arm/arch-tnetv107x/hardware.h create mode 100644 include/asm-arm/arch-tnetv107x/mux.h create mode 100644 include/asm-arm/arch-tnetv107x/nand_defs.h create mode 100644 include/configs/tnetv107x_evm.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 3/3] TI: TNETV107X EVM initial support
TNETV107X is a Texas Instruments SoC based on an ARM1176 core, and with a bunch on on-chip integrated peripherals. This patch adds support for the TNETV107X EVM board. Signed-off-by: Cyril Chemparathy cy...@ti.com --- v4: rebased on next in u-boot-arm.git (unchanged) v3: Added NAND MTDID comment in board config v2: Added maintainers entry v2: Fixed sort order in main makefile v2: Remove board specific linker script v2: Style fixes - multiline comments v2: Replaced clk_get() with clk_get_rate() MAINTAINERS |4 + MAKEALL |1 + Makefile |3 + board/ti/tnetv107xevm/Makefile| 49 + board/ti/tnetv107xevm/config.mk | 20 board/ti/tnetv107xevm/sdb_board.c | 66 +++ include/configs/tnetv107x_evm.h | 214 + 7 files changed, 357 insertions(+), 0 deletions(-) create mode 100644 board/ti/tnetv107xevm/Makefile create mode 100644 board/ti/tnetv107xevm/config.mk create mode 100644 board/ti/tnetv107xevm/sdb_board.c create mode 100644 include/configs/tnetv107x_evm.h diff --git a/MAINTAINERS b/MAINTAINERS index 0658bc3..37cf8b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -62,6 +62,10 @@ Oliver Brown obr...@adventnetworks.com gw8260 MPC8260 +Cyril Chemparathy cy...@ti.com + + tnetv107x_evm tnetv107x + Conn Clark cl...@esteem.com ESTEEM192E MPC8xx diff --git a/MAKEALL b/MAKEALL index a88c31e..63d8d16 100755 --- a/MAKEALL +++ b/MAKEALL @@ -623,6 +623,7 @@ LIST_ARM11=\ mx31pdk_nand\ qong\ smdk6400\ + tnetv107x_evm \ # diff --git a/Makefile b/Makefile index 4532550..d0ef39d 100644 --- a/Makefile +++ b/Makefile @@ -3313,6 +3313,9 @@ smdk6400_config : unconfig fi @echo CONFIG_NAND_U_BOOT = y $(obj)include/config.mk +tnetv107x_evm_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm1176 tnetv107xevm ti tnetv107x + # # i386 # diff --git a/board/ti/tnetv107xevm/Makefile b/board/ti/tnetv107xevm/Makefile new file mode 100644 index 000..2446c2a --- /dev/null +++ b/board/ti/tnetv107xevm/Makefile @@ -0,0 +1,49 @@ +# +# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS += sdb_board.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +.PHONY: all + +all: $(LIB) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak *~ .depend + +# +# This is for $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/ti/tnetv107xevm/config.mk b/board/ti/tnetv107xevm/config.mk new file mode 100644 index 000..d24d49a --- /dev/null +++ b/board/ti/tnetv107xevm/config.mk @@ -0,0 +1,20 @@ +# +# 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., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +TEXT_BASE = 0x83FC diff --git
Re: [U-Boot] [PATCH V6 1/3] Initial support for Marvell Orion5x SoC
(apparently one of Prafulla's answers did not reach me; copy-pasting it and replying even though it's slightly out of place within the thread) Prafulla Wadaskar a écrit : -Original Message- From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Prafulla Wadaskar Sent: Friday, April 09, 2010 3:08 PM To: Albert Aribaud; U-Boot at lists.denx.de Subject: Re: [U-Boot] [PATCH V6 3/3] Add support for the LaCie ED Mini V2 board -Original Message- From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Albert Aribaud Sent: Friday, April 09, 2010 1:59 PM To: U-Boot at lists.denx.de Subject: [U-Boot] [PATCH V6 3/3] Add support for the LaCie ED Mini V2 board This patch adds support for the LaCie ED Mini V2 product which is based on the Marvell Orion5x SoC. --- MAINTAINERS|4 + MAKEALL|1 + Makefile |3 + board/LaCie/edminiv2/Makefile | 58 +++ board/LaCie/edminiv2/board_lowlevel_init.S | 59 +++ board/LaCie/edminiv2/config.mk | 27 + board/LaCie/edminiv2/edminiv2.c| 93 ++ board/LaCie/edminiv2/edminiv2.h| 54 ++ include/configs/edminiv2.h | 147 9 files changed, 446 insertions(+), 0 deletions(-) create mode 100644 board/LaCie/edminiv2/Makefile create mode 100644 board/LaCie/edminiv2/board_lowlevel_init.S create mode 100644 board/LaCie/edminiv2/config.mk create mode 100644 board/LaCie/edminiv2/edminiv2.c create mode 100644 board/LaCie/edminiv2/edminiv2.h create mode 100644 include/configs/edminiv2.h ..snip.. diff --git a/board/LaCie/edminiv2/board_lowlevel_init.S b/board/LaCie/edminiv2/board_lowlevel_init.S new file mode 100644 index 000..00e68e9 --- /dev/null +++ b/board/LaCie/edminiv2/board_lowlevel_init.S @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2010 Albert ARIBAUD albert.aribaud at free.fr + * + * (C) Copyright 2009 + * Marvell Semiconductor www.marvell.com + * Written-by: Prafulla Wadaskar prafulla at marvell.com + * + * 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., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include edminiv2.h + +/* + * Low-level init happens right after start.S has switched to SVC32, + * flushed and disabled caches and disabled MMU. We're still running + * from the boot chip select, so the first thing we should do is set + * up RAM for us to relocate into. + * + * board_low_level_init is called by the Orion5x lowlevel_init code, + * and sets up board-specifics such as MPPs and GPIOs. + */ + +.globl board_lowlevel_init + +board_lowlevel_init: + + /* Use R3 as the base for Device Bus registers */ + add r3, r4, #0x1 + + /* init MPPs */ + ldr r6, =EDMINIV2_MPP0_7 + str r6, [r3, #0x000] + ldr r6, =EDMINIV2_MPP8_15 + str r6, [r3, #0x004] + ldr r6, =EDMINIV2_MPP16_23 + str r6, [r3, #0x050] + + /* init GPIOs */ + ldr r6, =EDMINIV2_GPIO_OUT_ENABLE + str r6, [r3, #0x104] + + /* Return to lowlevel_init via saved link register */ + mov pc, lr Dear Albert You are just doing mpp and gpio settings here, those are IO specific only you can have mpp and gpio configs as in case of Kirkwood (c functions) and call them from your bard_init. Please remove this file. and dependency of this code with lowlevel_init.S in patch 1/2 That's it. Dear Albert Can you pls do the needfull for above and post V7 for this patch? I can, but IMO that would doing C code for the sake of C code. The ED Mini board is a product, not a dev board, and has a completely static and predefined MPP and GPIO configuration; there will not even be an API to modify them from within U-boot (this was discussed in earlier iterations of the patch) and thus their whole handling throughout the whole patch takes no more than these eight ASM statements. Unless there is a pressing
[U-Boot] U-boot Update feature with Nandflash support
Hi all, I am trying to implement a remote update feature for a at91sam9263ek board using tftp. basically i want to get this feature working with NAND flash similar to the link given below. http://www.denx.de/wiki/DULG/HowCanIImplementAutomaticSoftwareUpdates http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.update. But it looks like it is more specific to NOR flash. Again i am not sure of this. I just wanted to have this implementation working with NAND flash. If I have to use it for NAND flash what changes will be required?. Thanks, Krishna. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] [v3] fix print_size printing fractional gigabyte numbers on 32-bit platforms
On Fri, Apr 9, 2010 at 3:10 PM, Wolfgang Denk w...@denx.de wrote: Dear Timur Tabi, In message 1269990179-23666-1-git-send-email-ti...@freescale.com you wrote: In print_size(), the math that calculates the fractional remainder of a number used the same integer size as a physical address. However, the 10 * factor of the algorithm means that a large number (e.g. 1.5GB) can overflow the integer if we're running on a 32-bit system. Therefore, we need to disassociate this function from the size of a physical address. Signed-off-by: Timur Tabi ti...@freescale.com --- lib_generic/display_options.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Applied, thanks. I don't see this patch anywhere in http://git.denx.de/?p=u-boot.git. Are you sure you applied it? -- Timur Tabi Linux kernel developer at Freescale ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
On Fri, Apr 9, 2010 at 3:40 PM, Wolfgang Denk w...@denx.de wrote: If we make this change, we can probably use this function as well to print the size of storage devices like NAND, USB Mass Storage, hard disk drives, etc. Eventually we can clean up some pieces of code then... I'm working on it now. I did notice something odd, though. The strings for sizes are GB, MB, and kB. Why is the k lowercase? -- Timur Tabi Linux kernel developer at Freescale ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
On 12/04/10 17:12, Timur Tabi wrote: On Fri, Apr 9, 2010 at 3:40 PM, Wolfgang Denk w...@denx.de wrote: If we make this change, we can probably use this function as well to print the size of storage devices like NAND, USB Mass Storage, hard disk drives, etc. Eventually we can clean up some pieces of code then... I'm working on it now. I did notice something odd, though. The strings for sizes are GB, MB, and kB. Why is the k lowercase? To differentiate from K, which means 1000, rather than 1024. Example Kg = 1000 grammes. kB = 1024 Bytes Nick ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Nick Thompson wrote: To differentiate from K, which means 1000, rather than 1024. I don't think that's correct. I understand the 1000/1024 debate, but my understanding is that KB = 1000 bytes KiB = 1024 bytes (personally, I think the whole kibi-byte thing is stupid, and we should just say that K=1024 when talking about memory sizes, but whatever) I've never seen K=1000 and k=1024. Then why don't we do mB instead of MB? By your logical, M=100 and m=1048576 -- Timur Tabi Linux kernel developer at Freescale ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
On 12/04/10 17:21, Timur Tabi wrote: Nick Thompson wrote: To differentiate from K, which means 1000, rather than 1024. I don't think that's correct. I understand the 1000/1024 debate, but my understanding is that KB = 1000 bytes KiB = 1024 bytes (personally, I think the whole kibi-byte thing is stupid, and we should just say that K=1024 when talking about memory sizes, but whatever) I've never seen K=1000 and k=1024. Then why don't we do mB instead of MB? By your logical, M=100 and m=1048576 Hmm, yes, my bad. http://physics.nist.gov/cuu/Units/prefixes.html lists SI prefixes and k = 1000. m is milli of course. K is not used by SI, so might be free for 1024...? Nick. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Does U-boot supports Spansion S29GL512P NOR Flash?
For slow devices, the memory controller is usually setup to use the GPCM. Check your options and base registers (OR0 and BR0). What is GPCM? Which source/header file I need to check for these settings.? Hi Prakash, I didn't know that a IBM PPC440 CPU didn't contain an embedded memory controller. I assumed it did and therefore mentioned the GPCM (General Purpose Chip Select Machine - Terminology used on Freescale SoCs). Since your controller is obviously external/custom, it's hard to help you. You mention different size.. is the port size different too? I think u-boot takes care of port size as if we do not define the port size then u-boot search with all possible port size. BTW how I can cross-check the port size? Hmm.. As I don't have a 440 system, it's hard to tell. But on other systems, the port-size is programmed for each chip-select, and tells the memory controller the supported bus width connected to each device for a given chip-select. For M29W128GH I have to do some code fixup from patch suggested by Stefan. Is there any special code fixup is required for S29GL512P flash chip support? As I mentioned before, we didn't do anything special in order to get S29GL512P working for our board. Best regards, Frank Thanks Regards, Prakash On Fri, Apr 9, 2010 at 6:57 PM, Frank Svendsbøe frank.svends...@gmail.com wrote: I am using PPC440x5 Cpu core. How to check the chip-select flash is using? Earlier I have run the same code for M29W128GH and it works fine. But with S29GL512 it is not working. Now the difference is only in size and write/read timings. So I believe it should work in smooth manner. Hmm.. If you're supposed to boot from this device, then I assume the flash is connected to CS0.For slow devices, the memory controller is usually setup to use the GPCM. Check your options and base registers (OR0 and BR0). Everything related to timing (for GPCM controlled devices) is done in these two registers. If you have a BDI JTAG, you can set these registers using that and try to perform flash operations from here. Again, if you can, try to access the flash using the JTAG before experimenting with U-Boot. You mention different size.. is the port size different too? In order to help you, I think the community needs more info about your system. Stefan asked for logs, etc. Regards, Frank ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] PXA: Align stack to 8 bytes
On Sun, Apr 11, 2010 at 3:21 PM, Marek Vasut marek.va...@gmail.com wrote: Stack must be aligned to 8 bytes on PXA (possibly all armv5te) for LDRD/STRD instructions. In case LDRD/STRD is issued on an unaligned address, the behaviour is undefined. Well, I guess this is true for all ARMv5. ARMv6 and later however, provides support for such unaligned accesses. According to ARM DDI 0100I, A2.8 Prior to ARMv6, doubleword (LDRD/STRD) accesses to memory, where the address is not doubleword-aligned, are UNPREDICTABLE. Also, data accesses to non-aligned word and halfword data are treated as aligned from the memory interface perspective. That is: • the address is treated as truncated, with address bits[1:0] treated as zero for word accesses, and address bit[0] treated as zero for halfword accesses. • load single word ARM instructions are architecturally defined to rotate right the word-aligned data transferred by a non word-aligned address one, two or three bytes depending on the value of the two least significant address bits. • alignment checking is defined for implementations supporting a System Control coprocessor using the A bit in CP15 register 1. When this bit is set, a Data Abort indicating an alignment fault is reported for unaligned accesses. ARMv6 introduces unaligned word and halfword load and store data access support. When this is enabled, the processor uses one or more memory accesses to generate the required transfer of adjacent bytes transparently to the programmer, apart from a potential access time penalty where the transaction crosses an IMPLEMENTATION DEFINED cache-line, bus-width or page boundary condition. Doubleword accesses must be word-aligned in this configuration. The issue was observed when working with the NAND code, which was rendered disfunctional. Also, the vsprintf() function had serious problems with printing 64bit wide long longs. After aligning the stack, this wrong behaviour is no longer present. Tested on: Marvell Littleton PXA310 board Toradex Colibri PXA320 board Aeronix Zipit Z2 PXA270 handheld Voipac PXA270 board Signed-off-by: Marek Vasut marek.va...@gmail.com --- cpu/pxa/start.S | 5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S index 13e2edb..bbfcfd1 100644 --- a/cpu/pxa/start.S +++ b/cpu/pxa/start.S @@ -140,7 +140,10 @@ stack_setup: #ifdef CONFIG_USE_IRQ sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ) #endif /* CONFIG_USE_IRQ */ - sub sp, r0, #12 /* leave 3 words for abort-stack */ + bic sp, r0, #7 /* leave 4 words for abort-stack */ + /* NOTE: stack MUST be aligned to */ + /* 8 bytes in case we want to use */ + /* 64bit datatypes (eg. VSPRINTF64) */ clear_bss: ldr r0, _bss_start /* find start of bss segment */ -- 1.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Does U-boot supports Spansion S29GL512P NOR Flash?
## Unknown FLASH on Bank 1 - Size = 0x = 0 MB flash_protect ON: from 0xFFFC to 0xFFFE81FF flash_protect ON: from 0xFFFA to 0xFFFB *** failed *** ### ERROR ### Please RESET the board ### This is just a wild guess. Check that your memory controller setup is correct. Since you've changed your flash size, you might have a corrupt memory controller setup. On our Freescale system, we initially had problems when increasing flash size due to where we've decided to put the internal space base / memory map (ISB/IMM). When changing the size, we had to move the IMM to a lower address (.ie at least a sector below 0xfc00). Best regards, Frank ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Dear Timur Tabi, In message x2ped82fe3e1004120912u313a0c4du533a91f292cea...@mail.gmail.com you wrote: On Fri, Apr 9, 2010 at 3:40 PM, Wolfgang Denk w...@denx.de wrote: If we make this change, we can probably use this function as well to print the size of storage devices like NAND, USB Mass Storage, hard disk drives, etc. =A0Eventually we can clean up some pieces of code then... I'm working on it now. I did notice something odd, though. The strings for sizes are GB, MB, and kB. Why is the k lowercase? H[iy]st[oe]ric reasons, probably. We should use standardized names now, i. e. GiB, MiB, KiB, etc. 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 Madness takes its toll. Please have exact change. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Dear Nick Thompson, In message 4bc34758.3050...@ge.com you wrote: I'm working on it now. I did notice something odd, though. The strings for sizes are GB, MB, and kB. Why is the k lowercase? To differentiate from K, which means 1000, rather than 1024. Example Kg = 1000 grammes. kB = 1024 Bytes No, that's actually wrong. The official preffix for kilo (meaning 1000) is 'k', i. e. 1 kg = 1000 g. The prefix for 1024 is Ki. 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 Intel's new motto: United we stand. Divided we fall! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Wolfgang Denk wrote: We should use standardized names now, i. e. GiB, MiB, KiB, etc. Ugh. I'm not sure everyone recognizes those acronyms. I'm expecting a lot of people to say, What the hell is MiB? Men in Black? -- Timur Tabi Linux kernel developer at Freescale ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH]fsl_i2c: Move i2c_board_init to after i2c_init operations
Dear richardretanu...@ruggedcom.com, In message 20100412180215.ga11...@richardretanubun.eng.lan you wrote: From 00f84e4a9a2d13971c9328fc815825456b25f760 Mon Sep 17 00:00:00 2001 From: Richard Retanubun richardretanu...@ruggedcom.com Date: Mon, 12 Apr 2010 13:32:09 -0400 Subject: [PATCH] fsl_i2c: Move the call for i2c_init_board to the end of i2c_init This patch moved the call to i2c_init_board to the end of i2c_init. This allows the board fixup functions to take advantage of the setups done by i2c_init (i.e. bus speed and slave address). On other boards, i2c_init_board is called before i2c_init operation because the method of resetting i2c bus typically uses GPIOs to bit-bang SCLK. For i2c controllers that is using fsl_i2c this is unneccessary because there is a i2c register access sequence that accomplish the same thing, and it is better to do the accesses after the bus speed and slave address have been configured. I dislike such inconsitent behaviour. It would be better if we could rely on a specific initialization sequence, i. e. the function always be called at the beginning or always at the end. Having to deal with a situation where one or the other might happen, even on the same hardware, depending on if we use the HW or the SW I2C driver, sounds like a nightmare to me. If you need a late init function, then better add a new one. 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 Have you lived in this village all your life?No, not yet. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Dear Timur Tabi, In message 4bc36057.30...@freescale.com you wrote: Wolfgang Denk wrote: We should use standardized names now, i. e. GiB, MiB, KiB, etc. Ugh. I'm not sure everyone recognizes those acronyms. I'm expecting a lot of people to say, What the hell is MiB? Men in Black? There are also people in the world who don't really understand what mph or gallons per horsepower-hour (one of my favorites) are. But these are the official standardized IEC binary prefixes, and we should rather use these instead of anything else. 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 Machines take me by surprise with great frequency. - Alan Turing ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH]fsl_i2c: Move i2c_board_init to after i2c_init operations
Wolfgang Denk wrote: If you need a late init function, then better add a new one. Hi Wolfgang, That is one of the options I put forth, what would be a name you like for this callpoint? i2c_board_late_init ?? - Richard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Timur Tabi wrote: Wolfgang Denk wrote: We should use standardized names now, i. e. GiB, MiB, KiB, etc. Ugh. I'm not sure everyone recognizes those acronyms. I'm expecting a lot of people to say, What the hell is MiB? Men in Black? It's used often enough (including many places in U-Boot already), and there's typically enough context, that I don't think too many would be confused. It comes up early in the Google results for kiB, MiB, etc. for those who do find it unfamiliar. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Scott Wood wrote: It's used often enough (including many places in U-Boot already), and there's typically enough context, that I don't think too many would be confused. I guess my objection that I think the whole idea is stupid doesn't count for much? I'll do it if Wolfgang insists, but I honestly believe that there was no confusion and that the introduction of KiB and its ilk just makes things worse, not better. No one is going to compare memory sizes in kilobytes with distances in kilometers and get confused. -- Timur Tabi Linux kernel developer at Freescale ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH]fsl_i2c: Move i2c_board_init to after i2c_init operations
Dear Richard, In message 4bc364d1.8020...@ruggedcom.com you wrote: That is one of the options I put forth, what would be a name you like for this callpoint? i2c_board_late_init ?? I think we agree that it's not exactly an elegant name, but given the fact that we already have board_late_init() it would be at least consistent. 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 Never underestimate the power of human stupidity when it comes to using technology they don't understand. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Dear Timur Tabi, In message 4bc366de.1000...@freescale.com you wrote: I guess my objection that I think the whole idea is stupid doesn't count for much? I'll do it if Wolfgang insists, but I honestly believe that there was no confusion and that the introduction of KiB and its ilk just makes things worse, not better. No one is going to compare memory sizes in kilobytes with distances in kilometers and get confused. Well, there _is_ a lot of confusion For example, how big is (ummm: was) a standard 3.5 floppy disk? 1.44 MB, right? Well, actually it's 1474560 bytes, or 1440 * 1024 bytes. So this MB here is 1000 * 1024 - which is complete nonsense. Let's use the official standard units, please. We may not like them, but at least they will not cause a $125 million Mars orbiter to crash... 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 All your people must learn before you can reach for the stars. -- Kirk, The Gamesters of Triskelion, stardate 3259.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Wolfgang Denk wrote: For example, how big is (ummm: was) a standard 3.5 floppy disk? 1.44 MB, right? Well, actually it's 1474560 bytes, or 1440 * 1024 bytes. So this MB here is 1000 * 1024 - which is complete nonsense. This is bad example, because the size of a floppy is neither 1.44MB nor 1.44 MiB. Let's use the official standard units, please. We may not like them, but at least they will not cause a $125 million Mars orbiter to crash... Alright. -- Timur Tabi Linux kernel developer at Freescale ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH]fsl_i2c: Add i2c_board_late_init
From d0d9e0df99ce9035db43ebcf9d48601fa6f096d4 Mon Sep 17 00:00:00 2001 From: Richard Retanubun richardretanu...@ruggedcom.com Date: Mon, 12 Apr 2010 15:08:17 -0400 Subject: [PATCH] fsl_i2c: Added a callpoint for i2c_board_late_init This patch adds a callpoint in i2c_init that allows board specific i2c board initialization (typically for i2c bus reset) that is called after i2c_init operations, allowing the i2c_board_late_init function to use the pre-configured i2c bus speed and slave address. --- Hi Wolfgang Heiko, This is the patch that adds another callpoint. Thanks for all the feedback. - Richard drivers/i2c/fsl_i2c.c |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 2241990..a1a62fa 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -249,6 +249,14 @@ i2c_init(int speed, int slaveadd) writeb(0x0, dev-sr); /* clear status register */ writeb(I2C_CR_MEN, dev-cr); /* start I2C controller */ #endif + +#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT + /* Call board specific i2c bus reset routine after the bus has been */ + /* initialized. Use either this callpoint or i2c_init_board; which is */ + /* called before i2c_init operations. */ + /* For details about this problem see doc/I2C_Edge_Conditions.*/ + i2c_board_late_init(); +#endif } static int -- 1.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] allow print_size to print large numbers on 32-bit systems
Timur Tabi wrote: Wolfgang Denk wrote: For example, how big is (ummm: was) a standard 3.5 floppy disk? 1.44 MB, right? Well, actually it's 1474560 bytes, or 1440 * 1024 bytes. So this MB here is 1000 * 1024 - which is complete nonsense. This is bad example, because the size of a floppy is neither 1.44MB nor 1.44 MiB. It's a good example, because it was a result of allowing prefixes like MB to be fuzzily defined. If you give the marketers room to interpret fuzzy things in their favor, they'll use it. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH]fsl_i2c: Add i2c_board_late_init
Dear richardretanu...@ruggedcom.com, In message 20100412191703.ga30...@richardretanubun.eng.lan you wrote: From d0d9e0df99ce9035db43ebcf9d48601fa6f096d4 Mon Sep 17 00:00:00 2001 From: Richard Retanubun richardretanu...@ruggedcom.com Date: Mon, 12 Apr 2010 15:08:17 -0400 Subject: [PATCH] fsl_i2c: Added a callpoint for i2c_board_late_init This patch adds a callpoint in i2c_init that allows board specific i2c board initialization (typically for i2c bus reset) that is called after i2c_init operations, allowing the i2c_board_late_init function to use the pre-configured i2c bus speed and slave address. --- Hi Wolfgang Heiko, This is the patch that adds another callpoint. Thanks for all the feedback. - Richard drivers/i2c/fsl_i2c.c |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 2241990..a1a62fa 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -249,6 +249,14 @@ i2c_init(int speed, int slaveadd) writeb(0x0, dev-sr); /* clear status register */ writeb(I2C_CR_MEN, dev-cr); /* start I2C controller */ #endif + +#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT + /* Call board specific i2c bus reset routine after the bus has been */ + /* initialized. Use either this callpoint or i2c_init_board; which is */ + /* called before i2c_init operations. */ + /* For details about this problem see doc/I2C_Edge_Conditions.*/ + i2c_board_late_init(); +#endif Incorrect multiline comment style. Instead of adding more #ifdef'ery we now tend to use weak symbols - but I'm not sure about this here in this context, though. Heiko, what do you think about this? 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 There's an old proverb that says just about whatever you want it to. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2]fsl_i2c: Add i2c_board_late_init
From de1623005ece04af9082f397759fe92cbae84211 Mon Sep 17 00:00:00 2001 From: Richard Retanubun richardretanu...@ruggedcom.com Date: Mon, 12 Apr 2010 15:08:17 -0400 Subject: [PATCH] fsl_i2c: Added a callpoint for i2c_board_late_init This patch adds a callpoint in i2c_init that allows board specific i2c board initialization (typically for i2c bus reset) that is called after i2c_init operations, allowing the i2c_board_late_init function to use the pre-configured i2c bus speed and slave address. --- v2: Adds missing function prototype declaration in include/i2c.h drivers/i2c/fsl_i2c.c |8 include/i2c.h |3 +++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 2241990..a1a62fa 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -249,6 +249,14 @@ i2c_init(int speed, int slaveadd) writeb(0x0, dev-sr); /* clear status register */ writeb(I2C_CR_MEN, dev-cr); /* start I2C controller */ #endif + +#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT + /* Call board specific i2c bus reset routine after the bus has been */ + /* initialized. Use either this callpoint or i2c_init_board; which is */ + /* called before i2c_init operations. */ + /* For details about this problem see doc/I2C_Edge_Conditions.*/ + i2c_board_late_init(); +#endif } static int diff --git a/include/i2c.h b/include/i2c.h index d828964..cd23c8a 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -111,6 +111,9 @@ void i2c_init(int speed, int slaveaddr); #ifdef CONFIG_SYS_I2C_INIT_BOARD void i2c_init_board(void); #endif +#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT +void i2c_board_late_init(void); +#endif #if defined(CONFIG_I2C_MUX) -- 1.7.0 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH/RFC] Fixup for directory reorganization patch series
Dear Peter Tyser, In message 1271045621-17393-1-git-send-email-pty...@xes-inc.com you wrote: This patch fixes 2 issues with the original directory reorganization patchset: 1. It fixes the symlinking of the 'proc' directory in include/asm when building out-of-tree. side questionAnyone know what the deal is with the 'include2' directory that's created when building out of tree? Or why its needed?/side question 2. It determines CPUDIR earlier in the build process. Previously some architecture config.mk files would not properly set the LDSCRIPT variable since CPUDIR was not available when the LDSCRIPT path was determined. This patch is only meant to fix building of ARM boards and to clearly show what changes were needed. I'll fold #1 above into the 07/20 Move architecture-specific includes to arch/$ARCH/include/asm change and #2 into 01/20] Create CPUDIR variable after waiting for other feedback on the patchset. I confirm that this additional patch fixes the problems I observed before. Thanks. So far nobody else complained, so I think when you post the next version of this series I will apply it directly to master. 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 Old programmers never die, they just become managers. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] [v2] allow print_size to print large numbers on 32-bit systems
Modify print_size() so that it can accept numbers larger than 4GB on 32-bit
systems.
Add support for display terabyte, petabyte, and exabyte sizes. Change the
output to use International Electrotechnical Commission binary prefix standard.
Signed-off-by: Timur Tabi ti...@freescale.com
---
lib_generic/display_options.c | 22 +++---
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib_generic/display_options.c b/lib_generic/display_options.c
index da17a62..53b154d 100644
--- a/lib_generic/display_options.c
+++ b/lib_generic/display_options.c
@@ -40,22 +40,22 @@ int display_options (void)
/*
* print sizes as xxx kB, xxx.y kB, xxx MB, xxx.y MB,
- * xxx GB, or xxx.y GB as needed; allow for optional trailing string
+ * xxx GB, xxx.y GB, etc as needed; allow for optional trailing string
* (like \n)
*/
void print_size(unsigned long long size, const char *s)
{
unsigned long m = 0, n;
- unsigned long long d = 1 30; /* 1 GB */
- char c = 'G';
-
- if (size d) { /* try MB */
- c = 'M';
- d = 1 20;
- if (size d) { /* print in kB */
- c = 'k';
- d = 1 10;
- }
+ static const char names[] = {'K', 'M', 'G', 'T', 'P', 'E'};
+ unsigned long long d;
+ char c;
+ unsigned int i;
+
+ for (i = ARRAY_SIZE(names); i 0 ; i--) {
+ d = 1ULL (10 * i);
+ c = names[i - 1];
+ if (size = d)
+ break;
}
n = size / d;
@@ -74,7 +74,7 @@ void print_size(unsigned long long size, const char *s)
if (m) {
printf (.%ld, m);
}
- printf ( %cB%s, c, s);
+ printf ( %ciB%s, c, s);
}
/*
--
1.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] [v2] allow print_size to print large numbers on 32-bit systems
Timur Tabi wrote: Modify print_size() so that it can accept numbers larger than 4GB on 32-bit systems. Add support for display terabyte, petabyte, and exabyte sizes. Change the output to use International Electrotechnical Commission binary prefix standard. Signed-off-by: Timur Tabi ti...@freescale.com --- lib_generic/display_options.c | 22 +++--- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib_generic/display_options.c b/lib_generic/display_options.c index da17a62..53b154d 100644 --- a/lib_generic/display_options.c +++ b/lib_generic/display_options.c @@ -40,22 +40,22 @@ int display_options (void) /* * print sizes as xxx kB, xxx.y kB, xxx MB, xxx.y MB, - * xxx GB, or xxx.y GB as needed; allow for optional trailing string + * xxx GB, xxx.y GB, etc as needed; allow for optional trailing string [snip] - printf ( %cB%s, c, s); + printf ( %ciB%s, c, s); Comment should be updated to match the code. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] [v3] allow print_size to print large numbers on 32-bit systems
Modify print_size() so that it can accept numbers larger than 4GB on 32-bit
systems.
Add support for display terabyte, petabyte, and exabyte sizes. Change the
output to use International Electrotechnical Commission binary prefix standard.
Signed-off-by: Timur Tabi ti...@freescale.com
---
lib_generic/display_options.c | 24
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib_generic/display_options.c b/lib_generic/display_options.c
index da17a62..5a2097f 100644
--- a/lib_generic/display_options.c
+++ b/lib_generic/display_options.c
@@ -39,23 +39,23 @@ int display_options (void)
}
/*
- * print sizes as xxx kB, xxx.y kB, xxx MB, xxx.y MB,
- * xxx GB, or xxx.y GB as needed; allow for optional trailing string
+ * print sizes as xxx KiB, xxx.y KiB, xxx MiB, xxx.y MiB,
+ * xxx GiB, xxx.y GiB, etc as needed; allow for optional trailing string
* (like \n)
*/
void print_size(unsigned long long size, const char *s)
{
unsigned long m = 0, n;
- unsigned long long d = 1 30; /* 1 GB */
- char c = 'G';
-
- if (size d) { /* try MB */
- c = 'M';
- d = 1 20;
- if (size d) { /* print in kB */
- c = 'k';
- d = 1 10;
- }
+ static const char names[] = {'K', 'M', 'G', 'T', 'P', 'E'};
+ unsigned long long d;
+ char c;
+ unsigned int i;
+
+ for (i = ARRAY_SIZE(names); i 0 ; i--) {
+ d = 1ULL (10 * i);
+ c = names[i - 1];
+ if (size = d)
+ break;
}
n = size / d;
@@ -74,7 +74,7 @@ void print_size(unsigned long long size, const char *s)
if (m) {
printf (.%ld, m);
}
- printf ( %cB%s, c, s);
+ printf ( %ciB%s, c, s);
}
/*
--
1.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH/RFC] Fixup for directory reorganization patch series
Hi Wolfgang, In message 1271045621-17393-1-git-send-email-pty...@xes-inc.com you wrote: This patch fixes 2 issues with the original directory reorganization patchset: 1. It fixes the symlinking of the 'proc' directory in include/asm when building out-of-tree. side questionAnyone know what the deal is with the 'include2' directory that's created when building out of tree? Or why its needed?/side question 2. It determines CPUDIR earlier in the build process. Previously some architecture config.mk files would not properly set the LDSCRIPT variable since CPUDIR was not available when the LDSCRIPT path was determined. This patch is only meant to fix building of ARM boards and to clearly show what changes were needed. I'll fold #1 above into the 07/20 Move architecture-specific includes to arch/$ARCH/include/asm change and #2 into 01/20] Create CPUDIR variable after waiting for other feedback on the patchset. I confirm that this additional patch fixes the problems I observed before. Thanks. So far nobody else complained, so I think when you post the next version of this series I will apply it directly to master. Great! I'll repost v4 later tonight. Peter ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] [v4] allow print_size to print large numbers on 32-bit systems
Modify print_size() so that it can accept numbers larger than 4GB on 32-bit
systems.
Add support for display terabyte, petabyte, and exabyte sizes. Change the
output to use International Electrotechnical Commission binary prefix standard.
Signed-off-by: Timur Tabi ti...@freescale.com
---
optimized the loop. If I had a log-base-10 function, I could eliminate it
completely, but it appears only ppc has __ilog2.
lib_generic/display_options.c | 29 +
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/lib_generic/display_options.c b/lib_generic/display_options.c
index da17a62..86df05d 100644
--- a/lib_generic/display_options.c
+++ b/lib_generic/display_options.c
@@ -39,25 +39,30 @@ int display_options (void)
}
/*
- * print sizes as xxx kB, xxx.y kB, xxx MB, xxx.y MB,
- * xxx GB, or xxx.y GB as needed; allow for optional trailing string
+ * print sizes as xxx KiB, xxx.y KiB, xxx MiB, xxx.y MiB,
+ * xxx GiB, xxx.y GiB, etc as needed; allow for optional trailing string
* (like \n)
*/
void print_size(unsigned long long size, const char *s)
{
unsigned long m = 0, n;
- unsigned long long d = 1 30; /* 1 GB */
- char c = 'G';
-
- if (size d) { /* try MB */
- c = 'M';
- d = 1 20;
- if (size d) { /* print in kB */
- c = 'k';
- d = 1 10;
+ static const char names[] = {'E', 'P', 'T', 'G', 'M', 'K'};
+ unsigned long long d = 1ULL (10 * ARRAY_SIZE(names));
+ char c = 0;
+ unsigned int i;
+
+ for (i = 0; i ARRAY_SIZE(names); i++, d = 10) {
+ if (size = d) {
+ c = names[i];
+ break;
}
}
+ if (!c) {
+ printf(%llu Bytes%s, size, s);
+ return;
+ }
+
n = size / d;
/* If there's a remainder, deal with it */
@@ -70,11 +75,11 @@ void print_size(unsigned long long size, const char *s)
}
}
- printf (%2ld, n);
+ printf (%lu, n);
if (m) {
printf (.%ld, m);
}
- printf ( %cB%s, c, s);
+ printf ( %ciB%s, c, s);
}
/*
--
1.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH/RFC] Fixup for directory reorganization patch series
On Tue, Apr 13, 2010 at 6:21 AM, Peter Tyser pty...@xes-inc.com wrote: Hi Wolfgang, In message 1271045621-17393-1-git-send-email-pty...@xes-inc.com you wrote: [snip] So far nobody else complained, so I think when you post the next version of this series I will apply it directly to master. Great! I'll repost v4 later tonight. I have a quick (stacked)git question - I have nearly 30 patches in my stg stack (26 are pending application to master). Is git smart enough to apply these patches to the new file locations or will I have to spend some time adjusting each patch? I just want to know if I need to set aside some time to redo the patch series. Regards, Graeme ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH/RFC] Fixup for directory reorganization patch series
On Tue, 2010-04-13 at 07:56 +1000, Graeme Russ wrote: On Tue, Apr 13, 2010 at 6:21 AM, Peter Tyser pty...@xes-inc.com wrote: Hi Wolfgang, In message 1271045621-17393-1-git-send-email-pty...@xes-inc.com you wrote: [snip] So far nobody else complained, so I think when you post the next version of this series I will apply it directly to master. Great! I'll repost v4 later tonight. I have a quick (stacked)git question - I have nearly 30 patches in my stg stack (26 are pending application to master). Is git smart enough to apply these patches to the new file locations or will I have to spend some time adjusting each patch? I just want to know if I need to set aside some time to redo the patch series. I'm pretty sure that git isn't that smart. For example, between v2 and v3 of the reorganization patches the ppc440 I2C driver moved from cpu/ppc4xx/i2c.c to drivers/i2c/ppc4xx_i2c.c. When I rebased the v2 patch on the latest U-Boot, git wasn't smart enough to know that drivers/i2c/ppc4xx_i2c.c should be modified instead of cpu/ppc4xx/i2c.c and I had to manually make the change. I imagine the same thing will happen to you unfortunately. On the plus side, migrating your changes should be pretty easy. Hopefully you can just update the paths in your patches to reflect the new file locations, then re-apply them to a clean, up-to-date U-Boot tree. Something like the following may automate the process (untested): perl -p -i -e 's/\-\-\- a\/cpu\/i386/\-\-\- a\/arch\/i386\/cpu/' * perl -p -i -e 's/\+\+\+ b\/cpu\/i386/\+\+\+ b\/arch\/i386\/cpu/' * perl -p -i -e 's/\-\-\- a\/lib_i386/\-\-\- a\/arch\/i386\/lib/' * perl -p -i -e 's/\+\+\+ b\/lib_i386/\+\+\+ b\/arch\/i386\/lib/' * perl -p -i -e 's/\-\-\- a\/lib_generic/\-\-\- a\/lib/' * perl -p -i -e 's/\+\+\+ b\/lib_generic/\+\+\+ b\/lib/' * ... Hopefully a few regular expressions can fix up most of the changes, but I imagine there might be a few manual tweaks that need to be made too. When you rebase your changes it would be nice if you mentioned how it went and how you did it as I imagine others will have this same issue to some degree. Best, Peter ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] pm9263: remove CONFIG_CMD_AUTOSCRIPT
Asen Dimov wrote: Signed-off-by: Asen Dimov di...@ronetix.at --- include/configs/pm9263.h |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 807dba8..f854f38 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -215,7 +215,6 @@ #include config_cmd_default.h #undef CONFIG_CMD_BDI #undef CONFIG_CMD_IMI -#undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_LOADS #undef CONFIG_CMD_IMLS This has been applied to arm/next.. so to be in arm/master. Thanks Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Uboot and mpc8536 - questions and confusions
Hi, First posting to this mailing list so apologies if I make any mailing list etiquette mistakes. I'm doing bring up on a new MPC8536 based board and hitting headaches and had a few questions. First off is any recommendations/advice on what version of uboot I should be using? I've got the uboot from freescale SDK (1.3.4) which has plenty wrong with it and the 2009.11 from denx which is unfortunately giving me some headaches. Previous experience is that Freescale not only release buggy software, but that it also doesn't support the things they say it does (PCIe on 8378 jumps to mind) so I've leaned to using denx latest as at it's maintained. Freescale claim they don't submit all their fixes to denx, but I know for sure they don't release fixes they sign off on the denx stream to their customers so I'm somewhat bemused as to what I'm supposed to do. To any freescale engineers reading this - please advise me as your customer support sometimes seem as confused as I am :-) More importantly, specifically my current problem is that on this board we have some DDR (1G) with multiple chip selects and it seems that both chip selects won't work together. If I have both configured then I don't boot past trap_init() - it fails to read the code it copied into the top of memory. If I pretend that I actually only have half the memory (512M) I can use either chip select and it's fine. On top of this as soon as I able 36 bit address support, which we want to use, I also fail in trap_init() - but this time when the code writes the exception vector code to offset 0x100. Wierd huh. The Freescale 1.3.4 version works just fine for 32 bit addressing - but doesn't have 36 bit addressing support in yet (and I suspect it's missing other stuff too). Any answers or advice to the above very gratefully received. Is there a patch I missed? Thanks Mark ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 02/20] Change directory-specific CFLAGS to use full path
Previously, a specific file or directory could be compiled with custom CFLAGS by adding a Makefile variable such as: CFLAGS_dlmalloc.o = custom flags for common/dlmalloc.c or CFLAGS_lib = custom flags for lib directory This method breaks down once multiple files or directories share the same path. Eg FLAGS_fileA = custom flags would incorrectly result in both dir1/fileA.c and dir2/fileA.c being compiled with custom flags. This change allows finer grained control which we need once we move lib_$ARCH to arch/$ARCH/lib/ and lib_generic/ to lib/. Without this change all lib/ directories would share the same custom CFLAGS. Signed-off-by: Peter Tyser pty...@xes-inc.com --- board/bf518f-ezbrd/config.mk |2 +- board/bf526-ezbrd/config.mk |2 +- board/bf527-ezkit/config.mk |2 +- board/bf533-ezkit/config.mk |2 +- board/bf533-stamp/config.mk |2 +- board/bf537-stamp/config.mk |2 +- board/bf538f-ezkit/config.mk |2 +- board/bf548-ezkit/config.mk |2 +- board/bf561-acvilon/config.mk |2 +- board/bf561-ezkit/config.mk |2 +- board/cm-bf527/config.mk |2 +- board/cm-bf533/config.mk |2 +- board/cm-bf537e/config.mk |2 +- board/cm-bf537u/config.mk |2 +- board/cm-bf548/config.mk |2 +- board/cm-bf561/config.mk |2 +- board/eNET/config.mk |2 +- board/tcm-bf518/config.mk |2 +- board/tcm-bf537/config.mk |2 +- config.mk | 17 +++-- 20 files changed, 30 insertions(+), 25 deletions(-) diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk index f85bef5..fb93531 100644 --- a/board/bf518f-ezbrd/config.mk +++ b/board/bf518f-ezbrd/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk index f85bef5..fb93531 100644 --- a/board/bf526-ezbrd/config.mk +++ b/board/bf526-ezbrd/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk index f85bef5..fb93531 100644 --- a/board/bf527-ezkit/config.mk +++ b/board/bf527-ezkit/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk index 3c0b46f..b50e1f2 100644 --- a/board/bf533-ezkit/config.mk +++ b/board/bf533-ezkit/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk index 3c0b46f..b50e1f2 100644 --- a/board/bf533-stamp/config.mk +++ b/board/bf533-stamp/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk index bc14257..95d0fcc 100644 --- a/board/bf537-stamp/config.mk +++ b/board/bf537-stamp/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk index 3c0b46f..b50e1f2 100644 --- a/board/bf538f-ezkit/config.mk +++ b/board/bf538f-ezkit/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk index 42ff946..aff12e9 100644 --- a/board/bf548-ezkit/config.mk +++ b/board/bf548-ezkit/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic += -O2 -CFLAGS_lzma += -O2 +CFLAGS_lib_generic/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --dma 6 diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk index cfad21a..b517025 100644 --- a/board/bf561-acvilon/config.mk +++ b/board/bf561-acvilon/config.mk @@ -27,7 +27,7 @@ #TEXT_BASE = do-not-use-me CFLAGS_lib_generic
[U-Boot] [PATCH v4 00/20] Reorganize directory structure
This series reorganizes U-Boot's directory structure so that it looks like: /arch/$ARCH/ /lib/sources currently in lib_$ARCH/ /include/asm/headers currently in incluce/asm-$ARCH/ /cpu/appropriate cpu directories in cpu/ or just files in cpu/$CPU if 1 CPU type /config.mk (old lib_$ARCH/config.mk) /lib/ /source files currently in lib_generic /libfdt/ /lzma/ /lzo/ Patches 8 through 19 can be squashed if desired, I split them up to keep the series somewhat manageable. Some of the patches still exceed the mailinglist's arbitrary size limit. I can post the series on a website if needed. I compile tested on PPC, mips, and blackfin and no new errors were introduced. The previous discussion about this series can be seen at http://lists.denx.de/pipermail/u-boot/2009-December/065391.html Changes since v1: - Convert to using directory-specific CFLAGS - No cpu subdirectories for 1-CPU architectures (eg blackfin, mips, etc) as mentioned by Mike Frysinger - Fix libfdt path typo pointed out by Luigi Mantellini - Added final README fixup patch Changes since v2: - Rebased on current TOT Changes since v3: - Set CPUDIR variable earlier to prevent build errors on some arches - Fix out of tree building for ARM Peter Tyser (20): Create CPUDIR variable Change directory-specific CFLAGS to use full path Move lib_$ARCH directories to arch/$ARCH/lib Rename lib_generic/ to lib/ Move libfdt/ into lib/ Replace #include asm-$ARCH/$FILE with #include asm/$FILE Move architecture-specific includes to arch/$ARCH/include/asm ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU sh: Move cpu/$CPU to arch/sh/cpu/$CPU arm: Move cpu/$CPU to arch/arm/cpu/$CPU m68k: Move cpu/$CPU to arch/m68k/cpu/$CPU blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/* mips: Move cpu/mips/* to arch/mips/cpu/* avr32: Move cpu/at32ap/* to arch/avr32/cpu/* microblaze: Move cpu/microblaze/* to arch/microblaze/cpu/* i386: Move cpu/i386/* to arch/i386/cpu/* sparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23] nios: Move cpu/nios/* to arch/nios/cpu/* nios2: Move cpu/nios2/* to arch/nios2/cpu/* Update README to reflect new directory structure ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 05/20] Move libfdt/ into lib/
Move the libfdt directory into the common lib/ directory to clean up the
top-level directory.
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
Makefile |2 +-
{libfdt = lib/libfdt}/Makefile |0
{libfdt = lib/libfdt}/README|0
{libfdt = lib/libfdt}/fdt.c |0
{libfdt = lib/libfdt}/fdt_ro.c |0
{libfdt = lib/libfdt}/fdt_rw.c |0
{libfdt = lib/libfdt}/fdt_strerror.c|0
{libfdt = lib/libfdt}/fdt_sw.c |0
{libfdt = lib/libfdt}/fdt_wip.c |0
{libfdt = lib/libfdt}/libfdt_internal.h |0
tools/Makefile |6 +++---
tools/imls/Makefile |6 +++---
12 files changed, 7 insertions(+), 7 deletions(-)
rename {libfdt = lib/libfdt}/Makefile (100%)
rename {libfdt = lib/libfdt}/README (100%)
rename {libfdt = lib/libfdt}/fdt.c (100%)
rename {libfdt = lib/libfdt}/fdt_ro.c (100%)
rename {libfdt = lib/libfdt}/fdt_rw.c (100%)
rename {libfdt = lib/libfdt}/fdt_strerror.c (100%)
rename {libfdt = lib/libfdt}/fdt_sw.c (100%)
rename {libfdt = lib/libfdt}/fdt_wip.c (100%)
rename {libfdt = lib/libfdt}/libfdt_internal.h (100%)
diff --git a/Makefile b/Makefile
index 0b70dca..fdd781a 100644
--- a/Makefile
+++ b/Makefile
@@ -244,7 +244,7 @@ LIBS += drivers/usb/phy/libusb_phy.a
LIBS += drivers/video/libvideo.a
LIBS += drivers/watchdog/libwatchdog.a
LIBS += common/libcommon.a
-LIBS += libfdt/libfdt.a
+LIBS += lib/libfdt/libfdt.a
LIBS += api/libapi.a
LIBS += post/libpost.a
diff --git a/libfdt/Makefile b/lib/libfdt/Makefile
similarity index 100%
rename from libfdt/Makefile
rename to lib/libfdt/Makefile
diff --git a/libfdt/README b/lib/libfdt/README
similarity index 100%
rename from libfdt/README
rename to lib/libfdt/README
diff --git a/libfdt/fdt.c b/lib/libfdt/fdt.c
similarity index 100%
rename from libfdt/fdt.c
rename to lib/libfdt/fdt.c
diff --git a/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c
similarity index 100%
rename from libfdt/fdt_ro.c
rename to lib/libfdt/fdt_ro.c
diff --git a/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c
similarity index 100%
rename from libfdt/fdt_rw.c
rename to lib/libfdt/fdt_rw.c
diff --git a/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c
similarity index 100%
rename from libfdt/fdt_strerror.c
rename to lib/libfdt/fdt_strerror.c
diff --git a/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c
similarity index 100%
rename from libfdt/fdt_sw.c
rename to lib/libfdt/fdt_sw.c
diff --git a/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c
similarity index 100%
rename from libfdt/fdt_wip.c
rename to lib/libfdt/fdt_wip.c
diff --git a/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h
similarity index 100%
rename from libfdt/libfdt_internal.h
rename to lib/libfdt/libfdt_internal.h
diff --git a/tools/Makefile b/tools/Makefile
index a6f11c9..749d994 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -122,7 +122,7 @@ endif
# now $(obj) is defined
HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
-HOSTSRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
+HOSTSRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y)))
LIBFDT_OBJS:= $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
@@ -136,7 +136,7 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_OBJ_FILES-y))
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \
-idirafter $(OBJTREE)/include \
- -I $(SRCTREE)/libfdt \
+ -I $(SRCTREE)/lib/libfdt \
-I $(SRCTREE)/tools \
-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
-D__KERNEL_STRICT_NAMES
@@ -199,7 +199,7 @@ $(obj)%.o: $(SRCTREE)/common/%.c
$(obj)%.o: $(SRCTREE)/lib/%.c
$(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $
-$(obj)%.o: $(SRCTREE)/libfdt/%.c
+$(obj)%.o: $(SRCTREE)/lib/libfdt/%.c
$(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $
subdirs:
diff --git a/tools/imls/Makefile b/tools/imls/Makefile
index 82c2728..8407277 100644
--- a/tools/imls/Makefile
+++ b/tools/imls/Makefile
@@ -41,7 +41,7 @@ LIBFDT_OBJ_FILES-y += fdt_wip.o
# now $(obj) is defined
SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
SRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
-SRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
+SRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y)))
LIBFDT_OBJS:= $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
@@ -52,7 +52,7 @@ LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-idirafter $(OBJTREE)/include2 \
-idirafter $(OBJTREE)/include \
- -I $(SRCTREE)/libfdt \
+ -I $(SRCTREE)/lib/libfdt \
-I
[U-Boot] [PATCH v4 06/20] Replace #include asm-$ARCH/$FILE with #include asm/$FILE
The appropriate include/asm-$ARCH directory should already by symlinked to include/asm so using the whole asm-$ARCH path is unnecessary. This change should also allow us to move the include/asm-$ARCH directories into their appropriate lib/$ARCH/ directories. Signed-off-by: Peter Tyser pty...@xes-inc.com --- board/amcc/bamboo/init.S|2 +- board/amcc/canyonlands/init.S |2 +- board/amcc/ebony/init.S |2 +- board/amcc/katmai/init.S|2 +- board/amcc/luan/init.S |2 +- board/amcc/ocotea/init.S|2 +- board/amcc/redwood/init.S |2 +- board/amcc/redwood/redwood.c|2 +- board/amcc/sequoia/init.S |2 +- board/amcc/yucca/init.S |2 +- board/bf537-stamp/cmd_bf537led.c|2 +- board/esd/du440/init.S |2 +- board/esd/pmc440/init.S |2 +- board/galaxy5200/galaxy5200.c |2 +- board/gdsys/intip/init.S|2 +- board/korat/init.S |2 +- board/lwmon5/init.S |2 +- board/m501sk/m501sk.h |6 +++--- board/netstal/hcu4/hcu4.c |2 +- board/netstal/mcu25/mcu25.c |2 +- board/phytec/pcm030/pcm030.c|2 +- board/pleb2/pleb2.c |2 +- board/prodrive/alpr/fpga.c |2 +- board/sandburst/common/ppc440gx_i2c.c |2 +- board/tqc/tqm834x/tqm834x.c |2 +- board/xilinx/ppc440-generic/init.S |2 +- cpu/ppc4xx/4xx_pcie.c |2 +- drivers/i2c/ppc4xx_i2c.c|2 +- include/asm-arm/arch-arm720t/hardware.h |2 +- include/asm-arm/arch-lpc2292/hardware.h |2 +- nand_spl/board/freescale/mpc8569mds/nand_boot.c |2 +- nand_spl/board/freescale/p1_p2_rdb/nand_boot.c |2 +- nand_spl/nand_boot_fsl_nfc.c|4 ++-- 33 files changed, 36 insertions(+), 36 deletions(-) diff --git a/board/amcc/bamboo/init.S b/board/amcc/bamboo/init.S index a5c9d6d..7439c80 100644 --- a/board/amcc/bamboo/init.S +++ b/board/amcc/bamboo/init.S @@ -25,7 +25,7 @@ #include ppc_asm.tmpl #include config.h -#include asm-ppc/mmu.h +#include asm/mmu.h /** * TLB TABLE diff --git a/board/amcc/canyonlands/init.S b/board/amcc/canyonlands/init.S index 0b66796..993bec3 100644 --- a/board/amcc/canyonlands/init.S +++ b/board/amcc/canyonlands/init.S @@ -23,7 +23,7 @@ #include ppc_asm.tmpl #include config.h -#include asm-ppc/mmu.h +#include asm/mmu.h /** * TLB TABLE diff --git a/board/amcc/ebony/init.S b/board/amcc/ebony/init.S index 811a96a..153fa81 100644 --- a/board/amcc/ebony/init.S +++ b/board/amcc/ebony/init.S @@ -22,7 +22,7 @@ #include ppc_asm.tmpl #include config.h -#include asm-ppc/mmu.h +#include asm/mmu.h /** * TLB TABLE diff --git a/board/amcc/katmai/init.S b/board/amcc/katmai/init.S index 1c74a82..90598f6 100644 --- a/board/amcc/katmai/init.S +++ b/board/amcc/katmai/init.S @@ -25,7 +25,7 @@ #include ppc_asm.tmpl #include config.h -#include asm-ppc/mmu.h +#include asm/mmu.h /** * TLB TABLE diff --git a/board/amcc/luan/init.S b/board/amcc/luan/init.S index fb54dea..513b0fc 100644 --- a/board/amcc/luan/init.S +++ b/board/amcc/luan/init.S @@ -25,7 +25,7 @@ #include ppc_asm.tmpl #include config.h -#include asm-ppc/mmu.h +#include asm/mmu.h /** * TLB TABLE diff --git a/board/amcc/ocotea/init.S b/board/amcc/ocotea/init.S index 8bcfbb1..e7c75df 100644 --- a/board/amcc/ocotea/init.S +++ b/board/amcc/ocotea/init.S @@ -22,7 +22,7 @@ #include ppc_asm.tmpl #include config.h -#include asm-ppc/mmu.h +#include asm/mmu.h /** * TLB TABLE diff --git a/board/amcc/redwood/init.S b/board/amcc/redwood/init.S index 363d793..4da5869 100644 --- a/board/amcc/redwood/init.S +++ b/board/amcc/redwood/init.S @@ -23,7 +23,7 @@ #include ppc_asm.tmpl #include config.h -#include asm-ppc/mmu.h +#include asm/mmu.h /** * TLB TABLE diff --git a/board/amcc/redwood/redwood.c b/board/amcc/redwood/redwood.c index bc8cb0c..32fb8c5 100644 --- a/board/amcc/redwood/redwood.c +++ b/board/amcc/redwood/redwood.c @@
[U-Boot] [PATCH v4 13/20] mips: Move cpu/mips/* to arch/mips/cpu/*
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
{cpu/mips = arch/mips/cpu}/Makefile |0
{cpu/mips = arch/mips/cpu}/asc_serial.c |0
{cpu/mips = arch/mips/cpu}/asc_serial.h |0
{cpu/mips = arch/mips/cpu}/au1x00_eth.c |0
{cpu/mips = arch/mips/cpu}/au1x00_serial.c |0
{cpu/mips = arch/mips/cpu}/au1x00_usb_ohci.c |0
{cpu/mips = arch/mips/cpu}/au1x00_usb_ohci.h |0
{cpu/mips = arch/mips/cpu}/cache.S |0
{cpu/mips = arch/mips/cpu}/config.mk |0
{cpu/mips = arch/mips/cpu}/cpu.c |0
{cpu/mips = arch/mips/cpu}/incaip_clock.c|0
{cpu/mips = arch/mips/cpu}/incaip_wdt.S |0
{cpu/mips = arch/mips/cpu}/interrupts.c |0
{cpu/mips = arch/mips/cpu}/start.S |0
board/dbau1x00/dbau1x00.c |2 +-
board/gth2/gth2.c |2 +-
board/pb1x00/pb1x00.c |2 +-
board/purple/u-boot.lds |4 ++--
drivers/usb/host/isp116x-hcd.c|2 +-
19 files changed, 6 insertions(+), 6 deletions(-)
rename {cpu/mips = arch/mips/cpu}/Makefile (100%)
rename {cpu/mips = arch/mips/cpu}/asc_serial.c (100%)
rename {cpu/mips = arch/mips/cpu}/asc_serial.h (100%)
rename {cpu/mips = arch/mips/cpu}/au1x00_eth.c (100%)
rename {cpu/mips = arch/mips/cpu}/au1x00_serial.c (100%)
rename {cpu/mips = arch/mips/cpu}/au1x00_usb_ohci.c (100%)
rename {cpu/mips = arch/mips/cpu}/au1x00_usb_ohci.h (100%)
rename {cpu/mips = arch/mips/cpu}/cache.S (100%)
rename {cpu/mips = arch/mips/cpu}/config.mk (100%)
rename {cpu/mips = arch/mips/cpu}/cpu.c (100%)
rename {cpu/mips = arch/mips/cpu}/incaip_clock.c (100%)
rename {cpu/mips = arch/mips/cpu}/incaip_wdt.S (100%)
rename {cpu/mips = arch/mips/cpu}/interrupts.c (100%)
rename {cpu/mips = arch/mips/cpu}/start.S (100%)
diff --git a/cpu/mips/Makefile b/arch/mips/cpu/Makefile
similarity index 100%
rename from cpu/mips/Makefile
rename to arch/mips/cpu/Makefile
diff --git a/cpu/mips/asc_serial.c b/arch/mips/cpu/asc_serial.c
similarity index 100%
rename from cpu/mips/asc_serial.c
rename to arch/mips/cpu/asc_serial.c
diff --git a/cpu/mips/asc_serial.h b/arch/mips/cpu/asc_serial.h
similarity index 100%
rename from cpu/mips/asc_serial.h
rename to arch/mips/cpu/asc_serial.h
diff --git a/cpu/mips/au1x00_eth.c b/arch/mips/cpu/au1x00_eth.c
similarity index 100%
rename from cpu/mips/au1x00_eth.c
rename to arch/mips/cpu/au1x00_eth.c
diff --git a/cpu/mips/au1x00_serial.c b/arch/mips/cpu/au1x00_serial.c
similarity index 100%
rename from cpu/mips/au1x00_serial.c
rename to arch/mips/cpu/au1x00_serial.c
diff --git a/cpu/mips/au1x00_usb_ohci.c b/arch/mips/cpu/au1x00_usb_ohci.c
similarity index 100%
rename from cpu/mips/au1x00_usb_ohci.c
rename to arch/mips/cpu/au1x00_usb_ohci.c
diff --git a/cpu/mips/au1x00_usb_ohci.h b/arch/mips/cpu/au1x00_usb_ohci.h
similarity index 100%
rename from cpu/mips/au1x00_usb_ohci.h
rename to arch/mips/cpu/au1x00_usb_ohci.h
diff --git a/cpu/mips/cache.S b/arch/mips/cpu/cache.S
similarity index 100%
rename from cpu/mips/cache.S
rename to arch/mips/cpu/cache.S
diff --git a/cpu/mips/config.mk b/arch/mips/cpu/config.mk
similarity index 100%
rename from cpu/mips/config.mk
rename to arch/mips/cpu/config.mk
diff --git a/cpu/mips/cpu.c b/arch/mips/cpu/cpu.c
similarity index 100%
rename from cpu/mips/cpu.c
rename to arch/mips/cpu/cpu.c
diff --git a/cpu/mips/incaip_clock.c b/arch/mips/cpu/incaip_clock.c
similarity index 100%
rename from cpu/mips/incaip_clock.c
rename to arch/mips/cpu/incaip_clock.c
diff --git a/cpu/mips/incaip_wdt.S b/arch/mips/cpu/incaip_wdt.S
similarity index 100%
rename from cpu/mips/incaip_wdt.S
rename to arch/mips/cpu/incaip_wdt.S
diff --git a/cpu/mips/interrupts.c b/arch/mips/cpu/interrupts.c
similarity index 100%
rename from cpu/mips/interrupts.c
rename to arch/mips/cpu/interrupts.c
diff --git a/cpu/mips/start.S b/arch/mips/cpu/start.S
similarity index 100%
rename from cpu/mips/start.S
rename to arch/mips/cpu/start.S
diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c
index 42756f5..b3c6d51 100644
--- a/board/dbau1x00/dbau1x00.c
+++ b/board/dbau1x00/dbau1x00.c
@@ -37,7 +37,7 @@ phys_size_t initdram(int board_type)
#define BCSR_PCMCIA_PC0DRVEN 0x0010
#define BCSR_PCMCIA_PC0RST 0x0080
-/* In cpu/mips/cpu.c */
+/* In arch/mips/cpu/cpu.c */
void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
int checkboard (void)
diff --git a/board/gth2/gth2.c b/board/gth2/gth2.c
index 59873d5..8c3b55a 100644
--- a/board/gth2/gth2.c
+++ b/board/gth2/gth2.c
@@ -93,7 +93,7 @@ phys_size_t initdram(int board_type)
return (SDRAM_SIZE);
}
-/* In cpu/mips/cpu.c */
+/* In arch/mips/cpu/cpu.c */
void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
void set_ledcard(u32 value){
diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c
index 773e446..2510ddf 100644
---
[U-Boot] [PATCH v4 14/20] avr32: Move cpu/at32ap/* to arch/avr32/cpu/*
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
{cpu/at32ap = arch/avr32/cpu}/Makefile|0
{cpu/at32ap = arch/avr32/cpu}/at32ap700x/Makefile |0
{cpu/at32ap = arch/avr32/cpu}/at32ap700x/clk.c|0
.../at32ap = arch/avr32/cpu}/at32ap700x/portmux.c |0
{cpu/at32ap = arch/avr32/cpu}/at32ap700x/sm.h |0
{cpu/at32ap = arch/avr32/cpu}/cache.c |0
{cpu/at32ap = arch/avr32/cpu}/config.mk |0
{cpu/at32ap = arch/avr32/cpu}/cpu.c |0
{cpu/at32ap = arch/avr32/cpu}/exception.c |0
{cpu/at32ap = arch/avr32/cpu}/hsdramc.c |0
{cpu/at32ap = arch/avr32/cpu}/hsdramc1.h |0
{cpu/at32ap = arch/avr32/cpu}/hsmc3.h |0
{cpu/at32ap = arch/avr32/cpu}/interrupts.c|0
{cpu/at32ap = arch/avr32/cpu}/pio2.h |0
{cpu/at32ap = arch/avr32/cpu}/portmux-gpio.c |0
{cpu/at32ap = arch/avr32/cpu}/portmux-pio.c |0
{cpu/at32ap = arch/avr32/cpu}/start.S |0
board/mimc/mimc200/mimc200.c |2 +-
18 files changed, 1 insertions(+), 1 deletions(-)
rename {cpu/at32ap = arch/avr32/cpu}/Makefile (100%)
rename {cpu/at32ap = arch/avr32/cpu}/at32ap700x/Makefile (100%)
rename {cpu/at32ap = arch/avr32/cpu}/at32ap700x/clk.c (100%)
rename {cpu/at32ap = arch/avr32/cpu}/at32ap700x/portmux.c (100%)
rename {cpu/at32ap = arch/avr32/cpu}/at32ap700x/sm.h (100%)
rename {cpu/at32ap = arch/avr32/cpu}/cache.c (100%)
rename {cpu/at32ap = arch/avr32/cpu}/config.mk (100%)
rename {cpu/at32ap = arch/avr32/cpu}/cpu.c (100%)
rename {cpu/at32ap = arch/avr32/cpu}/exception.c (100%)
rename {cpu/at32ap = arch/avr32/cpu}/hsdramc.c (100%)
rename {cpu/at32ap = arch/avr32/cpu}/hsdramc1.h (100%)
rename {cpu/at32ap = arch/avr32/cpu}/hsmc3.h (100%)
rename {cpu/at32ap = arch/avr32/cpu}/interrupts.c (100%)
rename {cpu/at32ap = arch/avr32/cpu}/pio2.h (100%)
rename {cpu/at32ap = arch/avr32/cpu}/portmux-gpio.c (100%)
rename {cpu/at32ap = arch/avr32/cpu}/portmux-pio.c (100%)
rename {cpu/at32ap = arch/avr32/cpu}/start.S (100%)
diff --git a/cpu/at32ap/Makefile b/arch/avr32/cpu/Makefile
similarity index 100%
rename from cpu/at32ap/Makefile
rename to arch/avr32/cpu/Makefile
diff --git a/cpu/at32ap/at32ap700x/Makefile b/arch/avr32/cpu/at32ap700x/Makefile
similarity index 100%
rename from cpu/at32ap/at32ap700x/Makefile
rename to arch/avr32/cpu/at32ap700x/Makefile
diff --git a/cpu/at32ap/at32ap700x/clk.c b/arch/avr32/cpu/at32ap700x/clk.c
similarity index 100%
rename from cpu/at32ap/at32ap700x/clk.c
rename to arch/avr32/cpu/at32ap700x/clk.c
diff --git a/cpu/at32ap/at32ap700x/portmux.c
b/arch/avr32/cpu/at32ap700x/portmux.c
similarity index 100%
rename from cpu/at32ap/at32ap700x/portmux.c
rename to arch/avr32/cpu/at32ap700x/portmux.c
diff --git a/cpu/at32ap/at32ap700x/sm.h b/arch/avr32/cpu/at32ap700x/sm.h
similarity index 100%
rename from cpu/at32ap/at32ap700x/sm.h
rename to arch/avr32/cpu/at32ap700x/sm.h
diff --git a/cpu/at32ap/cache.c b/arch/avr32/cpu/cache.c
similarity index 100%
rename from cpu/at32ap/cache.c
rename to arch/avr32/cpu/cache.c
diff --git a/cpu/at32ap/config.mk b/arch/avr32/cpu/config.mk
similarity index 100%
rename from cpu/at32ap/config.mk
rename to arch/avr32/cpu/config.mk
diff --git a/cpu/at32ap/cpu.c b/arch/avr32/cpu/cpu.c
similarity index 100%
rename from cpu/at32ap/cpu.c
rename to arch/avr32/cpu/cpu.c
diff --git a/cpu/at32ap/exception.c b/arch/avr32/cpu/exception.c
similarity index 100%
rename from cpu/at32ap/exception.c
rename to arch/avr32/cpu/exception.c
diff --git a/cpu/at32ap/hsdramc.c b/arch/avr32/cpu/hsdramc.c
similarity index 100%
rename from cpu/at32ap/hsdramc.c
rename to arch/avr32/cpu/hsdramc.c
diff --git a/cpu/at32ap/hsdramc1.h b/arch/avr32/cpu/hsdramc1.h
similarity index 100%
rename from cpu/at32ap/hsdramc1.h
rename to arch/avr32/cpu/hsdramc1.h
diff --git a/cpu/at32ap/hsmc3.h b/arch/avr32/cpu/hsmc3.h
similarity index 100%
rename from cpu/at32ap/hsmc3.h
rename to arch/avr32/cpu/hsmc3.h
diff --git a/cpu/at32ap/interrupts.c b/arch/avr32/cpu/interrupts.c
similarity index 100%
rename from cpu/at32ap/interrupts.c
rename to arch/avr32/cpu/interrupts.c
diff --git a/cpu/at32ap/pio2.h b/arch/avr32/cpu/pio2.h
similarity index 100%
rename from cpu/at32ap/pio2.h
rename to arch/avr32/cpu/pio2.h
diff --git a/cpu/at32ap/portmux-gpio.c b/arch/avr32/cpu/portmux-gpio.c
similarity index 100%
rename from cpu/at32ap/portmux-gpio.c
rename to arch/avr32/cpu/portmux-gpio.c
diff --git a/cpu/at32ap/portmux-pio.c b/arch/avr32/cpu/portmux-pio.c
similarity index 100%
rename from cpu/at32ap/portmux-pio.c
rename to arch/avr32/cpu/portmux-pio.c
diff --git a/cpu/at32ap/start.S b/arch/avr32/cpu/start.S
similarity index 100%
rename from cpu/at32ap/start.S
rename to arch/avr32/cpu/start.S
diff --git a/board/mimc/mimc200/mimc200.c b/board/mimc/mimc200/mimc200.c
index 0dcacb9..cc0f137 100644
--- a/board/mimc/mimc200/mimc200.c
+++
[U-Boot] [PATCH v4 12/20] blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
Makefile |2 +-
{cpu/blackfin = arch/blackfin/cpu}/.gitignore |0
{cpu/blackfin = arch/blackfin/cpu}/Makefile |0
.../blackfin/cpu}/bootrom-asm-offsets.awk |0
.../blackfin/cpu}/bootrom-asm-offsets.c.in |0
{cpu/blackfin = arch/blackfin/cpu}/cache.S|0
{cpu/blackfin = arch/blackfin/cpu}/cpu.c |0
{cpu/blackfin = arch/blackfin/cpu}/cpu.h |0
{cpu/blackfin = arch/blackfin/cpu}/initcode.c |0
{cpu/blackfin = arch/blackfin/cpu}/interrupt.S|0
{cpu/blackfin = arch/blackfin/cpu}/interrupts.c |0
{cpu/blackfin = arch/blackfin/cpu}/jtag-console.c |0
{cpu/blackfin = arch/blackfin/cpu}/os_log.c |0
{cpu/blackfin = arch/blackfin/cpu}/reset.c|0
{cpu/blackfin = arch/blackfin/cpu}/serial.c |0
{cpu/blackfin = arch/blackfin/cpu}/serial.h |0
{cpu/blackfin = arch/blackfin/cpu}/start.S|0
{cpu/blackfin = arch/blackfin/cpu}/traps.c|0
{cpu/blackfin = arch/blackfin/cpu}/watchdog.c |0
arch/blackfin/lib/u-boot.lds.S |4 ++--
include/configs/bf533-stamp.h |6 +++---
include/configs/bf537-pnav.h |6 +++---
include/configs/bf537-stamp.h |6 +++---
include/configs/bf538f-ezkit.h |6 +++---
include/configs/bf561-ezkit.h |6 +++---
include/configs/cm-bf537e.h|6 +++---
include/configs/cm-bf537u.h|6 +++---
include/configs/ibf-dsp561.h |6 +++---
include/configs/tcm-bf537.h|6 +++---
29 files changed, 30 insertions(+), 30 deletions(-)
rename {cpu/blackfin = arch/blackfin/cpu}/.gitignore (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/Makefile (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/bootrom-asm-offsets.awk (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/bootrom-asm-offsets.c.in (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/cache.S (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/cpu.c (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/cpu.h (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/initcode.c (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/interrupt.S (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/interrupts.c (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/jtag-console.c (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/os_log.c (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/reset.c (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/serial.c (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/serial.h (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/start.S (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/traps.c (100%)
rename {cpu/blackfin = arch/blackfin/cpu}/watchdog.c (100%)
diff --git a/Makefile b/Makefile
index e922ec3..0381c81 100644
--- a/Makefile
+++ b/Makefile
@@ -3745,7 +3745,7 @@ clean:
$(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \
$(obj)arch/blackfin/lib/u-boot.lds
\
$(obj)u-boot.lds \
- $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
+ $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]
@rm -f $(obj)include/bmp_logo.h
@rm -f $(obj)nand_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,System.map}
@rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map}
diff --git a/cpu/blackfin/.gitignore b/arch/blackfin/cpu/.gitignore
similarity index 100%
rename from cpu/blackfin/.gitignore
rename to arch/blackfin/cpu/.gitignore
diff --git a/cpu/blackfin/Makefile b/arch/blackfin/cpu/Makefile
similarity index 100%
rename from cpu/blackfin/Makefile
rename to arch/blackfin/cpu/Makefile
diff --git a/cpu/blackfin/bootrom-asm-offsets.awk
b/arch/blackfin/cpu/bootrom-asm-offsets.awk
similarity index 100%
rename from cpu/blackfin/bootrom-asm-offsets.awk
rename to arch/blackfin/cpu/bootrom-asm-offsets.awk
diff --git a/cpu/blackfin/bootrom-asm-offsets.c.in
b/arch/blackfin/cpu/bootrom-asm-offsets.c.in
similarity index 100%
rename from cpu/blackfin/bootrom-asm-offsets.c.in
rename to arch/blackfin/cpu/bootrom-asm-offsets.c.in
diff --git a/cpu/blackfin/cache.S b/arch/blackfin/cpu/cache.S
similarity index 100%
rename from cpu/blackfin/cache.S
rename to arch/blackfin/cpu/cache.S
diff --git a/cpu/blackfin/cpu.c b/arch/blackfin/cpu/cpu.c
similarity index 100%
rename from cpu/blackfin/cpu.c
rename to arch/blackfin/cpu/cpu.c
diff --git a/cpu/blackfin/cpu.h b/arch/blackfin/cpu/cpu.h
similarity index 100%
rename from cpu/blackfin/cpu.h
rename to arch/blackfin/cpu/cpu.h
diff --git a/cpu/blackfin/initcode.c b/arch/blackfin/cpu/initcode.c
similarity index 100%
rename from cpu/blackfin/initcode.c
rename to
[U-Boot] [PATCH v4 16/20] i386: Move cpu/i386/* to arch/i386/cpu/*
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
{cpu/i386 = arch/i386/cpu}/Makefile|0
{cpu/i386 = arch/i386/cpu}/config.mk |0
{cpu/i386 = arch/i386/cpu}/cpu.c |0
{cpu/i386 = arch/i386/cpu}/interrupts.c|0
{cpu/i386 = arch/i386/cpu}/resetvec.S |0
{cpu/i386 = arch/i386/cpu}/sc520/Makefile |0
{cpu/i386 = arch/i386/cpu}/sc520/sc520.c |0
{cpu/i386 = arch/i386/cpu}/sc520/sc520_asm.S |0
{cpu/i386 = arch/i386/cpu}/sc520/sc520_pci.c |0
{cpu/i386 = arch/i386/cpu}/sc520/sc520_ssi.c |0
{cpu/i386 = arch/i386/cpu}/sc520/sc520_timer.c |0
{cpu/i386 = arch/i386/cpu}/serial.c|0
{cpu/i386 = arch/i386/cpu}/start.S |0
{cpu/i386 = arch/i386/cpu}/start16.S |0
arch/i386/include/asm/interrupt.h |2 +-
arch/i386/include/asm/u-boot-i386.h |2 +-
doc/TODO-i386 |4 ++--
17 files changed, 4 insertions(+), 4 deletions(-)
rename {cpu/i386 = arch/i386/cpu}/Makefile (100%)
rename {cpu/i386 = arch/i386/cpu}/config.mk (100%)
rename {cpu/i386 = arch/i386/cpu}/cpu.c (100%)
rename {cpu/i386 = arch/i386/cpu}/interrupts.c (100%)
rename {cpu/i386 = arch/i386/cpu}/resetvec.S (100%)
rename {cpu/i386 = arch/i386/cpu}/sc520/Makefile (100%)
rename {cpu/i386 = arch/i386/cpu}/sc520/sc520.c (100%)
rename {cpu/i386 = arch/i386/cpu}/sc520/sc520_asm.S (100%)
rename {cpu/i386 = arch/i386/cpu}/sc520/sc520_pci.c (100%)
rename {cpu/i386 = arch/i386/cpu}/sc520/sc520_ssi.c (100%)
rename {cpu/i386 = arch/i386/cpu}/sc520/sc520_timer.c (100%)
rename {cpu/i386 = arch/i386/cpu}/serial.c (100%)
rename {cpu/i386 = arch/i386/cpu}/start.S (100%)
rename {cpu/i386 = arch/i386/cpu}/start16.S (100%)
diff --git a/cpu/i386/Makefile b/arch/i386/cpu/Makefile
similarity index 100%
rename from cpu/i386/Makefile
rename to arch/i386/cpu/Makefile
diff --git a/cpu/i386/config.mk b/arch/i386/cpu/config.mk
similarity index 100%
rename from cpu/i386/config.mk
rename to arch/i386/cpu/config.mk
diff --git a/cpu/i386/cpu.c b/arch/i386/cpu/cpu.c
similarity index 100%
rename from cpu/i386/cpu.c
rename to arch/i386/cpu/cpu.c
diff --git a/cpu/i386/interrupts.c b/arch/i386/cpu/interrupts.c
similarity index 100%
rename from cpu/i386/interrupts.c
rename to arch/i386/cpu/interrupts.c
diff --git a/cpu/i386/resetvec.S b/arch/i386/cpu/resetvec.S
similarity index 100%
rename from cpu/i386/resetvec.S
rename to arch/i386/cpu/resetvec.S
diff --git a/cpu/i386/sc520/Makefile b/arch/i386/cpu/sc520/Makefile
similarity index 100%
rename from cpu/i386/sc520/Makefile
rename to arch/i386/cpu/sc520/Makefile
diff --git a/cpu/i386/sc520/sc520.c b/arch/i386/cpu/sc520/sc520.c
similarity index 100%
rename from cpu/i386/sc520/sc520.c
rename to arch/i386/cpu/sc520/sc520.c
diff --git a/cpu/i386/sc520/sc520_asm.S b/arch/i386/cpu/sc520/sc520_asm.S
similarity index 100%
rename from cpu/i386/sc520/sc520_asm.S
rename to arch/i386/cpu/sc520/sc520_asm.S
diff --git a/cpu/i386/sc520/sc520_pci.c b/arch/i386/cpu/sc520/sc520_pci.c
similarity index 100%
rename from cpu/i386/sc520/sc520_pci.c
rename to arch/i386/cpu/sc520/sc520_pci.c
diff --git a/cpu/i386/sc520/sc520_ssi.c b/arch/i386/cpu/sc520/sc520_ssi.c
similarity index 100%
rename from cpu/i386/sc520/sc520_ssi.c
rename to arch/i386/cpu/sc520/sc520_ssi.c
diff --git a/cpu/i386/sc520/sc520_timer.c b/arch/i386/cpu/sc520/sc520_timer.c
similarity index 100%
rename from cpu/i386/sc520/sc520_timer.c
rename to arch/i386/cpu/sc520/sc520_timer.c
diff --git a/cpu/i386/serial.c b/arch/i386/cpu/serial.c
similarity index 100%
rename from cpu/i386/serial.c
rename to arch/i386/cpu/serial.c
diff --git a/cpu/i386/start.S b/arch/i386/cpu/start.S
similarity index 100%
rename from cpu/i386/start.S
rename to arch/i386/cpu/start.S
diff --git a/cpu/i386/start16.S b/arch/i386/cpu/start16.S
similarity index 100%
rename from cpu/i386/start16.S
rename to arch/i386/cpu/start16.S
diff --git a/arch/i386/include/asm/interrupt.h
b/arch/i386/include/asm/interrupt.h
index 8d324d9..07426fe 100644
--- a/arch/i386/include/asm/interrupt.h
+++ b/arch/i386/include/asm/interrupt.h
@@ -27,7 +27,7 @@
#ifndef __ASM_INTERRUPT_H_
#define __ASM_INTERRUPT_H_ 1
-/* cpu/i386/interrupts.c */
+/* arch/i386/cpu/interrupts.c */
void set_vector(u8 intnum, void *routine);
/* arch/i386/lib/interupts.c */
diff --git a/arch/i386/include/asm/u-boot-i386.h
b/arch/i386/include/asm/u-boot-i386.h
index a08632d..521fd35 100644
--- a/arch/i386/include/asm/u-boot-i386.h
+++ b/arch/i386/include/asm/u-boot-i386.h
@@ -33,7 +33,7 @@ void timer_isr(void *);
typedef void (timer_fnc_t) (void);
int register_timer_isr (timer_fnc_t *isr_func);
-/* Architecture specific - can be in cpu/i386/, arch/i386/lib/, or $(BOARD)/ */
+/* Architecture specific - can be in arch/i386/cpu/, arch/i386/lib/, or
$(BOARD)/ */
int timer_init(void);
/* cpu/.../interrupts.c */
diff --git a/doc/TODO-i386
[U-Boot] [PATCH v4 17/20] sparc: Move cpu/leon[23] to arch/sparc/cpu/leon[23]
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
{cpu = arch/sparc/cpu}/leon2/Makefile |0
{cpu = arch/sparc/cpu}/leon2/config.mk|0
{cpu = arch/sparc/cpu}/leon2/cpu.c|0
{cpu = arch/sparc/cpu}/leon2/cpu_init.c |0
{cpu = arch/sparc/cpu}/leon2/interrupts.c |0
{cpu = arch/sparc/cpu}/leon2/prom.c |0
{cpu = arch/sparc/cpu}/leon2/serial.c |0
{cpu = arch/sparc/cpu}/leon2/start.S |0
{cpu = arch/sparc/cpu}/leon3/Makefile |0
{cpu = arch/sparc/cpu}/leon3/ambapp.c |0
{cpu = arch/sparc/cpu}/leon3/config.mk|0
{cpu = arch/sparc/cpu}/leon3/cpu.c|0
{cpu = arch/sparc/cpu}/leon3/cpu_init.c |0
{cpu = arch/sparc/cpu}/leon3/interrupts.c |0
{cpu = arch/sparc/cpu}/leon3/prom.c |0
{cpu = arch/sparc/cpu}/leon3/serial.c |0
{cpu = arch/sparc/cpu}/leon3/start.S |0
{cpu = arch/sparc/cpu}/leon3/usb_uhci.c |0
{cpu = arch/sparc/cpu}/leon3/usb_uhci.h |0
board/gaisler/gr_cpci_ax2000/u-boot.lds|2 +-
board/gaisler/gr_ep2s60/u-boot.lds |2 +-
board/gaisler/gr_xc3s_1500/u-boot.lds |2 +-
board/gaisler/grsim/u-boot.lds |2 +-
board/gaisler/grsim_leon2/u-boot.lds |2 +-
24 files changed, 5 insertions(+), 5 deletions(-)
rename {cpu = arch/sparc/cpu}/leon2/Makefile (100%)
rename {cpu = arch/sparc/cpu}/leon2/config.mk (100%)
rename {cpu = arch/sparc/cpu}/leon2/cpu.c (100%)
rename {cpu = arch/sparc/cpu}/leon2/cpu_init.c (100%)
rename {cpu = arch/sparc/cpu}/leon2/interrupts.c (100%)
rename {cpu = arch/sparc/cpu}/leon2/prom.c (100%)
rename {cpu = arch/sparc/cpu}/leon2/serial.c (100%)
rename {cpu = arch/sparc/cpu}/leon2/start.S (100%)
rename {cpu = arch/sparc/cpu}/leon3/Makefile (100%)
rename {cpu = arch/sparc/cpu}/leon3/ambapp.c (100%)
rename {cpu = arch/sparc/cpu}/leon3/config.mk (100%)
rename {cpu = arch/sparc/cpu}/leon3/cpu.c (100%)
rename {cpu = arch/sparc/cpu}/leon3/cpu_init.c (100%)
rename {cpu = arch/sparc/cpu}/leon3/interrupts.c (100%)
rename {cpu = arch/sparc/cpu}/leon3/prom.c (100%)
rename {cpu = arch/sparc/cpu}/leon3/serial.c (100%)
rename {cpu = arch/sparc/cpu}/leon3/start.S (100%)
rename {cpu = arch/sparc/cpu}/leon3/usb_uhci.c (100%)
rename {cpu = arch/sparc/cpu}/leon3/usb_uhci.h (100%)
diff --git a/cpu/leon2/Makefile b/arch/sparc/cpu/leon2/Makefile
similarity index 100%
rename from cpu/leon2/Makefile
rename to arch/sparc/cpu/leon2/Makefile
diff --git a/cpu/leon2/config.mk b/arch/sparc/cpu/leon2/config.mk
similarity index 100%
rename from cpu/leon2/config.mk
rename to arch/sparc/cpu/leon2/config.mk
diff --git a/cpu/leon2/cpu.c b/arch/sparc/cpu/leon2/cpu.c
similarity index 100%
rename from cpu/leon2/cpu.c
rename to arch/sparc/cpu/leon2/cpu.c
diff --git a/cpu/leon2/cpu_init.c b/arch/sparc/cpu/leon2/cpu_init.c
similarity index 100%
rename from cpu/leon2/cpu_init.c
rename to arch/sparc/cpu/leon2/cpu_init.c
diff --git a/cpu/leon2/interrupts.c b/arch/sparc/cpu/leon2/interrupts.c
similarity index 100%
rename from cpu/leon2/interrupts.c
rename to arch/sparc/cpu/leon2/interrupts.c
diff --git a/cpu/leon2/prom.c b/arch/sparc/cpu/leon2/prom.c
similarity index 100%
rename from cpu/leon2/prom.c
rename to arch/sparc/cpu/leon2/prom.c
diff --git a/cpu/leon2/serial.c b/arch/sparc/cpu/leon2/serial.c
similarity index 100%
rename from cpu/leon2/serial.c
rename to arch/sparc/cpu/leon2/serial.c
diff --git a/cpu/leon2/start.S b/arch/sparc/cpu/leon2/start.S
similarity index 100%
rename from cpu/leon2/start.S
rename to arch/sparc/cpu/leon2/start.S
diff --git a/cpu/leon3/Makefile b/arch/sparc/cpu/leon3/Makefile
similarity index 100%
rename from cpu/leon3/Makefile
rename to arch/sparc/cpu/leon3/Makefile
diff --git a/cpu/leon3/ambapp.c b/arch/sparc/cpu/leon3/ambapp.c
similarity index 100%
rename from cpu/leon3/ambapp.c
rename to arch/sparc/cpu/leon3/ambapp.c
diff --git a/cpu/leon3/config.mk b/arch/sparc/cpu/leon3/config.mk
similarity index 100%
rename from cpu/leon3/config.mk
rename to arch/sparc/cpu/leon3/config.mk
diff --git a/cpu/leon3/cpu.c b/arch/sparc/cpu/leon3/cpu.c
similarity index 100%
rename from cpu/leon3/cpu.c
rename to arch/sparc/cpu/leon3/cpu.c
diff --git a/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c
similarity index 100%
rename from cpu/leon3/cpu_init.c
rename to arch/sparc/cpu/leon3/cpu_init.c
diff --git a/cpu/leon3/interrupts.c b/arch/sparc/cpu/leon3/interrupts.c
similarity index 100%
rename from cpu/leon3/interrupts.c
rename to arch/sparc/cpu/leon3/interrupts.c
diff --git a/cpu/leon3/prom.c b/arch/sparc/cpu/leon3/prom.c
similarity index 100%
rename from cpu/leon3/prom.c
rename to arch/sparc/cpu/leon3/prom.c
diff --git a/cpu/leon3/serial.c b/arch/sparc/cpu/leon3/serial.c
similarity index 100%
rename from cpu/leon3/serial.c
rename to arch/sparc/cpu/leon3/serial.c
diff --git a/cpu/leon3/start.S b/arch/sparc/cpu/leon3/start.S
similarity index 100%
rename from cpu/leon3/start.S
rename to
[U-Boot] [PATCH v4 15/20] microblaze: Move cpu/microblaze/* to arch/microblaze/cpu/*
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
{cpu/microblaze = arch/microblaze/cpu}/Makefile |0
{cpu/microblaze = arch/microblaze/cpu}/cache.c|0
{cpu/microblaze = arch/microblaze/cpu}/cpu.c |0
.../microblaze = arch/microblaze/cpu}/exception.c |0
.../microblaze/cpu}/interrupts.c |0
{cpu/microblaze = arch/microblaze/cpu}/irq.S |0
{cpu/microblaze = arch/microblaze/cpu}/start.S|0
{cpu/microblaze = arch/microblaze/cpu}/timer.c|0
board/xilinx/microblaze-generic/u-boot.lds |2 +-
9 files changed, 1 insertions(+), 1 deletions(-)
rename {cpu/microblaze = arch/microblaze/cpu}/Makefile (100%)
rename {cpu/microblaze = arch/microblaze/cpu}/cache.c (100%)
rename {cpu/microblaze = arch/microblaze/cpu}/cpu.c (100%)
rename {cpu/microblaze = arch/microblaze/cpu}/exception.c (100%)
rename {cpu/microblaze = arch/microblaze/cpu}/interrupts.c (100%)
rename {cpu/microblaze = arch/microblaze/cpu}/irq.S (100%)
rename {cpu/microblaze = arch/microblaze/cpu}/start.S (100%)
rename {cpu/microblaze = arch/microblaze/cpu}/timer.c (100%)
diff --git a/cpu/microblaze/Makefile b/arch/microblaze/cpu/Makefile
similarity index 100%
rename from cpu/microblaze/Makefile
rename to arch/microblaze/cpu/Makefile
diff --git a/cpu/microblaze/cache.c b/arch/microblaze/cpu/cache.c
similarity index 100%
rename from cpu/microblaze/cache.c
rename to arch/microblaze/cpu/cache.c
diff --git a/cpu/microblaze/cpu.c b/arch/microblaze/cpu/cpu.c
similarity index 100%
rename from cpu/microblaze/cpu.c
rename to arch/microblaze/cpu/cpu.c
diff --git a/cpu/microblaze/exception.c b/arch/microblaze/cpu/exception.c
similarity index 100%
rename from cpu/microblaze/exception.c
rename to arch/microblaze/cpu/exception.c
diff --git a/cpu/microblaze/interrupts.c b/arch/microblaze/cpu/interrupts.c
similarity index 100%
rename from cpu/microblaze/interrupts.c
rename to arch/microblaze/cpu/interrupts.c
diff --git a/cpu/microblaze/irq.S b/arch/microblaze/cpu/irq.S
similarity index 100%
rename from cpu/microblaze/irq.S
rename to arch/microblaze/cpu/irq.S
diff --git a/cpu/microblaze/start.S b/arch/microblaze/cpu/start.S
similarity index 100%
rename from cpu/microblaze/start.S
rename to arch/microblaze/cpu/start.S
diff --git a/cpu/microblaze/timer.c b/arch/microblaze/cpu/timer.c
similarity index 100%
rename from cpu/microblaze/timer.c
rename to arch/microblaze/cpu/timer.c
diff --git a/board/xilinx/microblaze-generic/u-boot.lds
b/board/xilinx/microblaze-generic/u-boot.lds
index c20c6dd..ee41145 100644
--- a/board/xilinx/microblaze-generic/u-boot.lds
+++ b/board/xilinx/microblaze-generic/u-boot.lds
@@ -30,7 +30,7 @@ SECTIONS
.text ALIGN(0x4):
{
__text_start = .;
- cpu/microblaze/start.o (.text)
+ arch/microblaze/cpu/start.o (.text)
*(.text)
__text_end = .;
}
--
1.6.2.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 11/20] m68k: Move cpu/$CPU to arch/m68k/cpu/$CPU
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
{cpu = arch/m68k/cpu}/mcf5227x/Makefile |0
{cpu = arch/m68k/cpu}/mcf5227x/config.mk |0
{cpu = arch/m68k/cpu}/mcf5227x/cpu.c |0
{cpu = arch/m68k/cpu}/mcf5227x/cpu_init.c |0
{cpu = arch/m68k/cpu}/mcf5227x/interrupts.c |0
{cpu = arch/m68k/cpu}/mcf5227x/speed.c|0
{cpu = arch/m68k/cpu}/mcf5227x/start.S|0
{cpu = arch/m68k/cpu}/mcf523x/Makefile|0
{cpu = arch/m68k/cpu}/mcf523x/config.mk |0
{cpu = arch/m68k/cpu}/mcf523x/cpu.c |0
{cpu = arch/m68k/cpu}/mcf523x/cpu_init.c |0
{cpu = arch/m68k/cpu}/mcf523x/interrupts.c|0
{cpu = arch/m68k/cpu}/mcf523x/speed.c |0
{cpu = arch/m68k/cpu}/mcf523x/start.S |0
{cpu = arch/m68k/cpu}/mcf52x2/Makefile|0
{cpu = arch/m68k/cpu}/mcf52x2/config.mk |0
{cpu = arch/m68k/cpu}/mcf52x2/cpu.c |0
{cpu = arch/m68k/cpu}/mcf52x2/cpu.h |0
{cpu = arch/m68k/cpu}/mcf52x2/cpu_init.c |0
{cpu = arch/m68k/cpu}/mcf52x2/interrupts.c|0
{cpu = arch/m68k/cpu}/mcf52x2/speed.c |0
{cpu = arch/m68k/cpu}/mcf52x2/start.S |0
{cpu = arch/m68k/cpu}/mcf532x/Makefile|0
{cpu = arch/m68k/cpu}/mcf532x/config.mk |0
{cpu = arch/m68k/cpu}/mcf532x/cpu.c |0
{cpu = arch/m68k/cpu}/mcf532x/cpu_init.c |0
{cpu = arch/m68k/cpu}/mcf532x/interrupts.c|0
{cpu = arch/m68k/cpu}/mcf532x/speed.c |0
{cpu = arch/m68k/cpu}/mcf532x/start.S |0
{cpu = arch/m68k/cpu}/mcf5445x/Makefile |0
{cpu = arch/m68k/cpu}/mcf5445x/config.mk |0
{cpu = arch/m68k/cpu}/mcf5445x/cpu.c |0
{cpu = arch/m68k/cpu}/mcf5445x/cpu_init.c |0
{cpu = arch/m68k/cpu}/mcf5445x/interrupts.c |0
{cpu = arch/m68k/cpu}/mcf5445x/pci.c |0
{cpu = arch/m68k/cpu}/mcf5445x/speed.c|0
{cpu = arch/m68k/cpu}/mcf5445x/start.S|0
{cpu = arch/m68k/cpu}/mcf547x_8x/Makefile |0
{cpu = arch/m68k/cpu}/mcf547x_8x/config.mk|0
{cpu = arch/m68k/cpu}/mcf547x_8x/cpu.c|0
{cpu = arch/m68k/cpu}/mcf547x_8x/cpu_init.c |0
{cpu = arch/m68k/cpu}/mcf547x_8x/interrupts.c |0
{cpu = arch/m68k/cpu}/mcf547x_8x/pci.c|0
{cpu = arch/m68k/cpu}/mcf547x_8x/slicetimer.c |0
{cpu = arch/m68k/cpu}/mcf547x_8x/speed.c |0
{cpu = arch/m68k/cpu}/mcf547x_8x/start.S |0
board/BuS/EB+MCF-EV123/u-boot.lds |2 +-
board/astro/mcf5373l/u-boot.lds|2 +-
board/cobra5272/u-boot.lds |6 +++---
board/esd/tasreg/u-boot.lds|4 ++--
board/freescale/m5208evbe/u-boot.lds |4 ++--
board/freescale/m52277evb/u-boot.spa |4 ++--
board/freescale/m52277evb/u-boot.stm |2 +-
board/freescale/m5235evb/u-boot.16 |4 ++--
board/freescale/m5235evb/u-boot.32 | 10 +-
board/freescale/m5249evb/u-boot.lds|4 ++--
board/freescale/m5253demo/u-boot.lds |4 ++--
board/freescale/m5253evbe/u-boot.lds |4 ++--
board/freescale/m5271evb/u-boot.lds|4 ++--
board/freescale/m5272c3/u-boot.lds |4 ++--
board/freescale/m5275evb/u-boot.lds|2 +-
board/freescale/m5282evb/u-boot.lds|2 +-
board/freescale/m53017evb/u-boot.lds |4 ++--
board/freescale/m5329evb/u-boot.lds|2 +-
board/freescale/m5373evb/u-boot.lds|2 +-
board/freescale/m54451evb/u-boot.spa |4 ++--
board/freescale/m54451evb/u-boot.stm | 12 ++--
board/freescale/m54455evb/u-boot.atm |2 +-
board/freescale/m54455evb/u-boot.int |2 +-
board/freescale/m54455evb/u-boot.stm |2 +-
board/freescale/m547xevb/u-boot.lds|2 +-
board/freescale/m548xevb/u-boot.lds|2 +-
board/idmr/u-boot.lds |4 ++--
doc/README.m52277evb | 14 +++---
doc/README.m53017evb | 14 +++---
doc/README.m5373evb| 14 +++---
doc/README.m54455evb | 14 +++---
doc/README.m5475evb| 16
doc/README.m68k|4 ++--
79 files changed, 88 insertions(+), 88 deletions(-)
rename {cpu = arch/m68k/cpu}/mcf5227x/Makefile (100%)
rename {cpu = arch/m68k/cpu}/mcf5227x/config.mk (100%)
rename {cpu = arch/m68k/cpu}/mcf5227x/cpu.c (100%)
rename {cpu = arch/m68k/cpu}/mcf5227x/cpu_init.c (100%)
rename {cpu = arch/m68k/cpu}/mcf5227x/interrupts.c (100%)
rename {cpu = arch/m68k/cpu}/mcf5227x/speed.c (100%)
rename {cpu = arch/m68k/cpu}/mcf5227x/start.S (100%)
[U-Boot] [PATCH v4 20/20] Update README to reflect new directory structure
Also fix up some whitespace issues that were introduced when moving directory locations. Signed-off-by: Peter Tyser pty...@xes-inc.com --- README | 158 +--- 1 files changed, 91 insertions(+), 67 deletions(-) diff --git a/README b/README index d5ccdc5..99320ab 100644 --- a/README +++ b/README @@ -138,68 +138,91 @@ U-Boot will always have a patchlevel of 0. Directory Hierarchy: -- api Machine/arch independent API for external apps -- boardBoard dependent files -- common Misc architecture independent functions -- cpu CPU specific files - - 74xx_7xx Files specific to Freescale MPC74xx and 7xx CPUs - - arm720tFiles specific to ARM 720 CPUs - - arm920tFiles specific to ARM 920 CPUs -- at91rm9200 Files specific to Atmel AT91RM9200 CPU -- imx Files specific to Freescale MC9328 i.MX CPUs -- s3c24x0 Files specific to Samsung S3C24X0 CPUs - - arm925tFiles specific to ARM 925 CPUs - - arm926ejs Files specific to ARM 926 CPUs - - arm1136Files specific to ARM 1136 CPUs - - at32ap Files specific to Atmel AVR32 AP CPUs - - blackfin Files specific to Analog Devices Blackfin CPUs - - i386 Files specific to i386 CPUs - - ixpFiles specific to Intel XScale IXP CPUs - - leon2 Files specific to Gaisler LEON2 SPARC CPU - - leon3 Files specific to Gaisler LEON3 SPARC CPU - - mcf52x2Files specific to Freescale ColdFire MCF52x2 CPUs - - mcf5227x Files specific to Freescale ColdFire MCF5227x CPUs - - mcf532xFiles specific to Freescale ColdFire MCF5329 CPUs - - mcf5445x Files specific to Freescale ColdFire MCF5445x CPUs - - mcf547x_8x Files specific to Freescale ColdFire MCF547x_8x CPUs - - mips Files specific to MIPS CPUs - - mpc5xx Files specific to Freescale MPC5xx CPUs - - mpc5xxxFiles specific to Freescale MPC5xxx CPUs - - mpc8xx Files specific to Freescale MPC8xx CPUs - - mpc8220Files specific to Freescale MPC8220 CPUs - - mpc824xFiles specific to Freescale MPC824x CPUs - - mpc8260Files specific to Freescale MPC8260 CPUs - - mpc85xxFiles specific to Freescale MPC85xx CPUs - - nios Files specific to Altera NIOS CPUs - - nios2 Files specific to Altera Nios-II CPUs - - ppc4xx Files specific to AMCC PowerPC 4xx CPUs - - pxaFiles specific to Intel XScale PXA CPUs - - s3c44b0Files specific to Samsung S3C44B0 CPUs - - sa1100 Files specific to Intel StrongARM SA1100 CPUs -- disk Code for disk drive partition handling -- doc Documentation (don't expect too much) -- drivers Commonly used device drivers -- examples Example code for standalone applications, etc. -- fs Filesystem code (cramfs, ext2, jffs2, etc.) -- include Header Files -- arch/arm/lib Files generic to ARM architecture -- arch/avr32/lib Files generic to AVR32 architecture -- arch/blackfin/libFiles generic to Blackfin architecture -- lib Files generic to all architectures -- arch/i386/libFiles generic to i386architecture -- arch/m68k/libFiles generic to m68karchitecture -- arch/microblaze/lib Files generic to microblaze architecture -- arch/mips/libFiles generic to MIPSarchitecture -- arch/nios/libFiles generic to NIOSarchitecture -- arch/nios/lib2 Files generic to NIOS2 architecture -- arch/ppc/lib Files generic to PowerPC architecture -- arch/sh/lib Files generic to SH architecture -- arch/sparc/lib Files generic to SPARC architecture -- libfdt Library files to support flattened device trees -- net Networking code -- post Power On Self Test -- rtc Real Time Clock drivers -- toolsTools to build S-Record or U-Boot images, etc. +/arch Architecture specific files + /arm Files generic to ARM architecture +/cpu CPU specific files + /arm720t Files specific to ARM 720 CPUs + /arm920t Files specific to ARM 920 CPUs +/at91rm9200Files specific to Atmel AT91RM9200 CPU +/imx Files specific to Freescale MC9328 i.MX CPUs +/s3c24x0 Files specific to Samsung S3C24X0 CPUs + /arm925t Files specific to ARM 925 CPUs + /arm926ejs Files specific to ARM 926 CPUs + /arm1136 Files specific to ARM 1136 CPUs + /ixp Files specific to Intel XScale IXP CPUs + /pxa Files specific to Intel XScale PXA CPUs + /s3c44b0 Files specific to Samsung S3C44B0 CPUs + /sa1100 Files specific to Intel StrongARM SA1100 CPUs +/lib Architecture specific library files + /avr32 Files generic to AVR32 architecture +/cpu CPU specific files +/lib
[U-Boot] [PATCH v4 18/20] nios: Move cpu/nios/* to arch/nios/cpu/*
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
{cpu/nios = arch/nios/cpu}/Makefile |0
{cpu/nios = arch/nios/cpu}/asmi.c |0
{cpu/nios = arch/nios/cpu}/config.mk|0
{cpu/nios = arch/nios/cpu}/cpu.c|0
{cpu/nios = arch/nios/cpu}/interrupts.c |0
{cpu/nios = arch/nios/cpu}/serial.c |0
{cpu/nios = arch/nios/cpu}/spi.c|0
{cpu/nios = arch/nios/cpu}/start.S |0
{cpu/nios = arch/nios/cpu}/traps.S |0
board/altera/dk1c20/u-boot.lds |2 +-
board/altera/dk1s10/u-boot.lds |2 +-
board/altera/ep1c20/u-boot.lds |2 +-
board/altera/ep1s10/u-boot.lds |2 +-
board/altera/ep1s40/u-boot.lds |2 +-
board/psyent/pci5441/u-boot.lds |2 +-
board/psyent/pk1c20/u-boot.lds |2 +-
board/ssv/adnpesc1/u-boot.lds|2 +-
doc/README.nios |2 +-
18 files changed, 9 insertions(+), 9 deletions(-)
rename {cpu/nios = arch/nios/cpu}/Makefile (100%)
rename {cpu/nios = arch/nios/cpu}/asmi.c (100%)
rename {cpu/nios = arch/nios/cpu}/config.mk (100%)
rename {cpu/nios = arch/nios/cpu}/cpu.c (100%)
rename {cpu/nios = arch/nios/cpu}/interrupts.c (100%)
rename {cpu/nios = arch/nios/cpu}/serial.c (100%)
rename {cpu/nios = arch/nios/cpu}/spi.c (100%)
rename {cpu/nios = arch/nios/cpu}/start.S (100%)
rename {cpu/nios = arch/nios/cpu}/traps.S (100%)
diff --git a/cpu/nios/Makefile b/arch/nios/cpu/Makefile
similarity index 100%
rename from cpu/nios/Makefile
rename to arch/nios/cpu/Makefile
diff --git a/cpu/nios/asmi.c b/arch/nios/cpu/asmi.c
similarity index 100%
rename from cpu/nios/asmi.c
rename to arch/nios/cpu/asmi.c
diff --git a/cpu/nios/config.mk b/arch/nios/cpu/config.mk
similarity index 100%
rename from cpu/nios/config.mk
rename to arch/nios/cpu/config.mk
diff --git a/cpu/nios/cpu.c b/arch/nios/cpu/cpu.c
similarity index 100%
rename from cpu/nios/cpu.c
rename to arch/nios/cpu/cpu.c
diff --git a/cpu/nios/interrupts.c b/arch/nios/cpu/interrupts.c
similarity index 100%
rename from cpu/nios/interrupts.c
rename to arch/nios/cpu/interrupts.c
diff --git a/cpu/nios/serial.c b/arch/nios/cpu/serial.c
similarity index 100%
rename from cpu/nios/serial.c
rename to arch/nios/cpu/serial.c
diff --git a/cpu/nios/spi.c b/arch/nios/cpu/spi.c
similarity index 100%
rename from cpu/nios/spi.c
rename to arch/nios/cpu/spi.c
diff --git a/cpu/nios/start.S b/arch/nios/cpu/start.S
similarity index 100%
rename from cpu/nios/start.S
rename to arch/nios/cpu/start.S
diff --git a/cpu/nios/traps.S b/arch/nios/cpu/traps.S
similarity index 100%
rename from cpu/nios/traps.S
rename to arch/nios/cpu/traps.S
diff --git a/board/altera/dk1c20/u-boot.lds b/board/altera/dk1c20/u-boot.lds
index 98ee8f8..50c3fe7 100644
--- a/board/altera/dk1c20/u-boot.lds
+++ b/board/altera/dk1c20/u-boot.lds
@@ -30,7 +30,7 @@ SECTIONS
{
.text :
{
- cpu/nios/start.o (.text)
+ arch/nios/cpu/start.o (.text)
*(.text)
}
__text_end = .;
diff --git a/board/altera/dk1s10/u-boot.lds b/board/altera/dk1s10/u-boot.lds
index 98ee8f8..50c3fe7 100644
--- a/board/altera/dk1s10/u-boot.lds
+++ b/board/altera/dk1s10/u-boot.lds
@@ -30,7 +30,7 @@ SECTIONS
{
.text :
{
- cpu/nios/start.o (.text)
+ arch/nios/cpu/start.o (.text)
*(.text)
}
__text_end = .;
diff --git a/board/altera/ep1c20/u-boot.lds b/board/altera/ep1c20/u-boot.lds
index e2eb3aa..b909e94 100644
--- a/board/altera/ep1c20/u-boot.lds
+++ b/board/altera/ep1c20/u-boot.lds
@@ -30,7 +30,7 @@ SECTIONS
{
.text :
{
- cpu/nios2/start.o (.text)
+ arch/nios/cpu2/start.o (.text)
*(.text)
*(.text.*)
*(.gnu.linkonce.t*)
diff --git a/board/altera/ep1s10/u-boot.lds b/board/altera/ep1s10/u-boot.lds
index e2eb3aa..b909e94 100644
--- a/board/altera/ep1s10/u-boot.lds
+++ b/board/altera/ep1s10/u-boot.lds
@@ -30,7 +30,7 @@ SECTIONS
{
.text :
{
- cpu/nios2/start.o (.text)
+ arch/nios/cpu2/start.o (.text)
*(.text)
*(.text.*)
*(.gnu.linkonce.t*)
diff --git a/board/altera/ep1s40/u-boot.lds b/board/altera/ep1s40/u-boot.lds
index e2eb3aa..b909e94 100644
--- a/board/altera/ep1s40/u-boot.lds
+++ b/board/altera/ep1s40/u-boot.lds
@@ -30,7 +30,7 @@ SECTIONS
{
.text :
{
- cpu/nios2/start.o (.text)
+ arch/nios/cpu2/start.o (.text)
*(.text)
*(.text.*)
*(.gnu.linkonce.t*)
diff --git a/board/psyent/pci5441/u-boot.lds b/board/psyent/pci5441/u-boot.lds
index b2d88a5..f155800 100644
--- a/board/psyent/pci5441/u-boot.lds
+++ b/board/psyent/pci5441/u-boot.lds
@@ -30,7 +30,7 @@ SECTIONS
{
.text :
{
- cpu/nios2/start.o (.text)
+ arch/nios/cpu2/start.o (.text)
*(.text)
*(.text.*)
*(.gnu.linkonce.t*)
diff --git
[U-Boot] [PATCH v4 19/20] nios2: Move cpu/nios2/* to arch/nios2/cpu/*
Signed-off-by: Peter Tyser pty...@xes-inc.com
---
{cpu/nios2 = arch/nios2/cpu}/Makefile |0
{cpu/nios2 = arch/nios2/cpu}/config.mk|0
{cpu/nios2 = arch/nios2/cpu}/cpu.c|0
{cpu/nios2 = arch/nios2/cpu}/epcs.c |0
{cpu/nios2 = arch/nios2/cpu}/exceptions.S |0
{cpu/nios2 = arch/nios2/cpu}/interrupts.c |0
{cpu/nios2 = arch/nios2/cpu}/start.S |0
{cpu/nios2 = arch/nios2/cpu}/sysid.c |0
{cpu/nios2 = arch/nios2/cpu}/traps.c |0
9 files changed, 0 insertions(+), 0 deletions(-)
rename {cpu/nios2 = arch/nios2/cpu}/Makefile (100%)
rename {cpu/nios2 = arch/nios2/cpu}/config.mk (100%)
rename {cpu/nios2 = arch/nios2/cpu}/cpu.c (100%)
rename {cpu/nios2 = arch/nios2/cpu}/epcs.c (100%)
rename {cpu/nios2 = arch/nios2/cpu}/exceptions.S (100%)
rename {cpu/nios2 = arch/nios2/cpu}/interrupts.c (100%)
rename {cpu/nios2 = arch/nios2/cpu}/start.S (100%)
rename {cpu/nios2 = arch/nios2/cpu}/sysid.c (100%)
rename {cpu/nios2 = arch/nios2/cpu}/traps.c (100%)
diff --git a/cpu/nios2/Makefile b/arch/nios2/cpu/Makefile
similarity index 100%
rename from cpu/nios2/Makefile
rename to arch/nios2/cpu/Makefile
diff --git a/cpu/nios2/config.mk b/arch/nios2/cpu/config.mk
similarity index 100%
rename from cpu/nios2/config.mk
rename to arch/nios2/cpu/config.mk
diff --git a/cpu/nios2/cpu.c b/arch/nios2/cpu/cpu.c
similarity index 100%
rename from cpu/nios2/cpu.c
rename to arch/nios2/cpu/cpu.c
diff --git a/cpu/nios2/epcs.c b/arch/nios2/cpu/epcs.c
similarity index 100%
rename from cpu/nios2/epcs.c
rename to arch/nios2/cpu/epcs.c
diff --git a/cpu/nios2/exceptions.S b/arch/nios2/cpu/exceptions.S
similarity index 100%
rename from cpu/nios2/exceptions.S
rename to arch/nios2/cpu/exceptions.S
diff --git a/cpu/nios2/interrupts.c b/arch/nios2/cpu/interrupts.c
similarity index 100%
rename from cpu/nios2/interrupts.c
rename to arch/nios2/cpu/interrupts.c
diff --git a/cpu/nios2/start.S b/arch/nios2/cpu/start.S
similarity index 100%
rename from cpu/nios2/start.S
rename to arch/nios2/cpu/start.S
diff --git a/cpu/nios2/sysid.c b/arch/nios2/cpu/sysid.c
similarity index 100%
rename from cpu/nios2/sysid.c
rename to arch/nios2/cpu/sysid.c
diff --git a/cpu/nios2/traps.c b/arch/nios2/cpu/traps.c
similarity index 100%
rename from cpu/nios2/traps.c
rename to arch/nios2/cpu/traps.c
--
1.6.2.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] u-boot compilation for MIPS Au1x00 board
Hi all, I am compiling u-boot latest version for MIPS processor Au1350. When I compile I get the following error as mentioned below. mipsel-linux-ld: /opt/rmi-linux/db1300/lib/gcc/mipsel-linux/4.2.4/libgcc.a(_lshrdi3.o): compiled for a little endian system and target is big endian mipsel-linux-ld: /opt/rmi-linux/db1300/lib/gcc/mipsel-linux/4.2.4/libgcc.a(_lshrdi3.o): endianness incompatible with that of the selected emulation mipsel-linux-ld: failed to merge target specific data of file /opt/rmi-linux/db1300/lib/gcc/mipsel-linux/4.2.4/libgcc.a(_lshrdi3.o) I am not using ELDK tool chain, we have customized tool chain. My environment settings are ARCH=mips CROSS_COMPILE=mipsel-linux- Am compiling for dbau1100 board. But when I use u-boot 1.1.6 version am able to compile the u-boot and creating u-boot.bin image file. So please let me know what am missing. is there any issue with the big endian or little endian? Or I need to configure any settings in the dbau1x00.h configuration file? Thanks Regards Gurumurthy Gowdar KPIT Cummins Infosystems Ltd. | Mobile: +91 9642645725 I E-mail : gurumurthy.gow...@kpitcummins.com I www.kpitcummins.com Client Site - Hyundai MOBIS India Research And Development Pvt. Ltd. |1st Floor , Survey No 5/2 5/3, Backside of NAC, Izzatnagar|(OPP. HitechCity MMTS Railway Station), Lingampally Mandal, Hyderabad - 500081.INDIA E-mail: gurumurthy.gow...@gmobis.com This message contains information that may be privileged or confidential and is the property of the KPIT Cummins Infosystems Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Cummins Infosystems Ltd. does not accept any liability for virus infected mails. P Please don't print this email unless absolutely necessary. Save Trees ! ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
